proxynt 2.0.60__tar.gz → 2.0.61rc1__tar.gz

{proxynt-2.0.60 → proxynt-2.0.61rc1}/PKG-INFO

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

{proxynt-2.0.60 → proxynt-2.0.61rc1}/client/tcp_forward_client.py

@@ -24,6 +24,9 @@ class PrivateSocketConnection:
         self.uid: bytes = uid
         self.socket: socket.socket = s
         self.name: str = name
+        self.bytes_recv: int = 0
+        self.bytes_sent: int = 0
+        self.create_time: float = time.time()
 
 
 class TcpForwardClient:
@@ -170,8 +173,17 @@ class TcpForwardClient:
 
         try:
             recv = each.recv(data.read_size)
-        except OSError:
+        except OSError as e:
+            LoggerFactory.get_logger().info('recv error uid: %s, %s: %s (errno=%s), sent=%d recv=%d, alive=%.3fs' % (
+                connection.uid.hex(), type(e).__name__, e, getattr(e, 'errno', None),
+                connection.bytes_sent, connection.bytes_recv, time.time() - connection.create_time))
             recv = b''
+        else:
+            if recv:
+                connection.bytes_recv += len(recv)
+            else:
+                LoggerFactory.get_logger().info('recv EOF from local uid: %s, sent=%d recv=%d, alive=%.3fs' % (
+                    connection.uid.hex(), connection.bytes_sent, connection.bytes_recv, time.time() - connection.create_time))
 
         if data.speed_limiter and recv:
             wait_time = data.speed_limiter.acquire(len(recv))
@@ -227,6 +239,7 @@ class TcpForwardClient:
                 ip, port = ip_port.split(':')
                 try:
                     s.connect((ip, int(port)))
+                    LoggerFactory.get_logger().info('connected uid: %s, local %s -> %s' % (uid.hex(), s.getsockname(), ip_port))
 
                     confirm_message: MessageEntity = {
                         'type_': MessageTypeConstant.CONNECT_CONFIRMED,
@@ -286,6 +299,8 @@ class TcpForwardClient:
         LoggerFactory.get_logger().info('Closing socket %s' % socket_client)
         if socket_client in self.socket_to_socket_connection:
             connection: PrivateSocketConnection = self.socket_to_socket_connection.pop(socket_client)
+            LoggerFactory.get_logger().info('close uid: %s, sent=%d recv=%d, alive=%.3fs' % (
+                connection.uid.hex(), connection.bytes_sent, connection.bytes_recv, time.time() - connection.create_time))
             self.socket_event_loop.unregister(socket_client)
             try:
                 socket_client.shutdown(socket.SHUT_RDWR)
@@ -369,7 +384,9 @@ class TcpForwardClient:
             s.settimeout(30)
             s.sendall(msg)
             s.settimeout(None)
+            connection.bytes_sent += len(msg)
             if not msg:
+                LoggerFactory.get_logger().info('server requested close uid: %s' % connection.uid.hex())
                 self.close_connection(s)
         except socket.timeout:
             LoggerFactory.get_logger().warning('sendall timeout, closing uid: %s' % connection.uid.hex())

{proxynt-2.0.60 → proxynt-2.0.61rc1}/constant/system_constant.py

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

{proxynt-2.0.60 → proxynt-2.0.61rc1}/proxynt.egg-info/PKG-INFO

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

{proxynt-2.0.60 → proxynt-2.0.61rc1}/proxynt.egg-info/SOURCES.txt

@@ -5,42 +5,6 @@ setup.py
 ./run_client.py
 ./run_server.py
 ./test_exchange.py
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/common/websocket2/compliance/autobahn-test-report-Feb-03-2021.html
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/server/template/base.html
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/server/template/ele_index.html
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/server/template/login.html
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/server/template/css/index.css
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/server/template/css/fonts/element-icons.woff
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/server/template/js/axios.min.js
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/server/template/js/index.js
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/server/template/js/vue.min.js
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/common/websocket2/compliance/autobahn-test-report-Feb-03-2021.html
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/server/template/base.html
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/server/template/ele_index.html
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/server/template/login.html
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/server/template/css/index.css
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/server/template/css/fonts/element-icons.woff
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/server/template/js/axios.min.js
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/server/template/js/index.js
-./build/lib/proxynt/build/lib/proxynt/build/lib/proxynt/server/template/js/vue.min.js
-./build/lib/proxynt/build/lib/proxynt/common/websocket2/compliance/autobahn-test-report-Feb-03-2021.html
-./build/lib/proxynt/build/lib/proxynt/server/template/base.html
-./build/lib/proxynt/build/lib/proxynt/server/template/ele_index.html
-./build/lib/proxynt/build/lib/proxynt/server/template/login.html
-./build/lib/proxynt/build/lib/proxynt/server/template/css/index.css
-./build/lib/proxynt/build/lib/proxynt/server/template/css/fonts/element-icons.woff
-./build/lib/proxynt/build/lib/proxynt/server/template/js/axios.min.js
-./build/lib/proxynt/build/lib/proxynt/server/template/js/index.js
-./build/lib/proxynt/build/lib/proxynt/server/template/js/vue.min.js
-./build/lib/proxynt/common/websocket2/compliance/autobahn-test-report-Feb-03-2021.html
-./build/lib/proxynt/server/template/base.html
-./build/lib/proxynt/server/template/ele_index.html
-./build/lib/proxynt/server/template/login.html
-./build/lib/proxynt/server/template/css/index.css
-./build/lib/proxynt/server/template/css/fonts/element-icons.woff
-./build/lib/proxynt/server/template/js/axios.min.js
-./build/lib/proxynt/server/template/js/index.js
-./build/lib/proxynt/server/template/js/vue.min.js
 ./client/__init__.py
 ./client/abstract_tunnel.py
 ./client/clear_nonce_task.py

{proxynt-2.0.60 → proxynt-2.0.61rc1}/server/tcp_forward_client.py

@@ -59,6 +59,13 @@ class PublicSocketConnection:
         self.connect_requested = False  # Whether REQUEST_TO_CONNECT has been sent
         self.early_data_buffer = []  # Buffer early data (data received before connection confirmation)
         self.max_early_data_packets = 65536 * 4  # Maximum buffered packets
+        self.bytes_from_public: int = 0
+        self.bytes_to_public: int = 0
+        self.create_time: float = time.time()
+
+    def stats(self) -> str:
+        return (f'from_public={self.bytes_from_public} to_public={self.bytes_to_public} '
+                f'confirmed={self.connection_confirmed} alive={time.time() - self.create_time:.3f}s')
 
     def __str__(self):
         return f'{self.uid}_{self.socket}_{self.socket_server.name}'
@@ -128,14 +135,21 @@ class TcpForwardClient:
     def handle_message(self, each: socket.socket, data: ResisterAppendData):
         # 发送到websocket
         each: socket.socket
+        recv_error = None
         try:
             recv = each.recv(data.read_size)
-        except ConnectionResetError:
+        except ConnectionResetError as e:
             recv = b''
+            recv_error = e
         # client = self.uid_to_client[uid]
         if each not in self.socket_to_connection:
             return
         socket_connection = self.socket_to_connection[each]
+        if recv:
+            socket_connection.bytes_from_public += len(recv)
+        else:
+            LoggerFactory.get_logger().info(
+                f'public side closed uid: {socket_connection.uid.hex()}, error: {recv_error}, {socket_connection.stats()}')
 
         # Optimistic send mode: buffer data if connection not confirmed
         if socket_connection.optimistic_mode and not socket_connection.connection_confirmed:
@@ -204,10 +218,10 @@ class TcpForwardClient:
             client.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
         except OSError:
             return
-        LoggerFactory.get_logger().info(f'Received connection from: {address}')
         server = self.listen_socket_to_public_server[server_socket]
         # Current server client also corresponds to a client connecting to internal network service
         uid = os.urandom(4)
+        LoggerFactory.get_logger().info(f'Received connection from: {address}, uid: {uid.hex()}, name: {server.name}')
         client_socket_connection = PublicSocketConnection(uid, client, server)
         self.uid_to_connection[uid] = client_socket_connection
         self.socket_to_connection[client] = client_socket_connection
@@ -246,22 +260,24 @@ class TcpForwardClient:
             try:
                 await asyncio.wait_for(asyncio.get_event_loop().sock_sendall(socket_client, message), timeout=30)
             except asyncio.TimeoutError:
-                LoggerFactory.get_logger().warn(f"Socket send timeout for {uid}, closing connection")
-                asyncio.ensure_future(self.close_connection_async(connection))
+                LoggerFactory.get_logger().warn(f"Socket send timeout for {uid.hex()}, closing connection")
+                asyncio.ensure_future(self.close_connection_async(connection, 'send timeout'))
                 return
             except OSError as e:
-                LoggerFactory.get_logger().warn(f'{uid} os error: {e}')
-                asyncio.ensure_future(self.close_connection_async(connection))
+                LoggerFactory.get_logger().warn(f'{uid.hex()} os error: {e}')
+                asyncio.ensure_future(self.close_connection_async(connection, f'send os error: {e}'))
                 return
+            connection.bytes_to_public += len(message)
             if not message:
-                asyncio.ensure_future(self.close_connection_async(connection))
+                asyncio.ensure_future(self.close_connection_async(connection, 'client reported inner close'))
             if LoggerFactory.get_logger().isEnabledFor(logging.DEBUG):
                 LoggerFactory.get_logger().debug(f'send to socket cost time {time.time() - send_start_time}')
 
-    async def close_connection_async(self, connection: PublicSocketConnection):
+    async def close_connection_async(self, connection: PublicSocketConnection, reason: str = ''):
         """Asynchronously close connection to avoid blocking in event loop"""
         try:
-            LoggerFactory.get_logger().info(f'Async closing connection {connection.uid}')
+            LoggerFactory.get_logger().info(
+                f'Async closing connection {connection.uid.hex()}, reason: {reason}, {connection.stats()}')
             uid = connection.uid
             if uid not in self.uid_to_connection:
                 return
@@ -286,7 +302,7 @@ class TcpForwardClient:
 
     def close_connection(self, connection: PublicSocketConnection):
         try:
-            LoggerFactory.get_logger().info(f'Closing connection {connection.uid}')
+            LoggerFactory.get_logger().info(f'Closing connection {connection.uid.hex()}, {connection.stats()}')
             uid = connection.uid
             if uid not in self.uid_to_connection:
                 return

{proxynt-2.0.60 → proxynt-2.0.61rc1}/server/websocket_handler.py

@@ -358,6 +358,8 @@ class MyWebSocketaHandler(WebSocketHandler):
                 elif uid in tcp_forward_client.uid_to_connection:
                     connection = tcp_forward_client.uid_to_connection[uid]
                     connection.connection_confirmed = True
+                    LoggerFactory.get_logger().info(
+                        f'connect confirmed uid: {uid.hex()}, flushing {sum(len(b) for b in connection.early_data_buffer)} bytes, {connection.stats()}')
 
                     for buffered_data in connection.early_data_buffer:
                         if buffered_data:
@@ -391,7 +393,7 @@ class MyWebSocketaHandler(WebSocketHandler):
                         LoggerFactory.get_logger().info(f'C2C 连接失败并已清理 UID: {uid.hex()}')
                 elif uid in tcp_forward_client.uid_to_connection:
                     connection = tcp_forward_client.uid_to_connection[uid]
-                    await tcp_forward_client.close_connection_async(connection)
+                    await tcp_forward_client.close_connection_async(connection, 'client CONNECT_FAILED')
 
             # Client-to-client forward request
             elif message_dict['type_'] == MessageTypeConstant.CLIENT_TO_CLIENT_FORWARD: