修复无法加载本地证书的情况，加快统计显示

Author: tianxiu2b2t

bmclapi_dashboard/static/js/index.min.js

@@ -2779,14 +2779,29 @@ app.$Menu.add("dashboard", new class {
             this.data_day_option = parseInt(index + "")
             if (this.get_globals_stats) {
                 $progress.set(60)
+                var percent = 0
+                var total = 6
+                var percent_func = (n) => {
+                    percent += n
+                    $progress.set(60 + (percent / total) * 100)
+                }
                 $MainSocket.send("pro_stats", { type: this.data_day_option }).then((data) => {
-                    $progress.set(90)
+                    percent_func(1)
                     this.pro_stats = data
                     this.drawGlobals()
                     this.drawGEO()
                 }).finally(() => {
-                    $progress.set(100)
+                    percent_func(2)
+                })
+                $MainSocket.send("geo_stats", { type: this.data_day_option }).then((data) => {
+                    percent_func(1)
+                    this.geo_stats = data
+                    this.drawGlobals()
+                    this.drawGEO()
+                }).finally(() => {
+                    percent_func(2)
                 })
+                $progress.set(100)
             }
         })
         this._be_qps = app.createEcharts().style("min-height: 162px;")
@@ -3474,6 +3489,11 @@ app.$Menu.add("dashboard", new class {
                 this.drawGlobals()
                 this.drawGEO()
             })
+            $MainSocket.send("geo_stats", { type: this.data_day_option }).then((data) => {
+                this.geo_stats = data
+                this.drawGlobals()
+                this.drawGEO()
+            })
         }, 0, 360000)
         this.detailSystemTimer = app.runTaskRepeat(() => {
             $MainSocket.send("system_details").then((data) => {
@@ -3751,12 +3771,12 @@ app.$Menu.add("dashboard", new class {
         }
     }
     drawGEO() {
-        if (this.pro_stats == null) return
+        if (this.geo_stats == null) return
         var data = []
         if (this.geo_type == "world") {
             var other = []
             var cn_data = 0
-            this.pro_stats.addresses.forEach(e => {
+            this.geo_stats.addresses.forEach(e => {
                 if (e.country == "CN") cn_data += e.value
                 else other.push(e)
             })
@@ -3836,6 +3856,49 @@ app.$Menu.add("dashboard", new class {
                 value: e.value
             }
         }))
+        var visits = (this.data_day_option <= 1 ? fillDateTimes(this.geo_stats.distinct_ip, this.data_day_option == 1 ? 7 : 1) : fillDates(this.geo_stats.distinct_ip))
+        this._e_visits.setOption({
+            color: app.getThemeVar("main-color"),
+            xAxis: {
+                data: Object.keys(visits)
+            },
+            series: [
+                {
+                    name: $I18N.t("dashboard.distincts"),
+                    data: Object.values(visits),
+                    type: 'line',
+                    smooth: true,
+                }
+            ]
+        })
+        this.pro[1].getChildren()[1].getChildren()[0].getChildren()[0].getChildren()[1].t18n({ peer: Math.max(...Object.values(visits)) })
+        this.pro[0].getChildren()[2].getChildren()[1].setText(this.geo_stats.distinct_ip_count + "")
+        var data = []
+        for (const key in this.geo_stats.useragents) {
+            data.push({
+                label: key,
+                value: this.geo_stats.useragents[key]
+            })
+        }
+        data = data.sort((a, b) => b.value - a.value)
+        this._e_ua.setOption({
+            color: [
+                app.getThemeVar("echarts-color-0"),
+                app.getThemeVar("echarts-color-1"),
+                app.getThemeVar("echarts-color-2"),
+                app.getThemeVar("echarts-color-3"),
+                app.getThemeVar("echarts-color-4")
+            ],
+            series: [
+                {
+                    itemStyle:{
+                        borderColor:app.getThemeVar("dark-color"),
+                    },
+                    data: data.slice(0, 5)
+                }
+            ]
+        })
+        this.setRank_UA();
     }
     drawSystem() {
         var hits, bytes;
@@ -3919,48 +3982,6 @@ app.$Menu.add("dashboard", new class {
         this.pro[3].getChildren()[2].getChildren()[0].getChildren()[1].t18n({ peer: Math.max(...Object.values(this.detail_system.connections), 0)})
     }
     drawGlobals() {
-        var visits = (this.data_day_option <= 1 ? fillDateTimes(this.pro_stats.distinct_ip, this.data_day_option == 1 ? 7 : 1) : fillDates(this.pro_stats.distinct_ip))
-        this._e_visits.setOption({
-            color: app.getThemeVar("main-color"),
-            xAxis: {
-                data: Object.keys(visits)
-            },
-            series: [
-                {
-                    name: $I18N.t("dashboard.distincts"),
-                    data: Object.values(visits),
-                    type: 'line',
-                    smooth: true,
-                }
-            ]
-        })
-        this.pro[1].getChildren()[1].getChildren()[0].getChildren()[0].getChildren()[1].t18n({ peer: Math.max(...Object.values(visits)) })
-        this.pro[0].getChildren()[2].getChildren()[1].setText(this.pro_stats.distinct_ip_count + "")
-        var data = []
-        for (const key in this.pro_stats.useragents) {
-            data.push({
-                label: key,
-                value: this.pro_stats.useragents[key]
-            })
-        }
-        data = data.sort((a, b) => b.value - a.value)
-        this._e_ua.setOption({
-            color: [
-                app.getThemeVar("echarts-color-0"),
-                app.getThemeVar("echarts-color-1"),
-                app.getThemeVar("echarts-color-2"),
-                app.getThemeVar("echarts-color-3"),
-                app.getThemeVar("echarts-color-4")
-            ],
-            series: [
-                {
-                    itemStyle:{
-                        borderColor:app.getThemeVar("dark-color"),
-                    },
-                    data: data.slice(0, 5)
-                }
-            ]
-        })
         this.pro[0].getChildren()[0].getChildren()[1].setText(this._format_number_unit(this.pro_stats.downloads))
         this.pro[0].getChildren()[1].getChildren()[1].setText(this._format_bytes(this.pro_stats.bytes))
         var data = []
@@ -3988,15 +4009,14 @@ app.$Menu.add("dashboard", new class {
                 }
             ]
         })
-        this.setRank_UA();
         this.setRank_Status();
     }
     setRank_UA() {
         var data = [];
-        for (const key in this.pro_stats != null && this.pro_stats.useragents != null ? this.pro_stats.useragents : {}) {
+        for (const key in this.geo_stats != null && this.geo_stats.useragents != null ? this.geo_stats.useragents : {}) {
             data.push({
                 label: key,
-                value: this.pro_stats.useragents[key]
+                value: this.geo_stats.useragents[key]
             })
         }
         data = data.sort((a, b) => b.value - a.value)

core/certificate.py

@@ -16,9 +16,10 @@
 _loaded: bool = False
 
 
-def load_cert(cert, key):
+def _load_cert(cert, key):
     global server_side_ssl, client_side_ssl, _loaded
     if not os.path.exists(cert) or not os.path.exists(key):
+        logger.terror("cert.error.failed.file", cert=cert, key=key)
         return False
     try:
         server_side_ssl.load_cert_chain(cert, key)
@@ -28,6 +29,13 @@ def load_cert(cert, key):
     except:
         logger.terror("cert.error.failed", failure=traceback.format_exc())
         return False
+    
+def load_cert(cert: str, key: str):
+    if _load_cert(cert, key):
+        logger.tsuccess("cert.success.loaded_cert")
+        from core.network import restart
+
+        restart()
 
 
 def get_loaded() -> bool:
@@ -41,7 +49,7 @@ def load_text(cert: str, key: str):
     with open(cert_file, "w") as c, open(key_file, "w") as k:
         c.write(cert)
         k.write(key)
-    if load_cert(cert_file, key_file):
+    if _load_cert(cert_file, key_file):
         logger.tsuccess("cert.success.loaded_cert")
         from core.network import restart
 

core/const.py

@@ -146,6 +146,9 @@ class Certificate:
     cert: str = ""
     path: str = ""
 
+    def empty(self):
+        return self.cert == self.path == ""
+
 if Config.get("storages") is not None:
     for name in Config.get("storages"):
         storage = Config.get(f"storages.{name}")
@@ -156,7 +159,8 @@ class Certificate:
         )
 
 CERTIFICATE = Certificate(Config.get("certificate.cert"), Config.get("certificate.key"))
-
+SSL_PORT: int = Config.get("web.ssl_port")
+PROTOCOL_HEADER_BYTES = Config.get("advanced.header_bytes")
 # xdb 默认参数
 XDB_HeaderInfoLength = 256
 XDB_VectorIndexRows = 256

core/dashboard.py

@@ -170,7 +170,7 @@ async def process(type: str, data: Any):
             "python": f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}",
             "os": platform.platform(),
         }
-    if type == "pro_stats":
+    if type == "pro_stats" or type == "geo_stats":
         day = 1
         if isinstance(data, dict):
             t = data.get("type", 0)
@@ -180,7 +180,9 @@ async def process(type: str, data: Any):
                 day = 30
             elif t >= 3:
                 day = -1
-        return await asyncio.get_event_loop().run_in_executor(None, statistics.stats_pro, day)
+        func = statistics.stats_pro if type == "pro_stats" else statistics.geo_pro
+        return await asyncio.get_event_loop().run_in_executor(None, func, day)
+    
     if type == "system_details":
         return system.get_loads_detail()
 

core/network.py

@@ -5,10 +5,10 @@
 import ssl
 import traceback
 from typing import Optional
-from core.certificate import get_loaded, client_side_ssl, server_side_ssl
+from core.certificate import get_loaded, client_side_ssl, server_side_ssl, load_cert
 from core.config import Config
 from core.utils import Client
-from core.i18n import locale
+from core.const import *
 from core import env, logger, scheduler, web
 
 
@@ -106,11 +106,6 @@ def get_origin_from_ip(self, ip: tuple[str, int]):
 server: Optional[asyncio.Server] = None
 proxy: Proxy = Proxy()
 check_port_key = os.urandom(8)
-PORT: int = Config.get("web.port")
-TIMEOUT: int = Config.get("advanced.timeout")
-SSL_PORT: int = Config.get("web.ssl_port")
-PROTOCOL_HEADER_BYTES = Config.get("advanced.header_bytes")
-IO_BUFFER: int = Config.get("advanced.io_buffer")
 
 async def _handle_ssl(reader: asyncio.StreamReader, writer: asyncio.StreamWriter):
     return await _handle_process(
@@ -215,6 +210,8 @@ async def check_ports():
 
 async def start():
     global server, ssl_server
+    if not CERTIFICATE.empty():
+        load_cert(CERTIFICATE.cert, CERTIFICATE.path)
     while "EXIT" not in env:
         close()
         try:

core/statistics.py

@@ -361,26 +361,15 @@ def daily():
     return data
 
 
-def stats_pro(day: int):
+def geo_pro(day: int):
     format_day = day == 30
     t = get_query_hour_tohour(0) - (day * 24)
-    status_arr = list(status.value for status in Status)
-    status: defaultdict[str, int] = defaultdict(int)
     d_address: defaultdict[int, defaultdict[str, int]] = defaultdict(lambda: defaultdict(int))
     d_ip: set[str] = set()
     d_geo: defaultdict[IPInfo, int] = defaultdict(int)
     d_useragent: defaultdict[UserAgent, int] = defaultdict(int)
-    d_hit, d_bytes, d_sync_hit, d_sync_bytes = 0, 0, 0, 0
     stats_t = StatsTiming()
-    stats_t.start("storage")
-    for q in queryAllData(f"select sum(hit + cache_hit) as hit, sum(bytes + cache_bytes) as bytes, sync_hit, sync_bytes, {', '.join((f'sum({arr})' for arr in status_arr))} from access_storage where hour >= ?", t):
-        d_hit += q[0] or 0
-        d_bytes += q[1] or 0
-        d_sync_hit += q[2] or 0
-        d_sync_bytes += q[3] or 0
-        for i, status_val in enumerate(status_arr):
-            status[status_val] += q[4 + i] or 0
-    stats_t.start("globals", "storage")
+    stats_t.start("globals")
     for q in queryAllData(f"select hour, addresses, useragents from access_globals where hour >= ?", t):
         hour = (q[0] + get_utc_offset()) if not format_day else (q[0] + get_utc_offset()) // 24
         data_address = q[1]
@@ -402,7 +391,6 @@ def stats_pro(day: int):
             d_geo[location.query(address)] += count
     stats_t.end("location")
     stats_t.print()
-    
     return {
         "useragents": {key.value: value for key, value in d_useragent.items() if value},
         "addresses": [
@@ -418,6 +406,25 @@ def stats_pro(day: int):
             for hour, ip in sorted(d_address.items())
         },
         "distinct_ip_count": len(d_ip),
+    }
+def stats_pro(day: int):
+    t = get_query_hour_tohour(0) - (day * 24)
+    status_arr = list(status.value for status in Status)
+    status: defaultdict[str, int] = defaultdict(int)
+    d_hit, d_bytes, d_sync_hit, d_sync_bytes = 0, 0, 0, 0
+    stats_t = StatsTiming()
+    stats_t.start("storage")
+    for q in queryAllData(f"select sum(hit + cache_hit) as hit, sum(bytes + cache_bytes) as bytes, sync_hit, sync_bytes, {', '.join((f'sum({arr})' for arr in status_arr))} from access_storage where hour >= ?", t):
+        d_hit += q[0] or 0
+        d_bytes += q[1] or 0
+        d_sync_hit += q[2] or 0
+        d_sync_bytes += q[3] or 0
+        for i, status_val in enumerate(status_arr):
+            status[status_val] += q[4 + i] or 0
+    stats_t.end("storage")
+    stats_t.print()
+    
+    return {
         "status": {k: v for k, v in status.items() if v != 0},
         "bytes": d_bytes,
         "downloads": d_hit,