nodebb-plugin-ezoic-infinite 1.6.2 → 1.6.4

package/package.json

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

package/public/client.js

@@ -1346,34 +1346,35 @@ function buildOrdinalMap(items) {
 
 
 
+
 // ===== CLEAN REFRACTOR: visibility manager for Ezoic wraps =====
 (function () {
-  // v3 improvements:
-  // - Faster global rendering: larger preload margin, higher show throughput.
-  // - Reliable on UP-scroll: scroll-proximity scanner enqueues showAds for near-viewport wraps even if IO doesn't fire.
+  // 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.
 
   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;
 
-  // We never remove message wraps; only very conservative cleanup for between wraps.
-  var KEEP_MARGIN_BETWEEN_DESKTOP = 3200;
-  var KEEP_MARGIN_BETWEEN_MOBILE  = 2300;
+  var KEEP_MARGIN_BETWEEN_DESKTOP = 2600;
+  var KEEP_MARGIN_BETWEEN_MOBILE  = 1900;
 
-  // Show tuning
-  var SHOW_COOLDOWN_MS = 650;   // faster re-show when coming back up
-  var MAX_SHOW_PER_TICK = 10;   // higher throughput for long scroll pages
+  // Show tuning (safe/moderate)
+  var SHOW_COOLDOWN_MS = 900;
+  var MAX_SHOW_PER_TICK = 6;
 
-  // Proximity scan (fix up-scroll non-display)
-  var PROXIMITY_SCAN_COOLDOWN_MS = 180;
-  var PROXIMITY_MARGIN_DESKTOP = 1400; // px above+below viewport
-  var PROXIMITY_MARGIN_MOBILE  = 1100;
+  // 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; }
-  function proximityMargin() { return isMobile() ? PROXIMITY_MARGIN_MOBILE : PROXIMITY_MARGIN_DESKTOP; }
 
   var lastShowById = Object.create(null);
   var showQueue = [];
@@ -1430,7 +1431,7 @@ function buildOrdinalMap(items) {
       if (removed >= 3) return;
       try {
         var lv = parseInt(w.getAttribute('data-last-visible') || '0', 10);
-        if (lv && (Date.now() - lv) < 15000) return;
+        if (lv && (Date.now() - lv) < 12000) return;
 
         var r = w.getBoundingClientRect();
         if (r.bottom < -margin || r.top > ((window.innerHeight || 0) + margin)) {
@@ -1441,7 +1442,7 @@ function buildOrdinalMap(items) {
     });
   }
 
-  // IntersectionObserver: preload well before viewport
+  // IO: preload earlier for faster display
   var io = null;
   function installIO() {
     if (io || typeof IntersectionObserver === 'undefined') return;
@@ -1457,12 +1458,11 @@ function buildOrdinalMap(items) {
           }
         });
       } catch (e) {}
-    }, { root: null, rootMargin: '1400px 0px 1400px 0px', threshold: 0.01 });
+    }, { 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) {}
   }
 
-  // Observe new wraps
   var moInstalled = false;
   function installMO() {
     if (moInstalled || typeof MutationObserver === 'undefined') return;
@@ -1496,37 +1496,89 @@ function buildOrdinalMap(items) {
     try { mo.observe(document.documentElement || document.body, { childList: true, subtree: true }); } catch (e) {}
   }
 
-  // Proximity scanner: ensures re-show on up-scroll even if IO doesn't trigger (e.g. cached intersection state)
-  var lastScan = 0;
-  function proximityScan() {
+  function closestWrap(el) {
+    try {
+      while (el && el !== document.body && el !== document.documentElement) {
+        if (el.classList && el.classList.contains('nodebb-ezoic-wrap')) return el;
+        el = el.parentElement;
+      }
+    } 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 - lastScan < PROXIMITY_SCAN_COOLDOWN_MS) return;
-    lastScan = now;
+    if (now - lastWalk < WALK_COOLDOWN_MS) return;
+    lastWalk = now;
+
+    if (typeof document.elementFromPoint !== 'function') return;
 
-    var margin = proximityMargin();
     var vh = window.innerHeight || document.documentElement.clientHeight || 0;
+    if (!vh) return;
 
-    var wraps;
-    try { wraps = document.querySelectorAll(WRAP_SELECTOR); } catch (e) { return; }
+    // 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)];
 
-    var budget = 12; // don't scan too heavy
-    for (var i = 0; i < wraps.length && budget > 0; i++) {
-      var w = wraps[i];
-      try {
-        var r = w.getBoundingClientRect();
-        if (r.bottom >= -margin && r.top <= (vh + margin)) {
-          var id = getWrapId(w) || getPlaceholderId(w);
-          if (id) enqueueShow(id);
-          budget--;
-        }
-      } catch (e) {}
+    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;
+      }
+
+      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]);
+          }
+        } catch (e) {}
+        backward = backward.previousElementSibling;
+      }
     }
   }
 
-  // Sweep only between cleanup
   var sweepPending = false;
   var lastSweep = 0;
-  var SWEEP_COOLDOWN_MS = 700;
+  var SWEEP_COOLDOWN_MS = 600;
 
   function scheduleSweep() {
     var now = Date.now();
@@ -1542,7 +1594,7 @@ function buildOrdinalMap(items) {
 
   function onScroll() {
     scheduleSweep();
-    proximityScan();
+    viewportWalkEnqueue();
     scheduleShowTick();
   }
 
@@ -1555,10 +1607,7 @@ function buildOrdinalMap(items) {
 
     if (window.jQuery) {
       window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function () {
-        setTimeout(function () {
-          installIO();
-          onScroll();
-        }, 0);
+        setTimeout(function () { installIO(); onScroll(); }, 0);
       });
     }
 
@@ -1572,3 +1621,4 @@ function buildOrdinalMap(items) {
 
 
 
+