nodebb-plugin-ezoic-infinite 1.7.95 → 1.7.96

package/package.json

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

package/public/client.js

@@ -79,14 +79,15 @@
 
   const EMPTY_CHECK_MS    = 20_000;  // délai avant collapse d'un wrap vide post-show
   const MIN_PRUNE_AGE_MS  = 8_000;   // délai de grâce avant pruning (stabilisation DOM)
-  const MAX_INSERTS_RUN   = 6;       // max insertions par appel runCore
+  const MAX_INSERTS_RUN   = 10;      // max insertions par appel runCore (plus réactif)
   const MAX_INFLIGHT      = 4;       // max showAds() simultanés
-  const SHOW_THROTTLE_MS  = 900;     // anti-spam showAds() par id
-  const BURST_COOLDOWN_MS = 200;     // délai min entre deux déclenchements de burst
+  const SHOW_THROTTLE_MS  = 600;     // anti-spam showAds() par id (plus réactif)
+  const BURST_COOLDOWN_MS = 120;     // délai min entre deux déclenchements de burst
 
   // Marges IO larges et fixes — observer créé une seule fois au boot
   const IO_MARGIN_DESKTOP = '2500px 0px 2500px 0px';
   const IO_MARGIN_MOBILE  = '3500px 0px 3500px 0px';
+  const FAST_SHOW_MARGIN_PX = 900; // show immédiat si slot déjà proche viewport
 
   const SEL = {
     post:     '[component="post"][data-pid]',
@@ -132,8 +133,8 @@
     burstDeadline: 0,
     burstCount:   0,
     lastBurstTs:  0,
+    scrollDir:    1,
     lastScrollY:  0,
-    scrollDir:    1,     // 1=down, -1=up
   };
 
   let blockedUntil = 0;
@@ -315,56 +316,58 @@
         typeof ez?.define             !== 'function' ||
         typeof ez?.displayMore        !== 'function') return null;
 
-    const vh = window.innerHeight || 800;
-    const targetRect = targetEl?.getBoundingClientRect?.() || { top: vh, bottom: vh };
+    const vh   = window.innerHeight || 800;
+    const dir  = S.scrollDir >= 0 ? 1 : -1;
+    const farTopThreshold    = -vh;     // hors écran au-dessus
+    const farBottomThreshold = vh * 2;  // loin sous le viewport (scroll-up)
 
-    // Recyclage bidirectionnel :
-    // - scroll vers le bas  -> recycle préférentiellement des wraps loin au-dessus
-    // - scroll vers le haut -> recycle préférentiellement des wraps loin en-dessous
-    // Fallback sur l'autre côté si aucun candidat.
-    const aboveThreshold = -vh;      // wrap entièrement/suffisamment au-dessus
-    const belowThreshold = vh * 2;   // wrap loin sous le viewport
+    let prefEmpty = null, prefEmptyScore = -Infinity;
+    let prefFilled = null, prefFilledScore = -Infinity;
+    let altEmpty = null, altEmptyScore = -Infinity;
+    let altFilled = null, altFilledScore = -Infinity;
 
-    let aboveEmpty = null, aboveEmptyBottom = Infinity;
-    let aboveFilled = null, aboveFilledBottom = Infinity;
-    let belowEmpty = null, belowEmptyTop = -Infinity;
-    let belowFilled = null, belowFilledTop = -Infinity;
-
-    document.querySelectorAll(`.${WRAP_CLASS}.${klass}`).forEach(wrap => {
+    for (const wrap of S.wrapByKey.values()) {
+      if (!wrap?.isConnected) continue;
+      if (!wrap.classList?.contains(WRAP_CLASS) || !wrap.classList.contains(klass)) continue;
       try {
-        if (!wrap?.isConnected) return;
         const rect = wrap.getBoundingClientRect();
+        const farAbove = rect.bottom <= farTopThreshold;
+        const farBelow = rect.top >= farBottomThreshold;
+        let preferred = false;
+        let score = -Infinity;
+
+        if (dir >= 0) {
+          if (farAbove) { preferred = true; score = Math.abs(rect.bottom); }
+          else if (farBelow) { score = Math.abs(rect.top); }
+        } else {
+          if (farBelow) { preferred = true; score = Math.abs(rect.top); }
+          else if (farAbove) { score = Math.abs(rect.bottom); }
+        }
+        if (score === -Infinity) continue;
 
-        if (rect.bottom < aboveThreshold) {
-          if (!isFilled(wrap)) {
-            if (rect.bottom < aboveEmptyBottom) { aboveEmptyBottom = rect.bottom; aboveEmpty = wrap; }
+        const filled = isFilled(wrap);
+        if (preferred) {
+          if (!filled) {
+            if (score > prefEmptyScore) { prefEmptyScore = score; prefEmpty = wrap; }
           } else {
-            if (rect.bottom < aboveFilledBottom) { aboveFilledBottom = rect.bottom; aboveFilled = wrap; }
+            if (score > prefFilledScore) { prefFilledScore = score; prefFilled = wrap; }
           }
-          return;
-        }
-
-        if (rect.top > belowThreshold) {
-          if (!isFilled(wrap)) {
-            if (rect.top > belowEmptyTop) { belowEmptyTop = rect.top; belowEmpty = wrap; }
+        } else {
+          if (!filled) {
+            if (score > altEmptyScore) { altEmptyScore = score; altEmpty = wrap; }
           } else {
-            if (rect.top > belowFilledTop) { belowFilledTop = rect.top; belowFilled = wrap; }
+            if (score > altFilledScore) { altFilledScore = score; altFilled = wrap; }
           }
         }
       } catch (_) {}
-    });
+    }
 
-    const preferBelow = (S.scrollDir < 0) || (targetRect.top < vh * 0.5);
-    const pickAbove = () => aboveEmpty ?? aboveFilled;
-    const pickBelow = () => belowEmpty ?? belowFilled;
-    const best = preferBelow ? (pickBelow() ?? pickAbove()) : (pickAbove() ?? pickBelow());
+    const best = prefEmpty ?? prefFilled ?? altEmpty ?? altFilled;
     if (!best) return null;
     const id = parseInt(best.getAttribute(A_WRAPID), 10);
     if (!Number.isFinite(id)) return null;
 
     const oldKey = best.getAttribute(A_ANCHOR);
-    // Neutraliser l'IO sur ce wrap avant déplacement — évite un showAds
-    // parasite si le nœud était encore dans la zone IO_MARGIN.
     try { const ph = best.querySelector(`#${PH_PREFIX}${id}`); if (ph) S.io?.unobserve(ph); } catch (_) {}
     mutate(() => {
       best.setAttribute(A_ANCHOR,  newKey);
@@ -378,9 +381,8 @@
     if (oldKey && S.wrapByKey.get(oldKey) === best) S.wrapByKey.delete(oldKey);
     S.wrapByKey.set(newKey, best);
 
-    // Délais requis : destroyPlaceholders est asynchrone en interne
-    const doDestroy = () => { try { ez.destroyPlaceholders([id]); } catch (_) {} setTimeout(doDefine,  300); };
-    const doDefine  = () => { try { ez.define([id]);              } catch (_) {} setTimeout(doDisplay, 300); };
+    const doDestroy = () => { try { ez.destroyPlaceholders([id]); } catch (_) {} setTimeout(doDefine, 220); };
+    const doDefine  = () => { try { ez.define([id]);              } catch (_) {} setTimeout(doDisplay,220); };
     const doDisplay = () => { try { ez.displayMore([id]);         } catch (_) {} };
     try { (typeof ez.cmd?.push === 'function') ? ez.cmd.push(doDestroy) : doDestroy(); } catch (_) {}
 
@@ -528,7 +530,16 @@
 
   function observePh(id) {
     const ph = document.getElementById(`${PH_PREFIX}${id}`);
-    if (ph?.isConnected) try { getIO()?.observe(ph); } catch (_) {}
+    if (!ph?.isConnected) return;
+    try { getIO()?.observe(ph); } catch (_) {}
+    try {
+      const r = ph.getBoundingClientRect();
+      const vh = window.innerHeight || 800;
+      if (r.bottom >= -FAST_SHOW_MARGIN_PX && r.top <= vh + FAST_SHOW_MARGIN_PX) {
+        const pid = parseInt(ph.getAttribute('data-ezoic-id'), 10);
+        if (Number.isFinite(pid) && pid > 0) enqueueShow(pid);
+      }
+    } catch (_) {}
   }
 
   function enqueueShow(id) {
@@ -579,7 +590,7 @@
         const doShow = () => {
           try { ez.showAds(id); } catch (_) {}
           scheduleEmptyCheck(id, t);
-          setTimeout(() => { clearTimeout(timer); release(); }, 700);
+          setTimeout(() => { clearTimeout(timer); release(); }, 350);
         };
         Array.isArray(ez.cmd) ? ez.cmd.push(doShow) : doShow();
       } catch (_) { clearTimeout(timer); release(); }
@@ -704,7 +715,7 @@
       S.burstCount++;
       scheduleRun(n => {
         if (!n && !S.pending.length) { S.burstActive = false; return; }
-        setTimeout(step, n > 0 ? 150 : 300);
+        setTimeout(step, n > 0 ? 80 : 180);
       });
     };
     step();
@@ -847,22 +858,24 @@
   function bindScroll() {
     let ticking = false;
     window.addEventListener('scroll', () => {
-      try {
-        const y = window.scrollY || window.pageYOffset || 0;
-        const dy = y - (S.lastScrollY || 0);
-        if (Math.abs(dy) > 2) S.scrollDir = dy > 0 ? 1 : -1;
-        S.lastScrollY = y;
-      } catch (_) {}
       if (ticking) return;
       ticking = true;
-      requestAnimationFrame(() => { ticking = false; requestBurst(); });
+      requestAnimationFrame(() => {
+        ticking = false;
+        try {
+          const y = window.scrollY || window.pageYOffset || 0;
+          S.scrollDir = (y < (S.lastScrollY || 0)) ? -1 : 1;
+          S.lastScrollY = y;
+        } catch (_) {}
+        requestBurst();
+      });
     }, { passive: true });
   }
 
   // ── Boot ───────────────────────────────────────────────────────────────────
 
   S.pageKey = pageKey();
-  try { S.lastScrollY = window.scrollY || window.pageYOffset || 0; } catch (_) { S.lastScrollY = 0; }
+  try { S.lastScrollY = window.scrollY || window.pageYOffset || 0; } catch (_) {}
   muteConsole();
   ensureTcfLocator();
   warmNetwork();