nodebb-plugin-ezoic-infinite 1.4.7 → 1.4.8

package/package.json

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

package/public/client.js

@@ -189,6 +189,8 @@
   function resetPlaceholderInWrap(wrap, id) {
     try {
       if (!wrap) return;
+      try { wrap.removeAttribute('data-ezoic-filled'); } catch (e) {}
+      try { if (wrap.__ezoicFillObs) { wrap.__ezoicFillObs.disconnect(); wrap.__ezoicFillObs = null; } } catch (e) {}
       const old = wrap.querySelector && wrap.querySelector(`#${PLACEHOLDER_PREFIX}${id}`);
       if (old) old.remove();
       // Remove any leftover markup inside wrapper
@@ -234,6 +236,7 @@
     if (findWrap(kindClass, afterPos)) return null;
     const wrap = buildWrap(id, kindClass, afterPos);
     target.insertAdjacentElement('afterend', wrap);
+    attachFillObserver(wrap, id);
     return wrap;
   }
 
@@ -285,17 +288,59 @@
   }
 
 
+
+  function markFilled(wrap) {
+    try {
+      if (!wrap) return;
+      try { wrap.removeAttribute('data-ezoic-filled'); } catch (e) {}
+      try { if (wrap.__ezoicFillObs) { wrap.__ezoicFillObs.disconnect(); wrap.__ezoicFillObs = null; } } catch (e) {}
+      wrap.setAttribute('data-ezoic-filled', '1');
+    } catch (e) {}
+  }
+
+  function isWrapMarkedFilled(wrap) {
+    try { return wrap && wrap.getAttribute && wrap.getAttribute('data-ezoic-filled') === '1'; } catch (e) { return false; }
+  }
+
+  function attachFillObserver(wrap, id) {
+    try {
+      const ph = wrap && wrap.querySelector && wrap.querySelector(`#${PLACEHOLDER_PREFIX}${id}`);
+      if (!ph) return;
+      // Already filled?
+      if (ph.childNodes && ph.childNodes.length > 0) {
+        markFilled(wrap);
+        state.definedIds && state.definedIds.add(id);
+        return;
+      }
+      const obs = new MutationObserver(() => {
+        if (ph.childNodes && ph.childNodes.length > 0) {
+          markFilled(wrap);
+          try { state.definedIds && state.definedIds.add(id); } catch (e) {}
+          try { obs.disconnect(); } catch (e) {}
+        }
+      });
+      obs.observe(ph, { childList: true, subtree: true });
+      // Keep a weak reference on the wrapper so we can disconnect on recycle/remove
+      wrap.__ezoicFillObs = obs;
+    } catch (e) {}
+  }
+
   function isPlaceholderFilled(id) {
     const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
     if (!ph || !ph.isConnected) return false;
 
-    // Ezoic typically injects content inside the placeholder node.
+    const wrap = ph.parentElement;
+    if (wrap && isWrapMarkedFilled(wrap)) return true;
+
     const filled = !!(ph.childNodes && ph.childNodes.length > 0);
     if (filled) {
       try { state.definedIds && state.definedIds.add(id); } catch (e) {}
+      try { markFilled(wrap); } catch (e) {}
     }
     return filled;
   }
+    return filled;
+  }
 
   function scheduleRefill(delay = 350) {
     clearTimeout(state.retryTimer);
@@ -329,12 +374,12 @@
       const phNow = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
       const wrapNow = phNow && phNow.parentElement;
       // If Ezoic already defined this id earlier but the placeholder is empty now, we must destroy+reset before re-showAds.
-      if (wrapNow && wrapNow.isConnected && state.definedIds && state.definedIds.has(id) && !isPlaceholderFilled(id)) {
+      if (wrapNow && wrapNow.isConnected && state.definedIds && state.definedIds.has(id) && !isPlaceholderFilled(id) && !isWrapMarkedFilled(wrapNow)) {
         destroyPlaceholderIds([id]);
         resetPlaceholderInWrap(wrapNow, id);
       }
       // If this id was previously attempted and still empty, force a full reset before re-requesting.
-      if (attempts > 0 && wrapNow && wrapNow.isConnected && !isPlaceholderFilled(id)) {
+      if (attempts > 0 && wrapNow && wrapNow.isConnected && !isPlaceholderFilled(id) && !isWrapMarkedFilled(wrapNow)) {
         destroyPlaceholderIds([id]);
         resetPlaceholderInWrap(wrapNow, id);
       }
@@ -360,6 +405,11 @@
         state.retryById.delete(id);
         continue;
       }
+      // If wrapper was marked filled, don't try to refill even if placeholder temporarily appears empty.
+      if (isWrapMarkedFilled(wrap)) {
+        state.retryById.delete(id);
+        continue;
+      }
 
       const tries = (state.retryById.get(id) || 0);
       if (tries >= 8) { state.badIds && state.badIds.add(id); continue; }
@@ -512,9 +562,12 @@
         if (state.definedIds && state.definedIds.has(id)) {
           destroyPlaceholderIds([id]);
         }
-        wrap = pick.recycled.wrap;
-        if (!moveWrapAfter(wrap, el, kindClass, afterPos)) continue;
-        resetPlaceholderInWrap(wrap, id);
+        // Remove the old wrapper entirely, then create a fresh wrapper at the new position (same id)
+        const oldWrap = pick.recycled.wrap;
+        try { if (oldWrap && oldWrap.__ezoicFillObs) { oldWrap.__ezoicFillObs.disconnect(); } } catch (e) {}
+        try { oldWrap && oldWrap.remove(); } catch (e) {}
+        wrap = insertAfter(el, id, kindClass, afterPos);
+        if (!wrap) continue;
         setTimeout(() => { enqueueRetry(id); }, 450);
       } else {
         usedSet.add(id);