backward proxy stability

Author: qwj

pproxy/__doc__.py

@@ -1,5 +1,5 @@
 __title__       = "pproxy"
-__version__     = "2.1.4"
+__version__     = "2.1.5"
 __license__     = "MIT"
 __description__ = "Proxy server that can tunnel among remote servers by regex rules."
 __keywords__    = "proxy socks http shadowsocks shadowsocksr ssr redirect pf tunnel cipher ssl udp"

pproxy/server.py

@@ -210,10 +210,15 @@ async def server_run(self, handler):
             try:
                 reader, writer = await asyncio.wait_for(wait, timeout=SOCKET_TIMEOUT)
                 self.writer = writer
-                data = await reader.read_()
+                try:
+                    data = await reader.read_n(1)
+                except asyncio.TimeoutError:
+                    data = None
                 if data:
                     reader._buffer[0:0] = data
                     asyncio.ensure_future(handler(reader, writer))
+                else:
+                    writer.close()
                 errwait = 0
             except Exception as ex:
                 try:
@@ -222,7 +227,7 @@ async def server_run(self, handler):
                     pass
                 if not self.closed:
                     await asyncio.sleep(errwait)
-                    errwait = errwait*1.3 + 0.1
+                    errwait = min(errwait*1.3 + 0.1, 30)
     def client_run(self):
         async def handler(reader, writer):
             while not self.conn.empty():