nodebb-plugin-ezoic-infinite 1.4.0 → 1.4.2

package/package.json

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

package/public/client.js

@@ -27,6 +27,12 @@
     usedPosts: new Set(),
     usedCategories: new Set(),
 
+    // wrappers currently on page (FIFO for recycling)
+    liveBetween: [],
+    liveMessage: [],
+    liveCategory: [],
+    usedCategories: new Set(),
+
     lastShowById: new Map(),
     pendingById: new Set(),
 
@@ -103,6 +109,60 @@
     });
   }
 
+
+  function safeRect(el) {
+    try { return el.getBoundingClientRect(); } catch (e) { return null; }
+  }
+
+  function destroyPlaceholderIds(ids) {
+    if (!ids || !ids.length) return;
+    const call = () => {
+      try {
+        if (window.ezstandalone && typeof window.ezstandalone.destroyPlaceholders === 'function') {
+          window.ezstandalone.destroyPlaceholders(ids);
+        }
+      } catch (e) {}
+    };
+    try {
+      window.ezstandalone = window.ezstandalone || {};
+      window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+      if (window.ezstandalone && typeof window.ezstandalone.destroyPlaceholders === 'function') call();
+      else window.ezstandalone.cmd.push(call);
+    } catch (e) {}
+  }
+
+  function getRecyclable(liveArr) {
+    const margin = 1800;
+    for (let i = 0; i < liveArr.length; i++) {
+      const entry = liveArr[i];
+      if (!entry || !entry.wrap || !entry.wrap.isConnected) { liveArr.splice(i, 1); i--; continue; }
+      const r = safeRect(entry.wrap);
+      if (r && r.bottom < -margin) {
+        liveArr.splice(i, 1);
+        return entry;
+      }
+    }
+    return null;
+  }
+
+  function moveWrapAfter(wrap, target, kindClass, afterPos) {
+    try {
+      wrap.className = `${WRAP_CLASS} ${kindClass}`;
+      wrap.setAttribute('data-ezoic-after', String(afterPos));
+      target.insertAdjacentElement('afterend', wrap);
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  function pickId(pool, liveArr) {
+    if (pool.length) return { id: pool.shift(), recycled: null };
+    const recycled = getRecyclable(liveArr);
+    if (recycled) return { id: recycled.id, recycled };
+    return { id: null, recycled: null };
+  }
+
   function buildWrap(id, kindClass, afterPos) {
     const wrap = document.createElement('div');
     wrap.className = `${WRAP_CLASS} ${kindClass}`;
@@ -132,16 +192,10 @@
     try {
       state.usedTopics.forEach((id) => ids.push(id));
       state.usedPosts.forEach((id) => ids.push(id));
-      state.usedCategories.forEach((id) => ids.push(id));
+      state.usedCategories && state.usedCategories.forEach((id) => ids.push(id));
     } catch (e) {}
-
-    if (!ids.length) return;
-
-    const call = () => {
-      try {
-        if (window.ezstandalone && typeof window.ezstandalone.destroyPlaceholders === 'function') {
-          window.ezstandalone.destroyPlaceholders(ids);
-        }
+    destroyPlaceholderIds(ids);
+  }
       } catch (e) {}
     };
 
@@ -239,9 +293,9 @@
     })();
   }
 
-  function nextId(kind) {
-    const pool = (kind === 'between') ? state.poolTopics : (kind === 'message') ? state.poolPosts : state.poolCategories;
-    if (pool.length) return pool.shift();
+  function nextId(pool) {
+    // backward compatible: the injector passes the pool array
+    if (Array.isArray(pool) && pool.length) return pool.shift();
     return null;
   }
 
@@ -298,13 +352,26 @@
 
       if (findWrap(kindClass, afterPos)) continue;
 
-      const id = nextId(kindPool);
+      const liveArr = (kindClass === 'ezoic-ad-between') ? state.liveBetween
+        : (kindClass === 'ezoic-ad-message') ? state.liveMessage
+        : state.liveCategory;
+
+      const pick = pickId(kindPool, liveArr);
+      const id = pick.id;
       if (!id) break;
 
-      usedSet.add(id);
-      const wrap = insertAfter(el, id, kindClass, afterPos);
-      if (!wrap) continue;
+      let wrap = null;
+      if (pick.recycled && pick.recycled.wrap) {
+        destroyPlaceholderIds([id]);
+        wrap = pick.recycled.wrap;
+        if (!moveWrapAfter(wrap, el, kindClass, afterPos)) continue;
+      } else {
+        usedSet.add(id);
+        wrap = insertAfter(el, id, kindClass, afterPos);
+        if (!wrap) continue;
+      }
 
+      liveArr.push({ id, wrap });
       callShowAdsWhenReady(id);
       inserted += 1;
     }
@@ -331,8 +398,13 @@
     state.poolTopics = [];
     state.poolPosts = [];
     state.poolCategories = [];
+    state.poolCategories = [];
     state.usedTopics.clear();
     state.usedPosts.clear();
+    state.usedCategories && state.usedCategories.clear();
+    state.liveBetween = [];
+    state.liveMessage = [];
+    state.liveCategory = [];
     state.usedCategories.clear();
 
     state.lastShowById = new Map();