move things around, update body behavior
This commit is contained in:
23
src/index.ts
23
src/index.ts
@@ -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
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user