nodebb-plugin-ezoic-infinite 1.4.4 → 1.4.6

package/package.json

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

package/public/client.js

@@ -40,6 +40,8 @@
     retryQueue: [],
     retryQueueSet: new Set(),
     retryQueueRunning: false,
+    badIds: new Set(),
+    definedIds: new Set(),
 
     scheduled: false,
     timer: null,
@@ -121,10 +123,16 @@
 
   function destroyPlaceholderIds(ids) {
     if (!ids || !ids.length) return;
+    // Only destroy ids that were actually "defined" (filled at least once) to avoid Ezoic warnings.
+    const filtered = ids.filter((id) => {
+      try { return state.definedIds && state.definedIds.has(id); } catch (e) { return true; }
+    });
+    if (!filtered.length) return;
+
     const call = () => {
       try {
         if (window.ezstandalone && typeof window.ezstandalone.destroyPlaceholders === 'function') {
-          window.ezstandalone.destroyPlaceholders(ids);
+          window.ezstandalone.destroyPlaceholders(filtered);
         }
       } catch (e) {}
     };
@@ -135,6 +143,15 @@
       else window.ezstandalone.cmd.push(call);
     } catch (e) {}
   }
+      } 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;
@@ -168,6 +185,34 @@
     return { id: null, recycled: null };
   }
 
+
+  function resetPlaceholderInWrap(wrap, id) {
+    try {
+      if (!wrap) return;
+      const old = wrap.querySelector && wrap.querySelector(`#${PLACEHOLDER_PREFIX}${id}`);
+      if (old) old.remove();
+      // Remove any leftover markup inside wrapper
+      wrap.querySelectorAll && wrap.querySelectorAll('iframe, ins').forEach(n => n.remove());
+      const ph = document.createElement('div');
+      ph.id = `${PLACEHOLDER_PREFIX}${id}`;
+      wrap.appendChild(ph);
+    } catch (e) {}
+  }
+
+  function isAdjacentAd(target) {
+    if (!target || !target.nextElementSibling) return false;
+    const next = target.nextElementSibling;
+    if (next && next.classList && next.classList.contains(WRAP_CLASS)) return true;
+    return false;
+  }
+
+  function isPrevAd(target) {
+    if (!target || !target.previousElementSibling) return false;
+    const prev = target.previousElementSibling;
+    if (prev && prev.classList && prev.classList.contains(WRAP_CLASS)) return true;
+    return false;
+  }
+
   function buildWrap(id, kindClass, afterPos) {
     const wrap = document.createElement('div');
     wrap.className = `${WRAP_CLASS} ${kindClass}`;
@@ -243,10 +288,13 @@
   function isPlaceholderFilled(id) {
     const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
     if (!ph || !ph.isConnected) return false;
-    if (ph.childNodes && ph.childNodes.length > 0) return true;
-    const wrap = ph.parentElement;
-    if (wrap && wrap.querySelector && wrap.querySelector('iframe, ins, [id^="ezslot_"], [class*="ez"]')) return true;
-    return false;
+
+    // Ezoic typically injects content inside the placeholder node.
+    const filled = !!(ph.childNodes && ph.childNodes.length > 0);
+    if (filled) {
+      try { state.definedIds && state.definedIds.add(id); } catch (e) {}
+    }
+    return filled;
   }
 
   function scheduleRefill(delay = 350) {
@@ -256,6 +304,7 @@
 
   function enqueueRetry(id) {
     if (!id) return;
+    if (state.badIds && state.badIds.has(id)) return;
     if (state.retryQueueSet.has(id)) return;
     state.retryQueueSet.add(id);
     state.retryQueue.push(id);
@@ -270,11 +319,23 @@
       const id = state.retryQueue.shift();
       if (!id) {
         state.retryQueueRunning = false;
+    state.badIds = new Set();
+    state.definedIds = new Set();
         return;
       }
       state.retryQueueSet.delete(id);
+      // If this id was previously attempted and still empty, force a full reset before re-requesting.
+      const attempts = (state.retryById.get(id) || 0);
+      const phNow = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
+      const wrapNow = phNow && phNow.parentElement;
+      if (attempts > 0 && wrapNow && wrapNow.isConnected && !isPlaceholderFilled(id)) {
+        if (state.definedIds && state.definedIds.has(id)) {
+          destroyPlaceholderIds([id]);
+        }
+        resetPlaceholderInWrap(wrapNow, id);
+      }
       callShowAdsWhenReady(id);
-      setTimeout(step, 950);
+      setTimeout(step, 1100);
     };
 
     step();
@@ -297,7 +358,7 @@
       }
 
       const tries = (state.retryById.get(id) || 0);
-      if (tries >= 8) continue;
+      if (tries >= 8) { state.badIds && state.badIds.add(id); continue; }
 
       const r = safeRect(wrap);
       if (r && (r.top > window.innerHeight + 1200 || r.bottom < -1200)) continue;
@@ -423,8 +484,7 @@
       if (!el || !el.isConnected) continue;
 
       // Prevent adjacent ads (DOM-based, robust against virtualization)
-      const nextSibling = el.nextElementSibling;
-      if (nextSibling && nextSibling.classList && nextSibling.classList.contains(WRAP_CLASS)) {
+      if (isAdjacentAd(el) || isPrevAd(el)) {
         continue;
       }
 
@@ -444,10 +504,14 @@
 
       let wrap = null;
       if (pick.recycled && pick.recycled.wrap) {
-        destroyPlaceholderIds([id]);
+        // Only destroy if Ezoic has actually defined this placeholder before
+        if (state.definedIds && state.definedIds.has(id)) {
+          destroyPlaceholderIds([id]);
+        }
         wrap = pick.recycled.wrap;
         if (!moveWrapAfter(wrap, el, kindClass, afterPos)) continue;
-        setTimeout(() => { enqueueRetry(id); }, 250);
+        resetPlaceholderInWrap(wrap, id);
+        setTimeout(() => { enqueueRetry(id); }, 450);
       } else {
         usedSet.add(id);
         wrap = insertAfter(el, id, kindClass, afterPos);
@@ -455,6 +519,17 @@
       }
 
       liveArr.push({ id, wrap });
+      // If adjacency ended up happening (e.g. DOM shifts), rollback this placement.
+      if (wrap && (wrap.previousElementSibling && wrap.previousElementSibling.classList && wrap.previousElementSibling.classList.contains(WRAP_CLASS)) || (wrap.nextElementSibling && wrap.nextElementSibling.classList && wrap.nextElementSibling.classList.contains(WRAP_CLASS))) {
+        try { wrap.remove(); } catch (e) {}
+        // Put id back if it was newly consumed (not recycled)
+        if (!(pick.recycled && pick.recycled.wrap)) {
+          try { kindPool.unshift(id); } catch (e) {}
+          try { usedSet.delete(id); } catch (e) {}
+        }
+        inserted -= 0; // no-op
+        continue;
+      }
       if (!(pick.recycled && pick.recycled.wrap)) {
         callShowAdsWhenReady(id);
       }