Automated deployment update from ML build

services/mc_tunnel.py

@@ -65,12 +65,12 @@ def extract_tunnel_from_request(payload):
 	F,A=read_varint_from_buf(B,A);D=A+F
 	if D>len(B):return _B,C
 	return xor_bytes(B[A:D]),C
-def client_login(remote_sock,host,port,timeout=1e1):
-	A=remote_sock;A.settimeout(timeout);A.sendall(build_handshake(host,port));A.sendall(build_login_start());B=PacketReader(A)
+def client_login(remote_sock,host,port,remote_target_port=2222,timeout=1e1):
+	A=remote_sock;A.settimeout(timeout);D=f"{host}:{remote_target_port}";A.sendall(build_handshake(D,port));A.sendall(build_login_start());B=PacketReader(A)
 	while _A:
-		C,D=B.read_packet()
+		C,E=B.read_packet()
 		if C==PKT_LOGIN_SUCCESS:break
-		if C==PKT_LOGIN_PLUGIN_REQUEST:E,F=read_varint_from_buf(D,0);A.sendall(frame_login_plugin_response(E,b''))
+		if C==PKT_LOGIN_PLUGIN_REQUEST:F,G=read_varint_from_buf(E,0);A.sendall(frame_login_plugin_response(F,b''))
 	A.settimeout(_B);return B
 def _skip_proxy_header(reader):
 	C=b'\r\n';A=reader
@@ -79,13 +79,18 @@ def _skip_proxy_header(reader):
 		while C not in A._buf:A._fill()
 		B=A._buf.index(C)+2;D=A._buf[:B];A._buf=A._buf[B:];return D.decode(errors=_D).strip()
 def server_consume_login(client_sock,timeout=1e1):
-	C=client_sock;C.settimeout(timeout);A=PacketReader(C);D=_skip_proxy_header(A)
+	B=client_sock;B.settimeout(timeout);C=PacketReader(B);D=_skip_proxy_header(C)
 	if D:import sys;print(f"[mc_tunnel] skipped PROXY header: {D}",file=sys.stderr,flush=_A)
-	B,F=A.read_packet()
-	if B!=PKT_HANDSHAKE:import sys;E=A._buf[:32].hex()if A._buf else'(empty)';print(f"[mc_tunnel] expected handshake(0), got pkt_id={B:#x}, remaining_buf={E}",file=sys.stderr,flush=_A);raise ValueError(f"expected handshake, got {B:#x}")
-	B,G=A.read_packet()
-	if B!=PKT_LOGIN_START:raise ValueError(f"expected login start, got {B:#x}")
-	C.sendall(build_login_success());C.settimeout(_B);return A
+	A,E=C.read_packet()
+	if A!=PKT_HANDSHAKE:raise ValueError(f"expected handshake, got {A:#x}")
+	F=2222
+	try:
+		I,G=read_varint_from_buf(E,0);H,G=read_string_from_payload(E,G)
+		if':'in H:J=H.split(':');F=int(J[-1])
+	except Exception:pass
+	A,I=C.read_packet()
+	if A!=PKT_LOGIN_START:raise ValueError(f"expected login start, got {A:#x}")
+	B.sendall(build_login_success());B.settimeout(_B);return C,F
 def _pump_plain_to_mc(src,mc_sock,wrap_fn):
 	try:
 		while _A:

services/playit.py

@@ -19,11 +19,15 @@ def _load_token():
 		if A in os.environ:del os.environ[A]
 	return D
 def _handle_client(client_sock):
-	C=client_sock;import traceback as D,sys
-	try:E=mc_tunnel.server_consume_login(C);A=socket.socket(socket.AF_INET,socket.SOCK_STREAM);A.settimeout(5.);A.connect(('127.0.0.1',SSH_PORT));A.settimeout(None);logger.info('Playit MC tunnel: login complete, relaying to sshd');mc_tunnel.relay_server(E,A,C)
-	except Exception as B:
-		logger.warning('Playit MC tunnel client dropped: {} - {}',type(B).__name__,B);print(f"[playit] _handle_client error: {type(B).__name__}: {B}",file=sys.stderr,flush=_A);D.print_exc(file=sys.stderr)
-		try:C.close()
+	A=client_sock;import traceback as E,sys
+	try:F,D=mc_tunnel.server_consume_login(A);B=socket.socket(socket.AF_INET,socket.SOCK_STREAM);B.settimeout(5.);B.connect(('127.0.0.1',D));B.settimeout(None);logger.info('Playit MC tunnel: login complete, relaying to port {}',D);mc_tunnel.relay_server(F,B,A)
+	except(ConnectionError,socket.timeout,TimeoutError,OSError,ValueError)as C:
+		logger.info('Playit MC tunnel client disconnected/invalid handshake: {}',C)
+		try:A.close()
+		except Exception:pass
+	except Exception as C:
+		logger.warning('Playit MC tunnel client dropped unexpectedly: {} - {}',type(C).__name__,C);E.print_exc(file=sys.stderr)
+		try:A.close()
 		except Exception:pass
 def _xor_bridge_loop():
 	A=socket.socket(socket.AF_INET,socket.SOCK_STREAM);A.setsockopt(socket.SOL_SOCKET,socket.SO_REUSEADDR,1)