Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
e4ec06bf47
|
|||
|
2ad75dc3fb
|
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@tsndr/cloudflare-worker-router",
|
||||
"version": "3.0.0-8",
|
||||
"version": "3.0.0-9",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@tsndr/cloudflare-worker-router",
|
||||
"version": "3.0.0-8",
|
||||
"version": "3.0.0-9",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"@cloudflare/workers-types": "^4.20230115.0",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@tsndr/cloudflare-worker-router",
|
||||
"version": "3.0.0-8",
|
||||
"version": "3.0.0-9",
|
||||
"description": "",
|
||||
"main": "index.js",
|
||||
"types": "index.d.ts",
|
||||
|
||||
23
src/index.ts
23
src/index.ts
@@ -47,8 +47,13 @@ export type RouterRequest<TExt> = {
|
||||
headers: Headers
|
||||
body: string | any
|
||||
raw: Request
|
||||
cf?: IncomingRequestCfProperties
|
||||
arrayBuffer(): Promise<ArrayBuffer>
|
||||
text(): Promise<string>
|
||||
json<T>(): Promise<T>
|
||||
formData(): Promise<FormData>
|
||||
blob(): Promise<Blob>
|
||||
bearer: () => string
|
||||
cf?: IncomingRequestCfProperties
|
||||
} & TExt
|
||||
|
||||
/**
|
||||
@@ -388,15 +393,14 @@ export class Router<TEnv = any, TExt = any> {
|
||||
raw: request,
|
||||
params: {},
|
||||
query: {},
|
||||
body: '',
|
||||
arrayBuffer: request.arrayBuffer,
|
||||
text: request.text,
|
||||
json: request.json,
|
||||
formData: request.formData,
|
||||
blob: request.blob,
|
||||
bearer: () => request.headers.get('Authorization')?.replace(/^(B|b)earer /, '').trim() ?? '',
|
||||
} as RouterRequest<TExt>
|
||||
|
||||
const route = this.getRoute(req)
|
||||
|
||||
if (!route)
|
||||
return new Response(this.debugMode ? 'Route not found!' : null, { status: 404 })
|
||||
|
||||
if (this.corsEnabled && req.method === 'OPTIONS') {
|
||||
return new Response(null, {
|
||||
headers: this.setCorsHeaders(),
|
||||
@@ -404,6 +408,11 @@ export class Router<TEnv = any, TExt = any> {
|
||||
})
|
||||
}
|
||||
|
||||
const route = this.getRoute(req)
|
||||
|
||||
if (!route)
|
||||
return new Response(this.debugMode ? 'Route not found!' : null, { status: 404 })
|
||||
|
||||
const handlers = [...this.globalHandlers, ...route.handlers]
|
||||
const dbg = this.debugMode
|
||||
|
||||
|
||||
Reference in New Issue
Block a user