nodebb-plugin-ezoic-infinite 1.4.3 → 1.4.5

package/package.json

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

package/public/client.js

@@ -37,6 +37,10 @@
     pendingById: new Set(),
     retryById: new Map(),
     retryTimer: null,
+    retryQueue: [],
+    retryQueueSet: new Set(),
+    retryQueueRunning: false,
+    badIds: new Set(),
 
     scheduled: false,
     timer: null,
@@ -165,6 +169,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 slot markup inside wrapper
+      wrap.querySelectorAll && wrap.querySelectorAll('iframe, ins, [id^="ezslot_"]').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}`;
@@ -251,6 +283,43 @@
     state.retryTimer = setTimeout(refillUnfilled, delay);
   }
 
+  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);
+    processRetryQueue();
+  }
+
+  function processRetryQueue() {
+    if (state.retryQueueRunning) return;
+    state.retryQueueRunning = true;
+
+    const step = () => {
+      const id = state.retryQueue.shift();
+      if (!id) {
+        state.retryQueueRunning = false;
+    state.badIds = 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)) {
+        destroyPlaceholderIds([id]);
+        resetPlaceholderInWrap(wrapNow, id);
+      }
+      callShowAdsWhenReady(id);
+      setTimeout(step, 1100);
+    };
+
+    step();
+  }
+
+
   function refillUnfilled() {
     const wraps = Array.from(document.querySelectorAll(`.${WRAP_CLASS}`));
     let scheduledAny = false;
@@ -267,13 +336,13 @@
       }
 
       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;
 
       state.retryById.set(id, tries + 1);
-      callShowAdsWhenReady(id);
+      enqueueRetry(id);
       scheduledAny = true;
     }
 
@@ -392,6 +461,11 @@
       const el = items[afterPos - 1];
       if (!el || !el.isConnected) continue;
 
+      // Prevent adjacent ads (DOM-based, robust against virtualization)
+      if (isAdjacentAd(el) || isPrevAd(el)) {
+        continue;
+      }
+
       // Prevent back-to-back at load
       const prevWrap = findWrap(kindClass, afterPos - 1);
       if (prevWrap) continue;
@@ -411,6 +485,8 @@
         destroyPlaceholderIds([id]);
         wrap = pick.recycled.wrap;
         if (!moveWrapAfter(wrap, el, kindClass, afterPos)) continue;
+        resetPlaceholderInWrap(wrap, id);
+        setTimeout(() => { enqueueRetry(id); }, 450);
       } else {
         usedSet.add(id);
         wrap = insertAfter(el, id, kindClass, afterPos);
@@ -418,7 +494,20 @@
       }
 
       liveArr.push({ id, wrap });
-      callShowAdsWhenReady(id);
+      // 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);
+      }
       inserted += 1;
     }
     return inserted;