nodebb-plugin-ezoic-infinite 1.5.99 → 1.6.1

package/package.json

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

package/public/client.js

@@ -1344,92 +1344,184 @@ function buildOrdinalMap(items) {
 
 
 
-// ===== V8 between-cap-per-window =====
+
+// ===== CLEAN REFRACTOR: visibility manager for Ezoic wraps =====
 (function () {
-  var ticking = false;
-  var lastRun = 0;
-  var RUN_COOLDOWN = 220; // ms
+  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;
 
-  // Keep at most N between-wraps per vertical band around viewport
-  var BAND_PX = 900;
-  var MAX_PER_BAND = 2;
+  var KEEP_MARGIN_BETWEEN_DESKTOP = 2600;
+  var KEEP_MARGIN_BETWEEN_MOBILE  = 1900;
 
-  function capBetweenWraps() {
-    var now = Date.now();
-    if (now - lastRun < RUN_COOLDOWN) return;
-    lastRun = now;
+  var SHOW_COOLDOWN_MS = 1200;
+  var MAX_SHOW_PER_TICK = 4;
 
-    var wraps;
-    try { wraps = Array.prototype.slice.call(document.querySelectorAll('.nodebb-ezoic-wrap.ezoic-ad-between')); }
-    catch (e) { return; }
+  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);
+  var showQueue = [];
+  var showTicking = false;
 
-    if (!wraps.length) return;
+  function getWrapId(w) {
+    try { return w.getAttribute('data-ezoic-wrapid'); } 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();
+  }
 
-    var y = window.pageYOffset || document.documentElement.scrollTop || 0;
-    var viewportTop = y;
-    var viewportBottom = y + (window.innerHeight || document.documentElement.clientHeight || 0);
+  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();
+    });
+  }
 
-    // Priorité: conserver ce qui est proche/visible, limiter le reste par bande
-    var buckets = Object.create(null);
+  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();
-        var absTop = y + r.top;
-        var absBottom = y + r.bottom;
-
-        var inOrNearViewport = (absBottom >= viewportTop - 200) && (absTop <= viewportBottom + 200);
-        var band = Math.floor(absTop / BAND_PX);
-        var key = String(band);
-
-        if (!buckets[key]) buckets[key] = [];
-        buckets[key].push({
-          node: w,
-          absTop: absTop,
-          absBottom: absBottom,
-          inOrNearViewport: inOrNearViewport
-        });
+        if (r.bottom < -margin || r.top > ((window.innerHeight || 0) + margin)) {
+          w.remove();
+          removed += 1;
+        }
       } catch (e) {}
     });
+  }
 
-    Object.keys(buckets).forEach(function (k) {
-      var arr = buckets[k];
-      // garde d'abord proche/visible, puis les plus récents (data-created), puis position
-      arr.sort(function (a, b) {
-        if (a.inOrNearViewport !== b.inOrNearViewport) return a.inOrNearViewport ? -1 : 1;
-        var ac = parseInt((a.node.getAttribute('data-created') || '0'), 10);
-        var bc = parseInt((b.node.getAttribute('data-created') || '0'), 10);
-        if (ac !== bc) return bc - ac; // garder plus récent
-        return a.absTop - b.absTop;
-      });
+  var io = null;
+  function installIO() {
+    if (io || typeof IntersectionObserver === 'undefined') return;
 
-      for (var i = MAX_PER_BAND; i < arr.length; i++) {
-        try { arr[i].node.remove(); } catch (e) {}
-      }
+    io = new IntersectionObserver(function (entries) {
+      try {
+        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);
+            if (id) enqueueShow(id);
+
+            try {
+              var ph = e.target.querySelector('[data-ezoic-id]');
+              if (ph) enqueueShow(ph.getAttribute('data-ezoic-id'));
+            } catch (err) {}
+          }
+        });
+      } catch (e) {}
+    }, { root: null, rootMargin: '900px 0px 900px 0px', threshold: 0.01 });
+
+    try { document.querySelectorAll(WRAP_SELECTOR).forEach(function (w) { try { io.observe(w); } catch(e) {} }); } catch (e) {}
+  }
+
+  var moInstalled = false;
+  function installMO() {
+    if (moInstalled || typeof MutationObserver === 'undefined') return;
+    moInstalled = true;
+
+    var mo = new MutationObserver(function (muts) {
+      if (!io) return;
+      try {
+        for (var i = 0; i < muts.length; i++) {
+          var m = muts[i];
+          if (!m.addedNodes) continue;
+          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) {}
+              try { var id = getWrapId(n); if (id) enqueueShow(id); } catch (e) {}
+            } else if (n.querySelectorAll) {
+              var inner = n.querySelectorAll(WRAP_SELECTOR);
+              for (var k = 0; k < inner.length; k++) {
+                try { io.observe(inner[k]); } catch (e) {}
+              }
+            }
+          }
+        }
+      } catch (e) {}
     });
+
+    try { mo.observe(document.documentElement || document.body, { childList: true, subtree: true }); } catch (e) {}
   }
 
-  function scheduleCap() {
-    if (ticking) return;
-    ticking = true;
+  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 () {
-      try { capBetweenWraps(); } catch (e) {}
-      ticking = false;
+      sweepPending = false;
+      lastSweep = Date.now();
+      removeFarBetweenWraps();
     });
   }
 
-  window.addEventListener('scroll', scheduleCap, { passive: true });
-  window.addEventListener('resize', scheduleCap, { passive: true });
+  function init() {
+    installIO();
+    installMO();
 
-  if (window.jQuery) {
-    window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function () {
-      setTimeout(scheduleCap, 0);
-      setTimeout(scheduleCap, 200);
-      setTimeout(scheduleCap, 700);
-    });
+    window.addEventListener('scroll', function () {
+      scheduleSweep();
+      scheduleShowTick();
+    }, { passive: true });
+
+    window.addEventListener('resize', function () {
+      scheduleSweep();
+      scheduleShowTick();
+    }, { passive: true });
+
+    if (window.jQuery) {
+      window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', function () {
+        setTimeout(function () { installIO(); scheduleSweep(); scheduleShowTick(); }, 0);
+      });
+    }
+
+    setTimeout(function () { installIO(); scheduleSweep(); scheduleShowTick(); }, 0);
   }
 
-  setTimeout(scheduleCap, 0);
+  if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
+  else init();
 })();
-// ===== /V8 =====
+// ===== /CLEAN REFRACTOR =====
+
 

package/public/style.css

@@ -79,3 +79,9 @@
   position: static !important;
   top: auto !important;
 }
+
+
+/* ===== CLEAN REFRACTOR perf notes ===== */
+.nodebb-ezoic-wrap { contain: content; }
+/* ===== /CLEAN REFRACTOR ===== */
+