fix bugs.

chizukicn · Oct 14, 2022 · 672476b · 672476b
1 parent ff37f0d
commit 672476b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 46 deletions.
diff --git a/packages/core/src/app.ts b/packages/core/src/app.ts
@@ -114,10 +114,10 @@ export function defineFourze(options: FourzeOptions | FourzeBaseRoute[] | Fourze
         hooks: {
             get() {
                 return hooks.map(e => {
-                    return defineFourzeHook({
+                    return {
                         ...e,
-                        path: e.path ? resolvePath(e.path, _base) : _base
-                    })
+                        path: resolvePath(e.path, _base)
+                    }
                 })
             }
         },

diff --git a/packages/core/src/router.ts b/packages/core/src/router.ts
@@ -4,7 +4,6 @@ import { delayHook } from "./hooks"
 import { createLogger } from "./logger"
 import {
     createRequestContext,
-    defineFourzeHook,
     defineRoute,
     FourzeContext,
     FourzeHook,
@@ -17,7 +16,7 @@ import {
     FourzeRoute,
     FourzeSetupContext
 } from "./shared"
-import { asyncLock, DelayMsType, isMatch, relativePath, resolvePath, unique } from "./utils"
+import { asyncLock, DelayMsType, isMatch, relativePath, unique } from "./utils"
 
 export interface FourzeRouter extends FourzeMiddleware {
     /**
@@ -149,9 +148,7 @@ export function createRouter(params: FourzeRouterOptions | Fourze[] | MaybeAsync
                     ...route.meta
                 }
 
-                console.log("path", path, "meta", request.meta)
-
-                const activeHooks = router.hooks.filter(e => !e.path || path.startsWith(e.path))
+                const activeHooks = router.hooks.filter(e => isMatch(path, e.path))
 
                 const handle = async () => {
                     const hook = activeHooks.shift()
@@ -206,7 +203,6 @@ export function createRouter(params: FourzeRouterOptions | Fourze[] | MaybeAsync
 
     router.match = function (this: FourzeRouter, url: string, method?: string, allowed = false): [FourzeRoute, RegExpMatchArray] | [] {
         if (allowed || this.isAllow(url)) {
-            console.log("match", url)
             for (const route of this.routes) {
                 const matches = route.match(url, method)
                 if (matches) {
@@ -285,12 +281,10 @@ export function createRouter(params: FourzeRouterOptions | Fourze[] | MaybeAsync
         }
 
         for (const hook of newHooks) {
-            hooks.add(
-                defineFourzeHook({
-                    ...hook,
-                    path: hook.path ? resolvePath(hook.path, options.base) : options.base
-                })
-            )
+            hooks.add({
+                ...hook,
+                path: relativePath(hook.path, options.base)
+            })
         }
     })
 

diff --git a/packages/core/src/shared.ts b/packages/core/src/shared.ts
@@ -114,7 +114,6 @@ export function defineRoute(route: FourzeBaseRoute): FourzeRoute {
         match(this: FourzeRoute, url: string, method?: string) {
             if (!this.method || !method || this.method.toLowerCase() === method.toLowerCase()) {
                 const regex = new RegExp(`^${path.replace(PARAM_KEY_REGEX, "([a-zA-Z0-9_-\\s]+)?")}$`, "i")
-                console.log("Route match", regex, url, url.match(regex))
                 return url.match(regex)
             }
             return null
@@ -134,7 +133,7 @@ export interface FourzeBaseHook extends FourzeMiddleware<any> {
 
 export interface FourzeHook {
     handle: FourzeMiddleware<any>
-    path?: string
+    path: string
     readonly [FOURZE_HOOK_SYMBOL]: true
 }
 
@@ -145,9 +144,10 @@ export function defineFourzeHook(interceptor: FourzeBaseHook): FourzeHook
 export function defineFourzeHook(interceptor: DefineFourzeHook): FourzeHook
 
 export function defineFourzeHook(param0: string | DefineFourzeHook | FourzeBaseHook, param1?: FourzeBaseHook) {
-    const path = typeof param0 === "string" ? param0 : param0.path
+    const path = typeof param0 === "string" ? param0 : param0.path ?? ""
 
     const hook = {
+        path,
         handle:
             param1 ?? typeof param0 === "string"
                 ? param1
@@ -161,12 +161,6 @@ export function defineFourzeHook(param0: string | DefineFourzeHook | FourzeBaseH
                   }
     } as FourzeHook
 
-    Object.defineProperty(hook, "path", {
-        get() {
-            return path
-        }
-    })
-
     Object.defineProperty(hook, FOURZE_HOOK_SYMBOL, {
         get() {
             return true

diff --git a/test/hooks.test.ts b/test/hooks.test.ts
@@ -31,37 +31,33 @@ describe("hooks", async () => {
                         req.meta.token = req.headers["token"].toString().toUpperCase()
                     }
                     res.setHeader("token", data.token)
-                    console.log("set-meta", req.meta)
                     return await next?.()
                 })
 
-                // route.hook("/api/test", async (req, res, next) => {
-                //     if (req.method == "post") {
-                //         res.result = "others"
-                //     }
-                //     return next?.()
-                // })
+                route.hook("/api/test", async (req, res, next) => {
+                    if (req.method == "post") {
+                        res.result = "others"
+                    }
+                    return next?.()
+                })
 
-                // route.hook("/api/test", (req, res, next) => {
-                //     if (req.method == "post") {
-                //         return "something"
-                //     }
-                //     return next?.()
-                // })
+                route.hook("/api/test", (req, res, next) => {
+                    if (req.method == "post") {
+                        return "something"
+                    }
+                    return next?.()
+                })
 
-                // route.hook("/api/test", (req, res, next) => {
-                //     if (req.method == "post") {
-                //         console.log("after somethings")
-                //         return "unknown"
-                //     }
-                //     return next?.()
-                // })
+                route.hook("/api/test", (req, res, next) => {
+                    if (req.method == "post") {
+                        return "unknown"
+                    }
+                    return next?.()
+                })
             })
 
         await router.setup()
 
-        console.log("hooks", router.hooks)
-
         const res = await fetch("/api/test", {
             headers: {
                 token: data.token