nodebb-plugin-ezoic-infinite 1.8.61 → 1.8.62

package/package.json

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

package/public/client.js

@@ -32,12 +32,14 @@
     BLOCK_DURATION_MS:     1_500,
     SHOW_TIMEOUT_MS:       7_000,
     SHOW_RELEASE_MS:         700,
+    BATCH_FLUSH_MS:           80,
     RECYCLE_DELAY_MS:        450,
   };
 
   const LIMITS = {
     MAX_INSERTS_RUN: 6,
     MAX_INFLIGHT:    4,
+    BATCH_SIZE:      3,
     MAX_BURST_STEPS: 8,
     BURST_WINDOW_MS: 2_000,
   };
@@ -696,9 +698,9 @@
 
   // ── Patch Ezoic showAds ────────────────────────────────────────────────────
   //
-  // Intercepts ez.showAds() to filter disconnected placeholders and
-  // block calls during navigation. Matches v50 behavior: individual calls,
-  // no batching.
+  // Intercepts ez.showAds() to batch calls and filter disconnected placeholders.
+  // IMPORTANT: no-arg showAds() calls (used by Ezoic for page transitions)
+  // are passed through unmodified.
 
   function patchShowAds() {
     const apply = () => {
@@ -709,18 +711,46 @@
         window.__nbbEzPatched = true;
 
         const orig = ez.showAds.bind(ez);
+        const queue = new Set();
+        let flushTimer = null;
+
+        const flush = () => {
+          flushTimer = null;
+          if (isBlocked() || !queue.size) return;
+          const ids = Array.from(queue).sort((a, b) => a - b);
+          queue.clear();
+          const valid = ids.filter(id => {
+            const ph = document.getElementById(`${PH_PREFIX}${id}`);
+            if (!ph?.isConnected) { state.phState.delete(id); return false; }
+            if (isPlaceholderUsed(ph)) { state.phState.set(id, 'shown'); return false; }
+            return true;
+          });
+          for (let i = 0; i < valid.length; i += LIMITS.BATCH_SIZE) {
+            const chunk = valid.slice(i, i + LIMITS.BATCH_SIZE);
+            try { orig(...chunk); } catch (_) {
+              for (const cid of chunk) { try { orig(cid); } catch (_) {} }
+            }
+          }
+        };
+
         ez.showAds = function (...args) {
-          // No-arg call = Ezoic internal page refresh — pass through
-          if (args.length === 0) return orig();
+          // No-arg call = Ezoic page refresh — pass through unmodified
+          if (args.length === 0) {
+            return orig();
+          }
           if (isBlocked()) return;
           const ids = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
-          const seen = new Set();
           for (const v of ids) {
             const id = parseInt(v, 10);
-            if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
-            if (!document.getElementById(`${PH_PREFIX}${id}`)?.isConnected) continue;
-            seen.add(id);
-            try { orig(id); } catch (_) {}
+            if (!Number.isFinite(id) || id <= 0) continue;
+            const ph = document.getElementById(`${PH_PREFIX}${id}`);
+            if (!ph?.isConnected) continue;
+            if (isPlaceholderUsed(ph)) { state.phState.set(id, 'shown'); continue; }
+            state.phState.set(id, 'show-queued');
+            queue.add(id);
+          }
+          if (queue.size && !flushTimer) {
+            flushTimer = setTimeout(flush, TIMING.BATCH_FLUSH_MS);
           }
         };
       } catch (_) {}
@@ -814,6 +844,15 @@
   function cleanup() {
     state.blockedUntil = now() + TIMING.BLOCK_DURATION_MS;
 
+    // Tell Ezoic to destroy all placeholders BEFORE we remove DOM elements.
+    // This prevents GPT slotDestroyed events and Ezoic 400 errors.
+    try {
+      const ez = window.ezstandalone;
+      if (typeof ez?.destroyAll === 'function') {
+        ez.destroyAll();
+      }
+    } catch (_) {}
+
     mutate(() => {
       for (const w of document.querySelectorAll(`.${WRAP_CLASS}`)) dropWrap(w);
     });
@@ -1081,8 +1120,15 @@
 
     $(window).off('.nbbEzoic');
 
-    // Cleanup on every navigation, same as v50
-    $(window).on('action:ajaxify.start.nbbEzoic', cleanup);
+    // Only cleanup on actual page change, not same-page pagination
+    $(window).on('action:ajaxify.start.nbbEzoic', (ev, data) => {
+      const targetUrl = data?.url || data?.tpl_url || '';
+      const currentPath = location.pathname.replace(/^\//, '');
+      if (targetUrl && targetUrl.replace(/[?#].*$/, '') === currentPath.replace(/[?#].*$/, '')) {
+        return; // Same page — skip cleanup
+      }
+      cleanup();
+    });
 
     $(window).on('action:ajaxify.end.nbbEzoic', () => {
       state.pageKey    = pageKey();