Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
fe2f8ec227
|
|||
|
0e78ec4787
|
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "@tsndr/cloudflare-worker-router",
|
"name": "@tsndr/cloudflare-worker-router",
|
||||||
"version": "3.2.5",
|
"version": "3.2.6",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "@tsndr/cloudflare-worker-router",
|
"name": "@tsndr/cloudflare-worker-router",
|
||||||
"version": "3.2.5",
|
"version": "3.2.6",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@cloudflare/workers-types": "^4.20240222.0",
|
"@cloudflare/workers-types": "^4.20240222.0",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@tsndr/cloudflare-worker-router",
|
"name": "@tsndr/cloudflare-worker-router",
|
||||||
"version": "3.2.5",
|
"version": "3.2.6",
|
||||||
"description": "",
|
"description": "",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"exports": "./index.js",
|
"exports": "./index.js",
|
||||||
|
|||||||
17
src/index.ts
17
src/index.ts
@@ -406,21 +406,23 @@ export class Router<Env = any, CtxExt = {}, ReqExt = {}> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const route = this.getRoute(req)
|
const route = this.getRoute(req)
|
||||||
|
let response: Response | undefined
|
||||||
|
|
||||||
if (!route)
|
if (!route)
|
||||||
return new Response(this.debugMode ? 'Route not found!' : null, { status: 404 })
|
response = new Response(this.debugMode ? 'Route not found!' : null, { status: 404 })
|
||||||
|
|
||||||
const handlers = [...this.globalHandlers, ...route.handlers]
|
if (!response) {
|
||||||
const dbg = this.debugMode
|
const handlers = [
|
||||||
|
...this.globalHandlers,
|
||||||
let response: Response | undefined
|
...(route?.handlers ?? [])
|
||||||
|
]
|
||||||
|
|
||||||
for (const handler of handlers) {
|
for (const handler of handlers) {
|
||||||
const context = {
|
const context = {
|
||||||
...(ctxExt ?? {}),
|
...(ctxExt ?? {}),
|
||||||
env,
|
env,
|
||||||
req,
|
req,
|
||||||
dbg,
|
dbg: this.debugMode,
|
||||||
ctx
|
ctx
|
||||||
} as RouterContext<Env, CtxExt, ReqExt>
|
} as RouterContext<Env, CtxExt, ReqExt>
|
||||||
|
|
||||||
@@ -431,9 +433,10 @@ export class Router<Env = any, CtxExt = {}, ReqExt = {}> {
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!response)
|
if (!response)
|
||||||
return new Response(this.debugMode ? 'Handler did not return a Response!' : null, { status: 404 })
|
response = new Response(this.debugMode ? 'Handler did not return a Response!' : null, { status: 404 })
|
||||||
|
|
||||||
if (this.corsEnabled) {
|
if (this.corsEnabled) {
|
||||||
response = new Response(response.body, response)
|
response = new Response(response.body, response)
|
||||||
|
|||||||
Reference in New Issue
Block a user