nodebb-plugin-ezoic-infinite 1.5.26 → 1.5.27

package/package.json

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

package/public/client.js

@@ -19,8 +19,11 @@
     categoryItem: 'li[component="categories/category"]',
   };
 
-  // Hard block during navigation to avoid “placeholder does not exist” spam
-  let EZOIC_BLOCKED = false;
+  // Soft block during navigation / heavy DOM churn to avoid “placeholder does not exist” spam
+  let blockedUntil = 0;
+  function isBlocked() {
+    return Date.now() < blockedUntil;
+  }
 
   const state = {
     pageKey: null,
@@ -36,6 +39,8 @@
 
     // throttle per placeholder id
     lastShowById: new Map(),
+    internalDomChange: 0,
+    lastRecycleAt: { topic: 0, categoryTopics: 0, categories: 0 },
 
     // track placeholders that have been shown at least once in this pageview
     usedOnce: new Set(),
@@ -172,7 +177,7 @@
         const orig = ez.showAds;
 
         ez.showAds = function (...args) {
-          if (EZOIC_BLOCKED) return;
+          if (isBlocked()) return;
 
           let ids = [];
           if (args.length === 1 && Array.isArray(args[0])) ids = args[0];
@@ -201,7 +206,28 @@
     }
   }
 
-  // ---------- config & pools ----------
+    const RECYCLE_COOLDOWN_MS = 1500;
+
+    function kindKeyFromClass(kindClass) {
+    if (kindClass === 'ezoic-ad-message') return 'topic';
+    if (kindClass === 'ezoic-ad-between') return 'categoryTopics';
+    if (kindClass === 'ezoic-ad-categories') return 'categories';
+    return 'topic';
+  }
+
+function withInternalDomChange(fn) {
+    state.internalDomChange++;
+    try { fn(); } finally { state.internalDomChange--; }
+  }
+
+  function canRecycle(kind) {
+    const now = Date.now();
+    const last = state.lastRecycleAt[kind] || 0;
+    if (now - last < RECYCLE_COOLDOWN_MS) return false;
+    state.lastRecycleAt[kind] = now;
+    return true;
+  }
+// ---------- config & pools ----------
 
   async function fetchConfigOnce() {
     if (state.cfg) return state.cfg;
@@ -316,56 +342,71 @@
   }
 
   function showAd(id) {
-    if (!id || EZOIC_BLOCKED) return;
+    if (!id || isBlocked()) return;
 
     const now = Date.now();
     const last = state.lastShowById.get(id) || 0;
     if (now - last < 1500) return; // basic throttle
 
-    const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
-    if (!ph || !ph.isConnected) return;
+    // Defer one frame so the placeholder is definitely in DOM after insertion/recycle
+    requestAnimationFrame(() => {
+      if (isBlocked()) return;
 
-    state.lastShowById.set(id, now);
+      const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
+      if (!ph || !ph.isConnected) return;
 
-    try {
-      window.ezstandalone = window.ezstandalone || {};
-      const ez = window.ezstandalone;
-
-      // Fast path
-      if (typeof ez.showAds === 'function') {
-        try {
-          if (state.usedOnce && state.usedOnce.has(id) && typeof ez.destroyPlaceholders === 'function') {
-            ez.destroyPlaceholders(id);
-          }
-        } catch (e) {}
-        ez.showAds(id);
-        try { state.usedOnce && state.usedOnce.add(id); } catch (e) {}
-        return;
-      }
+      const now2 = Date.now();
+      const last2 = state.lastShowById.get(id) || 0;
+      if (now2 - last2 < 1200) return;
+      state.lastShowById.set(id, now2);
 
-      // Queue once for when Ezoic is ready
-      ez.cmd = ez.cmd || [];
-      if (!ph.__ezoicQueued) {
-        ph.__ezoicQueued = true;
-        ez.cmd.push(() => {
+      try {
+        window.ezstandalone = window.ezstandalone || {};
+        const ez = window.ezstandalone;
+
+        const doShow = () => {
           try {
-            if (EZOIC_BLOCKED) return;
-            const el = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
-            if (!el || !el.isConnected) return;
-            const ez2 = window.ezstandalone;
+            if (state.usedOnce && state.usedOnce.has(id) && typeof ez.destroyPlaceholders === 'function') {
+              // Avoid Ezoic caching state for reused placeholders
+              ez.destroyPlaceholders(id);
+            }
+          } catch (e) {}
+          try { ez.showAds(id); } catch (e) {}
+          try { state.usedOnce && state.usedOnce.add(id); } catch (e) {}
+        };
+
+        // Fast path
+        if (typeof ez.showAds === 'function') {
+          doShow();
+          return;
+        }
+
+        // Queue once for when Ezoic is ready
+        ez.cmd = ez.cmd || [];
+        if (!ph.__ezoicQueued) {
+          ph.__ezoicQueued = true;
+          ez.cmd.push(() => {
             try {
-              if (state.usedOnce && state.usedOnce.has(id) && typeof ez2.destroyPlaceholders === 'function') {
-                ez2.destroyPlaceholders(id);
-              }
+              if (isBlocked()) return;
+              const el = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
+              if (!el || !el.isConnected) return;
+              const ez2 = window.ezstandalone;
+              if (!ez2 || typeof ez2.showAds !== 'function') return;
+              try {
+                if (state.usedOnce && state.usedOnce.has(id) && typeof ez2.destroyPlaceholders === 'function') {
+                  ez2.destroyPlaceholders(id);
+                }
+              } catch (e) {}
+              try { ez2.showAds(id); } catch (e) {}
+              try { state.usedOnce && state.usedOnce.add(id); } catch (e) {}
             } catch (e) {}
-            ez2.showAds(id);
-            try { state.usedOnce && state.usedOnce.add(id); } catch (e) {}
-          } catch (e) {}
-        });
-      }
-    } catch (e) {}
+          });
+        }
+      } catch (e) {}
+    });
   }
 
+
   // ---------- preload / above-the-fold ----------
 
   function ensurePreloadObserver() {
@@ -429,12 +470,20 @@
 
       let id = pickIdFromAll(allIds, cursorKey);
       if (!id) {
-        // No free ids: recycle an old ad wrapper so we can reuse its placeholder id
-        const recycled = removeOneOldWrap(kindClass);
+        // No free ids: recycle an old ad wrapper so we can reuse its placeholder id.
+        // Guard against tight observer loops.
+        if (!canRecycle(kindKeyFromClass(kindClass))) {
+          dbg('recycle-skip-cooldown', kindClass);
+          break;
+        }
+        let recycled = false;
+        withInternalDomChange(() => {
+          recycled = removeOneOldWrap(kindClass);
+        });
         dbg('recycle-needed', kindClass, { recycled, ids: allIds.length });
-        id = pickIdFromAll(allIds, cursorKey);
+        // Stop this run after a recycle; the next mutation/scroll will retry injection.
+        break;
       }
-      if (!id) break;
       const wrap = insertAfter(el, id, kindClass, afterPos);
       if (!wrap) {
         continue;
@@ -507,7 +556,7 @@
   }
 
   async function runCore() {
-    if (EZOIC_BLOCKED) { dbg('blocked'); return; }
+    if (isBlocked()) { dbg('blocked'); return; }
 
     patchShowAds();
 
@@ -568,7 +617,7 @@
   // ---------- observers / lifecycle ----------
 
   function cleanup() {
-    EZOIC_BLOCKED = true;
+    blockedUntil = Date.now() + 1200;
 
     // remove all wrappers
     try {
@@ -595,7 +644,8 @@
   function ensureDomObserver() {
     if (state.domObs) return;
     state.domObs = new MutationObserver(() => {
-      if (!EZOIC_BLOCKED) scheduleRun();
+      if (state.internalDomChange > 0) return;
+      if (!isBlocked()) scheduleRun();
     });
     try {
       state.domObs.observe(document.body, { childList: true, subtree: true });
@@ -613,7 +663,7 @@
 
     $(window).on('action:ajaxify.end.ezoicInfinite', () => {
       state.pageKey = getPageKey();
-      EZOIC_BLOCKED = false;
+      blockedUntil = 0;
 
       warmUpNetwork();
       patchShowAds();
@@ -629,7 +679,7 @@
 
     // Infinite scroll / partial updates
     $(window).on('action:posts.loaded.ezoicInfinite action:topics.loaded.ezoicInfinite action:category.loaded.ezoicInfinite action:topic.loaded.ezoicInfinite', () => {
-      if (EZOIC_BLOCKED) return;
+      if (isBlocked()) return;
       scheduleRun();
     });
   }
@@ -641,7 +691,7 @@
       ticking = true;
       window.requestAnimationFrame(() => {
         ticking = false;
-        if (!EZOIC_BLOCKED) scheduleRun();
+        if (!isBlocked()) scheduleRun();
       });
     }, { passive: true });
   }
@@ -658,7 +708,7 @@
   bindScroll();
 
   // First paint: try hero + run
-  EZOIC_BLOCKED = false;
+  blockedUntil = 0;
   insertHeroAdEarly().catch(() => {});
   scheduleRun();
 })();