3.0.0-7

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
@@ -33,7 +33,7 @@ Migrating from `v2.x.x`, check out the [Migration Guide](MIGRATION.md).
 ```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
     //
@@ -264,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.
 
@@ -287,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
   //
@@ -302,9 +302,9 @@ const router = new Router<Env>()
 
 /// Example Route
 //
-// router.get(/'hi', async () => {
+// router.get('/hi', async () => {
 //    return new Response('Hello World')
-//}
+//})
 
 
 /// Example Route for splitting into multiple files
@@ -338,9 +338,9 @@ const router = new Router()
 
 /// Example Route
 //
-// router.get(/'hi', async () => {
+// router.get('/hi', async () => {
 //    return new Response('Hello World')
-//}
+//})
 
 /// Example Route for splitting into multiple files
 //

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsndr/cloudflare-worker-router",
-  "version": "3.0.0-6",
+  "version": "3.0.0-7",
   "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",
+    "@cloudflare/workers-types": "^4.20230115.0",
-    "typescript": "^4.7.4"
+    "typescript": "^4.9.5"
   }
 }

src/index.ts

@@ -48,6 +48,7 @@ export type RouterRequest<TExt> = {
 	body: string | any
 	raw: Request
 	cf?: IncomingRequestCfProperties
+	bearer: () => string
 } & TExt
 
 /**
@@ -387,7 +388,8 @@ export class Router<TEnv = any, TExt = any> {
 			raw: request,
 			params: {},
 			query: {},
-			body: ''
+			body: '',
+			bearer: () => request.headers.get('Authorization')?.replace('Bearer ', '').trim() ?? '',
 		} as RouterRequest<TExt>
 
 		const route = this.getRoute(req)