From dd68361474d2e13308f3ef5b5d6d5f9ac86f963b Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Fri, 27 Mar 2026 05:14:13 +0000
Subject: [PATCH] fix: move early fetch hook BEFORE async storage read

The early fetch hook was still inside the async init() function,
running AFTER await storage.local.get(). By the time storage
responded, ChatGPT's JS had already loaded and captured the
original fetch().

Moved the inline script injection to the TOP of the IIFE, before
any async operations. The sequence is now:

1. [synchronous] Inject inline <script> that captures fetch/XHR
2. [synchronous] Define mergeProfiles and other helpers
3. [async] Read storage for config
4. [async] Inject content.js with full substitution engine

This guarantees the fetch proxy is installed before any page
JavaScript runs, regardless of how long storage reads take.

https://claude.ai/code/session_01SWSwDfMVij53bCTNSCLMwn
---
 src/content/injector.js | 47 ++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/content/injector.js b/src/content/injector.js
index 1657fae..b870a82 100644
--- a/src/content/injector.js
+++ b/src/content/injector.js
@@ -15,6 +15,25 @@
   if (window.__silentSendInjected) return;
   window.__silentSendInjected = true;
 
+  // IMMEDIATELY inject a synchronous fetch hook into the page world
+  // BEFORE any async operations. This must run before any page JS
+  // (like ChatGPT's Next.js) can store a reference to the original fetch.
+  const earlyHook = document.createElement('script');
+  earlyHook.textContent = `(function(){
+    window.__ssOriginalFetch = window.fetch;
+    window.__ssOriginalXHROpen = XMLHttpRequest.prototype.open;
+    window.__ssOriginalXHRSend = XMLHttpRequest.prototype.send;
+    window.__ssReady = false;
+    window.fetch = function() {
+      if (window.__ssReady && window.__ssInterceptFetch) {
+        return window.__ssInterceptFetch.apply(this, arguments);
+      }
+      return window.__ssOriginalFetch.apply(this, arguments);
+    };
+  })();`;
+  (document.head || document.documentElement).appendChild(earlyHook);
+  earlyHook.remove();
+
   // Merge active profiles into flat identity object
   function mergeProfiles(data) {
     const profiles = data?.profiles || [];
@@ -70,32 +89,8 @@
     // Merge active profiles into a flat identity object for the content script
     const identity = mergeProfiles(identityData);
 
-    // STEP 1: Inject a synchronous inline script that patches fetch/XHR
-    // IMMEDIATELY, before any page JS can store a reference to the originals.
-    // This thin proxy queues calls until the full content.js loads.
-    const earlyHook = document.createElement('script');
-    earlyHook.textContent = `(function(){
-      // Store the real fetch/XHR before any page script can
-      window.__ssOriginalFetch = window.fetch;
-      window.__ssOriginalXHROpen = XMLHttpRequest.prototype.open;
-      window.__ssOriginalXHRSend = XMLHttpRequest.prototype.send;
-      window.__ssReady = false;
-      window.__ssQueue = [];
-
-      // Replace fetch with a proxy that queues until content.js is ready
-      window.fetch = function() {
-        if (window.__ssReady && window.__ssInterceptFetch) {
-          return window.__ssInterceptFetch.apply(this, arguments);
-        }
-        // If not ready yet, call original (no substitution possible)
-        return window.__ssOriginalFetch.apply(this, arguments);
-      };
-    })();`;
-    (document.head || document.documentElement).appendChild(earlyHook);
-    earlyHook.remove();
-
-    // STEP 2: Load the full content.js which will use __ssOriginalFetch
-    // and set __ssReady = true when it's done hooking
+    // Load the full content.js which will use __ssOriginalFetch
+    // (captured by the early hook above) and set __ssReady = true
     const script = document.createElement('script');
     script.setAttribute('data-ss-config', JSON.stringify({ mappings, identity, settings }));
     script.src = api.runtime.getURL('src/content/content.js');