nodebb-plugin-ezoic-infinite 1.7.93 → 1.7.95

package/package.json

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

package/public/client.js

@@ -77,12 +77,11 @@
   const A_CREATED   = 'data-ezoic-created';  // timestamp création ms
   const A_SHOWN     = 'data-ezoic-shown';    // timestamp dernier showAds ms
 
+  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_INFLIGHT      = 2;       // max showAds() simultanés (réduit le churn/unused)
-  const SHOW_THROTTLE_MS  = 1200;    // anti-spam showAds() par id
-  const UNUSED_COOLDOWN_MS = 15_000; // cooldown après tentative sans fill (unused probable)
-  const PENDING_TIMEOUT_MS = 12_000; // au-delà, tentative considérée obsolète
+  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
 
   // Marges IO larges et fixes — observer créé une seule fois au boot
@@ -125,11 +124,8 @@
     domObs:       null,
     mutGuard:     0,     // >0 : mutations DOM en cours (MutationObserver ignoré)
     inflight:     0,     // showAds() en cours
-    pending:      [],    // ids en attente de slot inflight (triés par priorité)
+    pending:      [],    // ids en attente de slot inflight
     pendingSet:   new Set(),
-    pendingShows: new Set(),  // ids avec tentative show en cours
-    cooldownUntil:new Map(),  // id -> ts de fin de cooldown (unused probable)
-    fillObsById:  new Map(),  // id -> MutationObserver placeholder fill
     wrapByKey:    new Map(),  // anchorKey → wrap DOM node
     runQueued:    false,
     burstActive:  false,
@@ -137,7 +133,7 @@
     burstCount:   0,
     lastBurstTs:  0,
     lastScrollY:  0,
-    scrollDir:    1,
+    scrollDir:    1,     // 1=down, -1=up
   };
 
   let blockedUntil = 0;
@@ -147,69 +143,6 @@
   const isMobile  = () => { try { return window.innerWidth < 768; } catch (_) { return false; } };
   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]'));
-  const isCooling = id => (S.cooldownUntil.get(id) || 0) > ts();
-
-  function viewportDistance(el) {
-    try {
-      const r = el?.getBoundingClientRect?.();
-      if (!r) return Infinity;
-      const vh = window.innerHeight || 800;
-      if (r.bottom >= 0 && r.top <= vh) return 0;
-      if (r.top > vh) return Math.max(0, r.top - vh);
-      return Math.max(0, -r.bottom);
-    } catch (_) { return Infinity; }
-  }
-
-  function pendingEnqueue(id) {
-    if (S.pendingSet.has(id)) return;
-    const ph = document.getElementById(`${PH_PREFIX}${id}`);
-    const prio = viewportDistance(ph?.closest?.(`.${WRAP_CLASS}`) || ph);
-    const item = { id, prio, at: ts() };
-    let i = S.pending.length;
-    while (i > 0 && S.pending[i - 1].prio > prio) i--;
-    S.pending.splice(i, 0, item);
-    S.pendingSet.add(id);
-  }
-
-  function markUnusedProbable(id) {
-    if (!id) return;
-    S.pendingShows.delete(id);
-    S.cooldownUntil.set(id, ts() + UNUSED_COOLDOWN_MS);
-  }
-
-  function clearCooldownIfFilled(id) {
-    if (!id) return;
-    S.cooldownUntil.delete(id);
-    S.pendingShows.delete(id);
-  }
-
-  function unobserveFill(id) {
-    const obs = S.fillObsById.get(id);
-    if (obs) { try { obs.disconnect(); } catch (_) {} }
-    S.fillObsById.delete(id);
-  }
-
-  function watchPlaceholderFill(id) {
-    const ph = document.getElementById(`${PH_PREFIX}${id}`);
-    if (!ph?.isConnected) return;
-    unobserveFill(id);
-    const onMut = () => {
-      try {
-        if (!ph.isConnected) return unobserveFill(id);
-        if (!isFilled(ph)) return;
-        clearCooldownIfFilled(id);
-        const wrap = ph.closest?.(`.${WRAP_CLASS}`);
-        if (wrap) wrap.classList.remove('is-empty');
-      } catch (_) {}
-    };
-    try {
-      const obs = new MutationObserver(onMut);
-      obs.observe(ph, { childList: true, subtree: true, attributes: true });
-      S.fillObsById.set(id, obs);
-    } catch (_) {}
-    onMut();
-  }
-
 
   function mutate(fn) {
     S.mutGuard++;
@@ -351,21 +284,6 @@
     return (w?.isConnected) ? w : null;
   }
 
-  function sweepDeadWraps() {
-    for (const [key, w] of Array.from(S.wrapByKey.entries())) {
-      if (w?.isConnected) continue;
-      S.wrapByKey.delete(key);
-      const id = parseInt(w?.getAttribute?.(A_WRAPID), 10);
-      if (Number.isFinite(id)) {
-        S.mountedIds.delete(id);
-        S.pendingSet.delete(id);
-        S.pending = S.pending.filter(it => (it?.id ?? it) !== id);
-        S.pendingShows.delete(id);
-        unobserveFill(id);
-      }
-    }
-  }
-
   // ── Pool ───────────────────────────────────────────────────────────────────
 
   /**
@@ -398,39 +316,56 @@
         typeof ez?.displayMore        !== 'function') return null;
 
     const vh = window.innerHeight || 800;
-    const targetRect = targetEl?.getBoundingClientRect?.();
-    const dir = S.scrollDir >= 0 ? 1 : -1;
+    const targetRect = targetEl?.getBoundingClientRect?.() || { top: vh, bottom: vh };
+
+    // 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 best = null, bestScore = Infinity;
-    let fallback = null, fallbackScore = Infinity;
+    let aboveEmpty = null, aboveEmptyBottom = Infinity;
+    let aboveFilled = null, aboveFilledBottom = Infinity;
+    let belowEmpty = null, belowEmptyTop = -Infinity;
+    let belowFilled = null, belowFilledTop = -Infinity;
 
-    for (const wrap of S.wrapByKey.values()) {
+    document.querySelectorAll(`.${WRAP_CLASS}.${klass}`).forEach(wrap => {
       try {
-        if (!wrap?.isConnected || !wrap.classList?.contains(WRAP_CLASS) || !wrap.classList.contains(klass)) continue;
+        if (!wrap?.isConnected) return;
         const rect = wrap.getBoundingClientRect();
-        const farAbove = rect.bottom < -vh;
-        const farBelow = rect.top > (window.innerHeight || 800) + vh;
-        if (!farAbove && !farBelow) continue;
-
-        const preferredSide = dir > 0 ? farAbove : farBelow;
-        const dist = targetRect ? Math.abs(rect.top - targetRect.top) : Math.abs(rect.top);
-        const score = (isFilled(wrap) ? 10000000 : 0) + dist;
-
-        if (preferredSide) {
-          if (score < bestScore) { best = wrap; bestScore = score; }
-        } else if (score < fallbackScore) {
-          fallback = wrap; fallbackScore = score;
+
+        if (rect.bottom < aboveThreshold) {
+          if (!isFilled(wrap)) {
+            if (rect.bottom < aboveEmptyBottom) { aboveEmptyBottom = rect.bottom; aboveEmpty = wrap; }
+          } else {
+            if (rect.bottom < aboveFilledBottom) { aboveFilledBottom = rect.bottom; aboveFilled = wrap; }
+          }
+          return;
+        }
+
+        if (rect.top > belowThreshold) {
+          if (!isFilled(wrap)) {
+            if (rect.top > belowEmptyTop) { belowEmptyTop = rect.top; belowEmpty = wrap; }
+          } else {
+            if (rect.top > belowFilledTop) { belowFilledTop = rect.top; belowFilled = wrap; }
+          }
         }
       } catch (_) {}
-    }
+    });
 
-    best = best || fallback;
+    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());
     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); unobserveFill(id); } } catch (_) {}
+    // 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);
       best.setAttribute(A_CREATED, String(ts()));
@@ -443,9 +378,10 @@
     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, 300); };
-    const doDefine  = () => { try { ez.define([id]); } catch (_) {} setTimeout(doDisplay, 300); };
-    const doDisplay = () => { try { ez.displayMore([id]); } catch (_) {} };
+    // 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 doDisplay = () => { try { ez.displayMore([id]);         } catch (_) {} };
     try { (typeof ez.cmd?.push === 'function') ? ez.cmd.push(doDestroy) : doDestroy(); } catch (_) {}
 
     return { id, wrap: best };
@@ -485,7 +421,6 @@
       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)) unobserveFill(id);
       if (Number.isFinite(id)) S.mountedIds.delete(id);
       const key = w.getAttribute(A_ANCHOR);
       if (key && S.wrapByKey.get(key) === w) S.wrapByKey.delete(key);
@@ -549,7 +484,6 @@
   function injectBetween(klass, items, interval, showFirst, poolKey) {
     if (!items.length) return 0;
     let inserted = 0;
-    sweepDeadWraps();
 
     for (const el of items) {
       if (inserted >= MAX_INSERTS_RUN) break;
@@ -562,15 +496,13 @@
       const key = anchorKey(klass, el);
       if (findWrap(key)) continue;
 
-      let id = pickId(poolKey);
-      if (!id) { sweepDeadWraps(); id = pickId(poolKey); }
+      const id = pickId(poolKey);
       if (id) {
         const w = insertAfter(el, id, klass, key);
         if (w) { observePh(id); inserted++; }
       } else {
         const recycled = recycleAndMove(klass, el, key);
         if (!recycled) break;
-        observePh(recycled.id);
         inserted++;
       }
     }
@@ -596,54 +528,45 @@
 
   function observePh(id) {
     const ph = document.getElementById(`${PH_PREFIX}${id}`);
-    if (ph?.isConnected) {
-      try { getIO()?.observe(ph); } catch (_) {}
-      watchPlaceholderFill(id);
-    }
+    if (ph?.isConnected) try { getIO()?.observe(ph); } catch (_) {}
   }
 
   function enqueueShow(id) {
     if (!id || isBlocked()) return;
-    if (isCooling(id) || S.pendingShows.has(id)) return;
     if (ts() - (S.lastShow.get(id) ?? 0) < SHOW_THROTTLE_MS) return;
-    if (S.inflight >= MAX_INFLIGHT) { pendingEnqueue(id); return; }
+    if (S.inflight >= MAX_INFLIGHT) {
+      if (!S.pendingSet.has(id)) { S.pending.push(id); S.pendingSet.add(id); }
+      return;
+    }
     startShow(id);
   }
 
   function drainQueue() {
     if (isBlocked()) return;
     while (S.inflight < MAX_INFLIGHT && S.pending.length) {
-      const item = S.pending.shift();
-      const id = item?.id ?? item;
+      const id = S.pending.shift();
       S.pendingSet.delete(id);
-      if (!id || isCooling(id) || S.pendingShows.has(id)) continue;
-      if (!document.getElementById(`${PH_PREFIX}${id}`)?.isConnected) continue;
-      if (ts() - (S.lastShow.get(id) ?? 0) < SHOW_THROTTLE_MS) continue;
       startShow(id);
     }
   }
 
   function startShow(id) {
     if (!id || isBlocked()) return;
-    if (S.pendingShows.has(id) || isCooling(id)) return;
-    S.pendingShows.add(id);
     S.inflight++;
     let done = false;
     const release = () => {
       if (done) return;
       done = true;
-      S.pendingShows.delete(id);
       S.inflight = Math.max(0, S.inflight - 1);
       drainQueue();
     };
-    const timer = setTimeout(() => { markUnusedProbable(id); release(); }, PENDING_TIMEOUT_MS);
+    const timer = setTimeout(release, 7000);
 
     requestAnimationFrame(() => {
       try {
         if (isBlocked()) { clearTimeout(timer); return release(); }
         const ph = document.getElementById(`${PH_PREFIX}${id}`);
-        if (!ph?.isConnected) { clearTimeout(timer); markUnusedProbable(id); return release(); }
-        if (isFilled(ph)) { clearTimeout(timer); clearCooldownIfFilled(id); return release(); }
+        if (!ph?.isConnected || isFilled(ph)) { clearTimeout(timer); return release(); }
 
         const t = ts();
         if (t - (S.lastShow.get(id) ?? 0) < SHOW_THROTTLE_MS) { clearTimeout(timer); return release(); }
@@ -655,6 +578,7 @@
         const ez = window.ezstandalone;
         const doShow = () => {
           try { ez.showAds(id); } catch (_) {}
+          scheduleEmptyCheck(id, t);
           setTimeout(() => { clearTimeout(timer); release(); }, 700);
         };
         Array.isArray(ez.cmd) ? ez.cmd.push(doShow) : doShow();
@@ -662,6 +586,17 @@
     });
   }
 
+  function scheduleEmptyCheck(id, showTs) {
+    setTimeout(() => {
+      try {
+        const ph   = document.getElementById(`${PH_PREFIX}${id}`);
+        const wrap = ph?.closest?.(`.${WRAP_CLASS}`);
+        if (!wrap || !ph?.isConnected) return;
+        if (parseInt(wrap.getAttribute(A_SHOWN) || '0', 10) > showTs) return;
+        wrap.classList.toggle('is-empty', !isFilled(ph));
+      } catch (_) {}
+    }, EMPTY_CHECK_MS);
+  }
 
   // ── Patch Ezoic showAds ────────────────────────────────────────────────────
   //
@@ -703,7 +638,6 @@
   async function runCore() {
     if (isBlocked()) return 0;
     patchShowAds();
-    sweepDeadWraps();
 
     const cfg = await fetchConfig();
     if (!cfg || cfg.excluded) return 0;
@@ -791,9 +725,6 @@
     S.inflight     = 0;
     S.pending      = [];
     S.pendingSet.clear();
-    S.pendingShows.clear();
-    S.cooldownUntil.clear();
-    for (const id of Array.from(S.fillObsById.keys())) unobserveFill(id);
     S.burstActive  = false;
     S.runQueued    = false;
   }
@@ -805,12 +736,7 @@
     const allSel = [SEL.post, SEL.topic, SEL.category];
     S.domObs = new MutationObserver(muts => {
       if (S.mutGuard > 0 || isBlocked()) return;
-      let sawWrapRemoval = false;
       for (const m of muts) {
-        for (const n of (m.removedNodes || [])) {
-          if (n?.nodeType !== 1) continue;
-          try { if ((n.classList && n.classList.contains(WRAP_CLASS)) || n.querySelector?.(`.${WRAP_CLASS}`)) sawWrapRemoval = true; } catch (_) {}
-        }
         for (const n of m.addedNodes) {
           if (n.nodeType !== 1) continue;
           // matches() d'abord (O(1)), querySelector() seulement si nécessaire
@@ -820,7 +746,6 @@
           }
         }
       }
-      if (sawWrapRemoval) sweepDeadWraps();
     });
     try { S.domObs.observe(document.body, { childList: true, subtree: true }); } catch (_) {}
   }
@@ -922,11 +847,14 @@
   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;
-      const y = window.scrollY || window.pageYOffset || 0;
-      S.scrollDir = y >= (S.lastScrollY || 0) ? 1 : -1;
-      S.lastScrollY = y;
       requestAnimationFrame(() => { ticking = false; requestBurst(); });
     }, { passive: true });
   }
@@ -934,6 +862,7 @@
   // ── Boot ───────────────────────────────────────────────────────────────────
 
   S.pageKey = pageKey();
+  try { S.lastScrollY = window.scrollY || window.pageYOffset || 0; } catch (_) { S.lastScrollY = 0; }
   muteConsole();
   ensureTcfLocator();
   warmNetwork();