initial stophack implementation (#317)

NotNite · Cynosphere · web-flow · commit 39c099bf6ac8 · 2026-05-01T13:24:41.000-04:00
Co-authored-by: Cynthia Foxwell &lt;gamers@riseup.net&gt;
diff --git a/packages/browser/manifest.json b/packages/browser/manifest.json
@@ -28,10 +28,6 @@
       }
     ]
   },
-  "background": {
-    "service_worker": "background.js",
-    "type": "module"
-  },
   "web_accessible_resources": [
     {
       "resources": ["index.js"],
diff --git a/packages/browser/moonlight-filter.json b/packages/browser/moonlight-filter.json
@@ -15,17 +15,5 @@
       "resourceTypes": ["main_frame"],
       "requestDomains": ["discord.com"]
     }
-  },
-  {
-    "id": 2,
-    "priority": 1,
-    "action": {
-      "type": "block"
-    },
-    "condition": {
-      "requestDomains": ["discord.com", "discordapp.com"],
-      "regexFilter": "\/assets\/.+\\..+\\.js$",
-      "resourceTypes": ["script"]
-    }
   }
 ]
diff --git a/packages/browser/src/background-mv2.js b/packages/browser/src/background-mv2.js
@@ -1,78 +1,5 @@
 /** biome-ignore-all lint/suspicious/noConsole: background script */
 
-chrome.webRequest.onBeforeRequest.addListener(
-  async (details) => {
-    if (details.tabId === -1) return;
-
-    const origin = new URL(details.originUrl);
-    if (
-      (origin.host.endsWith("discord.com") || origin.host.endsWith("discordapp.com")) &&
-      origin.pathname.match(/^\/developers\//)
-    )
-      return;
-
-    const url = new URL(details.url);
-    const hasUrl =
-      url.pathname.match(/\/assets\/[a-zA-Z\-]+\./) &&
-      !url.searchParams.has("inj") &&
-      (url.host.endsWith("discord.com") || url.host.endsWith("discordapp.com"));
-
-    const initScripts = ["web."];
-    const allowScripts = ["popout."];
-    const testScripts = (scripts) => scripts.some((script) => url.pathname.startsWith(`/assets/${script}`));
-    const shouldInit = hasUrl && testScripts(initScripts);
-    const shouldBlock = hasUrl && !testScripts(allowScripts);
-
-    if (shouldInit) {
-      setTimeout(async () => {
-        console.log("Starting moonlight", details.url);
-        await chrome.scripting.executeScript({
-          target: { tabId: details.tabId },
-          world: "MAIN",
-          args: [[details.url]],
-          func: async (blockedScripts) => {
-            console.log("Initializing moonlight");
-            try {
-              await window._moonlightBrowserInit();
-            } catch (e) {
-              console.error(e);
-            }
-
-            console.log("Readding scripts");
-            try {
-              const scripts = [...document.querySelectorAll("script")].filter(
-                (script) => script.src && blockedScripts.some((url) => url.includes(script.src))
-              );
-
-              blockedScripts.reverse();
-              for (const url of blockedScripts) {
-                if (!url.includes("/web.")) continue;
-
-                const script = scripts.find((script) => url.includes(script.src));
-                const newScript = document.createElement("script");
-                for (const attr of script.attributes) {
-                  if (attr.name === "src") attr.value += "?inj";
-                  newScript.setAttribute(attr.name, attr.value);
-                }
-                script.remove();
-                document.documentElement.appendChild(newScript);
-              }
-            } catch (e) {
-              console.error(e);
-            }
-          }
-        });
-      }, 0);
-    }
-
-    if (shouldBlock) return { cancel: true };
-  },
-  {
-    urls: ["https://*.discord.com/assets/*.js", "https://*.discordapp.com/assets/*.js"]
-  },
-  ["blocking"]
-);
-
 chrome.webRequest.onHeadersReceived.addListener(
   (details) => {
     return {
diff --git a/packages/browser/src/index.ts b/packages/browser/src/index.ts
@@ -164,3 +164,27 @@ window._moonlightBrowserInit = async () => {
   // This is set by web-preload for us
   await window._moonlightWebLoad!();
 };
+
+// violentmonkey's document-start injector logic
+const getOwnProp = (obj: any, key: any, defVal?: any) => {
+  try {
+    if (obj && Object.hasOwn(obj, key)) {
+      defVal = obj[key];
+    }
+  } catch {
+    // noop
+  }
+  return defVal;
+};
+const elemByTag = (tag: string, i?: number) => getOwnProp(document.getElementsByTagName(tag), i || 0);
+const observer = new MutationObserver(() => {
+  if (elemByTag("*")) {
+    observer.disconnect();
+
+    setTimeout(() => {
+      window.stop();
+      window._moonlightBrowserInit!();
+    }, 0);
+  }
+});
+observer.observe(document, { childList: true, subtree: true });
diff --git a/packages/core/src/patch.ts b/packages/core/src/patch.ts
@@ -121,10 +121,17 @@ function patchModule(id: string, patchId: string, replaced: string, entry: Webpa
   }
 }
 
-function patchModules(entry: WebpackJsonpEntry[1]) {
+const previouslyPatched = new Map<string, IdentifiedPatch>();
+
+function patchModules(entry: WebpackJsonpEntry[1], chunkId?: WebpackJsonpEntry[0]) {
   // Populate the module cache
   for (const [id, func] of Object.entries(entry)) {
-    if (!Object.hasOwn(moduleCache, id) && func.__moonlight !== true) {
+    if (func.__moonlight !== true) {
+      if (Object.hasOwn(moduleCache, id)) {
+        logger.debug(`Chunk "${chunkId?.join(", ") ?? "<unknown>"}" replacing module "${id}"`);
+        if (previouslyPatched.has(id)) moonlight.unpatched.add(previouslyPatched.get(id)!);
+      }
+
       moduleCache[id] = func.toString().replace(/\n/g, "");
       moonlight.moonmap.parseScript(id, moduleCache[id]);
     }
@@ -217,7 +224,10 @@ function patchModules(entry: WebpackJsonpEntry[1]) {
           exts.add(patch.ext);
         }
 
-        if (isPatched) moonlight.unpatched.delete(patch);
+        if (isPatched) {
+          previouslyPatched.set(id, patch);
+          moonlight.unpatched.delete(patch);
+        }
         if (shouldRemove) patches.splice(i--, 1);
       }
     }
@@ -501,7 +511,7 @@ export async function installWebpackPatcher() {
             });
 
             try {
-              patchModules(items[1]);
+              patchModules(items[1], items[0]);
             } catch (err) {
               logger.warn("Failed to patch Webpack modules:", err);
             }
diff --git a/packages/injector/src/index.ts b/packages/injector/src/index.ts
@@ -24,22 +24,14 @@ let oldPreloadPath: string | undefined;
 let corsAllow: string[] = [];
 let blockedUrls: RegExp[] = [];
 let injectorConfig: InjectorConfig | undefined;
-let initCalled = false;
 
 ipcMain.on(constants.ipcGetOldPreloadPath, (e) => {
-  initCalled = true;
   e.returnValue = oldPreloadPath;
 });
 
 ipcMain.on(constants.ipcGetAppData, (e) => {
   e.returnValue = app.getPath("appData");
 });
-ipcMain.on(constants.ipcGetInjectorConfig, (e) => {
-  e.returnValue = injectorConfig;
-});
-ipcMain.on(constants.ipcNodePreloadKickoff, (e) => {
-  e.returnValue = true;
-});
 ipcMain.handle(constants.ipcMessageBox, (_, opts) => {
   electron.dialog.showMessageBoxSync(opts);
 });
@@ -142,10 +134,6 @@ class BrowserWindow extends ElectronBrowserWindow {
       }
     }
 
-    this.webContents.on("did-navigate", () => {
-      initCalled = false;
-    });
-
     this.webContents.session.webRequest.onHeadersReceived((details, cb) => {
       if (details.responseHeaders != null) {
         // Patch CSP so things can use externally hosted assets
@@ -171,41 +159,6 @@ class BrowserWindow extends ElectronBrowserWindow {
     });
 
     this.webContents.session.webRequest.onBeforeRequest((details, cb) => {
-      /*
-        In order to get moonlight loading to be truly async, we prevent Discord
-        from loading their scripts immediately. We block the requests, keep note
-        of their URLs, and then send them off to node-preload when we get all of
-        them. node-preload then loads node side, web side, and then recreates
-        the script elements to cause them to re-fetch.
-
-        The browser extension also does this, but in a background script (see
-        packages/browser/src/background.js - we should probably get this working
-        with esbuild someday).
-      */
-      if (details.resourceType === "script" && isMainWindow) {
-        const url = new URL(details.url);
-        const hasUrl =
-          url.pathname.match(/\/assets\/(\d{3,5}|[a-zA-Z\-]+)\./) &&
-          !url.searchParams.has("inj") &&
-          (url.host.endsWith("discord.com") || url.host.endsWith("discordapp.com"));
-
-        const initScripts = ["web."];
-        const allowScripts = ["popout."];
-        const testScripts = (scripts: string[]) =>
-          scripts.some((script) => url.pathname.startsWith(`/assets/${script}`));
-        const shouldInit = hasUrl && testScripts(initScripts);
-        const shouldBlock = hasUrl && !testScripts(allowScripts);
-
-        if (shouldInit) {
-          setTimeout(() => {
-            logger.debug("Kicking off node-preload", details.url);
-            this.webContents.send(constants.ipcNodePreloadKickoff, [details.url]);
-          }, 0);
-        }
-
-        if (shouldBlock && !initCalled) return cb({ cancel: true });
-      }
-
       // Allow plugins to block some URLs,
       // this is needed because multiple webRequest handlers cannot be registered at once
       cb({ cancel: blockedUrls.some((u) => u.test(details.url)) });
diff --git a/packages/node-preload/src/index.ts b/packages/node-preload/src/index.ts
@@ -147,69 +147,44 @@ if (isOverlay) {
   // something from the original process
   require(oldPreloadPath);
 } else {
-  ipcRenderer.on(constants.ipcNodePreloadKickoff, (_, blockedScripts: string[]) => {
-    (async () => {
-      try {
-        await init();
-        logger.debug("Blocked scripts:", blockedScripts);
-
-        const oldPreloadPath: string = ipcRenderer.sendSync(constants.ipcGetOldPreloadPath);
-        logger.debug("Old preload path:", oldPreloadPath);
-        if (oldPreloadPath) require(oldPreloadPath);
-
-        // Do this to get global.DiscordNative assigned
-        // @ts-expect-error Lying to discord_desktop_core
-        process.emit("loaded");
-
-        function replayScripts() {
-          const ignoreScripts = [
-            // We never blocked this in the first place
-            "popout.",
-            // We don't want this to load at all
-            "sentry."
-          ];
-
-          const scripts = [...document.querySelectorAll("script")].filter((script) => {
-            if (!script.src) return false;
-
-            try {
-              const url = new URL(script.src);
-              const hasUrl =
-                url.pathname.match(/\/assets\/(\d{3,5}|[a-zA-Z-]+)\./) &&
-                !url.searchParams.has("inj") &&
-                (url.host.endsWith("discord.com") || url.host.endsWith("discordapp.com"));
-              const shouldIgnore = ignoreScripts.some((other) => url.pathname.startsWith(`/assets/${other}`));
-              return hasUrl && !shouldIgnore;
-            } catch {
-              return false;
-            }
-          });
-
-          // bruh.
-          if (moonlightNode.config.patchAll) scripts.sort((a, b) => a.src.localeCompare(b.src));
-
-          for (const script of scripts) {
-            const newScript = document.createElement("script");
-            for (const attr of script.attributes) {
-              if (attr.name === "src") attr.value += "?inj";
-              newScript.setAttribute(attr.name, attr.value);
-            }
-
-            if (script.src.includes("/assets/web.")) ipcRenderer.sendSync(constants.ipcNodePreloadKickoff);
-
-            script.remove();
-            document.documentElement.appendChild(newScript);
-          }
-        }
-
-        if (document.readyState === "complete") {
-          replayScripts();
-        } else {
-          window.addEventListener("load", replayScripts);
-        }
-      } catch (e) {
-        logger.error("Error restoring original scripts:", e);
+  const doInit = async () => {
+    try {
+      await init();
+
+      const oldPreloadPath: string = ipcRenderer.sendSync(constants.ipcGetOldPreloadPath);
+      logger!.debug("Old preload path:", oldPreloadPath);
+      if (oldPreloadPath) require(oldPreloadPath);
+
+      // Do this to get global.DiscordNative assigned
+      // @ts-expect-error Lying to discord_desktop_core
+      process.emit("loaded");
+    } catch (e) {
+      // biome-ignore lint/suspicious/noConsole: logger unlikely to be initialized
+      console.error("[moonlight:node-preload] Error initializing:", e);
+    }
+  };
+
+  // violentmonkey's document-start injector logic
+  const getOwnProp = (obj: any, key: any, defVal?: any) => {
+    try {
+      if (obj && Object.hasOwn(obj, key)) {
+        defVal = obj[key];
       }
-    })();
+    } catch {
+      // noop
+    }
+    return defVal;
+  };
+  const elemByTag = (tag: string, i?: number) => getOwnProp(document.getElementsByTagName(tag), i || 0);
+  const observer = new MutationObserver(() => {
+    if (elemByTag("*")) {
+      observer.disconnect();
+
+      setTimeout(() => {
+        window.stop();
+        doInit();
+      }, 0);
+    }
   });
+  observer.observe(document, { childList: true, subtree: true });
 }
diff --git a/packages/types/src/constants.ts b/packages/types/src/constants.ts
@@ -3,7 +3,6 @@ export const coreExtensionsDir = "core-extensions";
 export const repoUrlFile = ".moonlight-repo-url";
 export const installedVersionFile = ".moonlight-installed-version";
 
-export const ipcNodePreloadKickoff = "_moonlight_nodePreloadKickoff";
 export const ipcGetOldPreloadPath = "_moonlight_getOldPreloadPath";
 
 export const ipcGetAppData = "_moonlight_getAppData";
diff --git a/packages/web-preload/src/index.ts b/packages/web-preload/src/index.ts

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,6 @@`
`28`	`28`	`}`
`29`	`29`	`]`
`30`	`30`	`},`
`31`		`- "background": {`
`32`		`- "service_worker": "background.js",`
`33`		`- "type": "module"`
`34`		`- },`
`35`	`31`	`"web_accessible_resources": [`
`36`	`32`	`{`
`37`	`33`	`"resources": ["index.js"],`
Original file line number	Diff line number	Diff line change
`@@ -15,17 +15,5 @@`
`15`	`15`	`"resourceTypes": ["main_frame"],`
`16`	`16`	`"requestDomains": ["discord.com"]`
`17`	`17`	`}`
`18`		`- },`
`19`		`- {`
`20`		`- "id": 2,`
`21`		`- "priority": 1,`
`22`		`- "action": {`
`23`		`- "type": "block"`
`24`		`- },`
`25`		`- "condition": {`
`26`		`- "requestDomains": ["discord.com", "discordapp.com"],`
`27`		`- "regexFilter": "\/assets\/.+\\..+\\.js$",`
`28`		`- "resourceTypes": ["script"]`
`29`		`- }`
`30`	`18`	`}`
`31`	`19`	`]`
Original file line number	Diff line number	Diff line change
`@@ -121,10 +121,17 @@ function patchModule(id: string, patchId: string, replaced: string, entry: Webpa`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
`124`		`-function patchModules(entry: WebpackJsonpEntry[1]) {`
	`124`	`+const previouslyPatched = new Map<string, IdentifiedPatch>();`
	`125`	`+`
	`126`	`+function patchModules(entry: WebpackJsonpEntry[1], chunkId?: WebpackJsonpEntry[0]) {`
`125`	`127`	`// Populate the module cache`
`126`	`128`	`for (const [id, func] of Object.entries(entry)) {`
`127`		`- if (!Object.hasOwn(moduleCache, id) && func.__moonlight !== true) {`
	`129`	`+ if (func.__moonlight !== true) {`
	`130`	`+ if (Object.hasOwn(moduleCache, id)) {`
	`131`	+ logger.debug(`Chunk "${chunkId?.join(", ") ?? "<unknown>"}" replacing module "${id}"`);
	`132`	`+ if (previouslyPatched.has(id)) moonlight.unpatched.add(previouslyPatched.get(id)!);`
	`133`	`+ }`
	`134`	`+`
`128`	`135`	`moduleCache[id] = func.toString().replace(/\n/g, "");`
`129`	`136`	`moonlight.moonmap.parseScript(id, moduleCache[id]);`
`130`	`137`	`}`
`@@ -217,7 +224,10 @@ function patchModules(entry: WebpackJsonpEntry[1]) {`
`217`	`224`	`exts.add(patch.ext);`
`218`	`225`	`}`
`219`	`226`
`220`		`- if (isPatched) moonlight.unpatched.delete(patch);`
	`227`	`+ if (isPatched) {`
	`228`	`+ previouslyPatched.set(id, patch);`
	`229`	`+ moonlight.unpatched.delete(patch);`
	`230`	`+ }`
`221`	`231`	`if (shouldRemove) patches.splice(i--, 1);`
`222`	`232`	`}`
`223`	`233`	`}`
`@@ -501,7 +511,7 @@ export async function installWebpackPatcher() {`
`501`	`511`	`});`
`502`	`512`
`503`	`513`	`try {`
`504`		`- patchModules(items[1]);`
	`514`	`+ patchModules(items[1], items[0]);`
`505`	`515`	`} catch (err) {`
`506`	`516`	`logger.warn("Failed to patch Webpack modules:", err);`
`507`	`517`	`}`