From 6b4ab57f17e8863470b5c74e2d19aa8a94a853d3 Mon Sep 17 00:00:00 2001
From: dangered wolf <d@ngeredwolf.me>
Date: Thu, 18 Aug 2022 16:50:26 -0400
Subject: [PATCH] Revert "Moved some headers out of fetch function"

This reverts commit a410c0c04478efe0dfe8236127bec398db851aa4.
---
 src/fetch.ts | 73 ++++++++++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 39 deletions(-)

diff --git a/src/fetch.ts b/src/fetch.ts
index 17d641d..dd197a6 100644
--- a/src/fetch.ts
+++ b/src/fetch.ts
@@ -1,41 +1,5 @@
 import { Constants } from './constants';
 
-const invalidateTokenCache = (event: FetchEvent, cache: Cache) => {
-  console.log('Invalidating token cache');
-  event && event.waitUntil(cache.delete(guestTokenRequestCacheDummy));
-}
-
-const tokenHeaders: { [header: string]: string } = {
-  Authorization: Constants.GUEST_BEARER_TOKEN,
-  ...Constants.BASE_HEADERS
-};
-
-const guestTokenRequest = new Request(
-  `${Constants.TWITTER_API_ROOT}/1.1/guest/activate.json`,
-  {
-    method: 'POST',
-    headers: tokenHeaders,
-    cf: {
-      cacheEverything: true,
-      cacheTtl: Constants.GUEST_TOKEN_MAX_AGE
-    },
-    body: ''
-  }
-);
-
-/* A dummy version of the request only used for Cloudflare caching purposes.
-  The reason it exists at all is because Cloudflare won't cache POST requests. */
-  const guestTokenRequestCacheDummy = new Request(
-  `${Constants.TWITTER_API_ROOT}/1.1/guest/activate.json`,
-  {
-    method: 'GET',
-    cf: {
-      cacheEverything: true,
-      cacheTtl: Constants.GUEST_TOKEN_MAX_AGE
-    }
-  }
-);
-
 export const fetchUsingGuest = async (
   status: string,
   event: FetchEvent
@@ -43,6 +7,37 @@ export const fetchUsingGuest = async (
   let apiAttempts = 0;
   let newTokenGenerated = false;
 
+  const tokenHeaders: { [header: string]: string } = {
+    Authorization: Constants.GUEST_BEARER_TOKEN,
+    ...Constants.BASE_HEADERS
+  };
+
+  const guestTokenRequest = new Request(
+    `${Constants.TWITTER_API_ROOT}/1.1/guest/activate.json`,
+    {
+      method: 'POST',
+      headers: tokenHeaders,
+      cf: {
+        cacheEverything: true,
+        cacheTtl: Constants.GUEST_TOKEN_MAX_AGE
+      },
+      body: ''
+    }
+  );
+
+  /* A dummy version of the request only used for Cloudflare caching purposes.
+     The reason it exists at all is because Cloudflare won't cache POST requests. */
+  const guestTokenRequestCacheDummy = new Request(
+    `${Constants.TWITTER_API_ROOT}/1.1/guest/activate.json`,
+    {
+      method: 'GET',
+      cf: {
+        cacheEverything: true,
+        cacheTtl: Constants.GUEST_TOKEN_MAX_AGE
+      }
+    }
+  );
+
   const cache = caches.default;
 
   while (apiAttempts < 10) {
@@ -80,7 +75,7 @@ export const fetchUsingGuest = async (
 
         This can effectively mean virtually unlimited (read) access to Twitter's API,
         which is very funny. */
-      activate = await fetch(guestTokenRequest.clone());
+      activate = await fetch(guestTokenRequest);
     }
 
     /* Let's grab that guest_token so we can use it */
@@ -128,7 +123,7 @@ export const fetchUsingGuest = async (
       /* We'll usually only hit this if we get an invalid response from Twitter.
          It's uncommon, but it happens */
       console.error('Unknown error while fetching conversation from API');
-      invalidateTokenCache(event, cache);
+      event && event.waitUntil(cache.delete(guestTokenRequestCacheDummy));
       newTokenGenerated = true;
       continue;
     }
@@ -140,7 +135,7 @@ export const fetchUsingGuest = async (
     /* Running out of requests within our rate limit, let's purge the cache */
     if (remainingRateLimit < 20) {
       console.log(`Purging token on this edge due to low rate limit remaining`);
-      invalidateTokenCache(event, cache);
+      event && event.waitUntil(cache.delete(guestTokenRequestCacheDummy));
     }
 
     if (