nodebb-plugin-ezoic-infinite 1.5.63 → 1.5.64

package/package.json

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

package/public/client.js

@@ -234,22 +234,40 @@
         window.__nodebbEzoicPatched = true;
         const orig = ez.showAds;
 
+        // Important: preserve the original calling convention.
+        // Some Ezoic builds expect an array; calling one-by-one can lead to
+        // repeated define attempts and "Placeholder Id ... already been defined".
         ez.showAds = function (...args) {
           if (isBlocked()) return;
 
+          const now = Date.now();
           let ids = [];
-          if (args.length === 1 && Array.isArray(args[0])) ids = args[0];
+          const isArrayCall = (args.length === 1 && Array.isArray(args[0]));
+          if (isArrayCall) ids = args[0];
           else ids = args;
 
+          const filtered = [];
           const seen = new Set();
           for (const v of ids) {
             const id = parseInt(v, 10);
             if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
             const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
             if (!ph || !ph.isConnected) continue;
+
+            // Extra throttle to avoid rapid duplicate defines during ajaxify churn
+            const last = state.lastShowById.get(id) || 0;
+            if (now - last < 650) continue;
+            state.lastShowById.set(id, now);
+
             seen.add(id);
-            try { orig.call(ez, id); } catch (e) {}
+            filtered.push(id);
           }
+
+          if (!filtered.length) return;
+          try {
+            if (isArrayCall) orig.call(ez, filtered);
+            else orig.apply(ez, filtered);
+          } catch (e) {}
         };
       } catch (e) {}
     };
@@ -347,11 +365,21 @@ function withInternalDomChange(fn) {
       // NodeBB can insert separators/spacers; accept an anchor within a few previous siblings
       let ok = false;
       let prev = wrap.previousElementSibling;
-      for (let i = 0; i < 3 && prev; i++) {
+      for (let i = 0; i < 8 && prev; i++) {
         if (itemSet.has(prev)) { ok = true; break; }
         prev = prev.previousElementSibling;
       }
 
+      // If it is already filled (iframe/ins/img), be conservative and keep it.
+      // Prevents ads "disappearing too fast" during ajaxify churn / minor rerenders.
+      if (!ok) {
+        try {
+          const ph = wrap.querySelector && wrap.querySelector(`[id^="${PLACEHOLDER_PREFIX}"]`);
+          const filled = !!(ph && ph.querySelector && ph.querySelector('iframe, ins, img, .ez-ad, .ezoic-ad'));
+          if (filled) ok = true;
+        } catch (e) {}
+      }
+
       if (!ok) {
         const id = getWrapIdFromWrap(wrap);
         withInternalDomChange(() => {
@@ -368,6 +396,28 @@ function withInternalDomChange(fn) {
     return removed;
   }
 
+  function declusterWraps(kindClass) {
+    try {
+      const wraps = Array.from(document.querySelectorAll(`.${WRAP_CLASS}.${kindClass}`));
+      if (wraps.length < 2) return;
+      for (let i = 1; i < wraps.length; i++) {
+        const w = wraps[i];
+        if (!w || !w.isConnected) continue;
+        // If previous siblings contain another wrap within 2 hops, remove this one.
+        let prev = w.previousElementSibling;
+        let hops = 0;
+        while (prev && hops < 3) {
+          if (prev.classList && prev.classList.contains(WRAP_CLASS)) {
+            withInternalDomChange(() => { try { w.remove(); } catch (e) {} });
+            break;
+          }
+          prev = prev.previousElementSibling;
+          hops++;
+        }
+      }
+    } catch (e) {}
+  }
+
   function refreshEmptyState(id) {
     // After Ezoic has had a moment to fill the placeholder, toggle the CSS class.
     window.setTimeout(() => {
@@ -383,17 +433,25 @@ function withInternalDomChange(fn) {
     }, 3500);
   }
 
-function buildWrap(id, kindClass, afterPos) {
+function buildWrap(id, kindClass, afterPos, existingPlaceholder) {
     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%';
 
-    const ph = document.createElement('div');
-    ph.id = `${PLACEHOLDER_PREFIX}${id}`;
-    ph.setAttribute('data-ezoic-id', String(id));
-    wrap.appendChild(ph);
+    if (existingPlaceholder && existingPlaceholder.nodeType === 1) {
+      try {
+        existingPlaceholder.id = `${PLACEHOLDER_PREFIX}${id}`;
+        existingPlaceholder.setAttribute('data-ezoic-id', String(id));
+      } catch (e) {}
+      wrap.appendChild(existingPlaceholder);
+    } else {
+      const ph = document.createElement('div');
+      ph.id = `${PLACEHOLDER_PREFIX}${id}`;
+      ph.setAttribute('data-ezoic-id', String(id));
+      wrap.appendChild(ph);
+    }
 
     return wrap;
   }
@@ -407,24 +465,28 @@ function buildWrap(id, kindClass, afterPos) {
     if (findWrap(kindClass, afterPos)) return null;
     if (insertingIds.has(id)) return null;
 
-    const existingPh = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
-
     insertingIds.add(id);
     try {
-      const wrap = buildWrap(id, kindClass, afterPos);
-      target.insertAdjacentElement('afterend', wrap);
-
-      // If a placeholder with this id already exists elsewhere (some Ezoic flows
-      // pre-create placeholders), move it into our wrapper instead of aborting.
-      // replaceChild moves the node atomically (no detach window).
-      if (existingPh && existingPh !== wrap.firstElementChild) {
+      const existingPh = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
+
+      // CRITICAL: never create a second element with the same id, even briefly.
+      // That can trigger "Placeholder Id ... already been defined" during load.
+      // If an existing placeholder already exists, move it into the new wrapper
+      // before inserting the wrapper into the DOM.
+      let moved = null;
+      if (existingPh && existingPh.isConnected) {
+        moved = existingPh;
+        // If it was inside one of our wrappers, drop that empty wrapper.
         try {
-          existingPh.setAttribute('data-ezoic-id', String(id));
-          wrap.replaceChild(existingPh, wrap.firstElementChild);
-        } catch (e) {
-          // Keep the new placeholder if replace fails.
-        }
+          const oldWrap = moved.closest && moved.closest(`.${WRAP_CLASS}`);
+          if (oldWrap && oldWrap.parentNode) {
+            withInternalDomChange(() => { try { oldWrap.remove(); } catch (e) {} });
+          }
+        } catch (e) {}
       }
+
+      const wrap = buildWrap(id, kindClass, afterPos, moved);
+      target.insertAdjacentElement('afterend', wrap);
       return wrap;
     } finally {
       insertingIds.delete(id);
@@ -752,6 +814,7 @@ function startShow(id) {
           state.allPosts,
           'curPosts'
         );
+        declusterWraps('ezoic-ad-message');
       }
     } else if (kind === 'categoryTopics') {
       if (normalizeBool(cfg.enableBetweenAds)) {
@@ -765,6 +828,7 @@ function startShow(id) {
           state.allTopics,
           'curTopics'
         );
+        declusterWraps('ezoic-ad-between');
       }
     } else if (kind === 'categories') {
       if (normalizeBool(cfg.enableCategoryAds)) {
@@ -778,6 +842,7 @@ function startShow(id) {
           state.allCategories,
           'curCategories'
         );
+        declusterWraps('ezoic-ad-categories');
       }
     }
   }