nodebb-plugin-ezoic-infinite 1.6.0 → 1.6.2

package/package.json

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

package/public/client.js

@@ -1344,28 +1344,93 @@ function buildOrdinalMap(items) {
 
 
 
+
+
 // ===== CLEAN REFRACTOR: visibility manager for Ezoic wraps =====
 (function () {
-  var WRAP_SELECTOR = '.nodebb-ezoic-wrap.ezoic-ad-between, .nodebb-ezoic-wrap.ezoic-ad-message';
-  var KEEP_MARGIN_PX_DESKTOP = 1600;
-  var KEEP_MARGIN_PX_MOBILE  = 1100;
-  var MAX_REMOVALS_PER_SWEEP = 6;
+  // 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.
+
+  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;
+
+  // 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
+
+  // 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;
 
   function isMobile() {
     try { return window.matchMedia && window.matchMedia('(max-width: 767px)').matches; } catch (e) { return false; }
   }
-  function keepMargin() { return isMobile() ? KEEP_MARGIN_PX_MOBILE : KEEP_MARGIN_PX_DESKTOP; }
+  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 = [];
+  var showTicking = false;
+
+  function getWrapId(w) {
+    try { return w.getAttribute('data-ezoic-wrapid'); } catch (e) { return null; }
+  }
+  function getPlaceholderId(w) {
+    try {
+      var ph = w.querySelector('[data-ezoic-id]');
+      return ph ? ph.getAttribute('data-ezoic-id') : null;
+    } catch (e) { return null; }
+  }
+
+  function enqueueShow(id) {
+    if (!id) return;
+    var now = Date.now();
+    var last = lastShowById[id] || 0;
+    if (now - last < SHOW_COOLDOWN_MS) return;
+
+    for (var i = 0; i < showQueue.length; i++) if (showQueue[i] === id) return;
+    showQueue.push(id);
+    scheduleShowTick();
+  }
+
+  function scheduleShowTick() {
+    if (showTicking) return;
+    showTicking = true;
+    requestAnimationFrame(function () {
+      showTicking = false;
+      var n = 0;
+      while (showQueue.length && n < MAX_SHOW_PER_TICK) {
+        var id = showQueue.shift();
+        try {
+          if (window.ezstandalone && typeof window.ezstandalone.showAds === 'function') {
+            window.ezstandalone.showAds(String(id));
+            lastShowById[id] = Date.now();
+          }
+        } catch (e) {}
+        n++;
+      }
+      if (showQueue.length) scheduleShowTick();
+    });
+  }
 
-  function removeFarWraps() {
-    var margin = keepMargin();
+  function removeFarBetweenWraps() {
+    var margin = keepMarginBetween();
     var removed = 0;
     var wraps;
-    try { wraps = document.querySelectorAll(WRAP_SELECTOR); } catch (e) { return; }
+    try { wraps = document.querySelectorAll(BETWEEN_SELECTOR); } catch (e) { return; }
+
     wraps.forEach(function (w) {
-      if (removed >= MAX_REMOVALS_PER_SWEEP) return;
+      if (removed >= 3) return;
       try {
         var lv = parseInt(w.getAttribute('data-last-visible') || '0', 10);
-        if (lv && (Date.now() - lv) < 8000) return;
+        if (lv && (Date.now() - lv) < 15000) return;
 
         var r = w.getBoundingClientRect();
         if (r.bottom < -margin || r.top > ((window.innerHeight || 0) + margin)) {
@@ -1376,26 +1441,33 @@ function buildOrdinalMap(items) {
     });
   }
 
+  // IntersectionObserver: preload well before viewport
   var io = null;
   function installIO() {
     if (io || typeof IntersectionObserver === 'undefined') return;
+
     io = new IntersectionObserver(function (entries) {
       try {
         entries.forEach(function (e) {
-          if (e && e.target && e.isIntersecting) {
+          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);
           }
         });
       } catch (e) {}
-    }, { root: null, rootMargin: '0px', threshold: 0.01 });
+    }, { root: null, rootMargin: '1400px 0px 1400px 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;
     moInstalled = true;
+
     var mo = new MutationObserver(function (muts) {
       if (!io) return;
       try {
@@ -1405,8 +1477,11 @@ function buildOrdinalMap(items) {
           for (var j = 0; j < m.addedNodes.length; j++) {
             var n = m.addedNodes[j];
             if (!n || n.nodeType !== 1) continue;
+
             if (n.matches && n.matches(WRAP_SELECTOR)) {
               try { io.observe(n); } catch (e) {}
+              var id = getWrapId(n) || getPlaceholderId(n);
+              if (id) enqueueShow(id);
             } else if (n.querySelectorAll) {
               var inner = n.querySelectorAll(WRAP_SELECTOR);
               for (var k = 0; k < inner.length; k++) {
@@ -1417,12 +1492,41 @@ function buildOrdinalMap(items) {
         }
       } catch (e) {}
     });
+
     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() {
+    var now = Date.now();
+    if (now - lastScan < PROXIMITY_SCAN_COOLDOWN_MS) return;
+    lastScan = now;
+
+    var margin = proximityMargin();
+    var vh = window.innerHeight || document.documentElement.clientHeight || 0;
+
+    var wraps;
+    try { wraps = document.querySelectorAll(WRAP_SELECTOR); } catch (e) { return; }
+
+    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) {}
+    }
+  }
+
+  // Sweep only between cleanup
   var sweepPending = false;
   var lastSweep = 0;
-  var SWEEP_COOLDOWN_MS = 250;
+  var SWEEP_COOLDOWN_MS = 700;
 
   function scheduleSweep() {
     var now = Date.now();
@@ -1432,22 +1536,33 @@ function buildOrdinalMap(items) {
     requestAnimationFrame(function () {
       sweepPending = false;
       lastSweep = Date.now();
-      removeFarWraps();
+      removeFarBetweenWraps();
     });
   }
 
+  function onScroll() {
+    scheduleSweep();
+    proximityScan();
+    scheduleShowTick();
+  }
+
   function init() {
     installIO();
     installMO();
-    window.addEventListener('scroll', scheduleSweep, { passive: true });
-    window.addEventListener('resize', scheduleSweep, { passive: true });
+
+    window.addEventListener('scroll', onScroll, { passive: true });
+    window.addEventListener('resize', onScroll, { passive: true });
 
     if (window.jQuery) {
       window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function () {
-        setTimeout(function () { installIO(); scheduleSweep(); }, 0);
+        setTimeout(function () {
+          installIO();
+          onScroll();
+        }, 0);
       });
     }
-    setTimeout(function () { installIO(); scheduleSweep(); }, 0);
+
+    setTimeout(function () { installIO(); onScroll(); }, 0);
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
@@ -1455,3 +1570,5 @@ function buildOrdinalMap(items) {
 })();
 // ===== /CLEAN REFRACTOR =====
 
+
+