Go from polling based system to custom event

Author: MrBlankCoding

src/GM/gm_api_registry.js

@@ -135,8 +135,10 @@
       }
 
       if (enabled.gmListValues) {
-        const fn = () => this.listValues();
-        window.GM_listValues = window.GM.listValues = fn;
+        const syncFn = () => Array.from(this.cache.keys()).filter(key => typeof key === 'string' && key !== '');
+        const asyncFn = () => this.bridge.call("listValues");
+        window.GM_listValues = syncFn;
+        window.GM.listValues = asyncFn;
       }
 
       if (enabled.gmAddValueChangeListener) {
@@ -243,15 +245,15 @@
       if (enabled.gmGetResourceText) {
         const fn = (name) => new Promise(resolve => {
           const text = this.resourceManager.getText(name);
-          resolve(text === null ? undefined : text);
+          resolve(String(text || ''));
         });
         window.GM_getResourceText = window.GM.getResourceText = fn;
       }
 
       if (enabled.gmGetResourceURL) {
         const fn = (name) => new Promise(resolve => {
           const url = this.resourceManager.getURL(name);
-          resolve(url === null ? undefined : url);
+          resolve(String(url || ''));
         });
         window.GM_getResourceURL = window.GM.getResourceURL = fn;
       }

src/GM/gm_core.js

@@ -312,6 +312,10 @@
   window.GMBridge.executeUserScriptWithDependencies = executeUserScriptWithDependencies;
 
   window.postMessage({ type: "GM_CORE_EXECUTED" }, "*");
+
+  // Dispatch a custom event to signal that GMBridge is ready
+  const event = new CustomEvent('GMBridgeReady');
+  window.dispatchEvent(event);
 })();
 
 // Crazy !

src/utils/inject.js

@@ -20,44 +20,15 @@ function createMainWorldExecutor(
   requiredUrls,
   gmInfo
 ) {
-
-
-  const MAX_RETRIES = 30;
-  const RETRY_INTERVAL = 100;
-
   function waitForGMBridge(worldType, callback) {
-    let retries = 0;
-
-    function check() {
-      const hasRequiredObjects = 
-        window.GMBridge?.ResourceManager &&
-        window.GMBridge?.GMAPIRegistry &&
-        window.GMBridge?.ExternalScriptLoader &&
-        window.GMBridge?.executeUserScriptWithDependencies;
-
-      if (hasRequiredObjects) {
-        callback();
-        return;
-      }
-
-      if (retries < MAX_RETRIES) {
-        retries++;
-        setTimeout(check, RETRY_INTERVAL);
-      } else {
-        console.error(
-          `CodeTweak: Timed out waiting for core script to load for script '${scriptId}'${worldType ? ` in ${worldType} world` : ''}.`,
-          'Missing objects:', {
-            GMBridge: typeof window.GMBridge,
-            ResourceManager: typeof window.GMBridge?.ResourceManager,
-            GMAPIRegistry: typeof window.GMBridge?.GMAPIRegistry,
-            ExternalScriptLoader: typeof window.GMBridge?.ExternalScriptLoader,
-            executeUserScriptWithDependencies: typeof window.GMBridge?.executeUserScriptWithDependencies
-          }
-        );
-      }
+    if (window.GMBridge) {
+      callback();
+      return;
     }
 
-    check();
+    window.addEventListener('GMBridgeReady', () => {
+      callback();
+    }, { once: true });
   }
 
   function exposeGMInfo(info) {
@@ -140,42 +111,15 @@ function createIsolatedWorldExecutor(
   requiredUrls,
   gmInfo
 ) {
-  const MAX_RETRIES = 30;
-  const RETRY_INTERVAL = 100;
-
   function waitForGMBridge(worldType, callback) {
-    let retries = 0;
-
-    function check() {
-      const hasRequiredObjects = 
-        window.GMBridge?.ResourceManager &&
-        window.GMBridge?.GMAPIRegistry &&
-        window.GMBridge?.ExternalScriptLoader &&
-        window.GMBridge?.executeUserScriptWithDependencies;
-
-      if (hasRequiredObjects) {
-        callback();
-        return;
-      }
-
-      if (retries < MAX_RETRIES) {
-        retries++;
-        setTimeout(check, RETRY_INTERVAL);
-      } else {
-        console.error(
-          `CodeTweak: Timed out waiting for core script to load for script '${scriptId}'${worldType ? ` in ${worldType} world` : ''}.`,
-          'Missing objects:', {
-            GMBridge: typeof window.GMBridge,
-            ResourceManager: typeof window.GMBridge?.ResourceManager,
-            GMAPIRegistry: typeof window.GMBridge?.GMAPIRegistry,
-            ExternalScriptLoader: typeof window.GMBridge?.ExternalScriptLoader,
-            executeUserScriptWithDependencies: typeof window.GMBridge?.executeUserScriptWithDependencies
-          }
-        );
-      }
+    if (window.GMBridge) {
+      callback();
+      return;
     }
 
-    check();
+    window.addEventListener('GMBridgeReady', () => {
+      callback();
+    }, { once: true });
   }
 
   function exposeGMInfo(info) {