1
0

2 Commits

Author SHA1 Message Date
e4ec06bf47 3.0.0-9 2023-02-05 01:46:53 +01:00
2ad75dc3fb move things around, update body behavior 2023-02-05 01:46:20 +01:00
3 changed files with 19 additions and 10 deletions

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "@tsndr/cloudflare-worker-router", "name": "@tsndr/cloudflare-worker-router",
"version": "3.0.0-8", "version": "3.0.0-9",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@tsndr/cloudflare-worker-router", "name": "@tsndr/cloudflare-worker-router",
"version": "3.0.0-8", "version": "3.0.0-9",
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"@cloudflare/workers-types": "^4.20230115.0", "@cloudflare/workers-types": "^4.20230115.0",

View File

@@ -1,6 +1,6 @@
{ {
"name": "@tsndr/cloudflare-worker-router", "name": "@tsndr/cloudflare-worker-router",
"version": "3.0.0-8", "version": "3.0.0-9",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"types": "index.d.ts", "types": "index.d.ts",

View File

@@ -47,8 +47,13 @@ export type RouterRequest<TExt> = {
headers: Headers headers: Headers
body: string | any body: string | any
raw: Request raw: Request
cf?: IncomingRequestCfProperties arrayBuffer(): Promise<ArrayBuffer>
text(): Promise<string>
json<T>(): Promise<T>
formData(): Promise<FormData>
blob(): Promise<Blob>
bearer: () => string bearer: () => string
cf?: IncomingRequestCfProperties
} & TExt } & TExt
/** /**
@@ -388,15 +393,14 @@ export class Router<TEnv = any, TExt = any> {
raw: request, raw: request,
params: {}, params: {},
query: {}, 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() ?? '', bearer: () => request.headers.get('Authorization')?.replace(/^(B|b)earer /, '').trim() ?? '',
} as RouterRequest<TExt> } 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') { if (this.corsEnabled && req.method === 'OPTIONS') {
return new Response(null, { return new Response(null, {
headers: this.setCorsHeaders(), 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 handlers = [...this.globalHandlers, ...route.handlers]
const dbg = this.debugMode const dbg = this.debugMode