feat: 新增多证书共用端口

Author: tianxiu2b2t

core/__init__.py

@@ -1,12 +1,14 @@
 import asyncio
 import os
 import time
+
+from core import web
 from .logger import logger
 from . import utils
 import atexit
 from . import cluster
 from . import scheduler
-from . import web
+from . import web_old
 from . import dashboard
 from . import database
 
@@ -28,10 +30,10 @@ async def main():
     await asyncio.gather(*[
         call(m, "init") for m in (
             scheduler,
-            web,
             database,
             dashboard,
             cluster,
+            web
         )
     ])
     _WAITLOCK.acquire()
@@ -45,10 +47,10 @@ async def main():
         await asyncio.gather(*[
             call(m, "unload") for m in (
                 scheduler,
-                web,
                 cluster,
                 database,
-                dashboard
+                dashboard,
+                web
             )
         ])
 

core/cluster.py

@@ -78,7 +78,8 @@ async def _check_available(self):
                     self.available_storages.remove(storage)
             except:
                 logger.ttraceback("storage.error.check_available", type=storage.type, path=storage.path, url=getattr(storage, "url", None))
-                self.available_storages.remove(storage)
+                if storage in self.available_storages:
+                    self.available_storages.remove(storage)
             if res:
                 if storage not in self.available_storages:
                     self.available_storages.append(storage)
@@ -573,6 +574,7 @@ def __init__(self):
         self.cluster_id_tables: dict[str, 'Cluster'] = {}
         self.file_manager = FileListManager(self)
         self.storage_manager = StorageManager(self)
+        self.clusters_certificate: dict[str, ClusterCertificate] = {}
 
     def add_cluster(self, cluster: 'Cluster'):
         self.cluster_id_tables[cluster.id] = cluster
@@ -585,10 +587,11 @@ async def start(self):
         self.storage_manager.init()
         logger.tdebug("cluster.debug.base_url", base_url=config.const.base_url)
 
-        cert = await self.get_certificate()
-        await web.start_ssl_server(
-            cert.cert, cert.key
-        )
+        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
@@ -617,17 +620,26 @@ def byoc(self):
                 return True
         return False
 
-    async def get_certificate(self):
+    async def get_certificates(self, cluster_id: Optional[str] = None):
         if config.const.ssl_cert and config.const.ssl_key:
             main = ClusterCertificate(
                 config.const.host,
                 Path(config.const.ssl_cert),
                 Path(config.const.ssl_key)
             )
             if main.is_valid:
-                return main
-        await asyncio.gather(*[cluster.request_cert() for cluster in self.clusters])
-        return [cluster.certificate for cluster in self.clusters][0]
+                return [
+                    main
+                ]
+        if not self.clusters_certificate:
+            await asyncio.gather(*[cluster.request_cert() for cluster in self.clusters])
+            for cluster in self.clusters:
+                self.clusters_certificate[cluster.id] = cluster.certificate
+        if cluster_id is None:
+            return list(self.clusters_certificate.values())
+        if cluster_id in self.clusters_certificate:
+            return [self.clusters_certificate[cluster_id]]
+        return []
 
     async def stop(self):
         await asyncio.gather(*[cluster.disable(True) for cluster in self.clusters])
@@ -736,7 +748,7 @@ async def request_cert(self):
             key.write(result.ack["key"])
 
     async def enable(self):
-        cert = await clusters.get_certificate()
+        cert = await clusters.get_certificates(self.id)
         scheduler.cancel(self.delay_enable_task)
         if self.want_enable:
             return
@@ -747,7 +759,7 @@ async def enable(self):
             result = await self.socket_io.emit(
                 "enable", {
                     "host": config.const.host,
-                    "port": config.const.public_port,
+                    "port": config.const.public_port or config.const.port,
                     "byoc": clusters.byoc(),
                     "version": API_VERSION,
                     "noFastEnable": True,

core/config.py

@@ -114,7 +114,11 @@ def threads(self):
 
     @property
     def public_port(self):
-        return os.environ.get("web.public_port", Config.get("web.public_port", 6543))
+        return os.environ.get("web.public_port", Config.get("web.public_port", 6543)) or 6543
+
+    @property
+    def port(self):
+        return os.environ.get("web.port", Config.get("web.port", 0)) or 0
 
     @property
     def ssl_dir(self):
@@ -166,7 +170,7 @@ def rank_clusters_url(self):
 
 const = Const()
 
-VERSION = "3.2.7"
+VERSION = "3.3.0"
 API_VERSION = "1.13.1"
 USER_AGENT = f"openbmclapi/{API_VERSION} python-openbmclapi/{VERSION}"
 PYTHON_VERSION = ".".join(map(str, (sys.version_info.major, sys.version_info.minor, sys.version_info.micro)))