nodebb-plugin-ezoic-infinite 1.6.4 → 1.6.6

package/package.json

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

package/public/client.js

@@ -1347,55 +1347,62 @@ function buildOrdinalMap(items) {
 
 
 
+
+
 // ===== CLEAN REFRACTOR: visibility manager for Ezoic wraps =====
 (function () {
-  // v2.2:
-  // - Fix "after long scroll: no ads down / no ads up" caused by O(n) scans with a small budget.
-  // - Replace the near-viewport scan with a viewport-walk using elementFromPoint + sibling traversal.
-  //   This stays O(k) even with thousands of posts.
+  // 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:
+  // - 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;
 
-  var KEEP_MARGIN_BETWEEN_DESKTOP = 2600;
-  var KEEP_MARGIN_BETWEEN_MOBILE  = 1900;
+  var MAX_SHOW_PER_TICK = 4;
 
-  // Show tuning (safe/moderate)
-  var SHOW_COOLDOWN_MS = 900;
-  var MAX_SHOW_PER_TICK = 6;
+  // validation throttles
+  var VALIDATE_COOLDOWN_MS = 260;
+  var lastValidate = 0;
 
-  // Viewport-walk tuning
-  var WALK_COOLDOWN_MS = 180;
-  var lastWalk = 0;
-  var WALK_STEPS = 28;     // siblings in each direction
-  var WALK_POINTS = 2;     // sample top & bottom area of viewport
-
-  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; }
-
-  var lastShowById = Object.create(null);
+  // internal state
+  var activatedById = Object.create(null);
   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 (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;
-
+    if (activatedById[id]) return;
     for (var i = 0; i < showQueue.length; i++) if (showQueue[i] === id) return;
     showQueue.push(id);
     scheduleShowTick();
@@ -1410,9 +1417,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++;
@@ -1421,28 +1428,103 @@ function buildOrdinalMap(items) {
     });
   }
 
-  function removeFarBetweenWraps() {
-    var margin = keepMarginBetween();
-    var removed = 0;
-    var wraps;
-    try { wraps = document.querySelectorAll(BETWEEN_SELECTOR); } catch (e) { return; }
+  // --- Anchor guard ---
+  function ensureAnchor(w) {
+    try {
+      if (!w || !w.parentNode) return;
+      if (w.getAttribute('data-ezoic-anchored') === '1') 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 wrapUid = w.getAttribute('data-ezoic-wrapuid');
+      if (!wrapUid) {
+        wrapUid = String(Date.now()) + '-' + Math.floor(Math.random() * 1e9);
+        w.setAttribute('data-ezoic-wrapuid', wrapUid);
+      }
 
-        var r = w.getBoundingClientRect();
-        if (r.bottom < -margin || r.top > ((window.innerHeight || 0) + margin)) {
-          w.remove();
-          removed += 1;
+      // 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;
         }
-      } catch (e) {}
-    });
+      }
+
+      // 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) {}
   }
 
-  // IO: preload earlier for faster display
+  // --- De-dupe 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;
+          var wrap = ph.closest('.nodebb-ezoic-wrap');
+          if (!wrap) return;
+
+          // ensure anchor for any wrap we touch
+          ensureAnchor(wrap);
+
+          if (seen[id]) {
+            // remove duplicates; keep first occurrence
+            wrap.remove();
+          } else {
+            seen[id] = true;
+          }
+        } catch (e) {}
+      });
+    } catch (e) {}
+  }
+
+  // --- Visibility: trigger show once if empty ---
   var io = null;
   function installIO() {
     if (io || typeof IntersectionObserver === 'undefined') return;
@@ -1451,24 +1533,36 @@ 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) {
-            try { e.target.setAttribute('data-last-visible', String(Date.now())); } catch (err) {}
-            var id = getWrapId(e.target) || getPlaceholderId(e.target);
-            if (id) enqueueShow(id);
+            var id = getId(e.target);
+            if (!id) return;
+
+            if (isFilled(e.target)) {
+              activatedById[id] = activatedById[id] || Date.now();
+              return;
+            }
+            enqueueShow(id);
           }
         });
       } 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 anchor them
   var moInstalled = false;
   function installMO() {
     if (moInstalled || typeof MutationObserver === 'undefined') return;
     moInstalled = true;
 
     var mo = new MutationObserver(function (muts) {
+      try { dedupePlaceholders(); } catch (e) {}
+
       if (!io) return;
       try {
         for (var i = 0; i < muts.length; i++) {
@@ -1479,12 +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) {}
-              var id = getWrapId(n) || getPlaceholderId(n);
-              if (id) enqueueShow(id);
+              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) {}
               }
             }
@@ -1496,122 +1593,62 @@ function buildOrdinalMap(items) {
     try { mo.observe(document.documentElement || document.body, { childList: true, subtree: true }); } catch (e) {}
   }
 
-  function closestWrap(el) {
+  function init() {
+    // anchor + dedupe existing
     try {
-      while (el && el !== document.body && el !== document.documentElement) {
-        if (el.classList && el.classList.contains('nodebb-ezoic-wrap')) return el;
-        el = el.parentElement;
-      }
+      document.querySelectorAll('.nodebb-ezoic-wrap').forEach(function (w) { ensureAnchor(w); });
     } catch (e) {}
-    return null;
-  }
-
-  function enqueueWrap(w) {
-    if (!w) return;
-    var id = getWrapId(w) || getPlaceholderId(w);
-    if (id) enqueueShow(id);
-  }
-
-  // Viewport-walk: find content near viewport and walk siblings to pick nearby wraps.
-  function viewportWalkEnqueue() {
-    var now = Date.now();
-    if (now - lastWalk < WALK_COOLDOWN_MS) return;
-    lastWalk = now;
-
-    if (typeof document.elementFromPoint !== 'function') return;
-
-    var vh = window.innerHeight || document.documentElement.clientHeight || 0;
-    if (!vh) return;
+    dedupePlaceholders();
 
-    // sample points: near top and near bottom
-    var ys = [Math.min(vh - 10, 140), Math.max(10, vh - 180)];
-    if (WALK_POINTS === 1) ys = [Math.min(vh - 10, 180)];
-
-    for (var p = 0; p < ys.length; p++) {
-      var y = ys[p];
-      var el = null;
-      try { el = document.elementFromPoint(10, y); } catch (e) {}
-      if (!el) continue;
-
-      // ascend to a stable list item, then traverse siblings
-      var cursor = el;
-      // try to find an item container to traverse in topic lists
-      for (var i = 0; i < 8 && cursor && cursor.parentElement; i++) {
-        if (cursor.classList && (cursor.classList.contains('topic-item') || cursor.classList.contains('posts-list') || cursor.classList.contains('category-item'))) break;
-        cursor = cursor.parentElement;
-      }
-      // if cursor isn't traversable, just use the element itself
-      cursor = cursor || el;
-
-      // find nearest wrap around this point
-      enqueueWrap(closestWrap(el));
-
-      // walk next/prev siblings and enqueue wraps found
-      var forward = cursor;
-      for (var s = 0; s < WALK_STEPS; s++) {
-        if (!forward) break;
-        // check within forward node for wraps
-        try {
-          if (forward.matches && forward.matches(WRAP_SELECTOR)) enqueueWrap(forward);
-          if (forward.querySelectorAll) {
-            var w1 = forward.querySelectorAll(WRAP_SELECTOR);
-            for (var wi = 0; wi < w1.length; wi++) enqueueWrap(w1[wi]);
-          }
-        } catch (e) {}
-        forward = forward.nextElementSibling;
-      }
+    installIO();
+    installMO();
 
-      var backward = cursor;
-      for (var s2 = 0; s2 < WALK_STEPS; s2++) {
-        if (!backward) break;
-        try {
-          if (backward.matches && backward.matches(WRAP_SELECTOR)) enqueueWrap(backward);
-          if (backward.querySelectorAll) {
-            var w2 = backward.querySelectorAll(WRAP_SELECTOR);
-            for (var wj = 0; wj < w2.length; wj++) enqueueWrap(w2[wj]);
+    // 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];
+        ensureAnchor(w);
+        var r = w.getBoundingClientRect();
+        if (r.bottom >= -margin && r.top <= (vh + margin)) {
+          var id = getId(w);
+          if (id) {
+            if (isFilled(w)) activatedById[id] = activatedById[id] || Date.now();
+            else enqueueShow(id);
           }
-        } catch (e) {}
-        backward = backward.previousElementSibling;
+          budget--;
+        }
       }
-    }
-  }
-
-  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();
-    viewportWalkEnqueue();
-    scheduleShowTick();
-  }
-
-  function init() {
-    installIO();
-    installMO();
+    } catch (e) {}
 
-    window.addEventListener('scroll', onScroll, { passive: true });
-    window.addEventListener('resize', onScroll, { 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 () { installIO(); onScroll(); }, 0);
+        setTimeout(function () {
+          try { document.querySelectorAll('.nodebb-ezoic-wrap').forEach(function (w) { ensureAnchor(w); }); } catch (e) {}
+          dedupePlaceholders();
+          validateAnchors();
+          scheduleShowTick();
+        }, 0);
       });
     }
 
-    setTimeout(function () { installIO(); onScroll(); }, 0);
+    // periodic validate safety net
+    setInterval(validateAnchors, 1200);
+
+    setTimeout(function () { validateAnchors(); scheduleShowTick(); }, 0);
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
@@ -1622,3 +1659,5 @@ function buildOrdinalMap(items) {
 
 
 
+
+