nodebb-plugin-ezoic-infinite 1.6.5 → 1.6.6

package/package.json

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

package/public/client.js

@@ -1348,30 +1348,35 @@ function buildOrdinalMap(items) {
 
 
 
+
 // ===== CLEAN REFRACTOR: visibility manager for Ezoic wraps =====
 (function () {
-  // 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.
+  // v2.4 (anchor-guard):
+  // Issue reported: when scrolling back up, ad wraps accumulate before the first post.
+  // Root cause (most likely): some script/virtualization detaches ad nodes from their original place and
+  // re-inserts them near the top, without their original context.
   //
   // 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.
+  // - On creation of each wrap, insert a hidden "anchor" node right before it and tag the wrap with that anchor id.
+  // - Periodically validate: if a wrap is no longer immediately preceded by its anchor, remove the wrap.
+  //   (We do NOT recreate here; the normal injector will insert correct wraps as needed.)
+  //
+  // We also keep v2.3 no-redefine rules:
+  // - no wrap deletion for cleanup except for misplaced wraps / duplicate placeholders
+  // - showAds only once per placeholder id
 
   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;
 
-  // show tuning (safe)
   var MAX_SHOW_PER_TICK = 4;
 
+  // validation throttles
+  var VALIDATE_COOLDOWN_MS = 260;
+  var lastValidate = 0;
+
   // internal state
-  var activatedById = Object.create(null);   // id -> ts
+  var activatedById = Object.create(null);
   var showQueue = [];
   var showTicking = false;
 
@@ -1388,7 +1393,6 @@ function buildOrdinalMap(items) {
 
   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;
@@ -1398,9 +1402,7 @@ function buildOrdinalMap(items) {
 
   function enqueueShow(id) {
     if (!id) 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);
     scheduleShowTick();
@@ -1426,7 +1428,78 @@ function buildOrdinalMap(items) {
     });
   }
 
-  // De-duplicate placeholders to avoid Ezoic warnings.
+  // --- Anchor guard ---
+  function ensureAnchor(w) {
+    try {
+      if (!w || !w.parentNode) return;
+      if (w.getAttribute('data-ezoic-anchored') === '1') return;
+
+      var wrapUid = w.getAttribute('data-ezoic-wrapuid');
+      if (!wrapUid) {
+        wrapUid = String(Date.now()) + '-' + Math.floor(Math.random() * 1e9);
+        w.setAttribute('data-ezoic-wrapuid', wrapUid);
+      }
+
+      // If already preceded by matching anchor, mark anchored.
+      var prev = w.previousSibling;
+      if (prev && prev.nodeType === 1 && prev.classList && prev.classList.contains('nodebb-ezoic-anchor')) {
+        if (prev.getAttribute('data-anchor-for') === wrapUid) {
+          w.setAttribute('data-ezoic-anchored', '1');
+          return;
+        }
+      }
+
+      // Create anchor node
+      var a = document.createElement('span');
+      a.className = 'nodebb-ezoic-anchor';
+      a.setAttribute('data-anchor-for', wrapUid);
+      a.style.display = 'none';
+
+      w.parentNode.insertBefore(a, w);
+      w.setAttribute('data-ezoic-anchored', '1');
+    } catch (e) {}
+  }
+
+  function validateAnchors() {
+    var now = Date.now();
+    if (now - lastValidate < VALIDATE_COOLDOWN_MS) return;
+    lastValidate = now;
+
+    try {
+      // Remove wraps that lost their anchor adjacency (they have been moved)
+      var wraps = document.querySelectorAll('.nodebb-ezoic-wrap');
+      for (var i = 0; i < wraps.length; i++) {
+        var w = wraps[i];
+        try {
+          var uid = w.getAttribute('data-ezoic-wrapuid');
+          if (!uid) {
+            // If it's an old wrap with no uid, anchor it once.
+            ensureAnchor(w);
+            continue;
+          }
+          var prev = w.previousSibling;
+          if (!(prev && prev.nodeType === 1 && prev.classList && prev.classList.contains('nodebb-ezoic-anchor') && prev.getAttribute('data-anchor-for') === uid)) {
+            // Misplaced wrap -> remove it (prevents pile-up before first post)
+            w.remove();
+          }
+        } catch (e) {}
+      }
+
+      // Remove orphan anchors (anchor without following wrap)
+      var anchors = document.querySelectorAll('.nodebb-ezoic-anchor');
+      for (var j = 0; j < anchors.length; j++) {
+        var a = anchors[j];
+        try {
+          var next = a.nextSibling;
+          if (!(next && next.nodeType === 1 && next.classList && next.classList.contains('nodebb-ezoic-wrap'))) {
+            a.remove();
+          }
+        } catch (e) {}
+      }
+    } catch (e) {}
+  }
+
+  // --- De-dupe placeholders to avoid Ezoic warnings ---
   function dedupePlaceholders() {
     var seen = Object.create(null);
     try {
@@ -1434,10 +1507,15 @@ function buildOrdinalMap(items) {
         try {
           var id = ph.getAttribute('data-ezoic-id');
           if (!id) return;
+          var wrap = ph.closest('.nodebb-ezoic-wrap');
+          if (!wrap) return;
+
+          // ensure anchor for any wrap we touch
+          ensureAnchor(wrap);
+
           if (seen[id]) {
-            // remove duplicate wrapper entirely (keep first occurrence)
-            var wrap = ph.closest('.nodebb-ezoic-wrap');
-            if (wrap) wrap.remove();
+            // remove duplicates; keep first occurrence
+            wrap.remove();
           } else {
             seen[id] = true;
           }
@@ -1446,7 +1524,7 @@ function buildOrdinalMap(items) {
     } catch (e) {}
   }
 
-  // Track visibility: when a wrap comes near viewport, trigger show once if empty.
+  // --- Visibility: trigger show once if empty ---
   var io = null;
   function installIO() {
     if (io || typeof IntersectionObserver === 'undefined') return;
@@ -1455,8 +1533,11 @@ function buildOrdinalMap(items) {
       try {
         entries.forEach(function (e) {
           if (!e || !e.target) return;
+
+          // Always ensure anchor while visible/near
+          ensureAnchor(e.target);
+
           if (e.isIntersecting) {
-            // If the slot is already filled, mark it as activated to prevent re-define attempts.
             var id = getId(e.target);
             if (!id) return;
 
@@ -1470,17 +1551,16 @@ function buildOrdinalMap(items) {
       } catch (e) {}
     }, { root: null, rootMargin: '1200px 0px 1200px 0px', threshold: 0.01 });
 
-    try { document.querySelectorAll(WRAP_SELECTOR).forEach(function (w) { try { io.observe(w); } catch(e) {} }); } catch (e) {}
+    try { document.querySelectorAll(WRAP_SELECTOR).forEach(function (w) { try { ensureAnchor(w); io.observe(w); } catch(e) {} }); } catch (e) {}
   }
 
-  // Observe newly added wraps and observe them + dedupe
+  // Observe newly added wraps and anchor them
   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;
@@ -1493,14 +1573,15 @@ function buildOrdinalMap(items) {
             if (!n || n.nodeType !== 1) continue;
 
             if (n.matches && n.matches(WRAP_SELECTOR)) {
+              ensureAnchor(n);
               try { io.observe(n); } catch (e) {}
-              // 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++) {
+                ensureAnchor(inner[k]);
                 try { io.observe(inner[k]); } catch (e) {}
               }
             }
@@ -1513,14 +1594,16 @@ function buildOrdinalMap(items) {
   }
 
   function init() {
-    // 1) dedupe existing
+    // anchor + dedupe existing
+    try {
+      document.querySelectorAll('.nodebb-ezoic-wrap').forEach(function (w) { ensureAnchor(w); });
+    } catch (e) {}
     dedupePlaceholders();
 
-    // 2) install observers
     installIO();
     installMO();
 
-    // 3) initial eager show for empty visible-ish wraps (bounded)
+    // initial eager show for empty visible-ish wraps (bounded)
     try {
       var vh = window.innerHeight || document.documentElement.clientHeight || 0;
       var margin = 900;
@@ -1528,6 +1611,7 @@ function buildOrdinalMap(items) {
       var budget = 12;
       for (var i = 0; i < wraps.length && budget > 0; i++) {
         var w = wraps[i];
+        ensureAnchor(w);
         var r = w.getBoundingClientRect();
         if (r.bottom >= -margin && r.top <= (vh + margin)) {
           var id = getId(w);
@@ -1540,19 +1624,31 @@ function buildOrdinalMap(items) {
       }
     } catch (e) {}
 
-    window.addEventListener('scroll', scheduleShowTick, { passive: true });
-    window.addEventListener('resize', scheduleShowTick, { passive: true });
+    // validate regularly on scroll/resize (cheap)
+    window.addEventListener('scroll', function () {
+      validateAnchors();
+      scheduleShowTick();
+    }, { passive: true });
+    window.addEventListener('resize', function () {
+      validateAnchors();
+      scheduleShowTick();
+    }, { passive: true });
 
     if (window.jQuery) {
       window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function () {
         setTimeout(function () {
+          try { document.querySelectorAll('.nodebb-ezoic-wrap').forEach(function (w) { ensureAnchor(w); }); } catch (e) {}
           dedupePlaceholders();
+          validateAnchors();
           scheduleShowTick();
         }, 0);
       });
     }
 
-    setTimeout(scheduleShowTick, 0);
+    // periodic validate safety net
+    setInterval(validateAnchors, 1200);
+
+    setTimeout(function () { validateAnchors(); scheduleShowTick(); }, 0);
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
@@ -1564,3 +1660,4 @@ function buildOrdinalMap(items) {
 
 
 
+