chore: 优化 Docker 镜像

Author: tianxiu2b2t

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12
+FROM docker.1ms.run/library/python:3.12
 
 LABEL org.opencontainers.image.url https://python-openbmclapi.ttb-network.top/
 LABEL org.opencontainers.image.source https://github.com/TTB-Network/python-openbmclapi

assets/js/common.js

@@ -519,24 +519,66 @@ function createElement(object) {
     return new Element(object);
 }
 class RouteEvent {
-    constructor(instance, before_route, current_route, params = {}) {
+    constructor(manager, instance, before_route, current_route, params = {}) {
+        this.manager = manager
         this.instance = instance;
         this.current_route = current_route
         this.before_route = before_route
         this.params = params
     }
 }
 class Router {
-    constructor(route_prefix = "/") {
+    constructor(
+        route_prefix = "/",
+    ) {
         this._route_prefix = route_prefix.replace(/\/+$/, "")
-        this._before_handlers = []
-        this._after_handlers = []
-        this._current_path = null; //this._get_current_path()
         this._routes = []
+        this._beforeHandlers = []
+        this._afterHandlers = []
+        this._current_path = null
+    }
+    get _getCurrentPath() {
+        return window.location.pathname.replace(this._route_prefix, "") || "/"
+    }
+    on(path, handler) {
+        // path {xxx}
+        // replace to like python (?P<xxx>*.+)
+        var params = (path.match(/\{((\w+)|(\:(url)\:))\}/g) || []).map(x => x.replaceAll("{", "").replaceAll("}", "").replaceAll(":", ""))
+        var regexp_path = path.replace(/\{\:(url)\:\}/g, "(.*)").replace(/\{(\w+)\}/g, "([^/]*)")
+        var config = {
+            raw_path: path,
+            path: new RegExp(`^${regexp_path}$`),
+            params: params,
+            handler
+        }
+        this._routes.push(config)
+        // sort path length
+        this._routes.sort((a, b) => b.path.length - a.path.length)
+        return this
+    }
+    beforeHandler(handler) {
+        if (handler == null) this;
+        this._beforeHandlers.push(handler)
+        return this
+    }
+    afterHandler(handler) {
+        if (handler == null) this;
+        this._afterHandlers.push(handler)
+        return this
+    }
+
+}
+class RouterManager {
+    constructor(
+        route_prefix = "/",
+    ) {
+        this._routes = [
+            new Router(route_prefix)
+        ]
     }
     init() {
         window.addEventListener("popstate", () => {
-            this._popstate_handler()
+            this._popstateHandler()
         })
         window.addEventListener("click", (e) => {
             if (e.target.tagName == "A") {
@@ -545,86 +587,134 @@ class Router {
                 if (url.origin != window.location.origin) return;
                 e.preventDefault()
                 if (url.pathname.startsWith(this._route_prefix)) {
-                    this._popstate_handler(url.pathname)
+                    this._popstateHandler(url.pathname)
                 }
             }
         })
-        this._popstate_handler()
-    }
-    page(path) {
-        this._popstate_handler(path)
+        this._popstateHandler()
     }
-    _get_current_path() {
+    get _getCurrentPath() {
         return window.location.pathname
     }
-    async _popstate_handler(path) {
-        const new_path = (path ?? this._get_current_path()).replace(this._route_prefix, "") || "/"
-        const old_path = this._current_path
-        if (old_path == new_path) return;
-        window.history.pushState(null, '', this._route_prefix + new_path)
-        this._current_path = new_path
-        this._before_handlers.forEach(handler => {
-            try {
-                handler(new RouteEvent(this, old_path, new_path))
-            } catch (e) {
-                console.log(e)
+    _popstateHandler(path) {
+        path = path || this._getCurrentPath
+        const matchRoutes = []
+        for (const router of this._routes) {
+            if (path.startsWith(router._route_prefix)) {
+                matchRoutes.push(router)
             }
+        }
+        if (!matchRoutes.length) matchRoutes.push(this._routes[0])
+        const handlers = {
+            before: [],
+            route: [],
+            after: []
+        };
+        var router = null;
+        for (const r of matchRoutes) {
+            let new_path = path.replace(r._route_prefix, "") || "/"
+            var match_routes = r._routes.filter(x => x.path.test(new_path))
+            if (match_routes.length) {
+                router = r
+                break
+            }
+        }
+        router = router || matchRoutes[0]
+        const old_path = router._current_path
+        const new_path = path.replace(router._route_prefix, "") || "/"
+        if (new_path == router._current_path) return;
+        router._current_path = new_path
+        window.history.pushState(null, '', router._route_prefix + new_path)
+        for (const handler of router._beforeHandlers) {
+            handlers.before.push(handler)
+        }
+
+        // route
+        for (const route of router._routes.filter(x => x.path.test(new_path))) {
+            handlers.route.push(route)
+        }
+        // after
+        for (const handler of router._afterHandlers) {
+            handlers.after.push(handler)
+        }
+        this._run(handlers, {
+            manager: this,
+            router,
+            old_path: old_path,
+            new_path: new_path,
         })
+    }
+    _run(handlers = {
+        before: [],
+        route: [],
+        after: []
+    }, options = {
+        manager: this,
+        router: null,
+        old_path: null,
+        new_path: null,
+    }) {
+        var preHandle = (
+            preHandlers
+        ) => {
+            preHandlers.forEach(handler => {
+                try {
+                    handler(new RouteEvent(
+                        options.manager,
+                        options.router,
+                        options.old_path,
+                        options.new_path,
+                    ))
+                } catch (e) {
+                    console.error(e)
+                }
+            })
+        }
+        preHandle(handlers.before)
         try {
-            // get route
-            var routes = this._routes.filter(x => x.path.test(new_path))
-            if (routes) {
-                routes.forEach(route => {
-                    var params = route.path.exec(new_path).slice(1).reduce((acc, cur, i) => {
-                        acc[route.params[i]] = cur
-                        return acc
-                    }, {})
-                    var handler = route ? route.handler : null
-                    if (handler) {
-                        try {
-                            handler(new RouteEvent(this, old_path, new_path, params))
-                        } catch (e) {
-                            console.log(e)
-                        }
+            handlers.route.forEach(route => {
+                var params = route.path.exec(options.new_path).slice(1).reduce((acc, cur, i) => {
+                    acc[route.params[i]] = cur
+                    return acc
+                }, {})
+                var handler = route ? route.handler : null
+                if (handler) {
+                    try {
+                        handler(new RouteEvent(
+                            options.manager,
+                            options.router,
+                            options.old_path,
+                            options.new_path,
+                            params
+                        ))
+                    } catch (e) {
+                        console.log(e)
                     }
-                })
-                
-            }
+                }
+            })
         } catch (e) {
-            console.log(e)
+            console.error(e)
+
         }
-        this._after_handlers.forEach(handler => {
-            try {
-                handler(new RouteEvent(this, old_path, new_path))
-            } catch (e) {
-                console.log(e)
-            }
-        })
+        preHandle(handlers.after)
+        return true
     }
     on(path, handler) {
-        // path {xxx}
-        // replace to like python (?P<xxx>*.+)
-        var params = (path.match(/\{((\w+)|(\:(url)\:))\}/g) || []).map(x => x.replaceAll("{", "").replaceAll("}", "").replaceAll(":", ""))
-        var regexp_path = path.replace(/\{\:(url)\:\}/g, "(.*)").replace(/\{(\w+)\}/g, "([^/]*)")
-        var config = {
-            raw_path: path,
-            path: new RegExp(`^${regexp_path}$`),
-            params: params,
-            handler
-        }
-        this._routes.push(config)
-        // sort path length
-        this._routes.sort((a, b) => b.path.length - a.path.length)
+        this._routes[0].on(path, handler)
         return this
     }
-    before_handler(handler) {
-        if (handler == null) this;
-        this._before_handlers.push(handler)
+    beforeHandler(handler) {
+        this._routes[0].beforeHandler(handler)
         return this
     }
-    after_handler(handler) {
-        if (handler == null) this;
-        this._after_handlers.push(handler)
+    afterHandler(handler) {
+        this._routes[0].afterHandler(handler)
+        return this
+    }
+    page(path) {
+        this._popstateHandler(
+            this._routes[0]._route_prefix + path
+        )
         return this
     }
 }
@@ -1077,6 +1167,7 @@ export {
     createElement,
     Configuration,
     Router,
+    RouterManager,
     ElementManager,
     I18NManager,
     Style,

assets/js/index.js

@@ -12,7 +12,8 @@ import {
     Utils,
     ObjectID,
     ref,
-    THEMECHANGEEVENT
+    THEMECHANGEEVENT,
+    RouterManager,
 } from './common.js'
 
 import './config.js'
@@ -129,7 +130,7 @@ class Menu extends Element {
             this._render()
         })
         var cur_key, cur_sub;
-        $router.before_handler(async (event) => {
+        $router.beforeHandler(async (event) => {
             if (this._render_task) await new Promise((resolve) => {
                 this.route_handler_lock = resolve
             })
@@ -200,12 +201,18 @@ class Channel {
             current: 0,
         };
         this.timeout = 10000
+        this._event_source_init()
         if (!this.support_websocket) return;
         this._ws_init();
         this._ws_initizalized = false;
         this._ws_callbacks = {};
         this._ws_timeouts = {}
     }
+    // event source
+    _event_source_init() {
+        this._event_source = new EventSource(this.url + "_event");
+        
+    }
     // websocket
     _ws_init() {
         this._ws = new WebSocket("ws" + this.url.slice(4));
@@ -714,7 +721,7 @@ const $configuration = new Configuration();
 const $ElementManager = new ElementManager();
 const $style = new Style($configuration);
 const $i18n = new I18NManager();
-const $router = new Router("/pages");
+const $router = new RouterManager("/pages");
 globalThis.$channel = new Channel();
 $i18n.addLanguageTable("zh_CN", {
     "footer.powered_by": "由 %name% 提供服务支持",
@@ -1051,6 +1058,16 @@ class Tools {
         return `${d.getFullYear().toString().padStart(4, "0")}-${(d.getMonth() + 1).toString().padStart(2, "0")}-${d.getDate().toString().padStart(2, "0")}`
     }
 }
+class UserAuth {
+    constructor() {
+        $router.on("/auth", () => {
+            // ...
+        })
+    }
+}
+
+const $userAuth = new UserAuth();
+
 async function load() {
     const $dom_body = new Element(document.body);
     const $theme = {
@@ -1822,7 +1839,7 @@ async function load() {
         clearInterval($dashboard_locals.qps_task)
     }
 
-    $router.before_handler(() => {
+    $router.beforeHandler(() => {
         while ($main.firstChild != null) {
             $main.removeChild($main.firstChild)
         }

assets/js/pwa.js

@@ -0,0 +1,22 @@
+class ProgressiveWebApp {
+    constructor() {
+        if (!this.supportPWA()) {
+            return;
+        }
+        this.register()
+    }
+
+    register() {
+        navigator.serviceWorker.register('/service-worker.js').then(e => {
+            console.log('Service Worker registered successfully', e);
+        }).catch(e => {
+            console.log('Service Worker registration failed', e);
+        });
+    }
+
+    supportPWA() {
+        return 'serviceWorker' in navigator;
+    }
+}
+
+export const pwa = new ProgressiveWebApp();

assets/js/service-worker.js

@@ -0,0 +1,14 @@
+self.addEventListener('install', function(event) {
+})
+self.addEventListener('push', function (event) {
+    event.waitUntil(
+      self.registration.showNotification('新消息', {
+        body: '你有一条新消息，请查看！',
+        icon: 'icon.png',
+        vibrate: [200, 100, 200],
+        data: {
+          url: 'https://your-website.com/message'
+        }
+      })
+    );
+  });