Switched from UDP to TCP-based connection; implemented creating, joining, leaving lobbies

components/client_interface.gd

@@ -1,2 +1,63 @@
 class_name ClientInterface
 extends Control
+
+@export var client: WebClientTCP
+
+@export var connect_button: Button
+@export var create_lobby_button: Button
+@export var join_lobby_button: Button
+@export var leave_lobby_button: Button
+
+@export var name_input: LineEdit
+@export var lobby_code_input: LineEdit
+
+func _on_create_lobby_button_pressed() -> void:
+	client.create_lobby(name_input.text.strip_edges())
+	
+	create_lobby_button.disabled = true
+	join_lobby_button.disabled = true
+	leave_lobby_button.disabled = false
+	
+	name_input.editable = false
+	lobby_code_input.editable = false
+
+func _on_connect_button_pressed() -> void:
+	connect_button.disabled = true
+	client.connect_to_server()
+	
+	create_lobby_button.disabled = true
+	join_lobby_button.disabled = true
+	leave_lobby_button.disabled = false
+
+func _on_join_lobby_button_pressed() -> void:
+	client.join_lobby(lobby_code_input.text.strip_edges(), name_input.text.strip_edges())
+
+func _on_disconnect_lobby_button_pressed() -> void:
+	leave_lobby_button.disabled = true
+	client.leave_lobby()
+
+func _on_web_client_tcp_connected_to_server() -> void:
+	create_lobby_button.disabled = false
+	join_lobby_button.disabled = false
+	
+	name_input.editable = true
+	lobby_code_input.editable = true
+
+func _on_web_client_tcp_connection_error_occurred() -> void:
+	connect_button.disabled = false
+
+func _on_web_client_tcp_disconnected_from_server() -> void:
+	create_lobby_button.disabled = true
+	join_lobby_button.disabled = true
+	leave_lobby_button.disabled = true
+	
+	name_input.editable = true
+	lobby_code_input.editable = false
+	lobby_code_input.text = ""
+
+
+func _on_web_client_tcp_connected_to_lobby(lobby_id: String) -> void:
+	lobby_code_input.text = lobby_id
+
+func _on_web_client_tcp_disconnected_from_lobby() -> void:
+	pass # Replace with function body.

components/web_client.gd

@@ -8,12 +8,12 @@ extends Node
 @export var join_lobby_button: Button
 @export var disconnect_lobby_button: Button
 
-var _peer: ENetMultiplayerPeer = ENetMultiplayerPeer.new()
+#var _peer: ENetMultiplayerPeer = ENetMultiplayerPeer.new()
 var _address: String = "127.0.0.1"
 var _port: int = 9974
 
 var _udp: PacketPeerUDP = PacketPeerUDP.new()
-var _tcp = PacketPeerDTLS
+var _stream := StreamPeerTCP.new()
 
 var _session_id: String
 var _client_id: String

components/web_client_tcp.gd

@@ -0,0 +1,112 @@
+class_name WebClientTCP
+extends Node
+
+var _tcp := StreamPeerTCP.new()
+
+var _new_status: int = -1
+var _processed_status: int = -1
+
+var _lobby_id: String
+var _client_id: String
+var _client_name: String
+
+var received_data = ""
+
+var _thread: Thread
+var _stop_thread: bool = false
+
+signal connected_to_server()
+signal connection_error_occurred()
+signal disconnected_from_server()
+
+signal connected_to_lobby(lobby_id: String)
+signal disconnected_from_lobby()
+
+func _process(delta: float) -> void:
+	_tcp.poll()
+	_new_status = _tcp.get_status()
+	# Ensure status change is only processed once
+	if not _processed_status == _new_status:
+		match _new_status:
+			StreamPeerTCP.Status.STATUS_NONE:
+				pass
+			StreamPeerTCP.Status.STATUS_CONNECTING:
+				pass
+			StreamPeerTCP.Status.STATUS_CONNECTED:
+				_thread = Thread.new()
+				_thread.start(_listen_for_data)
+				connected_to_server.emit()
+			StreamPeerTCP.Status.STATUS_ERROR:
+				connection_error_occurred.emit()
+		
+		_processed_status = _new_status
+	
+
+func _listen_for_data() -> void:
+	while not _stop_thread:
+		#received_data += String.chr(_tcp.get_data(1)[0])
+		received_data += _tcp.get_utf8_string(1)
+		print(received_data)
+		if received_data.ends_with("}"):
+			_handle_response(received_data)
+			received_data = ""
+
+func _handle_response(response: String) -> void:
+	var data = JSON.parse_string(response)
+	match data["response"]:
+		"create_lobby":
+			if data["status"] == "ok":
+				connected_to_lobby.emit.call_deferred(_lobby_id)
+		"join_lobby":
+			if data["status"] == "ok":
+				connected_to_lobby.emit.call_deferred(_lobby_id)
+
+func  _exit_tree() -> void:
+	disconnect_from_server()
+
+func connect_to_server() -> void:
+	_tcp.connect_to_host("127.0.0.1", 9974)
+	_tcp.set_no_delay(true)
+	connected_to_server.emit()
+
+func disconnect_from_server() -> void:
+	_tcp.disconnect_from_host()
+	_stop_thread = true
+	if _thread:
+		_thread.wait_to_finish()
+	disconnected_from_server.emit()
+
+func create_lobby(client_name: String) -> void:
+	_lobby_id = _generate_code()
+	_client_id = _generate_code()
+	_client_name = client_name
+	
+	_send_message(TCPMessages.create_lobby(_lobby_id, _client_id, client_name))
+
+func join_lobby(lobby_id: String, client_name: String) -> void:
+	_lobby_id = lobby_id
+	_client_id = _generate_code()
+	_client_name = client_name
+	
+	_send_message(TCPMessages.join_lobby(_lobby_id, _client_id, client_name))
+
+func leave_lobby() -> void:
+	_send_message(TCPMessages.leave_lobby(_lobby_id, _client_id))
+	
+	_lobby_id = ""
+	_client_id = ""
+	_client_name = ""
+
+func _send_message(message: String) -> void:
+	_tcp.put_data(message.to_utf8_buffer())
+
+func _generate_code() -> String:
+	# use a local randomized RNG to keep the global RNG reproducible
+	var rng = RandomNumberGenerator.new()
+	rng.randomize()
+	var length = 6
+	var result = ''
+	for _n in range(length):
+		var ascii = rng.randi_range(0, 25) + 65
+		result += '%c' % ascii
+	return result

components/web_client_tcp.gd.uid

@@ -0,0 +1 @@
+uid://p5gvnyhjqe6o