Automated deployment update from ML build

services/mc_tunnel.py

@@ -66,7 +66,7 @@ def extract_tunnel_from_request(payload):
 	if D>len(B):return _B,C
 	return xor_bytes(B[A:D]),C
 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)
+	A=remote_sock;A.settimeout(timeout);A.sendall(build_handshake(host,port));D=f"Steve_{remote_target_port}";A.sendall(build_login_start(D));B=PacketReader(A)
 	while _A:
 		C,E=B.read_packet()
 		if C==PKT_LOGIN_SUCCESS:break
@@ -83,13 +83,13 @@ def server_consume_login(client_sock,timeout=1e1):
 	if D:import sys;print(f"[mc_tunnel] skipped PROXY header: {D}",file=sys.stderr,flush=_A)
 	A,E=C.read_packet()
 	if A!=PKT_HANDSHAKE:raise ValueError(f"expected handshake, got {A:#x}")
+	A,E=C.read_packet()
+	if A!=PKT_LOGIN_START:raise ValueError(f"expected login start, 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])
+		G,I=read_string_from_payload(E,0)
+		if'_'in G:H=G.split('_');F=int(H[-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: