3.0.0-1

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = false
+
+[src/**.ts]
+charset = utf-8
+indent_style = tab

.github/workflows/publish-pre.yml

@@ -1,4 +1,4 @@
-name: Publish (main)
+name: Publish (pre)
 
 on:
   release:
@@ -20,11 +20,11 @@ jobs:
       - name: Publish to npmjs
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-        run: npm publish --tag latest --access public
+        run: npm publish --tag pre --access public
       - uses: actions/setup-node@v1
         with:
           registry-url: https://npm.pkg.github.com/
       - name: Publish to GPR
         env:
           NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
-        run: npm publish --tag latest --access public
+        run: npm publish --tag pre --access public

README.md

@@ -1,6 +1,6 @@
 # Cloudflare Workers Router
 
-Cloudflare Workers Router is a super lightweight router (2.30 KiB) with middleware support and **ZERO dependencies** for [Cloudflare Workers](https://workers.cloudflare.com/).
+Cloudflare Workers Router is a super lightweight router (1.0K gzipped) with middleware support and **ZERO dependencies** for [Cloudflare Workers](https://workers.cloudflare.com/).
 
 When I was trying out Cloudflare Workers I almost immediately noticed how fast it was compared to other serverless offerings. So I wanted to build a full-fledged API to see how it performs doing real work, but since I wasn't able to find a router that suited my needs I created my own.
 
@@ -9,14 +9,107 @@ I worked a lot with [Express.js](https://expressjs.com/) in the past and really
 
 ## Contents
 
+- [Features](#features)
 - [Usage](#usage)
 - [Reference](#reference)
 - [Setup](#setup)
 
 
+## Features
+
+- ZERO dependencies
+- Lightweight (1.0K gzipped)
+- Fully written in TypeScript
+- Integrated Debug-Mode & CORS helper
+- Built specifically around Middlewares
+
+
 ## Usage
 
-### Simple Example
+### TypeScript Example
+
+```typescript
+import { Router } from '@tsndr/cloudflare-worker-router'
+
+export interface Env {
+    // Example binding to KV. Learn more at https://developers.cloudflare.com/workers/runtime-apis/kv/
+    // MY_KV_NAMESPACE: KVNamespace
+    //
+    // Example binding to Durable Object. Learn more at https://developers.cloudflare.com/workers/runtime-apis/durable-objects/
+    // MY_DURABLE_OBJECT: DurableObjectNamespace
+    //
+    // Example binding to R2. Learn more at https://developers.cloudflare.com/workers/runtime-apis/r2/
+    // MY_BUCKET: R2Bucket
+
+    SECRET_TOKEN: string
+}
+
+// Initialize router
+const router = new Router<Env>()
+
+// Enabling build in CORS support
+router.cors()
+
+// Register global middleware
+router.use(() => {
+    return new Response(null, {
+        headers: {
+            'X-Global-Middlewares': 'true'
+        }
+    })
+})
+
+// Simple get
+router.get('/user', () => {
+    return Response.json({
+        id: 1,
+        name: 'John Doe'
+    })
+})
+
+// Post route with url parameter
+router.post('/user/:id', ({ req }) => {
+
+    const userId = req.params.id
+
+    // Do stuff
+
+    if (!true) {
+        return Response.json({
+            error: 'Error doing stuff!'
+        }, { status: 400 })
+    }
+
+    return Response.json({ userId }, { status: 204 })
+})
+
+// Delete route using a middleware
+router.delete('/user/:id', ({ env, req }) => {
+    const { SECRET_TOKEN } = env
+
+    if (req.headers.get('Authorization') === SECRET_TOKEN)
+        return new Response(null, { status: 401 })
+
+}, ({ req }) => {
+
+  const userId = req.params.id
+
+  // Do stuff...
+
+  return Response.json({ userId })
+})
+
+// Listen Cloudflare Workers Fetch Event
+export default {
+    async fetch(request: Request, env: Env, ctx: ExecutionContext) {
+        return router.handle(request, env, ctx)
+    }
+}
+
+```
+
+<details>
+    <summary>JavaScript Example</summary>
 
 ```javascript
 import { Router } from '@tsndr/cloudflare-worker-router'
@@ -28,62 +121,60 @@ const router = new Router()
 router.cors()
 
 // Register global middleware
-router.use(({ req, res, next }) => {
-  res.headers.set('X-Global-Middlewares', 'true')
-  next()
+router.use(() => {
+    return new Response(null, {
+        headers: {
+            'X-Global-Middlewares': 'true'
+        }
+    })
 })
 
 // Simple get
-router.get('/user', ({ req, res }) => {
-  res.body = {
-    data: {
+router.get('/user', () => {
+    return Response.json({
         id: 1,
         name: 'John Doe'
-    }
-  }
+    })
 })
 
 // Post route with url parameter
-router.post('/user/:id', ({ req, res }) => {
-
+router.post('/user/:id', ({ req }) => {
     const userId = req.params.id
 
-  // Do stuff...
+    // Do stuff
 
     if (errorDoingStuff) {
-    res.status = 400
-    res.body = {
-      error: 'User did stupid stuff!'
-    }
-    return
+        return Response.json({
+            error: 'Error doing stuff!'
+        }, { status: 400 })
     }
 
-  res.status = 204
+    return Response.json({ userId }, { status: 204 })
 })
 
 // Delete route using a middleware
-router.delete('/user/:id', ({ req, res, next }) => {
+router.delete('/user/:id', ({ env, req }) => {
+    const { SECRET_TOKEN } = env
 
-  if (!apiTokenIsCorrect) {
-    res.status = 401
-    return
-  }
-  
-  await next()
-}, (req, res) => {
+    if (req.headers.get('Authorization') === SECRET_TOKEN)
+        return new Response(null, { status: 401 })
 
+}, ({ req }) => {
     const userId = req.params.id
 
     // Do stuff...
+
+    return Response.json({ userId })
 })
 
 // Listen Cloudflare Workers Fetch Event
 export default {
-  async fetch(request, env) {
-    return router.handle(env, request)
+    async fetch(request, env, ctx) {
+        return router.handle(request, env, ctx)
     }
 }
 ```
+</details>
 
 
 ## Reference
@@ -96,6 +187,10 @@ Enable or disable debug mode. Which will return the `error.stack` in case of an
 #### `state`
 State is a `boolean` which determines if debug mode should be enabled or not (default: `true`)
 
+Key                    | Type      | Default Value
+---------------------- | --------- | -------------
+`state`                | `boolean` | `true`
+
 
 ### `router.use([...handlers])`
 
@@ -106,8 +201,10 @@ Register a global middleware handler.
 
 Handler is a `function` which will be called for every request.
 
+
 #### `ctx`
-Object containing `env`, [`req`](#req-object), [`res`](#res-object), `next`
+
+Object containing `env`, [`req`](#req-object)
 
 
 ### `router.cors([config])`
@@ -126,16 +223,19 @@ Key                    | Type      | Default Value
 `optionsSuccessStatus` | `integer` | `204`
 
 
-### `router.any(url, [...handlers])`
-### `router.connect(url, [...handlers])`
-### `router.delete(url, [...handlers])`
-### `router.get(url, [...handlers])`
-### `router.head(url, [...handlers])`
-### `router.options(url, [...handlers])`
-### `router.patch(url, [...handlers])`
-### `router.post(url, [...handlers])`
-### `router.put(url, [...handlers])`
-### `router.trace(url, [...handlers])`
+### Supported Methods
+
+- `router.any(url, [...handlers])`
+- `router.connect(url, [...handlers])`
+- `router.delete(url, [...handlers])`
+- `router.get(url, [...handlers])`
+- `router.head(url, [...handlers])`
+- `router.options(url, [...handlers])`
+- `router.patch(url, [...handlers])`
+- `router.post(url, [...handlers])`
+- `router.put(url, [...handlers])`
+- `router.trace(url, [...handlers])`
+
 
 #### `url` (string)
 
@@ -145,16 +245,16 @@ Supports the use of dynamic parameters, prefixed with a `:` (i.e. `/user/:userId
 
 #### `handlers` (function, optional)
 
-An unlimited number of functions getting [`req`](#req-object) and [`res`](#res-object) passed into them.
+An unlimited number of functions getting [`ctx`](#ctx-object) passed into them.
 
 
 ### `ctx`-Object
+
 Key       | Type                | Description
 --------- | ------------------- | -----------
 `env`     | `object`            | Environment
 `req`     | `req`-Object        | Request Object
-`res`     | `res`-Object        | Response Object
-`next`    | `next`-Handler      | Next Handler
+`ctx`     | `ctx`-Object        | Cloudflare's `ctx`-Object
 
 
 ### `req`-Object
@@ -168,69 +268,87 @@ Key       | Type                | Description
 `query`   | `object`            | Object containing all query parameters
 
 
-### `res`-Object
-
-Key         | Type                | Description
------------ | ------------------- | -----------
-`body`      | `object` / `string` | Either set an `object` (will be converted to JSON) or a string
-`headers`   | `Headers`           | Response [Headers Object](https://developer.mozilla.org/en-US/docs/Web/API/Headers)
-`status`    | `integer`           | Return status code (default: `204`)
-`webSocket` | `WebSocket`         | Upgraded websocket connection
-
-
 ## Setup
 
-Please follow Cloudflare's [Get started guide](https://developers.cloudflare.com/workers/get-started/guide/) to install wrangler, then install the router using this command:
+Please follow Cloudflare's [Get started guide](https://developers.cloudflare.com/workers/get-started/guide/) to install wrangler.
+
+
+#### Initialize Project
+
+```bash
+wrangler init <name>
+```
+
+Use of TypeScript is strongly encouraged :)
 
 ```bash
 npm i -D @tsndr/cloudflare-worker-router
 ```
 
-and replace your `index.ts` / `index.js` with one of the following scripts
 
-<details>
-<summary>TypeScript (<code>src/index.ts</code>)</summary>
+### TypeScript (<code>src/index.ts</code>)
 
 ```typescript
 import { Router } from '@tsndr/cloudflare-worker-router'
 
 export interface Env {
   // Example binding to KV. Learn more at https://developers.cloudflare.com/workers/runtime-apis/kv/
-  // MY_KV_NAMESPACE: KVNamespace;
+  // MY_KV_NAMESPACE: KVNamespace
   //
   // Example binding to Durable Object. Learn more at https://developers.cloudflare.com/workers/runtime-apis/durable-objects/
-  // MY_DURABLE_OBJECT: DurableObjectNamespace;
+  // MY_DURABLE_OBJECT: DurableObjectNamespace
   //
   // Example binding to R2. Learn more at https://developers.cloudflare.com/workers/runtime-apis/r2/
-  // MY_BUCKET: R2Bucket;
+  // MY_BUCKET: R2Bucket
 }
 
-const router = new Router()
+const router = new Router<Env>()
+
+/// Example Route
+//
+// router.get(/'hi', ({ res }) => {
+//    res.body = 'Hello World'
+//}
+
+
+/// Example Route for splitting into multiple files
+//
+// const hiHandler: RouteHandler<Env> = ({ res }) => {
+//     res.body = 'Hello World'
+// }
+//
+// router.get('/hi', hiHandler)
+
 
 // TODO: add your routes here
 
 export default {
-    async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
-        return router.handle(env, request)
+    async fetch(request: Request, env: Env, ctx: ExecutionContext) {
+        return router.handle(request, env, ctx)
     }
 }
 ```
-</details>
+
+
+### JavaScript (<code>src/index.js</code>)
 
 <details>
-<summary>JavaScript (<code>src/index.js</code>)</summary>
+    <summary>Consider using TypeScript instead :)</summary>
 
 ```javascript
 import { Router } from '@tsndr/cloudflare-worker-router'
 
 const router = new Router()
 
+// router.get(/'hi', ({ res }) => {
+//    res.body = 'Hello World'
+//}
+
 // TODO: add your routes here
 
 export default {
     async fetch(request, env, ctx) {
-        return router.handle(env, request)
+        return router.handle(request, env, ctx)
     }
 }
 ```
-</details>

package-lock.json

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

package.json

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

src/index.ts

@@ -6,10 +6,10 @@
 * @property {string} url URL String
 * @property {RouterHandler[]} handlers Array of handler functions
 */
- export interface Route {
+export interface Route<TEnv> {
 	method: string
 	url: string
-    handlers: RouterHandler[]
+	handlers: RouterHandler<TEnv>[]
 }
 
 /**
@@ -18,14 +18,12 @@
 * @typedef RouterContext
 * @property {RouterEnv} env Environment
 * @property {RouterRequest} req Request Object
- * @property {RouterResponse} res Response Object
- * @property {RouterNext} next Next Handler
+* @property {ExecutionContext} ctx Context Object
 */
-export interface RouterContext {
-    env: any
+export interface RouterContext<TEnv = any> {
+	env: TEnv
 	req: RouterRequest
-    res: RouterResponse
-    next: RouterNext
+	ctx: ExecutionContext
 }
 
 /**
@@ -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 {
-    (ctx: RouterContext): Promise<void> | void
+export interface RouterHandler<TEnv = any> {
+	(ctx: RouterContext<TEnv>): Promise<Response | void> | Response | void
 }
 
 /**
@@ -131,7 +102,7 @@ export interface RouterCorsConfig {
 * @public
 * @class
 */
-export class Router {
+export class Router<TEnv = any> {
 
 	/**
 	* Router Array
@@ -139,7 +110,7 @@ export class Router {
 	* @protected
 	* @type {Route[]}
 	*/
-    protected routes: Route[] = []
+	protected routes: Route<TEnv>[] = []
 
 	/**
 	* Global Handlers
@@ -147,7 +118,7 @@ export class Router {
 	* @protected
 	* @type {RouterHandler[]}
 	*/
-    protected globalHandlers: RouterHandler[] = []
+	protected globalHandlers: RouterHandler<TEnv>[] = []
 
 	/**
 	* Debug Mode
@@ -167,7 +138,7 @@ export class Router {
 
 	/**
 	* CORS enabled
-     *-
+	*
 	* @protected
 	* @type {boolean}
 	*/
@@ -179,7 +150,7 @@ export class Router {
 	* @param {RouterHandler[]} handlers
 	* @returns {Router}
 	*/
-    public use(...handlers: RouterHandler[]): Router {
+	public use(...handlers: RouterHandler<TEnv>[]): Router<TEnv> {
 		for (let handler of handlers) {
 			this.globalHandlers.push(handler)
 		}
@@ -193,7 +164,7 @@ export class Router {
 	* @param  {RouterHandler[]} handlers
 	* @returns {Router}
 	*/
-    public connect(url: string, ...handlers: RouterHandler[]): Router {
+	public connect(url: string, ...handlers: RouterHandler<TEnv>[]): Router<TEnv> {
 		return this.register('CONNECT', url, handlers)
 	}
 
@@ -204,7 +175,7 @@ export class Router {
 	* @param  {RouterHandler[]} handlers
 	* @returns {Router}
 	*/
-    public delete(url: string, ...handlers: RouterHandler[]): Router {
+	public delete(url: string, ...handlers: RouterHandler<TEnv>[]): Router<TEnv> {
 		return this.register('DELETE', url, handlers)
 	}
 
@@ -215,7 +186,7 @@ export class Router {
 	* @param  {RouterHandler[]} handlers
 	* @returns {Router}
 	*/
-    public get(url: string, ...handlers: RouterHandler[]): Router {
+	public get(url: string, ...handlers: RouterHandler<TEnv>[]): Router<TEnv> {
 		return this.register('GET', url, handlers)
 	}
 
@@ -226,7 +197,7 @@ export class Router {
 	* @param  {RouterHandler[]} handlers
 	* @returns {Router}
 	*/
-    public head(url: string, ...handlers: RouterHandler[]): Router {
+	public head(url: string, ...handlers: RouterHandler<TEnv>[]): Router<TEnv> {
 		return this.register('HEAD', url, handlers)
 	}
 
@@ -237,7 +208,7 @@ export class Router {
 	* @param  {RouterHandler[]} handlers
 	* @returns {Router}
 	*/
-    public options(url: string, ...handlers: RouterHandler[]): Router {
+	public options(url: string, ...handlers: RouterHandler<TEnv>[]): Router<TEnv> {
 		return this.register('OPTIONS', url, handlers)
 	}
 
@@ -248,7 +219,7 @@ export class Router {
 	* @param  {RouterHandler[]} handlers
 	* @returns {Router}
 	*/
-    public patch(url: string, ...handlers: RouterHandler[]): Router {
+	public patch(url: string, ...handlers: RouterHandler<TEnv>[]): Router<TEnv> {
 		return this.register('PATCH', url, handlers)
 	}
 
@@ -259,7 +230,7 @@ export class Router {
 	* @param  {RouterHandler[]} handlers
 	* @returns {Router}
 	*/
-    public post(url: string, ...handlers: RouterHandler[]): Router {
+	public post(url: string, ...handlers: RouterHandler<TEnv>[]): Router<TEnv> {
 		return this.register('POST', url, handlers)
 	}
 
@@ -270,7 +241,7 @@ export class Router {
 	* @param  {RouterHandler[]} handlers
 	* @returns {Router}
 	*/
-    public put(url: string, ...handlers: RouterHandler[]): Router {
+	public put(url: string, ...handlers: RouterHandler<TEnv>[]): Router<TEnv> {
 		return this.register('PUT', url, handlers)
 	}
 
@@ -281,7 +252,7 @@ export class Router {
 	* @param  {RouterHandler[]} handlers
 	* @returns {Router}
 	*/
-    public trace(url: string, ...handlers: RouterHandler[]): Router {
+	public trace(url: string, ...handlers: RouterHandler<TEnv>[]): Router<TEnv> {
 		return this.register('TRACE', url, handlers)
 	}
 
@@ -292,7 +263,7 @@ export class Router {
 	* @param  {RouterHandler[]} handlers
 	* @returns {Router}
 	*/
-    public any(url: string, ...handlers: RouterHandler[]): Router {
+	public any(url: string, ...handlers: RouterHandler<TEnv>[]): Router<TEnv> {
 		return this.register('*', url, handlers)
 	}
 
@@ -302,7 +273,7 @@ export class Router {
 	* @param {boolean} [state=true] Whether to turn on or off debug mode (default: true)
 	* @returns {Router}
 	*/
-    public debug(state: boolean = true): Router {
+	public debug(state: boolean = true): Router<TEnv> {
 		this.debugMode = state
 		return this
 	}
@@ -313,7 +284,7 @@ export class Router {
 	* @param {RouterCorsConfig} [config]
 	* @returns {Router}
 	*/
-    public cors(config?: RouterCorsConfig): Router {
+	public cors(config?: RouterCorsConfig): Router<TEnv> {
 		this.corsEnabled = true
 		this.corsConfig = {
 			allowOrigin: config?.allowOrigin || '*',
@@ -325,6 +296,18 @@ export class Router {
 		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
 	*
@@ -334,7 +317,7 @@ export class Router {
 	* @param {RouterHandler[]} handlers Arrar of handler functions
 	* @returns {Router}
 	*/
-    private register(method: string, url: string, handlers: RouterHandler[]): Router {
+	private register(method: string, url: string, handlers: RouterHandler<TEnv>[]): Router<TEnv> {
 		this.routes.push({
 			method,
 			url,
@@ -351,7 +334,7 @@ export class Router {
 	* @param {RouterRequest} request
 	* @returns {Route | undefined}
 	*/
-    private getRoute(request: RouterRequest): Route | undefined {
+	private getRoute(request: RouterRequest): Route<TEnv> | undefined {
 		const url = new URL(request.url)
 		const pathArr = url.pathname.split('/').filter(i => i)
 
@@ -388,13 +371,12 @@ export class Router {
    /**
 	* Handle requests
 	*
-     * @param {any} env
+	* @param {TEnv} env
 	* @param {Request} request
 	* @param {any} [extend]
 	* @returns {Promise<Response>}
 	*/
-    public async handle(env: any, request: Request, extend: any = {}): Promise<Response> {
-        try {
+	public async handle(request: Request, env: TEnv, ctx: ExecutionContext, extend: any = {}): Promise<Response> {
 		const req: RouterRequest = {
 			...extend,
 			method: request.method,
@@ -406,76 +388,37 @@ export class Router {
 			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 (req.headers.has('Content-Type') && req.headers.get('Content-Type')!.includes('json')) {
-                    try {
-                        req.body = await request.json()
-                    } catch {
-                        req.body = {}
-                    }
-                } else {
-                    try {
-                        req.body = await request.text()
-                    } catch {
-                        req.body = ''
-                    }
-                }
+		if (this.corsEnabled && req.method === 'OPTIONS') {
+			return new Response(null, {
+				headers: this.setCorsHeaders(),
+				status: this.corsConfig.optionsSuccessStatus
+			})
 		}
 
-            const res: RouterResponse = { headers }
 		const handlers = [...this.globalHandlers, ...route.handlers]
-            let prevIndex = -1
 
-            const runner = async (index: number) => {
-                if (index === prevIndex)
-                    throw new Error('next() called multiple times')
+		let response: Response | undefined
 
-                prevIndex = index
+		for (const handler of handlers) {
+			const res = await handler({ env, req, ctx })
 
-                if (typeof handlers[index] === 'function')
-                    await handlers[index]({ env, req, res, next: async () => await runner(index + 1) })
-            }
-
-            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 })
+			if (res) {
+				response = res
+				break
 			}
 		}
+
+		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
+	}
 }

tsconfig.json

@@ -15,7 +15,6 @@
         "alwaysStrict": true,
         "noUnusedLocals": true,
         "noUnusedParameters": true,
-        "noImplicitReturns": true,
         "noFallthroughCasesInSwitch": true,
         "esModuleInterop": true,
         "preserveConstEnums": true,