nodebb-plugin-ezoic-infinite 1.8.43 → 1.8.44

package/package.json

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

package/public/client.js

@@ -346,16 +346,27 @@
 
   function scheduleEmptyCheck(id) {
     const showTs = now();
-    setTimeout(() => {
-      try {
-        const ph   = document.getElementById(`${PH_PREFIX}${id}`);
-        const wrap = ph?.closest(`.${WRAP_CLASS}`);
-        if (!wrap || !ph?.isConnected) return;
-        if (parseInt(wrap.getAttribute(ATTR.SHOWN) || '0', 10) > showTs) return;
-        if (clearEmptyIfFilled(wrap)) return;
-        wrap.classList.add('is-empty');
-      } catch (_) {}
-    }, TIMING.EMPTY_CHECK_MS);
+    // Check at 30s, then again at 60s — very conservative to avoid
+    // collapsing slow-loading ads
+    for (const delay of [30_000, 60_000]) {
+      setTimeout(() => {
+        try {
+          const ph   = document.getElementById(`${PH_PREFIX}${id}`);
+          const wrap = ph?.closest(`.${WRAP_CLASS}`);
+          if (!wrap || !ph?.isConnected) return;
+          // Don't collapse if a newer show happened
+          if (parseInt(wrap.getAttribute(ATTR.SHOWN) || '0', 10) > showTs) return;
+          // If already collapsed or uncollapsed, skip
+          if (clearEmptyIfFilled(wrap)) return;
+          // Don't collapse if there's any GPT slot, even unfilled
+          // (GPT may still be processing the ad request)
+          if (ph.querySelector('[id^="div-gpt-ad"]')) return;
+          // Don't collapse if there's any child with meaningful height
+          if (ph.offsetHeight > 10) return;
+          wrap.classList.add('is-empty');
+        } catch (_) {}
+      }, delay);
+    }
   }
 
   // ── Recycling ──────────────────────────────────────────────────────────────
@@ -677,7 +688,10 @@
     step();
   }
 
-  // ── Cleanup ────────────────────────────────────────────────────────────────
+  // ── Cleanup on navigation ────────────────────────────────────────────────
+  //
+  // Only runs on actual page transitions (pageKey changes).
+  // Uses destroyAll() to properly clean up Ezoic state before removing DOM.
 
   function cleanup() {
     state.blockedUntil = now() + TIMING.BLOCK_DURATION_MS;
@@ -686,6 +700,14 @@
     if (state.ezFlushTimer) { clearTimeout(state.ezFlushTimer); state.ezFlushTimer = null; }
     state.ezBatch.clear();
 
+    // Tell Ezoic to destroy all its placeholders BEFORE we remove DOM
+    try {
+      const ez = window.ezstandalone;
+      if (typeof ez?.destroyAll === 'function') {
+        ez.destroyAll();
+      }
+    } catch (_) {}
+
     mutate(() => {
       for (const w of document.querySelectorAll(`.${WRAP_CLASS}`)) dropWrap(w);
     });
@@ -882,7 +904,17 @@
     const $ = window.jQuery;
     if (!$) return;
     $(window).off('.nbbEzoic');
-    $(window).on('action:ajaxify.start.nbbEzoic', cleanup);
+    $(window).on('action:ajaxify.start.nbbEzoic', (ev, data) => {
+      // Only cleanup if navigating to a different page
+      // NodeBB fires ajaxify.start for pagination/sorting on the same page
+      const targetUrl = data?.url || data?.tpl_url || '';
+      const currentPath = location.pathname.replace(/^\//, '');
+      // If the URL is basically the same (ignoring query/hash), skip cleanup
+      if (targetUrl && targetUrl.replace(/[?#].*$/, '') === currentPath.replace(/[?#].*$/, '')) {
+        return;
+      }
+      cleanup();
+    });
     $(window).on('action:ajaxify.end.nbbEzoic', () => {
       state.pageKey = pageKey();
       state.kind = null;