simple-proxy 0.0.4__tar.gz → 0.0.6__tar.gz

{simple-proxy-0.0.4/simple_proxy.egg-info → simple-proxy-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple-proxy
-Version: 0.0.4
+Version: 0.0.6
 Summary: A very simple NIO TCP proxy server
 Home-page: https://github.com/ruanhao/simple-proxy
 Author: Hao Ruan

{simple-proxy-0.0.4 → simple-proxy-0.0.6}/setup.py

@@ -22,7 +22,7 @@ config = {
     'keywords': ['network', 'tcp', 'non-blocking', 'proxy'],
     'version': __version__,
     'packages': find_packages(),
-    'install_requires': ['click', 'py-netty==0.0.39', 'cryptography>=39.0.1'],
+    'install_requires': ['click', 'py-netty', 'cryptography', 'attrs'],
     'python_requires': ">=3.7, <4",
     'setup_requires': ['wheel'],
     'package_data': {'simple_proxy': ['*']},

{simple-proxy-0.0.4 → simple-proxy-0.0.6}/simple_proxy/__init__.py

@@ -4,6 +4,7 @@ import ssl
 from functools import wraps
 from py_netty.handler import LoggingChannelHandler
 from py_netty import Bootstrap, ServerBootstrap, EventLoopGroup
+from py_netty.channel import NioSocketChannel
 import traceback
 import sys
 import os
@@ -188,22 +189,26 @@ def sneaky():
 
 
 @sneaky()
-def _handle(buffer, direction, src, dst, print_content, to_file):
-    try:
-        src_ip, src_port = src.getpeername()[:2]
-        dst_ip, dst_port = dst.getpeername()[:2]
-    except OSError:
-        return buffer
+def _handle(buffer: bytes, direction: bool, src: NioSocketChannel, dst: NioSocketChannel, print_content: bool, to_file: bool):
+    # try:
+    #     src_ip, src_port = src.getpeername()[:2]
+    #     dst_ip, dst_port = dst.getpeername()[:2]
+    # except OSError:
+    #     return buffer
+
+    src_ip, src_port = src.channelinfo().peername
+    dst_ip, dst_port = dst.channelinfo().peername
 
     raddr = (src_ip, src_port) if direction else (dst_ip, dst_port)
-    client = _clients[raddr]
+
     if buffer:
-        if direction:
-            client.read(len(buffer))
-        else:
-            client.write(len(buffer))
+        client = _clients.get(raddr)
+        if client:
+            if direction:
+                client.read(len(buffer))
+            else:
+                client.write(len(buffer))
     else:                       # EOF
-        del _clients[raddr]
         return buffer
 
     if not print_content and not to_file:
@@ -296,7 +301,7 @@ class ProxyChannelHandler(LoggingChannelHandler):
         class _ChannelHandler(LoggingChannelHandler):
 
             def channel_read(this, ctx, bytebuf):
-                _handle(bytebuf, False, ctx.channel().socket(), ctx0.channel().socket(), self._content, self._to_file)
+                _handle(bytebuf, False, ctx.channel(), ctx0.channel(), self._content, self._to_file)
                 ctx0.write(bytebuf)
 
             def channel_inactive(this, ctx):
@@ -338,7 +343,7 @@ class ProxyChannelHandler(LoggingChannelHandler):
                 self._client_channel(ctx, self._remote_host, self._remote_port)
             _clients[self.raddr].proxy_socket = self._client.socket()
 
-        _handle(bytebuf, True, ctx.channel().socket(), self._client.socket(), self._content, self._to_file)
+        _handle(bytebuf, True, ctx.channel(), self._client, self._content, self._to_file)
         self._client.write(bytebuf)
 
     def channel_inactive(self, ctx):

{simple-proxy-0.0.4 → simple-proxy-0.0.6}/simple_proxy/utils.py

@@ -105,22 +105,22 @@ def from_module(filename=None):
     return os.path.join(module_path(mod), filename)
 
 
-def getpeername(sock: socket.socket) -> str:
+def _get_address_str(sock: socket.socket, peer: bool = False) -> str:
     if not sock:
         return '?'
     try:
-        return ':'.join(map(str, sock.getpeername()))
+        addr_tuple = sock.getpeername() if peer else sock.getsockname()
+        return ':'.join(map(str, addr_tuple[:2]))
     except OSError:
-        return '?'
+        return '!'
+
+
+def getpeername(sock: socket.socket) -> str:
+    return _get_address_str(sock, peer=True)
 
 
 def getsockname(sock: socket.socket) -> str:
-    if not sock:
-        return '?'
-    try:
-        return ':'.join(map(str, sock.getsockname()))
-    except OSError:
-        return '?'
+    return _get_address_str(sock, peer=False)
 
 
 def generate_private_key():

simple-proxy-0.0.6/simple_proxy/version.py

@@ -0,0 +1 @@
+__version__ = "0.0.6"

{simple-proxy-0.0.4 → simple-proxy-0.0.6/simple_proxy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple-proxy
-Version: 0.0.4
+Version: 0.0.6
 Summary: A very simple NIO TCP proxy server
 Home-page: https://github.com/ruanhao/simple-proxy
 Author: Hao Ruan

simple-proxy-0.0.6/simple_proxy.egg-info/requires.txt

@@ -0,0 +1,4 @@
+click
+py-netty
+cryptography
+attrs

simple-proxy-0.0.4/simple_proxy/version.py

@@ -1 +0,0 @@
-__version__ = "0.0.4"

simple-proxy-0.0.4/simple_proxy.egg-info/requires.txt

@@ -1,3 +0,0 @@
-click
-py-netty==0.0.39
-cryptography>=39.0.1