nodebb-plugin-ezoic-infinite 1.5.58 → 1.5.60

package/package.json

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

package/public/client.js

@@ -13,9 +13,24 @@
 // and eliminates "HTML element with id ... does not exist" noise.
 const POOL_ID = 'ezoic-placeholder-pool';
 
+function isInPool(el) {
+  try { return !!(el && el.closest && el.closest('#' + POOL_ID)); } catch (e) { return false; }
+}
+
+function isPlaceholderInUse(ph) {
+  // In use = connected AND not parked in our offscreen pool.
+  try { return !!(ph && ph.isConnected && !isInPool(ph)); } catch (e) { return false; }
+}
+
 function ensurePool() {
   let pool = document.getElementById(POOL_ID);
-  if (pool) return pool;
+  if (pool) {
+    // In rare cases (aggressive SPA navigation), the pool may get detached.
+    if (!pool.isConnected) {
+      try { (document.documentElement || document.body).appendChild(pool); } catch (e) {}
+    }
+    return pool;
+  }
   pool = document.createElement('div');
   pool.id = POOL_ID;
   pool.style.position = 'absolute';
@@ -44,24 +59,9 @@ function primePool(ids) {
   try {
     if (!ids || !ids.length) return;
     const pool = ensurePool();
-
-    // Normalize and compute bounds
-    const arr = [];
     for (const v of ids) {
-      const n = parseInt(v, 10);
-      if (Number.isFinite(n) && n > 0) arr.push(n);
-    }
-    if (!arr.length) return;
-
-    let min = arr[0], max = arr[0];
-    for (const n of arr) { if (n < min) min = n; if (n > max) max = n; }
-
-    // Ezoic sometimes touches ids in a contiguous range. If the configured list
-    // looks like a range, pre-create all ids between min..max (bounded).
-    const RANGE_LIMIT = 2000;
-    const useRange = (max - min) <= RANGE_LIMIT;
-
-    const ensureOne = (id) => {
+      const id = parseInt(v, 10);
+      if (!Number.isFinite(id) || id <= 0) continue;
       const domId = `${PLACEHOLDER_PREFIX}${id}`;
       let ph = document.getElementById(domId);
       if (!ph) {
@@ -72,12 +72,6 @@ function primePool(ids) {
       } else if (!ph.isConnected) {
         pool.appendChild(ph);
       }
-    };
-
-    if (useRange) {
-      for (let id = min; id <= max; id++) ensureOne(id);
-    } else {
-      for (const id of arr) ensureOne(id);
     }
   } catch (e) {}
 }
@@ -90,14 +84,14 @@ function acquirePlaceholder(id) {
     ph.id = domId;
     ph.setAttribute('data-ezoic-id', String(id));
     ensurePool().appendChild(ph);
-  }
-  // Detach from wherever it currently is (pool or a previous wrap)
-  try { if (ph.parentNode) ph.parentNode.removeChild(ph); } catch (e) {}
+  } 
+  // Note: appendChild will automatically move the node, no manual detach (avoids race gaps).
   // Clear request/defined flags when reusing
   try {
     if (ph.dataset) {
       ph.dataset.ezRequested = '0';
       ph.dataset.ezDefined = '0';
+      ph.dataset.ezActive = '0';
     }
   } catch (e) {}
   return ph;
@@ -108,6 +102,7 @@ function parkPlaceholderFromWrap(wrap) {
     const ph = wrap && wrap.querySelector ? wrap.querySelector(`[id^="${PLACEHOLDER_PREFIX}"]`) : null;
     if (!ph) return;
     try { if (state && state.io) state.io.unobserve(ph); } catch (e) {}
+    try { if (ph.dataset) ph.dataset.ezActive = '0'; } catch (e) {}
     ensurePool().appendChild(ph);
   } catch (e) {}
 }
@@ -246,10 +241,11 @@ function parkPlaceholderFromWrap(wrap) {
 
   function parsePool(raw) {
     if (!raw) return [];
-    // Accept newline, comma, semicolon, space separated lists.
-    // Some ACP inputs may be stored as "611,612,613" in a single line.
-    const tokens = String(raw).match(/\d+/g) || [];
-    return uniqInts(tokens);
+    const lines = String(raw)
+      .split(/\r?\n/)
+      .map(s => s.trim())
+      .filter(Boolean);
+    return uniqInts(lines);
   }
 
   function getPageKey() {
@@ -342,8 +338,24 @@ function parkPlaceholderFromWrap(wrap) {
           if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
 
           const domId = `${PLACEHOLDER_PREFIX}${id}`;
-          const ph = document.getElementById(domId);
-          if (!ph || !ph.isConnected) continue;
+          let ph = document.getElementById(domId);
+          if (!ph || !ph.isConnected) {
+            // If Ezoic (or another script) tries to show an id we haven't injected yet,
+            // create the placeholder in the offscreen pool so it exists, but don't load.
+            try {
+              ph = document.createElement('div');
+              ph.id = domId;
+              ph.setAttribute('data-ezoic-id', String(id));
+              if (ph.dataset) ph.dataset.ezActive = '0';
+              ensurePool().appendChild(ph);
+            } catch (e) {}
+            continue;
+          }
+
+          // Only allow loads for placeholders actively injected into the page (not parked in the pool)
+          // and currently marked active.
+          if (!isPlaceholderInUse(ph)) continue;
+          if (ph.dataset && ph.dataset.ezActive !== '1') continue;
 
           // Prevent repeated "define" attempts on the same placeholder while it remains in DOM.
           if (ph.dataset && (ph.dataset.ezRequested === '1' || ph.dataset.ezDefined === '1')) continue;
@@ -566,6 +578,7 @@ function buildWrap(id, kindClass, afterPos) {
     wrap.style.width = '100%';
 
     const ph = acquirePlaceholder(id);
+    try { if (ph.dataset) ph.dataset.ezActive = '1'; } catch (e) {}
     wrap.appendChild(ph);
 
     return wrap;
@@ -581,7 +594,7 @@ function buildWrap(id, kindClass, afterPos) {
     if (insertingIds.has(id)) return null;
 
     const existingPh = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
-    if (existingPh && existingPh.isConnected) return null;
+    if (existingPh && isPlaceholderInUse(existingPh)) return null;
 
     insertingIds.add(id);
     try {
@@ -604,7 +617,7 @@ function buildWrap(id, kindClass, afterPos) {
 
       const id = allIds[idx];
       const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
-      if (ph && ph.isConnected) continue;
+      if (ph && isPlaceholderInUse(ph)) continue;
 
       return id;
     }
@@ -709,16 +722,14 @@ function startShow(id) {
           const ph = document.getElementById(domId);
           if (!ph || !ph.isConnected) return;
 
-          // If this id was used before, destroy it first to avoid "already defined".
-          // Then schedule showAds on the next tick (gives Ezoic time to clear state).
+          // If this id was used before, destroy safely using full DOM id.
           if (state.usedOnce && state.usedOnce.has(id)) {
             safeDestroyById(id);
-            setTimeout(() => { try { ez.showAds(id); } catch (e) {} }, 0);
-          } else {
-            // First time: show immediately
-            ez.showAds(id);
           }
 
+          // showAds is patched to ignore missing placeholders and repeated defines.
+          ez.showAds(id);
+
           try { state.usedOnce && state.usedOnce.add(id); } catch (e) {}
         } catch (e) {}
         finally {