switch to return syntax

src/index.ts

@@ -18,14 +18,12 @@ export interface Route<TEnv> {
  * @typedef RouterContext
  * @property {RouterEnv} env Environment
  * @property {RouterRequest} req Request Object
-* @property {RouterResponse} res Response Object
+ * @property {ExecutionContext} ctx Context Object
-* @property {RouterNext} next Next Handler
  */
-export interface RouterContext<TEnv> {
+export interface RouterContext<TEnv = any> {
     env: TEnv
     req: RouterRequest
-	res: RouterResponse
+    ctx: ExecutionContext
-	next: RouterNext
 }
 
 /**
@@ -69,42 +67,15 @@ export interface RouterRequestQuery {
 	[key: string]: string
 }
 
-/**
-* Response Object
-*
-* @typedef RouterResponse
-* @property {Headers} headers Response headers object
-* @property {number} [status=204] Return status code (default: `204`)
-* @property {string | any} [body] Either an `object` (will be converted to JSON) or a string
-* @property {Response} [raw] A response object that is to be returned, this will void all other res properties and return this as is.
-*/
-export interface RouterResponse {
-	headers: Headers
-	status?: number
-	body?: string | any
-	raw?: Response,
-	webSocket?: WebSocket
-}
-
-/**
-* Next Function
-*
-* @callback RouterNext
-* @returns {Promise<void>}
-*/
-export interface RouterNext {
-	(): Promise<void>
-}
-
 /**
  * Handler Function
  *
  * @callback RouterHandler
  * @param {RouterContext} ctx
-* @returns {Promise<void> | void}
+ * @returns {Promise<Response | void> Response | void}
  */
 export interface RouterHandler<TEnv = any> {
-	(ctx: RouterContext<TEnv>): Promise<void> | void
+    (ctx: RouterContext<TEnv>): Promise<Response | void> | Response | void
 }
 
 /**
@@ -325,6 +296,18 @@ export class Router<TEnv = any> {
 		return this
 	}
 
+    private setCorsHeaders(headers: Headers = new Headers()): Headers {
+        if (this.corsConfig.allowOrigin && !headers.has('Access-Control-Allow-Origin'))
+            headers.set('Access-Control-Allow-Origin', this.corsConfig.allowOrigin)
+        if (this.corsConfig.allowMethods && !headers.has('Access-Control-Allow-Methods'))
+            headers.set('Access-Control-Allow-Methods', this.corsConfig.allowMethods)
+        if (this.corsConfig.allowHeaders && !headers.has('Access-Control-Allow-Headers'))
+            headers.set('Access-Control-Allow-Headers', this.corsConfig.allowHeaders)
+        if (this.corsConfig.maxAge && !headers.has('Access-Control-Max-Age'))
+            headers.set('Access-Control-Max-Age', this.corsConfig.maxAge.toString())
+        return headers
+    }
+
     /**
      * Register route
      *
@@ -393,8 +376,7 @@ export class Router<TEnv = any> {
      * @param {any} [extend]
      * @returns {Promise<Response>}
      */
-	public async handle(env: TEnv, request: Request, extend: any = {}): Promise<Response> {
+    public async handle(request: Request, env: TEnv, ctx: ExecutionContext, extend: any = {}): Promise<Response> {
-		try {
         const req: RouterRequest = {
             ...extend,
             method: request.method,
@@ -406,77 +388,37 @@ export class Router<TEnv = any> {
             body: ''
         }
 
-			const headers = new Headers()
         const route = this.getRoute(req)
 
-			if (this.corsEnabled) {
-				if (this.corsConfig.allowOrigin)
-					headers.set('Access-Control-Allow-Origin', this.corsConfig.allowOrigin)
-				if (this.corsConfig.allowMethods)
-					headers.set('Access-Control-Allow-Methods', this.corsConfig.allowMethods)
-				if (this.corsConfig.allowHeaders)
-					headers.set('Access-Control-Allow-Headers', this.corsConfig.allowHeaders)
-				if (this.corsConfig.maxAge)
-					headers.set('Access-Control-Max-Age', this.corsConfig.maxAge.toString())
-
-				if (!route && req.method === 'OPTIONS') {
-					return new Response(null, {
-						headers,
-						status: this.corsConfig.optionsSuccessStatus
-					})
-				}
-			}
-
         if (!route)
             return new Response(this.debugMode ? 'Route not found!' : null, { status: 404 })
 
-			if (['POST', 'PUT', 'PATCH'].includes(req.method)) {
+        if (this.corsEnabled && req.method === 'OPTIONS') {
-				if (req.headers.has('Content-Type') && req.headers.get('Content-Type')!.includes('json')) {
+            return new Response(null, {
-					try {
+                headers: this.setCorsHeaders(),
-						req.body = await request.json()
+                status: this.corsConfig.optionsSuccessStatus
-					} catch {
+            })
-						req.body = {}
-					}
-				} else {
-					try {
-						req.body = await request.text()
-					} catch {
-						req.body = ''
-					}
-				}
         }
 
-			const res: RouterResponse = { headers }
         const handlers = [...this.globalHandlers, ...route.handlers]
-			let prevIndex = -1
 
-			const runner = async (index: number) => {
+        let response: Response | undefined
-				if (index === prevIndex)
-					throw new Error('next() called multiple times')
 
-				prevIndex = index
+        for (const handler of handlers) {
+            const res = await handler({ env, req, ctx })
 
-				if (typeof handlers[index] === 'function')
+            if (res) {
-					await handlers[index]({ env, req, res, next: async () => await runner(index + 1) })
+                response = res
-			}
+                break
-
-			await runner(0)
-
-			if (typeof res.body === 'object') {
-				if (!res.headers.has('Content-Type'))
-					res.headers.set('Content-Type', 'application/json')
-
-				res.body = JSON.stringify(res.body)
-			}
-
-			if (res.raw)
-				return res.raw
-
-			return new Response([101, 204, 205, 304].includes(res.status || (res.body ? 200 : 204)) ? null : res.body, { status: res.status, headers: res.headers, webSocket: res.webSocket || null })
-		} catch(err) {
-			console.error(err)
-			return new Response(this.debugMode && err instanceof Error ? err.stack : '', { status: 500 })
             }
         }
->>>>>>> ad4557e (add editorconfig)
+
+        if (!response)
+            return new Response(this.debugMode ? 'Handler did not return a Response!' : null, { status: 404 })
+
+        if (this.corsEnabled)
+            this.setCorsHeaders(response.headers)
+
+        return response
+    }
 }