nodebb-plugin-ezoic-infinite 1.5.59 → 1.5.61

package/package.json

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

package/public/client.js

@@ -27,7 +27,7 @@ function ensurePool() {
   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) {}
+      try { document.body.appendChild(pool); } catch (e) {}
     }
     return pool;
   }
@@ -41,7 +41,7 @@ function ensurePool() {
   pool.style.overflow = 'hidden';
   pool.setAttribute('aria-hidden', 'true');
   // Attach early (documentElement exists before body), so placeholders are always connected.
-  try { (document.documentElement || document.body).appendChild(pool); } catch (e) {}
+  try { document.body.appendChild(pool); } catch (e) {}
   // If body exists later, move it under body (purely cosmetic).
   try {
     if (document.body && pool.parentNode !== document.body) {
@@ -76,6 +76,34 @@ function primePool(ids) {
   } catch (e) {}
 }
 
+
+// Prime a continuous id range (inclusive) into the offscreen pool.
+// Ezoic sometimes references ids outside our configured list (e.g. +N); a small buffer prevents "does not exist" spam.
+function primePoolRange(minId, maxId) {
+  try {
+    minId = parseInt(minId, 10);
+    maxId = parseInt(maxId, 10);
+    if (!Number.isFinite(minId) || !Number.isFinite(maxId)) return;
+    if (minId <= 0 || maxId <= 0) return;
+    if (maxId < minId) { const t = minId; minId = maxId; maxId = t; }
+    const span = Math.min(400, Math.max(0, maxId - minId)); // cap
+    const pool = ensurePool();
+    for (let id = minId; id <= minId + span; id += 1) {
+      const domId = `${PLACEHOLDER_PREFIX}${id}`;
+      let ph = document.getElementById(domId);
+      if (!ph) {
+        ph = document.createElement('div');
+        ph.id = domId;
+        ph.setAttribute('data-ezoic-id', String(id));
+        pool.appendChild(ph);
+      } else if (!ph.isConnected) {
+        pool.appendChild(ph);
+      }
+    }
+  } catch (e) {}
+}
+
+
 function acquirePlaceholder(id) {
   const domId = `${PLACEHOLDER_PREFIX}${id}`;
   let ph = document.getElementById(domId);
@@ -84,9 +112,8 @@ 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) {
@@ -470,28 +497,65 @@ function withInternalDomChange(fn) {
   }
 
   function initPools(cfg) {
-    if (!cfg) return;
-    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);
-
-    // Keep placeholders alive even before they're injected.
-    // This avoids Ezoic trying to touch ids that we haven't inserted yet.
-    primePool(state.allTopics);
-    primePool(state.allPosts);
-    primePool(state.allCategories);
-  }
+  if (!cfg) return;
+  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);
+
+  // Keep placeholders alive even before they're injected.
+  // Ezoic can reference ids slightly outside our configured lists (often sequential),
+  // so we prime a small buffered range to prevent "does not exist" spam.
+  const primeBuffered = (ids) => {
+    try {
+      if (!ids || !ids.length) return;
+      primePool(ids);
+
+      let min = Infinity, max = -Infinity;
+      for (const v of ids) {
+        const n = parseInt(v, 10);
+        if (!Number.isFinite(n) || n <= 0) continue;
+        if (n < min) min = n;
+        if (n > max) max = n;
+      }
+      if (!Number.isFinite(min) || !Number.isFinite(max)) return;
+
+      // small buffer in both directions; range prime is capped internally
+      primePoolRange(Math.max(1, min - 5), max + 120);
+    } catch (e) {}
+  };
+
+  primeBuffered(state.allTopics);
+  primeBuffered(state.allPosts);
+  primeBuffered(state.allCategories);
+}
+
 
   // ---------- insertion primitives ----------
 
   function isAdjacentAd(target) {
-    if (!target) return false;
-    const next = target.nextElementSibling;
-    if (next && next.classList && next.classList.contains(WRAP_CLASS)) return true;
-    const prev = target.previousElementSibling;
-    if (prev && prev.classList && prev.classList.contains(WRAP_CLASS)) return true;
-    return false;
+  if (!target) return false;
+  const isAdEl = (el) => !!(el && el.classList && el.classList.contains(WRAP_CLASS));
+  // Look a few siblings away, skipping spacer elements inserted by NodeBB/themes
+  let el = target;
+  for (let i = 0; i < 3; i += 1) {
+    el = el.nextElementSibling;
+    if (!el) break;
+    if (isAdEl(el)) return true;
+    // Skip elements that are effectively spacers/dividers
+    const h = el.getBoundingClientRect ? el.getBoundingClientRect().height : 0;
+    if (h > 8) break;
+  }
+  el = target;
+  for (let i = 0; i < 3; i += 1) {
+    el = el.previousElementSibling;
+    if (!el) break;
+    if (isAdEl(el)) return true;
+    const h = el.getBoundingClientRect ? el.getBoundingClientRect().height : 0;
+    if (h > 8) break;
   }
+  return false;
+}
+
 
   
   function getWrapIdFromWrap(wrap) {
@@ -571,41 +635,54 @@ function withInternalDomChange(fn) {
     }, 3500);
   }
 
-function buildWrap(id, kindClass, afterPos) {
-    const wrap = document.createElement('div');
-    wrap.className = `${WRAP_CLASS} ${kindClass}`;
-    wrap.setAttribute('data-ezoic-after', String(afterPos));
-    wrap.setAttribute('data-ezoic-wrapid', String(id));
-    wrap.style.width = '100%';
+function buildWrap(id, kindClass, afterPos, afterPid) {
+  const wrap = document.createElement('div');
+  wrap.className = `${WRAP_CLASS} ${kindClass}`;
+  wrap.setAttribute('data-ezoic-after', String(afterPos));
+  if (afterPid) wrap.setAttribute('data-ezoic-after-pid', String(afterPid));
+  wrap.setAttribute('data-ezoic-wrapid', String(id));
+  wrap.style.width = '100%';
 
-    const ph = acquirePlaceholder(id);
-    try { if (ph.dataset) ph.dataset.ezActive = '1'; } catch (e) {}
-    wrap.appendChild(ph);
+  const ph = acquirePlaceholder(id);
+  try { if (ph.dataset) ph.dataset.ezActive = '1'; } catch (e) {}
+  wrap.appendChild(ph);
 
-    return wrap;
-  }
+  return wrap;
+}
+
+
+  function findWrap(kindClass, afterPos, afterPid) {
+  try {
+    if (afterPid) {
+      const w = document.querySelector(`.${WRAP_CLASS}.${kindClass}[data-ezoic-after-pid="${afterPid}"]`);
+      if (w) return w;
+    }
+  } catch (e) {}
+  return document.querySelector(`.${WRAP_CLASS}.${kindClass}[data-ezoic-after="${afterPos}"]`);
+}
 
-  function findWrap(kindClass, afterPos) {
-    return document.querySelector(`.${WRAP_CLASS}.${kindClass}[data-ezoic-after="${afterPos}"]`);
-  }
 
   function insertAfter(target, id, kindClass, afterPos) {
-    if (!target || !target.insertAdjacentElement) return null;
-    if (findWrap(kindClass, afterPos)) return null;
-    if (insertingIds.has(id)) return null;
+  if (!target || !target.insertAdjacentElement) return null;
+  const afterPid = target.getAttribute ? target.getAttribute('data-pid') : null;
+  if (findWrap(kindClass, afterPos, afterPid)) return null;
+  if (insertingIds.has(id)) return null;
 
-    const existingPh = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
-    if (existingPh && isPlaceholderInUse(existingPh)) return null;
+  const existingPh = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
+  if (existingPh && isPlaceholderInUse(existingPh)) return null;
 
-    insertingIds.add(id);
-    try {
-      const wrap = buildWrap(id, kindClass, afterPos);
-      target.insertAdjacentElement('afterend', wrap);
-      return wrap;
-    } finally {
-      insertingIds.delete(id);
-    }
+  insertingIds.add(id);
+  try {
+    const wrap = buildWrap(id, kindClass, afterPos, afterPid);
+    target.insertAdjacentElement('afterend', wrap);
+    // Mark post as processed anchor to stabilize 1/X across infinite scroll reflows
+    try { if (afterPid) target.setAttribute('data-ezoic-anchored', '1'); } catch (e) {}
+    return wrap;
+  } finally {
+    insertingIds.delete(id);
   }
+}
+
 
   function pickIdFromAll(allIds, cursorKey) {
     const n = allIds.length;