Update core.py

core.py

@@ -22,7 +22,7 @@ bot = None
 
 result_file = None
 
-host = "b-ww.mjv.jp"
+host = "proxy.warfarinarknights.workers.dev"
 path = "/"
 
 CHANGCI = '41'
@@ -64,26 +64,30 @@ class WebSocketClient:
     
     def login(self, account):
         self.last_account = account
-        socks.set_default_proxy(socks.SOCKS5, "127.0.0.1", 4156) # Does not work
-        # Why this never passes proxy? It runs event I set the proxy port to an value that isnt
-        socket.socket = socks.socksocket
+        
+        # 删掉这两行代理相关的代码：
+        # socks.set_default_proxy(socks.SOCKS5, "127.0.0.1", 4156) # Does not work
+        # socket.socket = socks.socksocket
+
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         
         context = ssl.create_default_context()
-        wrapped_socket = context.wrap_socket(sock, server_hostname=host)
+        # 这里的 server_hostname 必须是你的 CF Worker 域名，否则 SSL 证书校验会失败
+        wrapped_socket = context.wrap_socket(sock, server_hostname=host) 
         wrapped_socket.connect((host, 443))
 
         key = base64.b64encode(hashlib.sha1(str(id(wrapped_socket)).encode()).digest()[:16])
 
+        # 注意这里：Host 请求头必须改成你的 CF Worker 域名
         request = (
             f"GET {path} HTTP/1.1\r\n"
-            f"Host: b-ww.mjv.jp\r\n"
+            f"Host: {host}\r\n"  # <--- 从 b-ww.mjv.jp 改成 {host}
             f"Upgrade: websocket\r\n"
             f"Connection: Upgrade\r\n"
             f"Sec-WebSocket-Key: {key.decode()}\r\n"
             f"Sec-WebSocket-Version: 13\r\n"
             f"Origin: https://tenhou.net\r\n"
-            f"User-Agent: User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:140.0) Gecko/20100101 Firefox/140.0\r\n"
+            f"User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:140.0) Gecko/20100101 Firefox/140.0\r\n"
             "\r\n"
         )
         wrapped_socket.send(request.encode())
@@ -98,6 +102,16 @@ class WebSocketClient:
         self.send('{"tag":"HELO","name":"' + str(account) + '","sx":"F"}')
         return wrapped_socket
 
+        response = wrapped_socket.recv(4096).decode()
+        if "101 Switching Protocols" not in response:
+            print(response)
+            raise Exception("Log in failed:", response)
+
+        self.sock = wrapped_socket
+        print(f'\033[33m尝试登录账号：{account}\033[0m')
+        self.send('{"tag":"HELO","name":"' + str(account) + '","sx":"F"}')
+        return wrapped_socket
+
     def send(self, data):
         if not self.sock:
             raise Exception("Socket not connected")