nodebb-plugin-ezoic-infinite 1.7.96 → 1.7.98

package/package.json

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

package/public/client.js

@@ -79,15 +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   = 10;      // max insertions par appel runCore (plus réactif)
+  const MAX_INSERTS_RUN   = 6;       // max insertions par appel runCore
   const MAX_INFLIGHT      = 4;       // max showAds() simultanés
-  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
+  const MAX_SHOW_BATCH    = 4;       // ids max par appel showAds(...ids)
+  const SHOW_THROTTLE_MS  = 900;     // anti-spam showAds() par id
+  const BURST_COOLDOWN_MS = 200;     // 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]',
@@ -128,13 +128,16 @@
     pending:      [],    // ids en attente de slot inflight
     pendingSet:   new Set(),
     wrapByKey:    new Map(),  // anchorKey → wrap DOM node
+    ezActiveIds:  new Set(),  // ids déjà passés à showAds/displayMore
+    scrollDir:    1,          // 1=bas, -1=haut
+    scrollSpeed:  0,          // px/s approx (EMA)
+    lastScrollY:  0,
+    lastScrollTs: 0,
     runQueued:    false,
     burstActive:  false,
     burstDeadline: 0,
     burstCount:   0,
     lastBurstTs:  0,
-    scrollDir:    1,
-    lastScrollY:  0,
   };
 
   let blockedUntil = 0;
@@ -145,10 +148,34 @@
   const normBool  = v  => v === true || v === 'true' || v === 1 || v === '1' || v === 'on';
   const isFilled  = n  => !!(n?.querySelector?.('iframe, ins, img, video, [data-google-container-id]'));
 
+  function getDynamicShowBatchMax() {
+    const speed = S.scrollSpeed || 0;
+    const pend  = S.pending.length;
+    // Scroll très rapide => petits batches (réduit le churn/unused)
+    if (speed > 2600) return 2;
+    if (speed > 1400) return 3;
+    // Peu de candidats => flush plus vite, inutile d'attendre 4
+    if (pend <= 1) return 1;
+    if (pend <= 3) return 2;
+    // Par défaut compromis dynamique
+    return 3;
+  }
+
   function mutate(fn) {
     S.mutGuard++;
     try { fn(); } finally { S.mutGuard--; }
   }
+function destroyEzoicId(id) {
+  if (!Number.isFinite(id) || id <= 0) return;
+  if (!S.ezActiveIds.has(id)) return;
+  try {
+    const ez = window.ezstandalone;
+    const run = () => { try { ez?.destroyPlaceholders?.([id]); } catch (_) {} };
+    try { (typeof ez?.cmd?.push === 'function') ? ez.cmd.push(run) : run(); } catch (_) {}
+  } catch (_) {}
+  S.ezActiveIds.delete(id);
+}
+
 
   // ── Config ─────────────────────────────────────────────────────────────────
 
@@ -310,84 +337,82 @@
    * displayMore = API Ezoic prévue pour l'infinite scroll.
    * Priorité : wraps vides d'abord, remplis si nécessaire.
    */
-  function recycleAndMove(klass, targetEl, newKey) {
-    const ez = window.ezstandalone;
-    if (typeof ez?.destroyPlaceholders !== 'function' ||
-        typeof ez?.define             !== 'function' ||
-        typeof ez?.displayMore        !== 'function') return null;
-
-    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)
-
-    let prefEmpty = null, prefEmptyScore = -Infinity;
-    let prefFilled = null, prefFilledScore = -Infinity;
-    let altEmpty = null, altEmptyScore = -Infinity;
-    let altFilled = null, altFilledScore = -Infinity;
-
-    for (const wrap of S.wrapByKey.values()) {
-      if (!wrap?.isConnected) continue;
-      if (!wrap.classList?.contains(WRAP_CLASS) || !wrap.classList.contains(klass)) continue;
-      try {
-        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); }
+function recycleAndMove(klass, targetEl, newKey) {
+  const ez = window.ezstandalone;
+  if (typeof ez?.destroyPlaceholders !== 'function' ||
+      typeof ez?.define             !== 'function' ||
+      typeof ez?.displayMore        !== 'function') return null;
+
+  const vh = window.innerHeight || 800;
+  const preferAbove = S.scrollDir >= 0; // scroll bas => recycle en haut
+  const farAbove = -vh;
+  const farBelow = vh * 2;
+
+  let bestPrefEmpty = null, bestPrefMetric = Infinity;
+  let bestPrefFilled = null, bestPrefFilledMetric = Infinity;
+  let bestAnyEmpty = null, bestAnyMetric = Infinity;
+  let bestAnyFilled = null, bestAnyFilledMetric = Infinity;
+
+  document.querySelectorAll(`.${WRAP_CLASS}.${klass}`).forEach(wrap => {
+    try {
+      const rect = wrap.getBoundingClientRect();
+      const isAbove = rect.bottom <= farAbove;
+      const isBelow = rect.top >= farBelow;
+      const anyFar = isAbove || isBelow;
+      if (!anyFar) return;
+
+      const qualifies = preferAbove ? isAbove : isBelow;
+      const metric = preferAbove ? Math.abs(rect.bottom) : Math.abs(rect.top - vh);
+      const filled = isFilled(wrap);
+
+      if (qualifies) {
+        if (!filled) {
+          if (metric < bestPrefMetric) { bestPrefMetric = metric; bestPrefEmpty = wrap; }
         } else {
-          if (farBelow) { preferred = true; score = Math.abs(rect.top); }
-          else if (farAbove) { score = Math.abs(rect.bottom); }
+          if (metric < bestPrefFilledMetric) { bestPrefFilledMetric = metric; bestPrefFilled = wrap; }
         }
-        if (score === -Infinity) continue;
-
-        const filled = isFilled(wrap);
-        if (preferred) {
-          if (!filled) {
-            if (score > prefEmptyScore) { prefEmptyScore = score; prefEmpty = wrap; }
-          } else {
-            if (score > prefFilledScore) { prefFilledScore = score; prefFilled = wrap; }
-          }
-        } else {
-          if (!filled) {
-            if (score > altEmptyScore) { altEmptyScore = score; altEmpty = wrap; }
-          } else {
-            if (score > altFilledScore) { altFilledScore = score; altFilled = wrap; }
-          }
-        }
-      } catch (_) {}
+      }
+      if (!filled) {
+        if (metric < bestAnyMetric) { bestAnyMetric = metric; bestAnyEmpty = wrap; }
+      } else {
+        if (metric < bestAnyFilledMetric) { bestAnyFilledMetric = metric; bestAnyFilled = wrap; }
+      }
+    } catch (_) {}
+  });
+
+  const best = bestPrefEmpty ?? bestPrefFilled ?? bestAnyEmpty ?? bestAnyFilled;
+  if (!best) return null;
+  const id = parseInt(best.getAttribute(A_WRAPID), 10);
+  if (!Number.isFinite(id)) return null;
+
+  const oldKey = best.getAttribute(A_ANCHOR);
+  try { const ph = best.querySelector(`#${PH_PREFIX}${id}`); if (ph) S.io?.unobserve(ph); } catch (_) {}
+  mutate(() => {
+    best.setAttribute(A_ANCHOR,  newKey);
+    best.setAttribute(A_CREATED, String(ts()));
+    best.setAttribute(A_SHOWN,   '0');
+    best.classList.remove('is-empty');
+    const ph = best.querySelector(`#${PH_PREFIX}${id}`);
+    if (ph) ph.innerHTML = '';
+    targetEl.insertAdjacentElement('afterend', best);
+  });
+  if (oldKey && S.wrapByKey.get(oldKey) === best) S.wrapByKey.delete(oldKey);
+  S.wrapByKey.set(newKey, best);
+
+  const doDestroy = () => {
+    if (S.ezActiveIds.has(id)) {
+      try { ez.destroyPlaceholders([id]); } catch (_) {}
+      S.ezActiveIds.delete(id);
     }
+    setTimeout(doDefine, 300);
+  };
+  const doDefine  = () => { try { ez.define([id]); } catch (_) {} setTimeout(doDisplay, 300); };
+  const doDisplay = () => { try { ez.displayMore([id]); S.ezActiveIds.add(id); } catch (_) {} };
+  try { (typeof ez.cmd?.push === 'function') ? ez.cmd.push(doDestroy) : doDestroy(); } catch (_) {}
 
-    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);
-    try { const ph = best.querySelector(`#${PH_PREFIX}${id}`); if (ph) S.io?.unobserve(ph); } catch (_) {}
-    mutate(() => {
-      best.setAttribute(A_ANCHOR,  newKey);
-      best.setAttribute(A_CREATED, String(ts()));
-      best.setAttribute(A_SHOWN,   '0');
-      best.classList.remove('is-empty');
-      const ph = best.querySelector(`#${PH_PREFIX}${id}`);
-      if (ph) ph.innerHTML = '';
-      targetEl.insertAdjacentElement('afterend', best);
-    });
-    if (oldKey && S.wrapByKey.get(oldKey) === best) S.wrapByKey.delete(oldKey);
-    S.wrapByKey.set(newKey, best);
-
-    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 (_) {}
+  return { id, wrap: best };
+}
 
-    return { id, wrap: best };
-  }
 
   // ── Wraps DOM — création / suppression ────────────────────────────────────
 
@@ -423,7 +448,7 @@
       const ph = w.querySelector(`[id^="${PH_PREFIX}"]`);
       if (ph instanceof Element) S.io?.unobserve(ph);
       const id = parseInt(w.getAttribute(A_WRAPID), 10);
-      if (Number.isFinite(id)) S.mountedIds.delete(id);
+      if (Number.isFinite(id)) { destroyEzoicId(id); S.mountedIds.delete(id); }
       const key = w.getAttribute(A_ANCHOR);
       if (key && S.wrapByKey.get(key) === w) S.wrapByKey.delete(key);
       w.remove();
@@ -530,72 +555,85 @@
 
   function observePh(id) {
     const ph = document.getElementById(`${PH_PREFIX}${id}`);
-    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) {
-    if (!id || isBlocked()) return;
-    if (ts() - (S.lastShow.get(id) ?? 0) < SHOW_THROTTLE_MS) return;
-    if (S.inflight >= MAX_INFLIGHT) {
-      if (!S.pendingSet.has(id)) { S.pending.push(id); S.pendingSet.add(id); }
-      return;
-    }
-    startShow(id);
-  }
+    if (ph?.isConnected) try { getIO()?.observe(ph); } catch (_) {}
+  }
+
+function enqueueShow(id) {
+  if (!id || isBlocked()) return;
+  if (ts() - (S.lastShow.get(id) ?? 0) < SHOW_THROTTLE_MS) return;
+  if (!S.pendingSet.has(id)) { S.pending.push(id); S.pendingSet.add(id); }
+  drainQueue();
+}
+
+function drainQueue() {
+  if (isBlocked()) return;
+  const free = Math.max(0, MAX_INFLIGHT - S.inflight);
+  if (!free || !S.pending.length) return;
+
+  const picked = [];
+  const seen = new Set();
+  const batchCap = Math.max(1, Math.min(MAX_SHOW_BATCH, free, getDynamicShowBatchMax()));
+  while (S.pending.length && picked.length < batchCap) {
+    const id = S.pending.shift();
+    S.pendingSet.delete(id);
+    if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
+    seen.add(id);
+    picked.push(id);
+  }
+  if (picked.length) startShowBatch(picked);
+}
+
+function startShowBatch(ids) {
+  if (!ids?.length || isBlocked()) return;
+  const reserve = ids.length;
+  S.inflight += reserve;
+
+  let done = false;
+  const release = () => {
+    if (done) return;
+    done = true;
+    S.inflight = Math.max(0, S.inflight - reserve);
+    drainQueue();
+  };
+  const timer = setTimeout(release, 7000);
 
-  function drainQueue() {
-    if (isBlocked()) return;
-    while (S.inflight < MAX_INFLIGHT && S.pending.length) {
-      const id = S.pending.shift();
-      S.pendingSet.delete(id);
-      startShow(id);
-    }
-  }
+  requestAnimationFrame(() => {
+    try {
+      if (isBlocked()) { clearTimeout(timer); return release(); }
 
-  function startShow(id) {
-    if (!id || isBlocked()) return;
-    S.inflight++;
-    let done = false;
-    const release = () => {
-      if (done) return;
-      done = true;
-      S.inflight = Math.max(0, S.inflight - 1);
-      drainQueue();
-    };
-    const timer = setTimeout(release, 7000);
+      const valid = [];
+      const t = ts();
 
-    requestAnimationFrame(() => {
-      try {
-        if (isBlocked()) { clearTimeout(timer); return release(); }
+      for (const raw of ids) {
+        const id = parseInt(raw, 10);
+        if (!Number.isFinite(id) || id <= 0) continue;
         const ph = document.getElementById(`${PH_PREFIX}${id}`);
-        if (!ph?.isConnected || isFilled(ph)) { clearTimeout(timer); return release(); }
+        if (!ph?.isConnected || isFilled(ph)) continue;
+        if (t - (S.lastShow.get(id) ?? 0) < SHOW_THROTTLE_MS) continue;
+        if (document.querySelectorAll(`#${PH_PREFIX}${id}`).length !== 1) continue;
 
-        const t = ts();
-        if (t - (S.lastShow.get(id) ?? 0) < SHOW_THROTTLE_MS) { clearTimeout(timer); return release(); }
         S.lastShow.set(id, t);
-
         try { ph.closest?.(`.${WRAP_CLASS}`)?.setAttribute(A_SHOWN, String(t)); } catch (_) {}
+        valid.push(id);
+      }
 
-        window.ezstandalone = window.ezstandalone || {};
-        const ez = window.ezstandalone;
-        const doShow = () => {
-          try { ez.showAds(id); } catch (_) {}
+      if (!valid.length) { clearTimeout(timer); return release(); }
+
+      window.ezstandalone = window.ezstandalone || {};
+      const ez = window.ezstandalone;
+      const doShow = () => {
+        try { ez.showAds(...valid); } catch (_) {}
+        for (const id of valid) {
+          S.ezActiveIds.add(id);
           scheduleEmptyCheck(id, t);
-          setTimeout(() => { clearTimeout(timer); release(); }, 350);
-        };
-        Array.isArray(ez.cmd) ? ez.cmd.push(doShow) : doShow();
-      } catch (_) { clearTimeout(timer); release(); }
-    });
-  }
+        }
+        setTimeout(() => { clearTimeout(timer); release(); }, 700);
+      };
+      Array.isArray(ez.cmd) ? ez.cmd.push(doShow) : doShow();
+    } catch (_) { clearTimeout(timer); release(); }
+  });
+}
+
 
   function scheduleEmptyCheck(id, showTs) {
     setTimeout(() => {
@@ -625,14 +663,22 @@
         const orig = ez.showAds.bind(ez);
         ez.showAds = function (...args) {
           if (isBlocked()) return;
-          const ids  = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
+          const ids = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
+          const valid = [];
           const seen = new Set();
           for (const v of ids) {
             const id = parseInt(v, 10);
             if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
             if (!document.getElementById(`${PH_PREFIX}${id}`)?.isConnected) continue;
+            if (document.querySelectorAll(`#${PH_PREFIX}${id}`).length !== 1) continue;
             seen.add(id);
-            try { orig(id); } catch (_) {}
+            valid.push(id);
+          }
+          if (!valid.length) return;
+          try { orig(...valid); } catch (_) {
+            for (const id of valid) {
+              try { orig(id); } catch (_) {}
+            }
           }
         };
       } catch (_) {}
@@ -715,7 +761,7 @@
       S.burstCount++;
       scheduleRun(n => {
         if (!n && !S.pending.length) { S.burstActive = false; return; }
-        setTimeout(step, n > 0 ? 80 : 180);
+        setTimeout(step, n > 0 ? 150 : 300);
       });
     };
     step();
@@ -733,11 +779,15 @@
     S.mountedIds.clear();
     S.lastShow.clear();
     S.wrapByKey.clear();
+    S.ezActiveIds.clear();
     S.inflight     = 0;
     S.pending      = [];
     S.pendingSet.clear();
     S.burstActive  = false;
     S.runQueued    = false;
+    S.scrollSpeed  = 0;
+    S.lastScrollY  = 0;
+    S.lastScrollTs = 0;
   }
 
   // ── MutationObserver ───────────────────────────────────────────────────────
@@ -857,25 +907,31 @@
 
   function bindScroll() {
     let ticking = false;
+    try {
+      S.lastScrollY = window.scrollY || window.pageYOffset || 0;
+      S.lastScrollTs = ts();
+    } catch (_) {}
     window.addEventListener('scroll', () => {
+      try {
+        const y = window.scrollY || window.pageYOffset || 0;
+        const t = ts();
+        const dy = y - (S.lastScrollY || 0);
+        const dt = Math.max(1, t - (S.lastScrollTs || t));
+        if (Math.abs(dy) > 1) S.scrollDir = dy >= 0 ? 1 : -1;
+        const inst = Math.abs(dy) * 1000 / dt;
+        S.scrollSpeed = S.scrollSpeed ? (S.scrollSpeed * 0.7 + inst * 0.3) : inst;
+        S.lastScrollY = y;
+        S.lastScrollTs = t;
+      } catch (_) {}
       if (ticking) return;
       ticking = true;
-      requestAnimationFrame(() => {
-        ticking = false;
-        try {
-          const y = window.scrollY || window.pageYOffset || 0;
-          S.scrollDir = (y < (S.lastScrollY || 0)) ? -1 : 1;
-          S.lastScrollY = y;
-        } catch (_) {}
-        requestBurst();
-      });
+      requestAnimationFrame(() => { ticking = false; requestBurst(); });
     }, { passive: true });
   }
 
   // ── Boot ───────────────────────────────────────────────────────────────────
 
   S.pageKey = pageKey();
-  try { S.lastScrollY = window.scrollY || window.pageYOffset || 0; } catch (_) {}
   muteConsole();
   ensureTcfLocator();
   warmNetwork();