Upload 2 files

app.py

@@ -5,18 +5,6 @@ import webbrowser
 import socketserver
 import os
 import random
-import asyncio
-import websockets
-from websockets.server import serve
-from urllib.parse import urlparse, parse_qs
-from concurrent.futures import ThreadPoolExecutor
-
-DOMAIN = "gitdeem-live.hf.space"
-PORT = 8000
-
-# 全局变量
-websocket_server = None
-ws_port = None
 
 def get_refresh_tokens():
     tokens = os.environ.get('REFRESH_TOKENS', '')
@@ -58,44 +46,12 @@ def get_livekit_url(access_token):
     }).json()
 
     livekit_url = "https://meet.livekit.io"
-    proxy_url = f"wss://{DOMAIN}/proxy"
-    url = f"{livekit_url}/custom?liveKitUrl={proxy_url}?target=wss://webrtc.chatgpt.com&token={res['token']}#{res['e2ee_key']}"
+    #url = f"{livekit_url}/custom?liveKitUrl={res['url']}&token={res['token']}#{res['e2ee_key']}"
+    url = f"{livekit_url}/custom?liveKitUrl=wss://webrtc.chatgpt.com&token={res['token']}#{res['e2ee_key']}"
     return url
 
-async def proxy_handler(websocket, path):
-    query = urlparse(path).query
-    params = parse_qs(query)
-    target_url = params.get('target', [''])[0]
-
-    if not target_url:
-        await websocket.close(1008, 'Missing target parameter')
-        return
-
-    try:
-        async with websockets.connect(target_url) as target_ws:
-            tasks = [
-                asyncio.create_task(forward(websocket, target_ws)),
-                asyncio.create_task(forward(target_ws, websocket))
-            ]
-            await asyncio.gather(*tasks, return_exceptions=True)
-    except websockets.exceptions.WebSocketException as e:
-        print(f"WebSocket error: {e}")
-
-async def forward(source, destination):
-    try:
-        async for message in source:
-            await destination.send(message)
-    except websockets.exceptions.WebSocketException:
-        pass
-
-class CombinedHandler(http.server.SimpleHTTPRequestHandler):
+class RedirectHandler(http.server.SimpleHTTPRequestHandler):
     def do_GET(self):
-        if self.path.startswith('/proxy'):
-            self.handle_websocket()
-        else:
-            self.handle_http()
-
-    def handle_http(self):
         refresh_tokens = get_refresh_tokens()
         if not refresh_tokens:
             self.send_error(500, "未设置 REFRESH_TOKENS 环境变量")
@@ -111,72 +67,11 @@ class CombinedHandler(http.server.SimpleHTTPRequestHandler):
         else:
             self.send_error(500, "无法获取访问令牌")
 
-    def handle_websocket(self):
-        global websocket_server, ws_port
-        
-        self.send_response(101, "Switching Protocols")
-        self.send_header('Upgrade', 'websocket')
-        self.send_header('Connection', 'Upgrade')
-        self.end_headers()
-        
-        if websocket_server is None:
-            loop = asyncio.new_event_loop()
-            asyncio.set_event_loop(loop)
-            
-            # 使用未使用的端口
-            ws_port = self.find_free_port()
-            websocket_server = serve(proxy_handler, "localhost", ws_port)
-            loop.run_until_complete(websocket_server)
-
-        # 创建新的事件循环
-        loop = asyncio.new_event_loop()
-        asyncio.set_event_loop(loop)
-
-        try:
-            # 创建到WebSocket服务器的连接
-            ws_client = loop.run_until_complete(websockets.connect(f"ws://localhost:{ws_port}"))
-            
-            # 在这里处理WebSocket连接
-            # 例如：loop.run_until_complete(self.handle_websocket_communication(ws_client))
-
-        finally:
-            loop.close()
-
-    # 添加这个新方法来处理WebSocket通信
-    async def handle_websocket_communication(self, ws_client):
-        # 在这里实现WebSocket通信逻辑
-        pass
-
-    @staticmethod
-    def find_free_port():
-        with socketserver.TCPServer(("localhost", 0), None) as s:
-            return s.server_address[1]
-
-# 修改 run_server 函数
-def run_server(port=PORT):
-    global websocket_server, ws_port
-    
-    with ThreadPoolExecutor(max_workers=1) as executor:
-        with socketserver.TCPServer(("", port), CombinedHandler) as httpd:
-            print(f"HTTP 服务器运行在 http://{DOMAIN}:{port}")
-            
-            # 启动 WebSocket 服务器
-            loop = asyncio.new_event_loop()
-            asyncio.set_event_loop(loop)
-            ws_port = CombinedHandler.find_free_port()
-            websocket_server = serve(proxy_handler, "localhost", ws_port)
-            loop.run_until_complete(websocket_server)
-            print(f"WebSocket 服务器运行在 ws://localhost:{ws_port}")
-            
-            executor.submit(httpd.serve_forever)
-            try:
-                loop.run_forever()
-            except KeyboardInterrupt:
-                print("服务器正在关闭...")
-                httpd.shutdown()
-                loop.run_until_complete(websocket_server.close())
-            finally:
-                loop.close()
+def run_server(port=8000):
+    with socketserver.TCPServer(("", port), RedirectHandler) as httpd:
+        print(f"服务器运行在 http://localhost:{port}")
+        webbrowser.open(f"http://localhost:{port}")
+        httpd.serve_forever()
 
 if __name__ == "__main__":
     refresh_tokens = get_refresh_tokens()

requirements.txt

@@ -1,2 +1 @@
-requests
-websockets
+requests