nodebb-plugin-ezoic-infinite 1.5.52 → 1.5.53

package/package.json

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

package/public/client.js

@@ -219,19 +219,12 @@
     } catch (e) {}
   }
 
-  // Patch showAds to avoid warnings when a placeholder disappears (infinite scroll, ajaxify)
   
-function patchShowAds() {
-  // Robustly filter ez.showAds calls so Ezoic won't spam "placeholder does not exist"
-  // during ajaxify navigation or when some placeholders are not present on the current view.
-  try {
-    window.ezstandalone = window.ezstandalone || {};
-    const ez = window.ezstandalone;
-    ez.cmd = ez.cmd || [];
-
-    const wrap = (orig) => {
-      if (typeof orig !== 'function') return orig;
-      if (orig.__nodebbWrapped) return orig;
+  // Patch showAds to avoid warnings when a placeholder disappears (infinite scroll, ajaxify)
+  // Ezoic can (re)define ezstandalone.showAds over time; we hook assignments to keep the guard.
+  function patchShowAds() {
+    function wrapShowAds(ez, orig) {
+      if (orig && orig.__nodebbWrapped) return orig;
 
       const wrapped = function (...args) {
         if (isBlocked()) return;
@@ -240,56 +233,90 @@ function patchShowAds() {
         if (args.length === 1 && Array.isArray(args[0])) ids = args[0];
         else ids = args;
 
-        const filtered = [];
         const seen = new Set();
         for (const v of ids) {
           const id = parseInt(v, 10);
           if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
-          const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
+
+          const domId = `${PLACEHOLDER_PREFIX}${id}`;
+          const ph = document.getElementById(domId);
           if (!ph || !ph.isConnected) continue;
+
+          // Prevent repeated "define" attempts on the same placeholder while it remains in DOM.
+          if (ph.dataset && (ph.dataset.ezRequested === '1' || ph.dataset.ezDefined === '1')) continue;
+
           seen.add(id);
-          filtered.push(id);
+          try {
+            if (ph.dataset) ph.dataset.ezRequested = '1';
+            orig.call(ez, id);
+            if (ph.dataset) {
+              ph.dataset.ezDefined = '1';
+              ph.dataset.ezRequested = '0';
+            }
+          } catch (e) {
+            try { if (ph.dataset) ph.dataset.ezRequested = '0'; } catch (_) {}
+          }
         }
-        if (!filtered.length) return;
-
-        // Call original with the same shape most implementations accept
-        try { return orig.call(ez, filtered.length === 1 ? filtered[0] : filtered); } catch (e) {}
       };
-      wrapped.__nodebbWrapped = true;
-      wrapped.__nodebbOrig = orig;
+      try { wrapped.__nodebbWrapped = true; } catch (e) {}
       return wrapped;
-    };
+    }
 
-    // If showAds already exists, wrap it now.
-    if (typeof ez.showAds === 'function') {
-      ez.showAds = wrap(ez.showAds);
-      return;
+    function ensureHook() {
+      try {
+        window.ezstandalone = window.ezstandalone || {};
+        const ez = window.ezstandalone;
+
+        // Hook future assignments to showAds so we keep our wrapper even if Ezoic overwrites it.
+        if (!ez.__nodebbShowAdsHooked) {
+          ez.__nodebbShowAdsHooked = true;
+          let _showAds = ez.showAds;
+
+          Object.defineProperty(ez, 'showAds', {
+            configurable: true,
+            enumerable: true,
+            get() {
+              return _showAds;
+            },
+            set(fn) {
+              _showAds = (typeof fn === 'function') ? wrapShowAds(ez, fn) : fn;
+            },
+          });
+
+          // If showAds already exists, wrap it immediately
+          if (typeof _showAds === 'function') {
+            _showAds = wrapShowAds(ez, _showAds);
+          }
+        } else if (typeof ez.showAds === 'function' && !ez.showAds.__nodebbWrapped) {
+          // In case defineProperty wasn't possible (rare), re-wrap
+          ez.showAds = wrapShowAds(ez, ez.showAds);
+        }
+      } catch (e) {}
     }
 
-    // Otherwise, define a setter hook so whenever Ezoic defines showAds, we wrap it.
-    if (!ez.__nodebbShowAdsHooked) {
-      ez.__nodebbShowAdsHooked = true;
-      let _showAds = null;
+    ensureHook();
 
-      Object.defineProperty(ez, 'showAds', {
-        configurable: true,
-        enumerable: true,
-        get() { return _showAds; },
-        set(fn) { _showAds = wrap(fn); }
-      });
+    // Also attempt via cmd queue
+    try {
+      window.ezstandalone = window.ezstandalone || {};
+      window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+      window.ezstandalone.cmd.push(ensureHook);
+    } catch (e) {}
+  }
 
-      // In case Ezoic sets showAds from cmd queue
-      ez.cmd.push(() => {
-        try {
-          if (typeof ez.showAds === 'function' && !ez.showAds.__nodebbWrapped) {
-            ez.showAds = wrap(ez.showAds);
-          }
-        } catch (e) {}
-      });
-    }
-  } catch (e) {}
-}
+        };
+      } catch (e) {}
+    };
 
+    applyPatch();
+    if (!window.__nodebbEzoicPatched) {
+      try {
+        window.ezstandalone = window.ezstandalone || {};
+        window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+        window.ezstandalone.cmd.push(applyPatch);
+      } catch (e) {}
+    }
+  }
 
     const RECYCLE_COOLDOWN_MS = 1500;
 
@@ -357,9 +384,15 @@ function withInternalDomChange(fn) {
 
   function safeDestroyById(id) {
     try {
+      const domId = `${PLACEHOLDER_PREFIX}${id}`;
+      const ph = document.getElementById(domId);
+      if (ph && ph.dataset) {
+        delete ph.dataset.ezDefined;
+        delete ph.dataset.ezRequested;
+      }
       const ez = window.ezstandalone;
       if (ez && typeof ez.destroyPlaceholders === 'function') {
-        ez.destroyPlaceholders([`${PLACEHOLDER_PREFIX}${id}`]);
+        ez.destroyPlaceholders([domId]);
       }
     } catch (e) {}
   }
@@ -522,10 +555,11 @@ function drainQueue() {
   }
 }
 
+
 function startShow(id) {
-  if (!id || isBlocked()) return;
+  if (!id) return;
 
-  // Reserve one inflight slot for this request
+  // Reserve an inflight slot, but ALWAYS release on any early exit.
   state.inflight++;
   let released = false;
   const release = () => {
@@ -537,22 +571,17 @@ function startShow(id) {
 
   const hardTimer = setTimeout(release, 6500);
 
-  const earlyExit = () => {
-    try { clearTimeout(hardTimer); } catch (e) {}
-    release();
-  };
-
   requestAnimationFrame(() => {
     try {
-      if (isBlocked()) return earlyExit();
+      if (isBlocked()) { clearTimeout(hardTimer); release(); return; }
 
       const domId = `${PLACEHOLDER_PREFIX}${id}`;
-      const ph = document.getElementById(domId);
-      if (!ph || !ph.isConnected) return earlyExit();
+      const phNow = document.getElementById(domId);
+      if (!phNow || !phNow.isConnected) { clearTimeout(hardTimer); release(); return; }
 
       const now2 = Date.now();
       const last2 = state.lastShowById.get(id) || 0;
-      if (now2 - last2 < 900) return earlyExit();
+      if (now2 - last2 < 900) { clearTimeout(hardTimer); release(); return; }
       state.lastShowById.set(id, now2);
 
       window.ezstandalone = window.ezstandalone || {};
@@ -560,30 +589,24 @@ function startShow(id) {
 
       const doShow = () => {
         try {
-          if (isBlocked()) return earlyExit();
+          if (isBlocked()) return;
 
-          // Re-check at execution time (cmd queue may delay)
-          const ph2 = document.getElementById(domId);
-          if (!ph2 || !ph2.isConnected) return earlyExit();
+          // Re-check at execution time (ez.cmd can run later).
+          const ph = document.getElementById(domId);
+          if (!ph || !ph.isConnected) return;
 
-          // If this id was used before in this pageview, destroy first (Ezoic best practice on recycle)
-          if (state.usedOnce && state.usedOnce.has(id) && typeof ez.destroyPlaceholders === 'function') {
-            try { ez.destroyPlaceholders([domId]); } catch (e) {}
+          // If this id was used before, destroy safely using full DOM id.
+          if (state.usedOnce && state.usedOnce.has(id)) {
+            safeDestroyById(id);
           }
 
-          // Call showAds (patched to filter missing placeholders)
-          try { ez.showAds(id); } catch (e) {}
+          // showAds is patched to ignore missing placeholders and repeated defines.
+          ez.showAds(id);
 
           try { state.usedOnce && state.usedOnce.add(id); } catch (e) {}
-          try { markEmptyWrapper(id); } catch (e) {}  // harmless; if removed later, it no-ops
-
-          // Release shortly after triggering, so we can pipeline the next ones
-          setTimeout(() => {
-            try { clearTimeout(hardTimer); } catch (e) {}
-            release();
-          }, 650);
-        } catch (e) {
-          earlyExit();
+        } catch (e) {}
+        finally {
+          setTimeout(() => { try { clearTimeout(hardTimer); } catch (_) {} release(); }, 650);
         }
       };
 
@@ -593,12 +616,14 @@ function startShow(id) {
         doShow();
       }
     } catch (e) {
-      earlyExit();
+      try { clearTimeout(hardTimer); } catch (_) {}
+      release();
     }
   });
 }
 
 
+
   // ---------- preload / above-the-fold ----------
 
   function ensurePreloadObserver() {