feat: 新增反代

Author: tianxiu2b2t

core/cluster.py

@@ -836,16 +836,19 @@ async def start(self):
         self.storage_manager.init()
         logger.tdebug("cluster.debug.base_url", base_url=config.const.base_url)
 
-        certificates = await self.get_certificates()
-        for cert in certificates:
-            await web.start_private_server(
-                cert.cert, cert.key
-            )
-        # start web ssl
-        public_port = config.const.public_port
-        public_host = cert.host
+        if not config.const.proxy:
+            certificates = await self.get_certificates()
+            for cert in certificates:
+                await web.start_private_server(
+                    cert.cert, cert.key
+                )
+            # start web ssl
+            public_port = config.const.public_port
+            public_host = cert.host
 
-        logger.tdebug("cluster.debug.public_host", host=public_host, port=public_port, domain=cert.domain)
+            logger.tdebug("cluster.debug.public_host", host=public_host, port=public_port, domain=cert.domain)
+        else:
+            public_host = config.const.host
 
         # check files
         await self.file_manager.sync()
@@ -1384,7 +1387,7 @@ def get(self, interval: int = 1) -> list[BandwidthList]:
 ]
 BANDWIDTH_COUNTER = BandwidthCounter()
 routes = web.routes
-aweb = web.web
+aweb = web.aiohttp_web
 clusters = ClusterManager()
 
 def convert_file_to_storage_file(file: File) -> SFile:

core/config.py

@@ -26,9 +26,9 @@
     "web": {
         "port": -1,
         "public_port": 6543,
-        "x_forwarded_for": 0,
         "backlog": 1024,
-        "sockets": 8
+        "sockets": 8,
+        "proxy": False
     },
     "clusters": [
         {
@@ -151,9 +151,9 @@ def sync_interval(self):
         return max(Config.get("advanced.sync_interval", 600) or 600, 600)
 
     @property
-    def xff(self):
-        return Config.get("web.x_forwarded_for") or 0
-    
+    def proxy(self) -> bool:
+        return Config.get("web.proxy") or False
+
     @property
     def auto_sync_assets(self):
         return bool(Config.get("advanced.auto_sync_assets", True))

core/logger.py

@@ -43,7 +43,7 @@ def warning(self, *args, **kwargs):
     def success(self, *args, **kwargs):
         self._log_with_args("SUCCESS", *args, **kwargs)
     def traceback(self, *args, **kwargs):
-        if args and kwargs:
+        if args or kwargs:
             self._log_with_args("ERROR", *args, **kwargs)
         self._log_with_args("ERROR", "\n" + traceback.format_exc())
 
@@ -68,7 +68,7 @@ def tsuccess(self, key: str, *args, **kwargs):
             key, *args, **kwargs
         ))
     def ttraceback(self, key: str, *args, **kwargs):
-        if args and kwargs:
+        if args or kwargs:
             self._log_with_args("ERROR", locale.t(
                 key, *args, **kwargs
             ))