nodebb-plugin-ezoic-infinite 1.5.76 → 1.5.78

package/package.json

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

package/public/client.js

@@ -10,7 +10,10 @@
   const POOL_ID = 'nodebb-ezoic-placeholder-pool';
 
   // Smoothness caps
-  const MAX_INSERTS_PER_RUN = 3;
+  // Limit how many placements we inject per scan pass.
+  // Too low = you end up with only a handful of placeholders after ajaxify.
+  // Too high = jank on very long pages.
+  const MAX_INSERTS_PER_RUN = 8;
 
   // Keep empty (unfilled) wraps alive for a while. Topics/messages can fill late (auction/CMP).
   // Pruning too early makes ads look like they "disappear" while scrolling.
@@ -135,11 +138,8 @@ function tightenEzoicMinHeight(wrap) {
     }
     if (!maxBottom) return;
 
-    // Account for the Ezoic badge (reportline) which is absolutely positioned.
-    const report = refNode.querySelector('.reportline');
-    if (report && report.offsetHeight) {
-      maxBottom += report.offsetHeight;
-    }
+    // NOTE: Do NOT add the Ezoic badge (reportline) height here.
+    // It is absolutely positioned and should not reserve layout space.
 
     const h = Math.max(1, Math.ceil(maxBottom));
 
@@ -229,6 +229,9 @@ function globalGapFixInit() {
     if (window.__nodebbEzoicGapFix) return;
     window.__nodebbEzoicGapFix = true;
 
+    // Observe only the main content area to minimize overhead.
+    const root = document.getElementById('content') || document.querySelector('[component="content"], #panel') || document.body;
+
     const inPostArea = (el) => {
       try {
         return !!(el && el.closest && el.closest('[component="post"], .topic, .posts, [component="topic"]'));
@@ -249,21 +252,37 @@ function globalGapFixInit() {
       });
     };
 
-    requestAnimationFrame(() => maybeFix(document));
+    requestAnimationFrame(() => maybeFix(root));
+
+    // Batch DOM mutation processing into a single rAF to avoid doing work per mutation.
+    const pending = new Set();
+    let scheduled = false;
+    const scheduleFlush = () => {
+      if (scheduled) return;
+      scheduled = true;
+      requestAnimationFrame(() => {
+        scheduled = false;
+        pending.forEach((n) => {
+          try { maybeFix(n); } catch (e) {}
+        });
+        pending.clear();
+      });
+    };
 
     const obs = new MutationObserver((muts) => {
       for (const m of muts) {
-        const t = m.target;
         if (m.type === 'attributes') {
-          maybeFix(t && t.nodeType === 1 ? t : t && t.parentElement);
+          const t = m.target && m.target.nodeType === 1 ? m.target : m.target && m.target.parentElement;
+          if (t) pending.add(t);
         } else if (m.addedNodes && m.addedNodes.length) {
           m.addedNodes.forEach((n) => {
-            if (n && n.nodeType === 1) maybeFix(n);
+            if (n && n.nodeType === 1) pending.add(n);
           });
         }
       }
+      if (pending.size) scheduleFlush();
     });
-    obs.observe(document.documentElement, { subtree: true, childList: true, attributes: true, attributeFilter: ['style'] });
+    obs.observe(root, { subtree: true, childList: true, attributes: true, attributeFilter: ['style'] });
   } catch (e) {}
 }
 
@@ -570,12 +589,11 @@ function globalGapFixInit() {
     if (!state.allPosts.length) state.allPosts = parsePool(cfg.messagePlaceholderIds);
     if (!state.allCategories.length) state.allCategories = parsePool(cfg.categoryPlaceholderIds);
 
-    // Create placeholders up-front in an offscreen pool.
-    // Ezoic may attempt to define/show ids during load; if they don't exist yet,
-    // it can spam errors and sometimes short-circuit. Pooling keeps ids existing without layout.
-    primePlaceholderPool(state.allTopics);
-    primePlaceholderPool(state.allPosts);
-    primePlaceholderPool(state.allCategories);
+    // IMPORTANT:
+    // We do NOT prime a DOM pool anymore.
+    // Keeping placeholders connected (even offscreen) can lead Ezoic/GPT to
+    // pre-define slots, which then causes "Placeholder Id X has already been defined".
+    // Instead, we create the placeholder element only when we actually inject its wrapper.
   }
 
   // ---------------- insertion primitives ----------------
@@ -892,6 +910,16 @@ function globalGapFixInit() {
         const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
         if (!ph || !ph.isConnected) return;
 
+        // If the placeholder already has creative, avoid re-showing.
+        // Re-showing is a common source of "Placeholder Id X has already been defined".
+        try {
+          if (ph.querySelector && ph.querySelector('iframe, ins, img, video, [data-google-container-id]')) {
+            clearTimeout(hardTimer);
+            release();
+            return;
+          }
+        } catch (e) {}
+
         const t = now();
         const last = state.lastShowById.get(id) || 0;
         if (t - last < 900) return;
@@ -1229,13 +1257,29 @@ function globalGapFixInit() {
       requestBurst();
     });
 
+    // Some setups populate content in multiple phases; ensure we re-scan.
+    $(window).on('action:ajaxify.contentLoaded.ezoicInfinite', () => {
+      if (isBlocked()) return;
+      requestBurst();
+    });
+
     $(window).on(
-      'action:posts.loaded.ezoicInfinite action:topics.loaded.ezoicInfinite action:category.loaded.ezoicInfinite action:topic.loaded.ezoicInfinite',
+      'action:posts.loaded.ezoicInfinite action:topics.loaded.ezoicInfinite action:categories.loaded.ezoicInfinite action:category.loaded.ezoicInfinite action:topic.loaded.ezoicInfinite',
       () => {
         if (isBlocked()) return;
         requestBurst();
       }
     );
+
+    // Also listen through NodeBB's AMD hooks module when available.
+    try {
+      require(['hooks'], (hooks) => {
+        if (!hooks || typeof hooks.on !== 'function') return;
+        ['action:ajaxify.end', 'action:ajaxify.contentLoaded', 'action:posts.loaded', 'action:topics.loaded', 'action:categories.loaded', 'action:category.loaded', 'action:topic.loaded'].forEach((ev) => {
+          try { hooks.on(ev, () => { if (!isBlocked()) requestBurst(); }); } catch (e) {}
+        });
+      });
+    } catch (e) {}
   }
 
   function bindScroll() {