From 4afc4e0dfe642833ca9d7974a36e047b6ffc8d8d Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Thu, 26 Sep 2024 07:08:21 +0800
Subject: [PATCH] framework: fix pathToRegexp

---
 framework/framework/router.ts | 2 +-
 framework/framework/server.ts | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/framework/framework/router.ts b/framework/framework/router.ts
index 070d705c2..55dc0a38e 100644
--- a/framework/framework/router.ts
+++ b/framework/framework/router.ts
@@ -15,7 +15,7 @@ export class WebSocketLayer {
     regexp: RegExp;
 
     constructor(path: Parameters<typeof pathToRegexp>[0], public callback?: WebSocketCallback) {
-        this.regexp = pathToRegexp(path);
+        this.regexp = pathToRegexp(path).regexp;
     }
 
     accept(socket: WebSocket, request: IncomingMessage, ctx: KoaContext) {
diff --git a/framework/framework/server.ts b/framework/framework/server.ts
index c46a73eaf..9b20a6b1a 100644
--- a/framework/framework/server.ts
+++ b/framework/framework/server.ts
@@ -481,7 +481,7 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
 
             const name = HandlerClass.name.replace(/Handler$/, '');
             const steps = [
-                'init', 'handler/init',
+                'log/__init', 'init', 'handler/init',
                 `handler/before-prepare/${name}#${method}`, `handler/before-prepare/${name}`, 'handler/before-prepare',
                 'log/__prepare', '__prepare', '_prepare', 'prepare', 'log/__prepareDone',
                 `handler/before/${name}#${method}`, `handler/before/${name}`, 'handler/before',
@@ -493,6 +493,7 @@ ${c.response.status} ${endTime - startTime}ms ${c.response.length}`);
                 `handler/after/${name}#${method}`, `handler/after/${name}`, 'handler/after',
                 'cleanup',
                 `handler/finish/${name}#${method}`, `handler/finish/${name}`, 'handler/finish',
+                'log/__finish',
             ];
 
             let current = 0;