nodebb-plugin-ezoic-infinite 0.8.2 → 0.8.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "0.8.2",
+  "version": "0.8.5",
   "description": "Ezoic ads with infinite scroll using a pool of placeholder IDs",
   "main": "library.js",
   "license": "MIT",

package/public/client.js

@@ -25,7 +25,8 @@ let fifoCat = [];                // [{afterPos, id}]
 function resetState() {
   seenAfterPostNo = new Set();
   seenAfterTopicPos = new Set();
-  usedIds = new Set();
+  usedIdsMsg = new Set();
+  usedIdsBetween = new Set();
   fifo = [];
   fifoCat = [];
 }
@@ -108,9 +109,9 @@ function cleanupOnNav() {
   $('.ezoic-ad-post, .ezoic-ad-topic').remove();
 }
 
-function pickNextId(pool) {
+function pickNextId(pool, usedSet) {
   for (const id of pool) {
-    if (!usedIds.has(id)) return id;
+    if (!usedSet.has(id)) return id;
   }
   return null;
 }
@@ -151,7 +152,7 @@ function recycleOldestTopicId($posts) {
     } catch (e) {}
 
     $el.remove();
-    usedIds.delete(old.id);
+    usedIdsMsg.delete(old.id);
     destroyEzoicId(old.id);
     return old.id;
   }
@@ -177,7 +178,7 @@ function recycleOldestCategoryId($items) {
     } catch (e) {}
 
     $el.remove();
-    usedIds.delete(old.id);
+    usedIdsBetween.delete(old.id);
     destroyEzoicId(old.id);
     return old.id;
   }
@@ -214,7 +215,30 @@ function callEzoic(ids) {
   window.ezstandalone = window.ezstandalone || {};
   window.ezstandalone.cmd = window.ezstandalone.cmd || [];
 
-  // Collect unrendered wrappers (prevents duplicates even if events fire multiple times)
+  const markAndFilterByIds = function (list) {
+    const out = [];
+    list.forEach(function (id) {
+      const sel = '.ezoic-ad[data-ezoic-id="' + id + '"]';
+      const wraps = document.querySelectorAll(sel);
+      let anyUnrendered = false;
+      wraps.forEach(function (w) {
+        if (w.getAttribute('data-ezoic-rendered') !== '1') {
+          anyUnrendered = true;
+        }
+      });
+      if (!wraps.length) {
+        // fallback: if wrapper is missing, allow showAds (Ezoic might still handle placeholder)
+        out.push(id);
+        return;
+      }
+      if (anyUnrendered) {
+        wraps.forEach(function (w) { w.setAttribute('data-ezoic-rendered', '1'); });
+        out.push(id);
+      }
+    });
+    return out;
+  };
+
   const collect = function () {
     const list = [];
     document.querySelectorAll('.ezoic-ad').forEach(function (wrap) {
@@ -224,16 +248,25 @@ function callEzoic(ids) {
       const idStr = ph.id.replace('ezoic-pub-ad-placeholder-', '');
       const id = parseInt(idStr, 10);
       if (!Number.isFinite(id) || id <= 0) return;
-
       wrap.setAttribute('data-ezoic-rendered', '1');
       list.push(id);
     });
     return Array.from(new Set(list));
   };
 
-  const toShow = (ids && ids.length) ? Array.from(new Set(ids)) : collect();
+  const input = (ids && ids.length) ? Array.from(new Set(ids)) : null;
+  const toShow = input ? markAndFilterByIds(input) : collect();
   if (!toShow.length) return;
 
+  // De-dupe rapid duplicate calls (observer/poller can fire twice)
+  const key = toShow.join(',');
+  const now = Date.now();
+  if (window.__ezoicLastShowKey === key && (now - (window.__ezoicLastShowAt || 0)) < 1200) {
+    return;
+  }
+  window.__ezoicLastShowKey = key;
+  window.__ezoicLastShowAt = now;
+
   const run = function () {
     try {
       if (typeof window.ezstandalone.showAds === 'function') {
@@ -247,13 +280,16 @@ function callEzoic(ids) {
   setupAdAutoHeight();
   window.ezstandalone.cmd.push(function () { run(); });
 
-  // Retry if Ezoic loads late
+  // Retry only if showAds isn't available yet
   let tries = 0;
   const maxTries = 6;
   const retry = function () {
     tries++;
     const ok = run();
     if (ok) return;
+    try {
+      if (typeof window.ezstandalone.showAds === 'function') return;
+    } catch (e) {}
     if (tries < maxTries) setTimeout(retry, 800);
   };
 
@@ -301,7 +337,7 @@ function injectTopicMessageAds($posts, pool, interval) {
     if (postNo % interval !== 0) return;
     if (seenAfterPostNo.has(postNo)) return;
 
-    let id = pickNextId(pool);
+    let id = pickNextId(pool, usedIdsMsg);
     if (!id) {
       id = recycleOldestTopicId($posts);
       if (!id) return;
@@ -318,7 +354,7 @@ function injectTopicMessageAds($posts, pool, interval) {
     $p.after(html);
 
     seenAfterPostNo.add(postNo);
-    usedIds.add(id);
+    usedIdsMsg.add(id);
     fifo.push({ afterPostNo: postNo, id: id });
     newIds.push(id);
   });
@@ -340,7 +376,7 @@ function injectCategoryBetweenAds($items, pool, interval) {
     if (pos % interval !== 0) return;
     if (seenAfterTopicPos.has(pos)) return;
 
-    let id = pickNextId(pool);
+    let id = pickNextId(pool, usedIdsBetween);
     if (!id) {
       id = recycleOldestCategoryId($items);
       if (!id) return;
@@ -357,7 +393,7 @@ function injectCategoryBetweenAds($items, pool, interval) {
     $it.after(html);
 
     seenAfterTopicPos.add(pos);
-    usedIds.add(id);
+    usedIdsBetween.add(id);
     fifoCat.push({ afterPos: pos, id: id });
     newIds.push(id);
   });
@@ -410,7 +446,6 @@ async function refreshAds() {
         newIds.push(...injectTopicMessageAds($posts, messagePool, messageInterval));
       }
       callEzoic(newIds);
-      callEzoic();
     }
   } finally {
     inFlight = false;
@@ -428,6 +463,24 @@ function debounceRefresh() {
 
 $(document).ready(function () { setupAdAutoHeight(); debounceRefresh(); });
 
+$(window).on('action:ajaxify.start', function (ev, data) {
+  // IMPORTANT: do not cleanup on infinite scroll loads; only when navigating to a different page.
+  try {
+    const targetUrl = (data && (data.url || data.href)) ? String(data.url || data.href) : '';
+    if (targetUrl) {
+      const a = document.createElement('a');
+      a.href = targetUrl;
+      const targetPath = a.pathname || targetUrl;
+      // If we're staying on the same logical page (same path), don't wipe ads/state
+      if (targetPath === window.location.pathname) {
+        return;
+      }
+    }
+  } catch (e) {}
+  pageKey = null;
+  resetState();
+  cleanupOnNav();
+});
 $(window).on('action:ajaxify.end action:posts.loaded action:topic.loaded action:topics.loaded action:category.loaded', debounceRefresh);
 
 setTimeout(function () { setupAdAutoHeight(); debounceRefresh(); }, 2200);