From f7a236f1f2cbddfb98bf13ae97b13ad9bfffe5fb Mon Sep 17 00:00:00 2001
From: Tobias Schneider <mail@tobias-schneider.io>
Date: Fri, 18 Mar 2022 20:03:29 +0100
Subject: [PATCH] Change `router.handle(request, env, ctx)` to
 `router.handle(request, extend)`

---
 index.d.ts   | 12 ++----------
 index.js     |  6 ++----
 package.json |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index d4a04c1..bbbdde9 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -288,17 +288,9 @@ type RouterRequest = {
      */
     url: string
     /**
-     * Environment object
+     * Extend request object with custom properties
      */
-    env: any
-    /**
-     * Context object
-     */
-    ctx: any
-    /**
-     * Cloudflare object
-     */
-    cf: any
+    extend: any
     /**
      * Object containing all parameters defined in the url string
      */
diff --git a/index.js b/index.js
index 6bc147e..1958dfe 100644
--- a/index.js
+++ b/index.js
@@ -313,19 +313,17 @@ class Router {
      * @param {any} ctx
      * @returns {Response}
      */
-    async handle(request, env, ctx) {
+    async handle(request, extend) {
         try {
             if (request instanceof Event) {
                 request = request.request
                 console.warn("Warning: Using `event` on `router.handle()` is deprecated and might go away in future versions, please use `event.request` instead.")
             }
             const req = {
+                ...extend,
                 method: request.method,
                 headers: request.headers,
                 url: request.url,
-                env: env || {},
-                ctx: ctx || {},
-                cf: request.cf || {},
                 params: []
             }
             if (req.method === 'OPTIONS' && Object.keys(this.corsConfig).length) {
diff --git a/package.json b/package.json
index 1f48a58..bea3895 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tsndr/cloudflare-worker-router",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "",
   "main": "index.js",
   "scripts": {},