Convert to ES modules

.eslintrc.js

@@ -2,7 +2,6 @@ module.exports = {
     // See https://github.com/torchbox/eslint-config-torchbox for rules.
     extends: 'torchbox',
     rules: {
-        "no-restricted-globals": 0,
         "no-use-before-define": 0
     },
     globals: {

cf-2fa-verify.js

@@ -10,19 +10,17 @@ const TOKENS = {
   "example.com": "deadbeef5",
 };
 
-async function handleRequest(request) {
-  const url = new URL(request.url);
+export default {
+  handleRequest(request) {
+    const url = new URL(request.url);
 
-  const verificationToken = TOKENS[url.host];
-  if (verificationToken) {
-    // If the domain is known and we have a token, return it.
-    return new Response(verificationToken);
-  }
+    const verificationToken = TOKENS[url.host];
+    if (verificationToken) {
+      // If the domain is known and we have a token, return it.
+      return new Response(verificationToken);
+    }
 
-  // Return something nonsensical for an invalid domain
-  return new Response("", { status: 404 });
-}
-
-addEventListener("fetch", (event) => {
-  event.respondWith(handleRequest(event.request));
-});
+    // Return something nonsensical for an invalid domain
+    return new Response("", { status: 404 });
+  },
+};

common-caching.js

@@ -97,40 +97,36 @@ const STRIP_VALUELESS_QUERYSTRING_KEYS = false;
 // (from https://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.4)
 const CACHABLE_HTTP_STATUS_CODES = [200, 203, 206, 300, 301, 410];
 
-addEventListener("fetch", (event) => {
-  event.respondWith(main(event));
-});
-
-async function main(event) {
-  const cache = caches.default;
-  let { request } = event;
-  let strippedParams;
-  // eslint-disable-next-line prefer-const
-  [request, strippedParams] = stripQuerystring(request);
-
-  if (!requestIsCachable(request)) {
-    // If the request isn't cacheable, return a Response directly from the origin.
-    return fetch(request);
-  }
+export default {
+  async fetch(originalRequest, env, ctx) {
+    const cache = caches.default;
+    // eslint-disable-next-line prefer-const
+    const [request, strippedParams] = stripQuerystring(originalRequest);
+
+    if (!requestIsCachable(request)) {
+      // If the request isn't cacheable, return a Response directly from the origin.
+      return fetch(request);
+    }
 
-  const cachingRequest = getCachingRequest(request);
-  let response = await cache.match(cachingRequest);
+    const cachingRequest = getCachingRequest(request);
+    let response = await cache.match(cachingRequest);
 
-  if (!response) {
-    // If we didn't get a response from the cache, fetch one from the origin
-    // and put it in the cache.
-    response = await fetch(request);
-    if (responseIsCachable(response)) {
-      event.waitUntil(cache.put(cachingRequest, response.clone()));
+    if (!response) {
+      // If we didn't get a response from the cache, fetch one from the origin
+      // and put it in the cache.
+      response = await fetch(request);
+      if (responseIsCachable(response)) {
+        ctx.waitUntil(cache.put(cachingRequest, response.clone()));
+      }
     }
-  }
 
-  if (REPLACE_STRIPPED_QUERYSTRING_ON_REDIRECT_LOCATION) {
-    response = replaceStrippedQsOnRedirectResponse(response, strippedParams);
-  }
+    if (REPLACE_STRIPPED_QUERYSTRING_ON_REDIRECT_LOCATION) {
+      response = replaceStrippedQsOnRedirectResponse(response, strippedParams);
+    }
 
-  return response;
-}
+    return response;
+  },
+};
 
 /*
  * Cacheability Utilities

holding-page.js

@@ -6,21 +6,19 @@
 // Keep it simple, small and self-contained.
 const HOLDING_PAGE_URL = "https://example.com";
 
-addEventListener("fetch", (event) => {
-  event.respondWith(fetchAndReplace());
-});
+export default {
+  async fetch() {
+    const modifiedHeaders = new Headers();
 
-async function fetchAndReplace() {
-  const modifiedHeaders = new Headers();
+    modifiedHeaders.set("Content-Type", "text/html");
+    modifiedHeaders.append("Pragma", "no-cache");
 
-  modifiedHeaders.set("Content-Type", "text/html");
-  modifiedHeaders.append("Pragma", "no-cache");
+    const holdingPage = await fetch(HOLDING_PAGE_URL);
+    const content = await holdingPage.text();
 
-  const holdingPage = await fetch(HOLDING_PAGE_URL);
-  const content = await holdingPage.text();
-
-  // Return modified response.
-  return new Response(content, {
-    headers: modifiedHeaders,
-  });
-}
+    // Return modified response.
+    return new Response(content, {
+      headers: modifiedHeaders,
+    });
+  },
+};

insert-banner.js

@@ -1,14 +1,14 @@
 // Inject some HTML before a given element in the response
 // Uses the HTMLRewriter API https://developers.cloudflare.com/workers/runtime-apis/html-rewriter
 
-addEventListener("fetch", (event) => {
-  event.respondWith(main(event));
-});
-
-async function main(event) {
-  const response = await fetch(event.request);
-  return addBanner(response);
-}
+export default {
+  async fetch(request) {
+    const response = await fetch(request);
+    return new HTMLRewriter()
+      .on("*", new BannerElementHandler())
+      .transform(response);
+  },
+};
 
 class BannerElementHandler {
   static async element(element) {
@@ -20,9 +20,3 @@ class BannerElementHandler {
     );
   }
 }
-
-function addBanner(response) {
-  return new HTMLRewriter()
-    .on("*", new BannerElementHandler())
-    .transform(response);
-}

insert-content.js

@@ -2,14 +2,14 @@
 // e.g.
 // <!-- include https://www.google.co.uk -->
 
-addEventListener("fetch", (event) => {
-  event.respondWith(main(event));
-});
-
-async function main(event) {
-  const response = await fetch(event.request);
-  return insertContent(response);
-}
+export default {
+  async fetch(request) {
+    const response = await fetch(request);
+    return new HTMLRewriter()
+      .onDocument(new DocumentHandler(response))
+      .transform(response);
+  },
+};
 
 class DocumentHandler {
   constructor(response) {
@@ -37,9 +37,3 @@ class DocumentHandler {
     }
   }
 }
-
-function insertContent(response) {
-  return new HTMLRewriter()
-    .onDocument(new DocumentHandler(response))
-    .transform(response);
-}