nodebb-plugin-ezoic-infinite 1.8.0 → 1.8.2

package/package.json

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

package/public/client.js

@@ -77,12 +77,18 @@
   const A_CREATED   = 'data-ezoic-created';  // timestamp création ms
   const A_SHOWN     = 'data-ezoic-shown';    // timestamp dernier showAds ms
 
+  // Tunables (stables en prod)
   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_INFLIGHT      = 4;       // max showAds() simultanés
+  const MAX_INSERTS_RUN   = 10;      // plus réactif si NodeBB injecte en rafale
+  const MAX_INFLIGHT      = 4;       // max showAds() simultanés (garde-fou)
   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
+  const SHOW_THROTTLE_MS  = 600;     // anti-spam showAds() par id (plus réactif)
+  const SHOW_RELEASE_MS   = 700;     // relâche inflight après showAds() batché
+  const SHOW_FAILSAFE_MS  = 7000;    // relâche forcée si stack pub lente
+  const BATCH_FLUSH_MS    = 40;      // micro-buffer pour regrouper les ids proches
+  const MAX_DESTROY_BATCH  = 4;       // ids max par destroyPlaceholders(...ids)
+  const DESTROY_FLUSH_MS   = 30;      // micro-buffer destroy pour lisser les rafales
+  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';
@@ -126,6 +132,11 @@
     inflight:     0,     // showAds() en cours
     pending:      [],    // ids en attente de slot inflight
     pendingSet:   new Set(),
+    showBatchTimer: 0,
+    destroyBatchTimer: 0,
+    destroyPending: [],
+    destroyPendingSet: new Set(),
+    sweepQueued:  false,
     wrapByKey:    new Map(),  // anchorKey → wrap DOM node
     ezActiveIds:  new Set(),  // ids déjà passés à showAds/displayMore
     scrollDir:    1,          // 1=bas, -1=haut
@@ -147,6 +158,33 @@
   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 phEl(id) {
+    return document.getElementById(`${PH_PREFIX}${id}`);
+  }
+
+  function hasSinglePlaceholder(id) {
+    try { return document.querySelectorAll(`#${PH_PREFIX}${id}`).length === 1; } catch (_) { return false; }
+  }
+
+  function canShowPlaceholderId(id, now = ts()) {
+    const n = parseInt(id, 10);
+    if (!Number.isFinite(n) || n <= 0) return false;
+    if (now - (S.lastShow.get(n) ?? 0) < SHOW_THROTTLE_MS) return false;
+    const ph = phEl(n);
+    if (!ph?.isConnected || isFilled(ph)) return false;
+    if (!hasSinglePlaceholder(n)) return false;
+    return true;
+  }
+
+  function queueSweepDeadWraps() {
+    if (S.sweepQueued) return;
+    S.sweepQueued = true;
+    requestAnimationFrame(() => {
+      S.sweepQueued = false;
+      sweepDeadWraps();
+    });
+  }
+
   function getDynamicShowBatchMax() {
     const speed = S.scrollSpeed || 0;
     const pend  = S.pending.length;
@@ -164,15 +202,42 @@
     S.mutGuard++;
     try { fn(); } finally { S.mutGuard--; }
   }
+function scheduleDestroyFlush() {
+  if (S.destroyBatchTimer) return;
+  S.destroyBatchTimer = setTimeout(() => {
+    S.destroyBatchTimer = 0;
+    flushDestroyBatch();
+  }, DESTROY_FLUSH_MS);
+}
+
+function flushDestroyBatch() {
+  if (!S.destroyPending.length) return;
+  const ids = [];
+  while (S.destroyPending.length && ids.length < MAX_DESTROY_BATCH) {
+    const id = S.destroyPending.shift();
+    S.destroyPendingSet.delete(id);
+    if (!Number.isFinite(id) || id <= 0) continue;
+    ids.push(id);
+  }
+  if (ids.length) {
+    try {
+      const ez = window.ezstandalone;
+      const run = () => { try { ez?.destroyPlaceholders?.(ids); } catch (_) {} };
+      try { (typeof ez?.cmd?.push === 'function') ? ez.cmd.push(run) : run(); } catch (_) {}
+    } catch (_) {}
+  }
+  if (S.destroyPending.length) scheduleDestroyFlush();
+}
+
 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);
+  if (!S.destroyPendingSet.has(id)) {
+    S.destroyPending.push(id);
+    S.destroyPendingSet.add(id);
+  }
+  scheduleDestroyFlush();
 }
 
 
@@ -329,6 +394,25 @@ function destroyEzoicId(id) {
     return null;
   }
 
+  function sweepDeadWraps() {
+    // NodeBB peut retirer des nœuds sans passer par dropWrap() (virtualisation / rerender).
+    // On libère alors les IDs/keys fantômes pour éviter l'épuisement du pool.
+    for (const [key, wrap] of Array.from(S.wrapByKey.entries())) {
+      if (wrap?.isConnected) continue;
+      S.wrapByKey.delete(key);
+      const id = parseInt(wrap?.getAttribute?.(A_WRAPID), 10);
+      if (Number.isFinite(id)) {
+        S.mountedIds.delete(id);
+        S.pendingSet.delete(id);
+        S.lastShow.delete(id);
+        S.ezActiveIds.delete(id);
+      }
+    }
+    if (S.pending.length) {
+      S.pending = S.pending.filter(id => S.pendingSet.has(id));
+    }
+  }
+
   /**
    * Pool épuisé : recycle un wrap loin au-dessus du viewport.
    * Séquence avec délais (destroyPlaceholders est asynchrone) :
@@ -352,13 +436,14 @@ function recycleAndMove(klass, targetEl, newKey) {
   let bestAnyEmpty = null, bestAnyMetric = Infinity;
   let bestAnyFilled = null, bestAnyFilledMetric = Infinity;
 
-  document.querySelectorAll(`.${WRAP_CLASS}.${klass}`).forEach(wrap => {
+  for (const wrap of S.wrapByKey.values()) {
+    if (!wrap?.isConnected || !wrap.classList?.contains(WRAP_CLASS) || !wrap.classList.contains(klass)) continue;
     try {
       const rect = wrap.getBoundingClientRect();
       const isAbove = rect.bottom <= farAbove;
       const isBelow = rect.top >= farBelow;
       const anyFar = isAbove || isBelow;
-      if (!anyFar) return;
+      if (!anyFar) continue;
 
       const qualifies = preferAbove ? isAbove : isBelow;
       const metric = preferAbove ? Math.abs(rect.bottom) : Math.abs(rect.top - vh);
@@ -377,7 +462,7 @@ function recycleAndMove(klass, targetEl, newKey) {
         if (metric < bestAnyFilledMetric) { bestAnyFilledMetric = metric; bestAnyFilled = wrap; }
       }
     } catch (_) {}
-  });
+  }
 
   const best = bestPrefEmpty ?? bestPrefFilled ?? bestAnyEmpty ?? bestAnyFilled;
   if (!best) return null;
@@ -399,11 +484,8 @@ function recycleAndMove(klass, targetEl, newKey) {
   S.wrapByKey.set(newKey, best);
 
   const doDestroy = () => {
-    if (S.ezActiveIds.has(id)) {
-      try { ez.destroyPlaceholders([id]); } catch (_) {}
-      S.ezActiveIds.delete(id);
-    }
-    setTimeout(doDefine, 300);
+    if (S.ezActiveIds.has(id)) destroyEzoicId(id);
+    setTimeout(doDefine, 330);
   };
   const doDefine  = () => { try { ez.define([id]); } catch (_) {} setTimeout(doDisplay, 300); };
   const doDisplay = () => { try { ez.displayMore([id]); S.ezActiveIds.add(id); } catch (_) {} };
@@ -522,7 +604,8 @@ function recycleAndMove(klass, targetEl, newKey) {
       const key = anchorKey(klass, el);
       if (findWrap(key)) continue;
 
-      const id = pickId(poolKey);
+      let id = pickId(poolKey);
+      if (!id) { sweepDeadWraps(); id = pickId(poolKey); }
       if (id) {
         const w = insertAfter(el, id, klass, key);
         if (w) { observePh(id); inserted++; }
@@ -553,15 +636,34 @@ function recycleAndMove(klass, targetEl, newKey) {
   }
 
   function observePh(id) {
-    const ph = document.getElementById(`${PH_PREFIX}${id}`);
+    const ph = phEl(id);
     if (ph?.isConnected) try { getIO()?.observe(ph); } catch (_) {}
+    // Fast-path : si déjà proche viewport, ne pas attendre un callback IO complet
+    try {
+      if (!ph?.isConnected) return;
+      const rect = ph.getBoundingClientRect();
+      const vh = window.innerHeight || 800;
+      const preload = isMobile() ? 1400 : 1000;
+      if (rect.top <= vh + preload && rect.bottom >= -preload) enqueueShow(id);
+    } 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();
+  const n = parseInt(id, 10);
+  if (!Number.isFinite(n) || n <= 0) return;
+  if (ts() - (S.lastShow.get(n) ?? 0) < SHOW_THROTTLE_MS) return;
+  if (!S.pendingSet.has(n)) { S.pending.push(n); S.pendingSet.add(n); }
+  scheduleDrainQueue();
+}
+
+function scheduleDrainQueue() {
+  if (isBlocked()) return;
+  if (S.showBatchTimer) return;
+  S.showBatchTimer = setTimeout(() => {
+    S.showBatchTimer = 0;
+    drainQueue();
+  }, BATCH_FLUSH_MS);
 }
 
 function drainQueue() {
@@ -576,10 +678,12 @@ function drainQueue() {
     const id = S.pending.shift();
     S.pendingSet.delete(id);
     if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
+    if (!phEl(id)?.isConnected) continue;
     seen.add(id);
     picked.push(id);
   }
   if (picked.length) startShowBatch(picked);
+  if (S.pending.length && (MAX_INFLIGHT - S.inflight) > 0) scheduleDrainQueue();
 }
 
 function startShowBatch(ids) {
@@ -594,7 +698,7 @@ function startShowBatch(ids) {
     S.inflight = Math.max(0, S.inflight - reserve);
     drainQueue();
   };
-  const timer = setTimeout(release, 7000);
+  const timer = setTimeout(release, SHOW_FAILSAFE_MS);
 
   requestAnimationFrame(() => {
     try {
@@ -606,10 +710,8 @@ function startShowBatch(ids) {
       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)) continue;
-        if (t - (S.lastShow.get(id) ?? 0) < SHOW_THROTTLE_MS) continue;
-        if (document.querySelectorAll(`#${PH_PREFIX}${id}`).length !== 1) continue;
+        const ph = phEl(id);
+        if (!canShowPlaceholderId(id, t)) continue;
 
         S.lastShow.set(id, t);
         try { ph.closest?.(`.${WRAP_CLASS}`)?.setAttribute(A_SHOWN, String(t)); } catch (_) {}
@@ -625,7 +727,7 @@ function startShowBatch(ids) {
         for (const id of valid) {
           S.ezActiveIds.add(id);
         }
-        setTimeout(() => { clearTimeout(timer); release(); }, 700);
+        setTimeout(() => { clearTimeout(timer); release(); }, SHOW_RELEASE_MS);
       };
       Array.isArray(ez.cmd) ? ez.cmd.push(doShow) : doShow();
     } catch (_) { clearTimeout(timer); release(); }
@@ -655,8 +757,7 @@ function startShowBatch(ids) {
           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;
+            if (!phEl(id)?.isConnected || !hasSinglePlaceholder(id)) continue;
             seen.add(id);
             valid.push(id);
           }
@@ -681,6 +782,7 @@ function startShowBatch(ids) {
   async function runCore() {
     if (isBlocked()) return 0;
     patchShowAds();
+    sweepDeadWraps();
 
     const cfg = await fetchConfig();
     if (!cfg || cfg.excluded) return 0;
@@ -747,7 +849,7 @@ function startShowBatch(ids) {
       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();
@@ -769,8 +871,13 @@ function startShowBatch(ids) {
     S.inflight     = 0;
     S.pending      = [];
     S.pendingSet.clear();
+    if (S.showBatchTimer) { clearTimeout(S.showBatchTimer); S.showBatchTimer = 0; }
+    if (S.destroyBatchTimer) { clearTimeout(S.destroyBatchTimer); S.destroyBatchTimer = 0; }
+    S.destroyPending = [];
+    S.destroyPendingSet.clear();
     S.burstActive  = false;
     S.runQueued    = false;
+    S.sweepQueued   = false;
     S.scrollSpeed  = 0;
     S.lastScrollY  = 0;
     S.lastScrollTs = 0;
@@ -784,6 +891,14 @@ function startShowBatch(ids) {
     S.domObs = new MutationObserver(muts => {
       if (S.mutGuard > 0 || isBlocked()) return;
       for (const m of muts) {
+        let sawWrapRemoval = false;
+        for (const n of m.removedNodes) {
+          if (n.nodeType !== 1) continue;
+          if ((n.matches && n.matches(`.${WRAP_CLASS}`)) || (n.querySelector && n.querySelector(`.${WRAP_CLASS}`))) {
+            sawWrapRemoval = true;
+          }
+        }
+        if (sawWrapRemoval) queueSweepDeadWraps();
         for (const n of m.addedNodes) {
           if (n.nodeType !== 1) continue;
           // matches() d'abord (O(1)), querySelector() seulement si nécessaire
@@ -871,7 +986,7 @@ function startShowBatch(ids) {
       S.pageKey    = pageKey();
       blockedUntil = 0;
       muteConsole(); ensureTcfLocator(); warmNetwork();
-      patchShowAds(); getIO(); ensureDomObserver(); requestBurst();
+      patchShowAds(); getIO(); ensureDomObserver(); sweepDeadWraps(); requestBurst();
     });
 
     const burstEvts = [

package/public/style.css

@@ -56,12 +56,6 @@
   top: auto !important;
 }
 
-/* ── État vide ────────────────────────────────────────────────────────────── */
-/*
-  Ajouté 20s après showAds si aucun fill détecté.
-  Collapse à 1px (pas 0) : reste observable par l'IO si le fill arrive tard.
-*/
-
 /* ── Ezoic global (hors de nos wraps) ────────────────────────────────────── */
 .ezoic-ad {
   margin: 0 !important;