nodebb-plugin-ezoic-infinite 1.5.23 → 1.5.25

package/package.json

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

package/public/client.js

@@ -26,13 +26,13 @@
     pageKey: null,
     cfg: null,
 
-    poolTopics: [],
-    poolPosts: [],
-    poolCategories: [],
-
-    usedTopics: new Set(),
-    usedPosts: new Set(),
-    usedCategories: new Set(),
+    // Full lists (never consumed) + cursors for round-robin reuse
+    allTopics: [],
+    allPosts: [],
+    allCategories: [],
+    curTopics: 0,
+    curPosts: 0,
+    curCategories: 0,
 
     // throttle per placeholder id
     lastShowById: new Map(),
@@ -46,9 +46,18 @@
     heroDoneForPage: false,
   };
 
-  const sessionDefinedIds = new Set();
   const insertingIds = new Set();
 
+  // Debug logs (enable with localStorage.ezoicInfiniteDebug = "1")
+  function dbg(...args) {
+    try {
+      if (window && window.localStorage && window.localStorage.getItem('ezoicInfiniteDebug') === '1') {
+        // eslint-disable-next-line no-console
+        console.log('[ezoicInfinite]', ...args);
+      }
+    } catch (e) {}
+  }
+
   // ---------- small utils ----------
 
   function normalizeBool(v) {
@@ -205,9 +214,9 @@
 
   function initPools(cfg) {
     if (!cfg) return;
-    if (state.poolTopics.length === 0) state.poolTopics = parsePool(cfg.placeholderIds);
-    if (state.poolPosts.length === 0) state.poolPosts = parsePool(cfg.messagePlaceholderIds);
-    if (state.poolCategories.length === 0) state.poolCategories = parsePool(cfg.categoryPlaceholderIds);
+    if (state.allTopics.length === 0) state.allTopics = parsePool(cfg.placeholderIds);
+    if (state.allPosts.length === 0) state.allPosts = parsePool(cfg.messagePlaceholderIds);
+    if (state.allCategories.length === 0) state.allCategories = parsePool(cfg.categoryPlaceholderIds);
   }
 
   // ---------- insertion primitives ----------
@@ -257,8 +266,50 @@
     }
   }
 
-  function pickId(pool) {
-    return pool.length ? pool.shift() : null;
+  function pickIdFromAll(allIds, cursorKey) {
+    const n = allIds.length;
+    if (!n) return null;
+
+    // Try at most n ids to find one that's not already in the DOM
+    for (let tries = 0; tries < n; tries++) {
+      const idx = state[cursorKey] % n;
+      state[cursorKey] = (state[cursorKey] + 1) % n;
+
+      const id = allIds[idx];
+      const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
+      if (ph && ph.isConnected) continue;
+
+      return id;
+    }
+    return null;
+  }
+
+
+  function removeOneOldWrap(kindClass) {
+    try {
+      const wraps = Array.from(document.querySelectorAll(`.${WRAP_CLASS}.${kindClass}`));
+      if (!wraps.length) return false;
+
+      // Prefer a wrap far above the viewport
+      let victim = null;
+      for (const w of wraps) {
+        const r = w.getBoundingClientRect();
+        if (r.bottom < -2000) { victim = w; break; }
+      }
+      // Otherwise remove the earliest one in the document
+      if (!victim) victim = wraps[0];
+
+      // Unobserve placeholder if still observed
+      try {
+        const ph = victim.querySelector && victim.querySelector(`[id^="${PLACEHOLDER_PREFIX}"]`);
+        if (ph && state.io) state.io.unobserve(ph);
+      } catch (e) {}
+
+      victim.remove();
+      return true;
+    } catch (e) {
+      return false;
+    }
   }
 
   function showAd(id) {
@@ -280,7 +331,6 @@
       // Fast path
       if (typeof ez.showAds === 'function') {
         ez.showAds(id);
-        sessionDefinedIds.add(id);
         return;
       }
 
@@ -294,7 +344,6 @@
             const el = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
             if (!el || !el.isConnected) return;
             window.ezstandalone.showAds(id);
-            sessionDefinedIds.add(id);
           } catch (e) {}
         });
       }
@@ -348,7 +397,7 @@
     return Array.from(new Set(out)).sort((a, b) => a - b);
   }
 
-  function injectBetween(kindClass, items, interval, showFirst, pool, usedSet) {
+  function injectBetween(kindClass, items, interval, showFirst, allIds, cursorKey) {
     if (!items.length) return 0;
 
     const targets = computeTargets(items.length, interval, showFirst);
@@ -362,14 +411,16 @@
       if (isAdjacentAd(el)) continue;
       if (findWrap(kindClass, afterPos)) continue;
 
-      const id = pickId(pool);
+      let id = pickIdFromAll(allIds, cursorKey);
+      if (!id) {
+        // No free ids: recycle an old ad wrapper so we can reuse its placeholder id
+        const recycled = removeOneOldWrap(kindClass);
+        dbg('recycle-needed', kindClass, { recycled, ids: allIds.length });
+        id = pickIdFromAll(allIds, cursorKey);
+      }
       if (!id) break;
-
-      usedSet.add(id);
       const wrap = insertAfter(el, id, kindClass, afterPos);
       if (!wrap) {
-        usedSet.delete(id);
-        pool.unshift(id);
         continue;
       }
 
@@ -383,36 +434,42 @@
   async function insertHeroAdEarly() {
     if (state.heroDoneForPage) return;
     const cfg = await fetchConfigOnce();
-    if (!cfg || cfg.excluded) return;
+    if (!cfg) { dbg('no-config'); return; }
+    if (cfg.excluded) { dbg('excluded'); return; }
 
     initPools(cfg);
 
     const kind = getKind();
     let items = [];
-    let pool = null;
-    let usedSet = null;
+    let allIds = [];
+    let cursorKey = '';
     let kindClass = '';
+    let showFirst = false;
 
     if (kind === 'topic' && normalizeBool(cfg.enableMessageAds)) {
       items = getPostContainers();
-      pool = state.poolPosts;
-      usedSet = state.usedPosts;
+      allIds = state.allPosts;
+      cursorKey = 'curPosts';
       kindClass = 'ezoic-ad-message';
+      showFirst = normalizeBool(cfg.showFirstMessageAd);
     } else if (kind === 'categoryTopics' && normalizeBool(cfg.enableBetweenAds)) {
       items = getTopicItems();
-      pool = state.poolTopics;
-      usedSet = state.usedTopics;
+      allIds = state.allTopics;
+      cursorKey = 'curTopics';
       kindClass = 'ezoic-ad-between';
+      showFirst = normalizeBool(cfg.showFirstTopicAd);
     } else if (kind === 'categories' && normalizeBool(cfg.enableCategoryAds)) {
       items = getCategoryItems();
-      pool = state.poolCategories;
-      usedSet = state.usedCategories;
+      allIds = state.allCategories;
+      cursorKey = 'curCategories';
       kindClass = 'ezoic-ad-categories';
+      showFirst = normalizeBool(cfg.showFirstCategoryAd);
     } else {
       return;
     }
 
     if (!items.length) return;
+    if (!showFirst) { state.heroDoneForPage = true; return; }
 
     // Insert after the very first item (above-the-fold)
     const afterPos = 1;
@@ -421,14 +478,11 @@
     if (isAdjacentAd(el)) return;
     if (findWrap(kindClass, afterPos)) { state.heroDoneForPage = true; return; }
 
-    const id = pickId(pool);
+    const id = pickIdFromAll(allIds, cursorKey);
     if (!id) return;
 
-    usedSet.add(id);
     const wrap = insertAfter(el, id, kindClass, afterPos);
     if (!wrap) {
-      usedSet.delete(id);
-      pool.unshift(id);
       return;
     }
 
@@ -437,12 +491,13 @@
   }
 
   async function runCore() {
-    if (EZOIC_BLOCKED) return;
+    if (EZOIC_BLOCKED) { dbg('blocked'); return; }
 
     patchShowAds();
 
     const cfg = await fetchConfigOnce();
-    if (!cfg || cfg.excluded) return;
+    if (!cfg) { dbg('no-config'); return; }
+    if (cfg.excluded) { dbg('excluded'); return; }
     initPools(cfg);
 
     const kind = getKind();
@@ -454,8 +509,8 @@
           getPostContainers(),
           Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3),
           normalizeBool(cfg.showFirstMessageAd),
-          state.poolPosts,
-          state.usedPosts
+          state.allPosts,
+          'curPosts'
         );
       }
     } else if (kind === 'categoryTopics') {
@@ -465,8 +520,8 @@
           getTopicItems(),
           Math.max(1, parseInt(cfg.intervalPosts, 10) || 6),
           normalizeBool(cfg.showFirstTopicAd),
-          state.poolTopics,
-          state.usedTopics
+          state.allTopics,
+          'curTopics'
         );
       }
     } else if (kind === 'categories') {
@@ -476,8 +531,8 @@
           getCategoryItems(),
           Math.max(1, parseInt(cfg.intervalCategories, 10) || 4),
           normalizeBool(cfg.showFirstCategoryAd),
-          state.poolCategories,
-          state.usedCategories
+          state.allCategories,
+          'curCategories'
         );
       }
     }
@@ -508,17 +563,15 @@
 
     // reset state
     state.cfg = null;
-    state.poolTopics = [];
-    state.poolPosts = [];
-    state.poolCategories = [];
-    state.usedTopics.clear();
-    state.usedPosts.clear();
-    state.usedCategories.clear();
+    state.allTopics = [];
+    state.allPosts = [];
+    state.allCategories = [];
+    state.curTopics = 0;
+    state.curPosts = 0;
+    state.curCategories = 0;
     state.lastShowById.clear();
     state.heroDoneForPage = false;
 
-    sessionDefinedIds.clear();
-
     // keep observers alive (MutationObserver will re-trigger after navigation)
   }