3.0.0-9

MIGRATION.md

@@ -1,71 +1,70 @@
 # Migration Guide
 
-From `v1.x.x` to `v2.x.x`.
+From `v2.x.x` to `v3.x.x`.
+
 
 ## Contents
 
-- [Preparation](#preparation)
-- [Update](#update)
-- [Import / Require](#import--require)
-- [Routes](#routes)
+- [Update Router](#update-router)
+- [Handlers](#handlers)
 - [Fetch](#fetch--routerhandle)
 
 
-## Preparation
+## Update Router
 
-Follow Cloudflare's [Migration Guide](https://developers.cloudflare.com/workers/wrangler/migration/migrating-from-wrangler-1/) to update your protject to [wrangler2](https://github.com/cloudflare/wrangler2).
-
-## Update
-
-Update to the latest version verstion
+Update to the latest version version of the router.
 
 ```bash
 npm i -D @tsndr/cloudflare-worker-router
 ```
 
-## Import / Require
 
-Switch to ESModules.
+## Handlers
+
+- Remove `res` and `next` from handler parameter list.
+- Replace `res.` with `return new Response()` / `return Response.json()`.
+- Remove `next()` calls from middlewares.
+
 
 ### Before
 
-```javascript
-const Router = require('@tsndr/cloudflare-worker-router')
+```typescript
+// Register global middleware
+router.use(({ env, req, res, next }) => {
+    if (req.headers.get('authorization') !== env.SECRET_TOKEN) {
+        res.status = 401
+        return
+    }
+
+    next()
+})
+
+// Simple get
+router.get('/user', ({ res }) => {
+    res.body = {
+        id: 1,
+        name: 'John Doe'
+    }
+})
 ```
 
 
 ### After
 
-```javascript
-import Router from '@tsndr/cloudflare-worker-router'
+```typescript
+// Register global middleware
+router.use(({ env, req }) => {
+    // Intercept if token doesn't match
+    if (req.headers.get('authorization') !== env.SECRET_TOKEN) {
+        return new Response(null, { status: 401 })
+    }
+})
+
+// Simple get
+router.get('/user', () => {
+    return Response.json({
+        id: 1,
+        name: 'John Doe'
+    })
+})
 ```
-
-
-## Routes
-
-Just add curly braces.
-
-
-### Before
-
-<a href="https://gist.github.com/tsndr/34e8544266ae15d51abd019d7c3d27ca" target="_blank"><img width="469" alt="Petrify 2022-06-24 at 5 57 01 PM" src="https://user-images.githubusercontent.com/2940127/175572731-a8729c1b-15e2-45ac-be80-7e8527c5502a.png"></a>
-
-
-### After
-
-<a href="https://gist.github.com/tsndr/8db6e8dd55e348015c2ff8e93dd6aa31" target="_blank"><img width="469" alt="Petrify 2022-06-24 at 5 55 56 PM" src="https://user-images.githubusercontent.com/2940127/175572549-0eea8fc4-3d90-412a-89cc-d2f4569f1139.png"></a>
-
-
-## Fetch / `router.handle()`
-
-❗️ Be aware that with `v2.0.0` the parameters of `router.handle()` changed ❗️
-
-
-### Before
-
-<a href="https://gist.github.com/tsndr/12b0f800269760c597646c90a562ef88" target="_blank"><img width="469" alt="Petrify 2022-06-24 at 5 58 43 PM" src="https://user-images.githubusercontent.com/2940127/175572993-fb4681c2-eece-4c92-88e8-1c2f57644769.png"></a>
-
-
-### After
-
-<a href="https://gist.github.com/tsndr/30902b01b134e2a58cf3a53648dd3e47" target="_blank"><img width="393" alt="Petrify 2022-06-24 at 5 59 22 PM" src="https://user-images.githubusercontent.com/2940127/175573110-b7dfcfb2-855d-4529-a957-6f8b9ec439f3.png"></a>

README.md

@@ -12,7 +12,7 @@ I worked a lot with [Express.js](https://expressjs.com/) in the past and really
 - [Features](#features)
 - [Usage](#usage)
 - [Reference](#reference)
-- [Setup](#setup)
+- [Getting started](#getting-started)
 
 
 ## Features
@@ -26,12 +26,14 @@ I worked a lot with [Express.js](https://expressjs.com/) in the past and really
 
 ## Usage
 
+Migrating from `v2.x.x`, check out the [Migration Guide](MIGRATION.md).
+
 ### TypeScript Example
 
 ```typescript
 import { Router } from '@tsndr/cloudflare-worker-router'
 
-export interface Env {
+export type Env = {
     // Example binding to KV. Learn more at https://developers.cloudflare.com/workers/runtime-apis/kv/
     // MY_KV_NAMESPACE: KVNamespace
     //
@@ -51,12 +53,10 @@ const router = new Router<Env>()
 router.cors()
 
 // Register global middleware
-router.use(() => {
-    return new Response(null, {
-        headers: {
-            'X-Global-Middlewares': 'true'
-        }
-    })
+router.use(({ env, req }) => {
+    // Intercept if token doesn't match
+    if (req.headers.get('authorization') !== env.SECRET_TOKEN)
+        return new Response(null, { status: 401 })
 })
 
 // Simple get
@@ -85,9 +85,7 @@ router.post('/user/:id', ({ req }) => {
 
 // Delete route using a middleware
 router.delete('/user/:id', ({ env, req }) => {
-    const { SECRET_TOKEN } = env
-
-    if (req.headers.get('Authorization') === SECRET_TOKEN)
+    if (req.headers.get('authorization') === env.SECRET_TOKEN)
         return new Response(null, { status: 401 })
 
 }, ({ req }) => {
@@ -121,12 +119,10 @@ const router = new Router()
 router.cors()
 
 // Register global middleware
-router.use(() => {
-    return new Response(null, {
-        headers: {
-            'X-Global-Middlewares': 'true'
-        }
-    })
+router.use(({ env, req }) => {
+    // Intercept if token doesn't match
+    if (req.headers.get('authorization') !== env.SECRET_TOKEN)
+        return new Response(null, { status: 401 })
 })
 
 // Simple get
@@ -139,11 +135,12 @@ router.get('/user', () => {
 
 // Post route with url parameter
 router.post('/user/:id', ({ req }) => {
+
     const userId = req.params.id
 
     // Do stuff
 
-    if (errorDoingStuff) {
+    if (!true) {
         return Response.json({
             error: 'Error doing stuff!'
         }, { status: 400 })
@@ -154,12 +151,11 @@ router.post('/user/:id', ({ req }) => {
 
 // Delete route using a middleware
 router.delete('/user/:id', ({ env, req }) => {
-    const { SECRET_TOKEN } = env
-
-    if (req.headers.get('Authorization') === SECRET_TOKEN)
+    if (req.headers.get('authorization') === env.SECRET_TOKEN)
         return new Response(null, { status: 401 })
 
 }, ({ req }) => {
+
   const userId = req.params.id
 
   // Do stuff...
@@ -268,7 +264,7 @@ Key       | Type                | Description
 `query`   | `object`            | Object containing all query parameters
 
 
-## Setup
+## Getting started
 
 Please follow Cloudflare's [Get started guide](https://developers.cloudflare.com/workers/get-started/guide/) to install wrangler.
 
@@ -291,7 +287,7 @@ npm i -D @tsndr/cloudflare-worker-router
 ```typescript
 import { Router } from '@tsndr/cloudflare-worker-router'
 
-export interface Env {
+export type Env = {
   // Example binding to KV. Learn more at https://developers.cloudflare.com/workers/runtime-apis/kv/
   // MY_KV_NAMESPACE: KVNamespace
   //
@@ -306,15 +302,15 @@ const router = new Router<Env>()
 
 /// Example Route
 //
-// router.get(/'hi', ({ res }) => {
-//    res.body = 'Hello World'
-//}
+// router.get('/hi', async () => {
+//    return new Response('Hello World')
+//})
 
 
 /// Example Route for splitting into multiple files
 //
-// const hiHandler: RouteHandler<Env> = ({ res }) => {
-//     res.body = 'Hello World'
+// const hiHandler: RouteHandler<Env> = async () => {
+//    return new Response('Hello World')
 // }
 //
 // router.get('/hi', hiHandler)
@@ -340,9 +336,19 @@ import { Router } from '@tsndr/cloudflare-worker-router'
 
 const router = new Router()
 
-// router.get(/'hi', ({ res }) => {
-//    res.body = 'Hello World'
+/// Example Route
+//
+// router.get('/hi', async () => {
+//    return new Response('Hello World')
+//})
+
+/// Example Route for splitting into multiple files
+//
+// async function hiHandler() {
+//    return new Response('Hello World')
 // }
+//
+// router.get('/hi', hiHandler)
 
 // TODO: add your routes here
 

package-lock.json

@@ -1,28 +1,28 @@
 {
   "name": "@tsndr/cloudflare-worker-router",
-  "version": "3.0.0-5",
+  "version": "3.0.0-9",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@tsndr/cloudflare-worker-router",
-      "version": "3.0.0-5",
+      "version": "3.0.0-9",
       "license": "MIT",
       "devDependencies": {
-        "@cloudflare/workers-types": "^3.13.0",
-        "typescript": "^4.7.4"
+        "@cloudflare/workers-types": "^4.20230115.0",
+        "typescript": "^4.9.5"
       }
     },
     "node_modules/@cloudflare/workers-types": {
-      "version": "3.13.0",
-      "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-3.13.0.tgz",
-      "integrity": "sha512-oyhzfYlWBLgd9odJ/WHcsD/8B+IaAjSD+OcPEGLzX5kGRONjwcW3NY0WQfsVIhQzZ6AbPzjwkmj4D2VFwU1xRQ==",
+      "version": "4.20230115.0",
+      "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20230115.0.tgz",
+      "integrity": "sha512-GPJEiO8AFN+jUpA+DHJ1qdVmk4s/hq8JYKjOV/+U7avGquQbVnj905+Kg6uAEfrq16muwmRKl+XJGqsvlBlDNg==",
       "dev": true
     },
     "node_modules/typescript": {
-      "version": "4.7.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
-      "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -35,15 +35,15 @@
   },
   "dependencies": {
     "@cloudflare/workers-types": {
-      "version": "3.13.0",
-      "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-3.13.0.tgz",
-      "integrity": "sha512-oyhzfYlWBLgd9odJ/WHcsD/8B+IaAjSD+OcPEGLzX5kGRONjwcW3NY0WQfsVIhQzZ6AbPzjwkmj4D2VFwU1xRQ==",
+      "version": "4.20230115.0",
+      "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20230115.0.tgz",
+      "integrity": "sha512-GPJEiO8AFN+jUpA+DHJ1qdVmk4s/hq8JYKjOV/+U7avGquQbVnj905+Kg6uAEfrq16muwmRKl+XJGqsvlBlDNg==",
       "dev": true
     },
     "typescript": {
-      "version": "4.7.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
-      "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "dev": true
     }
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsndr/cloudflare-worker-router",
-  "version": "3.0.0-5",
+  "version": "3.0.0-9",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -31,7 +31,7 @@
   },
   "homepage": "https://github.com/tsndr/cloudflare-worker-router#readme",
   "devDependencies": {
-    "@cloudflare/workers-types": "^3.13.0",
-    "typescript": "^4.7.4"
+    "@cloudflare/workers-types": "^4.20230115.0",
+    "typescript": "^4.9.5"
   }
 }

src/index.ts

@@ -6,7 +6,7 @@
 * @property {string} url URL String
 * @property {RouterHandler[]} handlers Array of handler functions
 */
-export interface Route<TEnv, TExt> {
+export type Route<TEnv, TExt> = {
 	method: string
 	url: string
 	handlers: RouterHandler<TEnv, TExt>[]
@@ -20,9 +20,10 @@ export interface Route<TEnv, TExt> {
 * @property {RouterRequest} req Request Object
 * @property {ExecutionContext} ctx Context Object
 */
-export interface RouterContext<TEnv = any, TExt = any> {
+export type RouterContext<TEnv = any, TExt = any> = {
 	env: TEnv
 	req: RouterRequest<TExt>
+	dbg: boolean
 	ctx?: ExecutionContext
 }
 
@@ -46,6 +47,12 @@ export type RouterRequest<TExt> = {
 	headers: Headers
 	body: string | any
 	raw: Request
+	arrayBuffer(): Promise<ArrayBuffer>
+	text(): Promise<string>
+	json<T>(): Promise<T>
+	formData(): Promise<FormData>
+	blob(): Promise<Blob>
+	bearer: () => string
 	cf?: IncomingRequestCfProperties
 } & TExt
 
@@ -54,7 +61,7 @@ export type RouterRequest<TExt> = {
 *
 * @typedef RouterRequestParams
 */
-export interface RouterRequestParams {
+export type RouterRequestParams = {
 	[key: string]: string
 }
 
@@ -63,7 +70,7 @@ export interface RouterRequestParams {
 *
 * @typedef RouterRequestQuery
 */
-export interface RouterRequestQuery {
+export type RouterRequestQuery = {
 	[key: string]: string
 }
 
@@ -74,7 +81,7 @@ export interface RouterRequestQuery {
 * @param {RouterContext} ctx
 * @returns {Promise<Response | void> Response | void}
 */
-export interface RouterHandler<TEnv = any, TExt = any> {
+export type RouterHandler<TEnv = any, TExt = any> = {
 	(ctx: RouterContext<TEnv, TExt>): Promise<Response | void> | Response | void
 }
 
@@ -88,7 +95,7 @@ export interface RouterHandler<TEnv = any, TExt = any> {
 * @property {number} [maxAge=86400] Access-Control-Max-Age (default: `86400`)
 * @property {number} [optionsSuccessStatus=204] Return status code for OPTIONS request (default: `204`)
 */
-export interface RouterCorsConfig {
+export type RouterCorsConfig = {
 	allowOrigin?: string
 	allowMethods?: string
 	allowHeaders?: string
@@ -287,11 +294,11 @@ export class Router<TEnv = any, TExt = any> {
 	public cors(config?: RouterCorsConfig): Router<TEnv, TExt> {
 		this.corsEnabled = true
 		this.corsConfig = {
-			allowOrigin: config?.allowOrigin || '*',
-			allowMethods: config?.allowMethods || '*',
-			allowHeaders: config?.allowHeaders || '*',
-			maxAge: config?.maxAge || 86400,
-			optionsSuccessStatus: config?.optionsSuccessStatus || 204
+			allowOrigin: config?.allowOrigin ?? '*',
+			allowMethods: config?.allowMethods ?? '*',
+			allowHeaders: config?.allowHeaders ?? '*',
+			maxAge: config?.maxAge ?? 86400,
+			optionsSuccessStatus: config?.optionsSuccessStatus ?? 204
 		}
 		return this
 	}
@@ -371,8 +378,8 @@ export class Router<TEnv = any, TExt = any> {
    /**
 	* Handle requests
 	*
-	* @param {TEnv} env
 	* @param {Request} request
+	* @param {TEnv} env
 	* @param {TExt} [ext]
 	* @returns {Promise<Response>}
 	*/
@@ -386,14 +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(),
@@ -401,12 +408,18 @@ 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
 
 		let response: Response | undefined
 
 		for (const handler of handlers) {
-			const res = await handler({ env, req, ctx })
+			const res = await handler({ env, req, dbg, ctx })
 
 			if (res) {
 				response = res