nodebb-plugin-ezoic-infinite 0.6.3 → 0.6.5

package/package.json

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

package/public/client.js

@@ -10,23 +10,23 @@ let debounceTimer;
 let inFlight = false;
 let rerunRequested = false;
 
-// Incremental state (prevents ads "jumping to the top")
+// Per-page incremental state
 let pageKey = null;
-let injectedSlots = new Set(); // slotNumber per page
-let usedIds = new Set();       // ids currently injected per page
+let injectedSlots = new Set();       // slot numbers already injected on this page
+let usedIds = new Set();             // IDs currently present in DOM
+let adsFIFO = [];                    // [{type, slot, id}] oldest first
 
 function resetPageState() {
   injectedSlots = new Set();
   usedIds = new Set();
+  adsFIFO = [];
 }
 
 function currentPageKey() {
-  // Stable key per ajaxified page
   try {
     if (ajaxify && ajaxify.data) {
       if (ajaxify.data.tid) return 'topic:' + ajaxify.data.tid;
       if (ajaxify.data.cid) return 'category:' + ajaxify.data.cid;
-      if (ajaxify.data.template) return 'tpl:' + ajaxify.data.template + ':' + (ajaxify.data.url || window.location.pathname);
     }
   } catch (e) {}
   return window.location.pathname;
@@ -86,6 +86,10 @@ function makeWrapperLike($target, classes, innerHtml, attrs) {
   return '<div class="' + classes + '"' + attrStr + '>' + innerHtml + '</div>';
 }
 
+function cleanupWrappersOnNav() {
+  $('.ezoic-ad-post, .ezoic-ad-between, .ezoic-ad-topic').remove();
+}
+
 function pickNextId(pool) {
   for (const id of pool) {
     if (!usedIds.has(id)) return id;
@@ -93,6 +97,19 @@ function pickNextId(pool) {
   return null;
 }
 
+function evictOldestOne() {
+  const old = adsFIFO.shift();
+  if (!old) return false;
+
+  const sel = '[data-ezoic-slot="' + old.slot + '"][data-ezoic-id="' + old.id + '"]';
+  const $el = $(sel);
+  if ($el.length) $el.remove();
+
+  injectedSlots.delete(old.slot);
+  usedIds.delete(old.id);
+  return true;
+}
+
 function callEzoic(ids) {
   if (!ids || !ids.length) return;
 
@@ -111,7 +128,7 @@ function callEzoic(ids) {
 
   window.ezstandalone.cmd.push(function () { run(); });
 
-  // retry a few times (Ezoic can load late)
+  // Retry (Ezoic can load late)
   let tries = 0;
   const maxTries = 6;
   const timer = setInterval(function () {
@@ -134,19 +151,27 @@ function injectBetweenIncremental($items, pool, interval, wrapperClass) {
     const $target = $items.eq(index);
     if (!$target.length) continue;
 
-    const id = pickNextId(pool);
+    let id = pickNextId(pool);
     if (!id) {
-      // pool exhausted: stop injecting further to avoid reusing ids and "jumping"
-      break;
+      // Pool full: evict oldest, then reuse freed ID
+      if (!evictOldestOne()) break;
+      id = pickNextId(pool);
+      if (!id) break;
     }
 
     const placeholder = '<div id="ezoic-pub-ad-placeholder-' + id + '"></div>';
-    const html = makeWrapperLike($target, wrapperClass, placeholder, 'data-ezoic-slot="' + slot + '" data-ezoic-id="' + id + '"');
+    const html = makeWrapperLike(
+      $target,
+      wrapperClass,
+      placeholder,
+      'data-ezoic-slot="' + slot + '" data-ezoic-id="' + id + '"'
+    );
 
     $target.after(html);
 
     injectedSlots.add(slot);
     usedIds.add(id);
+    adsFIFO.push({ type: 'between', slot: slot, id: id });
     newIds.push(id);
   }
 
@@ -167,16 +192,26 @@ function injectMessageIncremental($posts, pool, interval) {
     const $target = $posts.eq(index);
     if (!$target.length) continue;
 
-    const id = pickNextId(pool);
-    if (!id) break;
+    let id = pickNextId(pool);
+    if (!id) {
+      if (!evictOldestOne()) break;
+      id = pickNextId(pool);
+      if (!id) break;
+    }
 
     const inner = '<div class="content"><div id="ezoic-pub-ad-placeholder-' + id + '"></div></div>';
-    const html = makeWrapperLike($target, 'post ezoic-ad-post', inner, 'data-ezoic-slot="' + slot + '" data-ezoic-id="' + id + '"');
+    const html = makeWrapperLike(
+      $target,
+      'post ezoic-ad-post',
+      inner,
+      'data-ezoic-slot="' + slot + '" data-ezoic-id="' + id + '"'
+    );
 
     $target.after(html);
 
     injectedSlots.add(slot);
     usedIds.add(id);
+    adsFIFO.push({ type: 'message', slot: slot, id: id });
     newIds.push(id);
   }
 
@@ -184,13 +219,12 @@ function injectMessageIncremental($posts, pool, interval) {
 }
 
 async function refreshAds() {
-  // reset state when navigating (ajaxify)
+  // Reset state on navigation
   const key = currentPageKey();
   if (pageKey !== key) {
     pageKey = key;
     resetPageState();
-    // also cleanup any injected wrappers that may have been left by browser bfcache
-    $('.ezoic-ad-post, .ezoic-ad-between, .ezoic-ad-topic').remove();
+    cleanupWrappersOnNav();
   }
 
   if (inFlight) { rerunRequested = true; return; }