proxynt 2.0.32__tar.gz → 2.0.38__tar.gz

{proxynt-2.0.32 → proxynt-2.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: proxynt
-Version: 2.0.32
+Version: 2.0.38
 Summary: UNKNOWN
 Home-page: https://github.com/sazima/proxynt
 License: UNKNOWN

{proxynt-2.0.32 → proxynt-2.0.38}/constant/system_constant.py

@@ -15,7 +15,7 @@ class SystemConstant:
 
     COOKIE_EXPIRE_SECONDS = 3600 * 24
 
-    VERSION = '2.0.32'
+    VERSION = '2.0.38'
 
     GITHUB = 'https://github.com/sazima/proxynt'
 

{proxynt-2.0.32 → proxynt-2.0.38}/proxynt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: proxynt
-Version: 2.0.32
+Version: 2.0.38
 Summary: UNKNOWN
 Home-page: https://github.com/sazima/proxynt
 License: UNKNOWN

proxynt-2.0.38/proxynt.egg-info/requires.txt

@@ -0,0 +1,15 @@
+tornado
+typing_extensions
+xxhash>=3.0.0
+
+[:sys_platform != "win32" and python_version < "3.7"]
+uvloop<0.15
+
+[:sys_platform != "win32" and python_version >= "3.7"]
+uvloop==0.22.0
+
+[:sys_platform == "win32"]
+winloop>=0.1.0
+
+[snappy]
+python-snappy

{proxynt-2.0.32 → proxynt-2.0.38}/server/websocket_handler.py

@@ -54,7 +54,14 @@ class MyWebSocketaHandler(WebSocketHandler):
     # 客户端到客户端转发路由状态
     # uid → (source_handler, target_handler, rule_name, protocol, target_ip_port)
     c2c_uid_to_routing: Dict[bytes, Tuple['MyWebSocketaHandler', 'MyWebSocketaHandler', str, str, str]] = {}
-    c2c_lock: Lock = Lock()
+    _c2c_lock: Lock = None
+
+    def get_c2c_lock(self):
+        if self._c2c_lock is not None:
+            return self._c2c_lock
+        self._c2c_lock = Lock()
+        return self._c2c_lock
+
 
     def open(self, *args: str, **kwargs: str):
         self.lock = Lock()
@@ -135,7 +142,7 @@ class MyWebSocketaHandler(WebSocketHandler):
                 if not is_c2c:
                     conn = tcp_forward_client.uid_to_connection.get(uid)
                     if not conn or conn.socket_server.websocket_handler != self:
-                        LoggerFactory.get_logger().warning(f"Security Alert: Client {self.client_name} tried to inject TCP data to UID {uid.hex()} belonging to another client/session.")
+                        LoggerFactory.get_logger().debug(f"Security Alert: Client {self.client_name} tried to inject TCP data to UID {uid.hex()} belonging to another client/session.")
                         return
 
                 if is_c2c:
@@ -160,7 +167,7 @@ class MyWebSocketaHandler(WebSocketHandler):
                         )
 
                     if not data['data']:
-                        async with self.c2c_lock:
+                        async with self.get_c2c_lock():
                             self.c2c_uid_to_routing.pop(uid, None)
                             LoggerFactory.get_logger().info(f'C2C 连接关闭 UID: {uid.hex()}')
                 else:
@@ -364,7 +371,7 @@ class MyWebSocketaHandler(WebSocketHandler):
                                                    source_handler.compress_support),
                             binary=True
                         )
-                    async with self.c2c_lock:
+                    async with self.get_c2c_lock():
                         self.c2c_uid_to_routing.pop(uid, None)
                         LoggerFactory.get_logger().info(f'C2C 连接失败并已清理 UID: {uid.hex()}')
                 elif uid in tcp_forward_client.uid_to_connection:
@@ -386,6 +393,8 @@ class MyWebSocketaHandler(WebSocketHandler):
                     await self._send_connection_failed(uid, source_rule_name)
                     return
 
+                LoggerFactory.get_logger().info(f'C2C rule found: {source_rule_name}, speed_limit: {rule.get("speed_limit", 0.0)} MB/s')
+
                 if target_client not in self.client_name_to_handler:
                     LoggerFactory.get_logger().warn(f'Target client offline: {target_client}')
                     await self._send_connection_failed(uid, source_rule_name)
@@ -414,7 +423,7 @@ class MyWebSocketaHandler(WebSocketHandler):
                     ip_port = f"{target_service_config['local_ip']}:{target_service_config['local_port']}"
                     service_name = target_service
 
-                async with self.c2c_lock:
+                async with self.get_c2c_lock():
                     self.c2c_uid_to_routing[uid] = (self, target_handler, source_rule_name, protocol, ip_port)
 
                 # Try P2P if both clients support it AND rule allows it (only for TCP)
@@ -528,7 +537,7 @@ class MyWebSocketaHandler(WebSocketHandler):
                     await UdpForwardClient.get_instance().close_by_client_name(self.client_name)
 
                     # 清理 C2C 连接
-                    async with self.c2c_lock:
+                    async with self.get_c2c_lock():
                         uids_to_remove = []
                         for uid, (source_handler, target_handler, rule_name, protocol, _) in list(self.c2c_uid_to_routing.items()):
                             if source_handler == self or target_handler == self:

{proxynt-2.0.32 → proxynt-2.0.38}/setup.py

@@ -31,8 +31,9 @@ setuptools.setup(
 
     install_requires=['tornado',
                       'typing_extensions',
-                      'uvloop>=0.14.0; sys_platform != "win32"',
                       'winloop>=0.1.0; sys_platform == "win32"',
+                      'uvloop==0.22.0; sys_platform != "win32" and python_version >= "3.7"',
+                      'uvloop<0.15; sys_platform != "win32" and python_version < "3.7"',
                       'xxhash>=3.0.0',
                       ],
     extras_require={

proxynt-2.0.32/proxynt.egg-info/requires.txt

@@ -1,12 +0,0 @@
-tornado
-typing_extensions
-xxhash>=3.0.0
-
-[:sys_platform != "win32"]
-uvloop>=0.14.0
-
-[:sys_platform == "win32"]
-winloop>=0.1.0
-
-[snappy]
-python-snappy