nodebb-plugin-ezoic-infinite 1.1.0 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Production-ready Ezoic infinite ads integration for NodeBB 4.x",
   "main": "library.js",
   "license": "MIT",

package/public/client.js

@@ -118,33 +118,13 @@
   function callShowAdsSingle(id) {
     if (!id) return;
     const key = String(id);
+    const placeholderId = `${PLACEHOLDER_PREFIX}${id}`;
 
-    const now = Date.now();
-    const last = state.lastShowById[key] || 0;
-    if (now - last < 4000) return;
-
-    // If showAds is ready, call once and return
-    try {
-      window.ezstandalone = window.ezstandalone || {};
-      if (typeof window.ezstandalone.showAds === 'function') {
-        state.lastShowById[key] = now;
-        window.ezstandalone.showAds(id);
-        return;
-      }
-    } catch (e) {}
-
-    // Otherwise, queue a single pending attempt (per id)
-    if (state.pendingById[key]) return;
-    state.pendingById[key] = true;
-
-    window.ezstandalone = window.ezstandalone || {};
-    window.ezstandalone.cmd = window.ezstandalone.cmd || [];
-
-    const tryRun = () => {
+    const doCall = () => {
       try {
+        window.ezstandalone = window.ezstandalone || {};
         if (typeof window.ezstandalone.showAds === 'function') {
           state.lastShowById[key] = Date.now();
-          delete state.pendingById[key];
           window.ezstandalone.showAds(id);
           return true;
         }
@@ -152,19 +132,56 @@
       return false;
     };
 
-    window.ezstandalone.cmd.push(() => { tryRun(); });
+    // Wait until the placeholder exists in the DOM (critical on ajaxify navigation)
+    let attempts = 0;
+    (function waitForDom() {
+      attempts += 1;
+
+      const el = document.getElementById(placeholderId);
+      if (el && el.isConnected) {
+        const now = Date.now();
+        const last = state.lastShowById[key] || 0;
+        if (now - last < 4000) return;
+
+        if (doCall()) return;
+
+        // showAds not ready: queue once per id
+        if (state.pendingById[key]) return;
+        state.pendingById[key] = true;
+
+        window.ezstandalone = window.ezstandalone || {};
+        window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+        window.ezstandalone.cmd.push(() => {
+          try {
+            if (typeof window.ezstandalone.showAds === 'function') {
+              delete state.pendingById[key];
+              state.lastShowById[key] = Date.now();
+              window.ezstandalone.showAds(id);
+            }
+          } catch (e) {}
+        });
+
+        // also retry a few times in case cmd is late
+        let tries = 0;
+        (function tick() {
+          tries += 1;
+          if (doCall() || tries >= 6) {
+            if (tries >= 6) delete state.pendingById[key];
+            return;
+          }
+          setTimeout(tick, 800);
+        })();
 
-    let tries = 0;
-    (function tick() {
-      tries += 1;
-      if (tryRun() || tries >= 8) {
-        if (tries >= 8) delete state.pendingById[key];
         return;
       }
-      setTimeout(tick, 800);
+
+      if (attempts < 40) { // ~2s
+        setTimeout(waitForDom, 50);
+      }
     })();
   }
 
+
   function recycleIfNeeded(pool, usedSet, fifo, selectorFn) {
     // only recycle ads far above the viewport, so they don't "disappear" while reading
     const margin = 1200;
@@ -230,6 +247,7 @@
     state.observers = {};
 
     state.retryCount = {};
+
   }
 
   async function fetchConfig() {
@@ -293,6 +311,21 @@
     state.retryCount[key] += 1;
     setTimeout(run, 250);
   }
+        } catch (e) {}
+      };
+
+      state.predeclared[kind].add(key);
+
+      if (window.ezstandalone && typeof window.ezstandalone.showAds === 'function') {
+        call();
+        return;
+      }
+
+      window.ezstandalone = window.ezstandalone || {};
+      window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+      window.ezstandalone.cmd.push(call);
+    } catch (e) {}
+  }
 
   function injectBetweenTopics(cfg) {
     if (!normalizeBool(cfg.enableBetweenAds)) return;
@@ -371,15 +404,28 @@
       const cfg = await fetchConfig();
       if (!cfg || cfg.excluded) return;
 
+      // If Ezoic is not ready yet, schedule a single rerun via ezstandalone.cmd
+      try {
+        window.ezstandalone = window.ezstandalone || {};
+        window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+        if (typeof window.ezstandalone.showAds !== 'function') {
+          const rk = 'ezoicReadyRerun:' + getPageKey();
+          if (!state.retryCount[rk]) {
+            state.retryCount[rk] = 1;
+            window.ezstandalone.cmd.push(() => { setTimeout(run, 0); });
+          }
+        }
+      } catch (e) {}
+
       const kind = getPageKind();
 
       if (kind === 'topic') {
         const hasPosts = document.querySelectorAll(SELECTORS.postItem).length > 0;
-        if (hasPosts) injectBetweenMessages(cfg);
+        if (hasPosts) { injectBetweenMessages(cfg); }
         else { observeUntilTargets('topic', run); scheduleRetry('topic'); }
       } else {
         const hasList = document.querySelectorAll(SELECTORS.topicListItem).length > 0;
-        if (hasList) injectBetweenTopics(cfg);
+        if (hasList) { injectBetweenTopics(cfg); }
         else { observeUntilTargets('category', run); scheduleRetry('category'); }
       }
     } catch (e) {