nodebb-plugin-ezoic-infinite 0.8.3 → 0.8.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "0.8.3",
+  "version": "0.8.6",
   "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,14 +109,23 @@ 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;
+  } finally {
+    window.__ezoicRecycling = false;
+  }
 }
 
 function destroyEzoicId(id) {
+  window.__ezoicLastDestroy = window.__ezoicLastDestroy || {};
+  const now = Date.now();
+  if (window.__ezoicLastDestroy[id] && now - window.__ezoicLastDestroy[id] < 2000) {
+    return;
+  }
+  window.__ezoicLastDestroy[id] = now;
   try {
     window.ezstandalone = window.ezstandalone || {};
     window.ezstandalone.cmd = window.ezstandalone.cmd || [];
@@ -132,6 +142,9 @@ function destroyEzoicId(id) {
 }
 
 function recycleOldestTopicId($posts) {
+  if (window.__ezoicRecycling) return null;
+  window.__ezoicRecycling = true;
+  try {
   if (!fifo.length) return null;
   fifo.sort((a, b) => a.afterPostNo - b.afterPostNo);
 
@@ -151,14 +164,20 @@ function recycleOldestTopicId($posts) {
     } catch (e) {}
 
     $el.remove();
-    usedIds.delete(old.id);
+    usedIdsMsg.delete(old.id);
     destroyEzoicId(old.id);
     return old.id;
   }
   return null;
+  } finally {
+    window.__ezoicRecycling = false;
+  }
 }
 
 function recycleOldestCategoryId($items) {
+  if (window.__ezoicRecycling) return null;
+  window.__ezoicRecycling = true;
+  try {
   if (!fifoCat.length) return null;
   fifoCat.sort((a, b) => a.afterPos - b.afterPos);
 
@@ -177,7 +196,7 @@ function recycleOldestCategoryId($items) {
     } catch (e) {}
 
     $el.remove();
-    usedIds.delete(old.id);
+    usedIdsBetween.delete(old.id);
     destroyEzoicId(old.id);
     return old.id;
   }
@@ -336,7 +355,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;
@@ -353,7 +372,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);
   });
@@ -375,7 +394,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;
@@ -392,7 +411,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);
   });
@@ -401,6 +420,9 @@ function injectCategoryBetweenAds($items, pool, interval) {
 }
 
 async function refreshAds() {
+  const now = Date.now();
+  if (window.__ezoicRefreshThrottle && now - window.__ezoicRefreshThrottle < 250) return;
+  window.__ezoicRefreshThrottle = now;
   const key = getPageKey();
   if (pageKey !== key) {
     pageKey = key;
@@ -462,6 +484,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);