refactor: global envManager instead of envMap

Roosteridk · Dec 17, 2021 · c160c7a · c160c7a
1 parent 3836a27
commit c160c7a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/index.js b/src/index.js
@@ -13,19 +13,18 @@ import * as log from "./helpers/log.js";
 import * as util from "./helpers/util.js";
 import * as dnsutil from "./helpers/dnsutil.js";
 
-const envManager = new EnvManager();
-globalThis.envMap = envManager.getMap();
+globalThis.envManager = new EnvManager();
 
 if (typeof addEventListener !== "undefined") {
   addEventListener("fetch", (event) => {
-    if (!envManager.isLoaded) {
-      envManager.loadEnv();
-    }
     event.respondWith(handleRequest(event));
   });
 }
 
 export function handleRequest(event) {
+  if (!envManager.isLoaded) {
+    envManager.loadEnv();
+  }
   const processingTimeout = envManager.get("workerTimeout");
   const respectTimeout =
     envManager.get("runTimeEnv") == "worker" && processingTimeout > 0;
@@ -53,10 +52,6 @@ async function proxyRequest(event) {
       return res;
     }
 
-    // For environments which don't use FetchEvent to handle request.
-    if (!envManager.isLoaded) {
-      envManager.loadEnv();
-    }
     const currentRequest = new CurrentRequest();
     const plugin = new RethinkPlugin(event);
     await plugin.executePlugin(currentRequest);

diff --git a/src/plugin.js b/src/plugin.js
@@ -32,7 +32,7 @@ export default class RethinkPlugin {
     /**
      * Parameters of RethinkPlugin which may be used by individual plugins.
      */
-    this.parameter = new Map(envMap);
+    this.parameter = new Map(envManager.getMap());
     this.registerParameter("request", event.request);
     this.registerParameter("event", event);
     this.registerParameter(