Merge pull request qwj#51 from mosajjal/master

added daemon and uvloop

Author: qwj

pproxy/server.py

@@ -500,6 +500,21 @@ async def test_url(url, rserver):
     print(f'============ success ============')
 
 def main():
+    import importlib
+    uvloop_exists = importlib.util.find_spec("uvloop")
+    c_crypto_exists = importlib.util.find_spec("Crypto")
+
+    # Try to use uvloop instead of the default event loop
+    if uvloop_exists:
+        import uvloop
+        uvloop.install()
+        print("Using uvloop")
+    else:
+        print("Using default event loop")
+
+    if c_crypto_exists:
+        print("Using optimized C ciphers")
+
     parser = argparse.ArgumentParser(description=__description__+'\nSupported protocols: http,socks4,socks5,shadowsocks,shadowsocksr,redirect,pf,tunnel', epilog=f'Online help: <{__url__}>')
     parser.add_argument('-l', dest='listen', default=[], action='append', type=ProxyURI.compile, help='tcp server uri (default: http+socks4+socks5://:8080/)')
     parser.add_argument('-r', dest='rserver', default=[], action='append', type=ProxyURI.compile_relay, help='tcp remote server uri (default: direct)')
@@ -515,6 +530,7 @@ def main():
     parser.add_argument('--auth', dest='authtime', type=int, default=86400*30, help='re-auth time interval for same ip (default: 86400*30)')
     parser.add_argument('--sys', action='store_true', help='change system proxy setting (mac, windows)')
     parser.add_argument('--reuse', dest='ruport', action='store_true', help='set SO_REUSEPORT (Linux only)')
+    parser.add_argument('--daemon', dest='daemon', action='store_true', help='run as a daemon (Linux only)')
     parser.add_argument('--test', help='test this url for all remote proxies and exit')
     parser.add_argument('--version', action='version', version=f'%(prog)s {__version__}')
     args = parser.parse_args()
@@ -544,6 +560,14 @@ def main():
     elif any(map(lambda o: o.sslclient, args.listen)):
         print('You must specify --ssl to listen in ssl mode')
         return
+    if args.daemon:
+        try:
+            import daemon
+        except:
+            print("Missing library: pip install python-daemon")
+            exit(-1)
+        _daemon = daemon.DaemonContext()
+        _daemon.open()
     loop = asyncio.get_event_loop()
     if args.v:
         from . import verbose

setup.py

@@ -38,10 +38,14 @@ def find_value(name):
     extras_require      = {
         'accelerated': [
             'pycryptodome >= 3.7.2',
+            'uvloop >= 0.13.0'
         ],
         'sshtunnel': [
             'asyncssh >= 1.16.0',
         ],
+        'daemon': [
+            'python-daemon >= 2.2.3',
+        ]
     },
     install_requires    = [],
     entry_points        = {