nodebb-plugin-ezoic-infinite 1.6.3 → 1.6.5

package/package.json

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

package/public/client.js

@@ -1346,54 +1346,60 @@ function buildOrdinalMap(items) {
 
 
 
+
+
 // ===== CLEAN REFRACTOR: visibility manager for Ezoic wraps =====
 (function () {
-  // v2.1 (safe):
-  // - Keep the v2 behavior that didn't break forum rendering.
-  // - Improve speed moderately (earlier preload + slightly higher show throughput).
-  // - Improve up-scroll reliability without scanning the whole DOM:
-  //   * on scroll, enqueue showAds for wraps currently in/near viewport (small bounded loop).
+  // v2.3 (no-redefine):
+  // Your logs show:
+  // - "Placeholder Id XXX has already been defined"
+  // - "No valid placeholders for loadMore"
+  //
+  // Root cause: calling showAds repeatedly for the same placeholder id and/or
+  // removing/recreating wrappers with the same IDs causes Ezoic to treat them as re-defined.
+  //
+  // Fix:
+  // - NEVER remove wraps/placeholders here (no DOM deletion of ads).
+  // - Only call showAds ONCE per placeholder per page lifetime (unless the placeholder is truly empty).
+  // - De-duplicate placeholders in DOM: if the same data-ezoic-id appears multiple times, keep the first.
 
   var BETWEEN_SELECTOR = '.nodebb-ezoic-wrap.ezoic-ad-between';
   var MESSAGE_SELECTOR = '.nodebb-ezoic-wrap.ezoic-ad-message';
   var WRAP_SELECTOR = BETWEEN_SELECTOR + ', ' + MESSAGE_SELECTOR;
 
-  var KEEP_MARGIN_BETWEEN_DESKTOP = 2600;
-  var KEEP_MARGIN_BETWEEN_MOBILE  = 1900;
-
-  // Show tuning (moderate)
-  var SHOW_COOLDOWN_MS = 900;
-  var MAX_SHOW_PER_TICK = 6;
-
-  // Up-scroll helper: only check near-viewport wraps, bounded
-  var SCAN_COOLDOWN_MS = 220;
-  var lastScan = 0;
-  var SCAN_BUDGET = 10;
-
-  function isMobile() {
-    try { return window.matchMedia && window.matchMedia('(max-width: 767px)').matches; } catch (e) { return false; }
-  }
-  function keepMarginBetween() { return isMobile() ? KEEP_MARGIN_BETWEEN_MOBILE : KEEP_MARGIN_BETWEEN_DESKTOP; }
+  // show tuning (safe)
+  var MAX_SHOW_PER_TICK = 4;
 
-  var lastShowById = Object.create(null);
+  // internal state
+  var activatedById = Object.create(null);   // id -> ts
   var showQueue = [];
   var showTicking = false;
 
-  function getWrapId(w) {
+  function getIdFromWrap(w) {
     try { return w.getAttribute('data-ezoic-wrapid'); } catch (e) { return null; }
   }
-  function getPlaceholderId(w) {
+  function getIdFromPlaceholder(w) {
     try {
       var ph = w.querySelector('[data-ezoic-id]');
       return ph ? ph.getAttribute('data-ezoic-id') : null;
     } catch (e) { return null; }
   }
+  function getId(w) { return getIdFromWrap(w) || getIdFromPlaceholder(w); }
+
+  function isFilled(w) {
+    try {
+      // if Ezoic/Google already injected, there will be an iframe or an element with id starting google_ads_iframe
+      if (w.querySelector('iframe')) return true;
+      if (w.querySelector('[id^="google_ads_iframe"]')) return true;
+      if (w.querySelector('.ezoic-ad')) return true;
+    } catch (e) {}
+    return false;
+  }
 
   function enqueueShow(id) {
     if (!id) return;
-    var now = Date.now();
-    var last = lastShowById[id] || 0;
-    if (now - last < SHOW_COOLDOWN_MS) return;
+    // show only once (avoid "already defined")
+    if (activatedById[id]) return;
 
     for (var i = 0; i < showQueue.length; i++) if (showQueue[i] === id) return;
     showQueue.push(id);
@@ -1409,9 +1415,9 @@ function buildOrdinalMap(items) {
       while (showQueue.length && n < MAX_SHOW_PER_TICK) {
         var id = showQueue.shift();
         try {
-          if (window.ezstandalone && typeof window.ezstandalone.showAds === 'function') {
+          if (!activatedById[id] && window.ezstandalone && typeof window.ezstandalone.showAds === 'function') {
             window.ezstandalone.showAds(String(id));
-            lastShowById[id] = Date.now();
+            activatedById[id] = Date.now();
           }
         } catch (e) {}
         n++;
@@ -1420,28 +1426,27 @@ function buildOrdinalMap(items) {
     });
   }
 
-  function removeFarBetweenWraps() {
-    var margin = keepMarginBetween();
-    var removed = 0;
-    var wraps;
-    try { wraps = document.querySelectorAll(BETWEEN_SELECTOR); } catch (e) { return; }
-
-    wraps.forEach(function (w) {
-      if (removed >= 3) return;
-      try {
-        var lv = parseInt(w.getAttribute('data-last-visible') || '0', 10);
-        if (lv && (Date.now() - lv) < 12000) return;
-
-        var r = w.getBoundingClientRect();
-        if (r.bottom < -margin || r.top > ((window.innerHeight || 0) + margin)) {
-          w.remove();
-          removed += 1;
-        }
-      } catch (e) {}
-    });
+  // De-duplicate placeholders to avoid Ezoic warnings.
+  function dedupePlaceholders() {
+    var seen = Object.create(null);
+    try {
+      document.querySelectorAll('.nodebb-ezoic-wrap [data-ezoic-id]').forEach(function (ph) {
+        try {
+          var id = ph.getAttribute('data-ezoic-id');
+          if (!id) return;
+          if (seen[id]) {
+            // remove duplicate wrapper entirely (keep first occurrence)
+            var wrap = ph.closest('.nodebb-ezoic-wrap');
+            if (wrap) wrap.remove();
+          } else {
+            seen[id] = true;
+          }
+        } catch (e) {}
+      });
+    } catch (e) {}
   }
 
-  // IO: preload earlier for faster display
+  // Track visibility: when a wrap comes near viewport, trigger show once if empty.
   var io = null;
   function installIO() {
     if (io || typeof IntersectionObserver === 'undefined') return;
@@ -1451,9 +1456,15 @@ function buildOrdinalMap(items) {
         entries.forEach(function (e) {
           if (!e || !e.target) return;
           if (e.isIntersecting) {
-            try { e.target.setAttribute('data-last-visible', String(Date.now())); } catch (err) {}
-            var id = getWrapId(e.target) || getPlaceholderId(e.target);
-            if (id) enqueueShow(id);
+            // If the slot is already filled, mark it as activated to prevent re-define attempts.
+            var id = getId(e.target);
+            if (!id) return;
+
+            if (isFilled(e.target)) {
+              activatedById[id] = activatedById[id] || Date.now();
+              return;
+            }
+            enqueueShow(id);
           }
         });
       } catch (e) {}
@@ -1462,12 +1473,16 @@ function buildOrdinalMap(items) {
     try { document.querySelectorAll(WRAP_SELECTOR).forEach(function (w) { try { io.observe(w); } catch(e) {} }); } catch (e) {}
   }
 
+  // Observe newly added wraps and observe them + dedupe
   var moInstalled = false;
   function installMO() {
     if (moInstalled || typeof MutationObserver === 'undefined') return;
     moInstalled = true;
 
     var mo = new MutationObserver(function (muts) {
+      // dedupe quickly, then observe new wraps
+      try { dedupePlaceholders(); } catch (e) {}
+
       if (!io) return;
       try {
         for (var i = 0; i < muts.length; i++) {
@@ -1479,8 +1494,10 @@ function buildOrdinalMap(items) {
 
             if (n.matches && n.matches(WRAP_SELECTOR)) {
               try { io.observe(n); } catch (e) {}
-              var id = getWrapId(n) || getPlaceholderId(n);
-              if (id) enqueueShow(id);
+              // eager show if empty
+              var id = getId(n);
+              if (id && !isFilled(n)) enqueueShow(id);
+              else if (id) activatedById[id] = activatedById[id] || Date.now();
             } else if (n.querySelectorAll) {
               var inner = n.querySelectorAll(WRAP_SELECTOR);
               for (var k = 0; k < inner.length; k++) {
@@ -1495,67 +1512,47 @@ function buildOrdinalMap(items) {
     try { mo.observe(document.documentElement || document.body, { childList: true, subtree: true }); } catch (e) {}
   }
 
-  // Small bounded scan near viewport on scroll (helps on up-scroll)
-  function scanNearViewport() {
-    var now = Date.now();
-    if (now - lastScan < SCAN_COOLDOWN_MS) return;
-    lastScan = now;
+  function init() {
+    // 1) dedupe existing
+    dedupePlaceholders();
 
-    var vh = window.innerHeight || document.documentElement.clientHeight || 0;
-    var margin = 900; // near viewport window
-    var wraps;
-    try { wraps = document.querySelectorAll(WRAP_SELECTOR); } catch (e) { return; }
+    // 2) install observers
+    installIO();
+    installMO();
 
-    var budget = SCAN_BUDGET;
-    for (var i = 0; i < wraps.length && budget > 0; i++) {
-      var w = wraps[i];
-      try {
+    // 3) initial eager show for empty visible-ish wraps (bounded)
+    try {
+      var vh = window.innerHeight || document.documentElement.clientHeight || 0;
+      var margin = 900;
+      var wraps = document.querySelectorAll(WRAP_SELECTOR);
+      var budget = 12;
+      for (var i = 0; i < wraps.length && budget > 0; i++) {
+        var w = wraps[i];
         var r = w.getBoundingClientRect();
         if (r.bottom >= -margin && r.top <= (vh + margin)) {
-          var id = getWrapId(w) || getPlaceholderId(w);
-          if (id) enqueueShow(id);
+          var id = getId(w);
+          if (id) {
+            if (isFilled(w)) activatedById[id] = activatedById[id] || Date.now();
+            else enqueueShow(id);
+          }
           budget--;
         }
-      } catch (e) {}
-    }
-  }
-
-  var sweepPending = false;
-  var lastSweep = 0;
-  var SWEEP_COOLDOWN_MS = 600;
-
-  function scheduleSweep() {
-    var now = Date.now();
-    if (now - lastSweep < SWEEP_COOLDOWN_MS) return;
-    if (sweepPending) return;
-    sweepPending = true;
-    requestAnimationFrame(function () {
-      sweepPending = false;
-      lastSweep = Date.now();
-      removeFarBetweenWraps();
-    });
-  }
-
-  function onScroll() {
-    scheduleSweep();
-    scanNearViewport();
-    scheduleShowTick();
-  }
-
-  function init() {
-    installIO();
-    installMO();
+      }
+    } catch (e) {}
 
-    window.addEventListener('scroll', onScroll, { passive: true });
-    window.addEventListener('resize', onScroll, { passive: true });
+    window.addEventListener('scroll', scheduleShowTick, { passive: true });
+    window.addEventListener('resize', scheduleShowTick, { passive: true });
 
     if (window.jQuery) {
       window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function () {
-        setTimeout(function () { installIO(); onScroll(); }, 0);
+        setTimeout(function () {
+          dedupePlaceholders();
+          scheduleShowTick();
+        }, 0);
       });
     }
 
-    setTimeout(function () { installIO(); onScroll(); }, 0);
+    setTimeout(scheduleShowTick, 0);
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
@@ -1565,3 +1562,5 @@ function buildOrdinalMap(items) {
 
 
 
+
+