proxynt 2.0.45__tar.gz → 2.0.48__tar.gz

{proxynt-2.0.45/proxynt.egg-info → proxynt-2.0.48}/PKG-INFO

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

{proxynt-2.0.45 → proxynt-2.0.48}/common/nat_serialization_v2.py

@@ -1,12 +1,15 @@
 """
 NatSerialization V2 - msgpack format (flexible, supports arbitrary fields)
 """
+import logging
 import os
 import struct
 import time
 
 import msgpack
 
+from common.logger_factory import LoggerFactory
+
 try:
     import snappy
     has_snappy = True
@@ -40,14 +43,30 @@ class NatSerializationV2:
         # 处理 data_content，确保可以被 msgpack 序列化
         if data_content is not None:
             # 复制一份避免修改原数据
-            # serializable_content = dict(data_content) if isinstance(data_content, dict) else data_content
-            serializable_content = data_content
-
+            if compress:
+                serializable_content = dict(data_content) if isinstance(data_content, dict) else data_content
+            else:
+                serializable_content = data_content
             # 如果有 'data' 字段且需要压缩
             if isinstance(serializable_content, dict) and 'data' in serializable_content:
                 if compress and has_snappy and serializable_content['data']:
+                    original_size = len(serializable_content['data'])
+
                     serializable_content['data'] = snappy.snappy.compress(serializable_content['data'])
                     serializable_content['_compressed'] = True
+                    compressed_size = len(serializable_content['data'])
+
+                    if LoggerFactory.get_logger().isEnabledFor(logging.DEBUG):
+                        if original_size > 0:
+                            ratio = compressed_size / original_size
+                            LoggerFactory.get_logger().debug(
+                                "NatSerializationV2 compress | type=%s | original=%d bytes | "
+                                "compressed=%d bytes | ratio=%.2f",
+                                type_,
+                                original_size,
+                                compressed_size,
+                                ratio
+                            )
 
             body = msgpack.packb(serializable_content, use_bin_type=True)
         else:

{proxynt-2.0.45 → proxynt-2.0.48}/constant/system_constant.py

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

{proxynt-2.0.45 → proxynt-2.0.48/proxynt.egg-info}/PKG-INFO

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

{proxynt-2.0.45 → proxynt-2.0.48}/proxynt.egg-info/SOURCES.txt

@@ -59,7 +59,6 @@ setup.py
 ./context/context_utils.py
 ./entity/__init__.py
 ./entity/client_config_entity.py
-./entity/rule_entity.py
 ./entity/server_config_entity.py
 ./entity/message/__init__.py
 ./entity/message/message_entity.py

{proxynt-2.0.45 → proxynt-2.0.48}/proxynt.egg-info/requires.txt

@@ -7,7 +7,7 @@ msgpack
 uvloop<0.15
 
 [:sys_platform != "win32" and python_version >= "3.7"]
-uvloop==0.22.0
+uvloop>0.22.0
 
 [:sys_platform == "win32"]
 winloop>=0.1.0

{proxynt-2.0.45 → proxynt-2.0.48}/server/websocket_handler.py

@@ -105,6 +105,9 @@ class MyWebSocketaHandler(WebSocketHandler):
             await (super(MyWebSocketaHandler, self).write_message(byte_message, binary))
             if LoggerFactory.get_logger().isEnabledFor(logging.DEBUG):
                 LoggerFactory.get_logger().debug(f'Write message cost {time.time() - start_time}s, length: {len(message)}')
+            heart_beat_task = ContextUtils.get_heart_beat_task()
+            if heart_beat_task:
+                heart_beat_task.update_business_activity(self.client_name)
             return
         except Exception:
             LoggerFactory.get_logger().info(f'Send error: {message[:10]}')
@@ -132,9 +135,9 @@ class MyWebSocketaHandler(WebSocketHandler):
             # 智能心跳：记录业务活动（非 PING 消息）
             if self.client_name and message_dict['type_'] != MessageTypeConstant.PING:
                 from server.task.heart_beat_task import HeartBeatTask
-                heart_beat_task = ContextUtils.get_heart_beat_task()
-                if heart_beat_task:
-                    heart_beat_task.update_business_activity(self.client_name)
+                # heart_beat_task = ContextUtils.get_heart_beat_task()
+                # if heart_beat_task:
+                #     heart_beat_task.update_business_activity(self.client_name)
 
             if message_dict['type_'] == MessageTypeConstant.WEBSOCKET_OVER_TCP:
                 data: TcpOverWebsocketMessage = message_dict['data']

{proxynt-2.0.45 → proxynt-2.0.48}/setup.py

@@ -32,7 +32,7 @@ setuptools.setup(
     install_requires=['tornado',
                       'typing_extensions',
                       'winloop>=0.1.0; sys_platform == "win32"',
-                      'uvloop==0.22.0; sys_platform != "win32" and python_version >= "3.7"',
+                      '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',
                       'msgpack',

proxynt-2.0.45/entity/rule_entity.py

@@ -1,28 +0,0 @@
-from typing_extensions import TypedDict
-
-
-class RuleEntity(TypedDict):
-    # {
-    #     "name": "xjy_test",
-    #     "source_client": "家里小主机",
-    #     "target_client": "xinjiaya_server_test",
-    #     "local_port": 33333,
-    #     "local_ip": "127.0.0.1",
-    #     "protocol": "tcp",
-    #     "speed_limit": 0.0,
-    #     "enabled": true,
-    #     "p2p_enabled": false,
-    #     "target_ip": "127.0.0.1",
-    #     "target_port": 22
-    # }
-    name: str
-    source_client: str
-    target_client: str
-    local_port: int
-    local_ip: str
-    protocol: str
-    speed_limit: float
-    enabled: bool
-    p2p_enabled: bool
-    target_ip: str
-    target_port: int