From 17ebdea6b2f73d6e0caf3b3e06ab965647e71280 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Thu, 18 Jul 2024 20:08:55 +0800
Subject: [PATCH] framework: fix 404 handler

---
 framework/framework/package.json |  4 ++--
 framework/framework/server.ts    | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/framework/framework/package.json b/framework/framework/package.json
index 0a15fc001..1bff48d49 100644
--- a/framework/framework/package.json
+++ b/framework/framework/package.json
@@ -27,8 +27,8 @@
         "@types/koa": "^2.15.0",
         "@types/koa-compress": "^4.0.6",
         "@types/koa-router": "^7.4.8",
-        "@types/lodash": "^4.17.6",
+        "@types/lodash": "^4.17.7",
         "@types/saslprep": "^1.0.3",
-        "@types/ws": "^8.5.10"
+        "@types/ws": "^8.5.11"
     }
 }
diff --git a/framework/framework/server.ts b/framework/framework/server.ts
index 8b5f7c630..52c4ed697 100644
--- a/framework/framework/server.ts
+++ b/framework/framework/server.ts
@@ -393,19 +393,17 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
         }
         this.router.use((c, next) => executeMiddlewareStack(c, [
             ...this.handlerLayers,
-            {
-                name: '404',
-                func: async (t: any, n) => {
-                    await n();
-                    if (!t.handler) this.handleHttp(t, NotFoundHandler, () => true);
-                },
-            },
             { name: 'logic', func: next },
         ]).catch(console.error));
         this.server.use((c) => executeMiddlewareStack(c, [
             ...this.serverLayers,
             { name: 'routes', func: router.routes() },
             { name: 'methods', func: router.allowedMethods() },
+            ...this.handlerLayers,
+            {
+                name: '404',
+                func: (t) => this.handleHttp(t, NotFoundHandler, () => true),
+            },
         ]));
         this.addLayer('base', base(logger, this.config.xff, this.config.xhost));
         wsServer.on('connection', async (socket, request) => {