nodebb-plugin-ezoic-infinite 1.7.89 → 1.7.91

package/package.json

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

package/public/client.js

@@ -77,7 +77,6 @@
   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      = 4;       // max showAds() simultanés
@@ -127,11 +126,14 @@
     pending:      [],    // ids en attente de slot inflight
     pendingSet:   new Set(),
     wrapByKey:    new Map(),  // anchorKey → wrap DOM node
+    fillObsById:   new Map(),  // id -> MutationObserver
     runQueued:    false,
     burstActive:  false,
     burstDeadline: 0,
     burstCount:   0,
     lastBurstTs:  0,
+    lastScrollY:  0,
+    scrollDir:    1,     // 1=down, -1=up
   };
 
   let blockedUntil = 0;
@@ -142,6 +144,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 unwatchPlaceholderFillById(id) {
+    const obs = S.fillObsById.get(id);
+    if (obs) { try { obs.disconnect(); } catch (_) {} S.fillObsById.delete(id); }
+  }
+
+  function uncollapseIfFilled(ph) {
+    try {
+      const wrap = ph?.closest?.(`.${WRAP_CLASS}`);
+      if (!wrap) return false;
+      if (!isFilled(ph)) return false;
+      wrap.classList.remove('is-empty');
+      return true;
+    } catch (_) { return false; }
+  }
+
+  function watchPlaceholderFill(id) {
+    const ph = document.getElementById(`${PH_PREFIX}${id}`);
+    if (!ph?.isConnected || S.fillObsById.has(id)) return;
+    try {
+      const obs = new MutationObserver(() => { try { uncollapseIfFilled(ph); } catch (_) {} });
+      obs.observe(ph, { childList: true, subtree: true, attributes: true });
+      S.fillObsById.set(id, obs);
+      uncollapseIfFilled(ph);
+    } catch (_) {}
+  }
+
   function mutate(fn) {
     S.mutGuard++;
     try { fn(); } finally { S.mutGuard--; }
@@ -282,26 +311,24 @@
     return (w?.isConnected) ? w : null;
   }
 
-  /**
-   * Libère les ids de wraps supprimés du DOM (virtualisation NodeBB / rerender).
-   * Sans ce sweep, mountedIds peut conserver des ids fantômes → pool épuisé
-   * après long scroll alors qu'aucun wrap recyclable n'existe encore en DOM.
-   */
   function sweepDeadWraps() {
-    for (const [key, w] of S.wrapByKey.entries()) {
-      if (w?.isConnected) continue;
-      const id = parseInt(w?.getAttribute?.(A_WRAPID), 10);
-      if (Number.isFinite(id)) {
+    let freed = 0;
+    for (const [key, wrap] of Array.from(S.wrapByKey.entries())) {
+      if (wrap?.isConnected) continue;
+      const id = parseInt(wrap?.getAttribute?.(A_WRAPID) || '0', 10);
+      if (Number.isFinite(id) && id > 0) {
         S.mountedIds.delete(id);
+        unwatchPlaceholderFillById(id);
         S.lastShow.delete(id);
         S.pendingSet.delete(id);
       }
       S.wrapByKey.delete(key);
+      freed++;
     }
-    if (S.pending.length) {
-      S.pending = S.pending.filter(id => !S.pendingSet.has(id) || document.getElementById(`${PH_PREFIX}${id}`)?.isConnected);
-      S.pendingSet = new Set(S.pending);
+    if (freed && S.pending.length) {
+      S.pending = S.pending.filter(id => !S.mountedIds.has(id));
     }
+    return freed;
   }
 
   // ── Pool ───────────────────────────────────────────────────────────────────
@@ -335,26 +362,50 @@
         typeof ez?.define             !== 'function' ||
         typeof ez?.displayMore        !== 'function') return null;
 
-    const vh        = window.innerHeight || 800;
-    // Seuil : -1vh (hors viewport visible). On appelle unobserve(ph) juste
-    // après pour neutraliser l'IO — plus de showAds parasite possible.
-    const threshold = -vh;
-    let bestEmpty = null, bestEmptyBottom = Infinity;
-    let bestFilled = null, bestFilledBottom = Infinity;
+    const vh = window.innerHeight || 800;
+    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 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?.classList?.contains?.(klass)) continue;
       try {
+        if (!wrap?.isConnected) continue;
         const rect = wrap.getBoundingClientRect();
-        if (rect.bottom > threshold) return;
-        if (!isFilled(wrap)) {
-          if (rect.bottom < bestEmptyBottom) { bestEmptyBottom = rect.bottom; bestEmpty = wrap; }
-        } else {
-          if (rect.bottom < bestFilledBottom) { bestFilledBottom = rect.bottom; bestFilled = wrap; }
+
+        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; }
+          }
+          continue;
+        }
+
+        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 (_) {}
-    });
+    }
 
-    const best = bestEmpty ?? bestFilled;
+    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;
@@ -410,6 +461,7 @@
     mutate(() => el.insertAdjacentElement('afterend', w));
     S.mountedIds.add(id);
     S.wrapByKey.set(key, w);
+    watchPlaceholderFill(id);
     return w;
   }
 
@@ -418,7 +470,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)) { S.mountedIds.delete(id); unwatchPlaceholderFillById(id); S.lastShow.delete(id); S.pendingSet.delete(id); }
       const key = w.getAttribute(A_ANCHOR);
       if (key && S.wrapByKey.get(key) === w) S.wrapByKey.delete(key);
       w.remove();
@@ -494,12 +546,7 @@
       if (findWrap(key)) continue;
 
       let id = pickId(poolKey);
-      if (!id) {
-        // Réessaie après sweep : des wraps ont pu être retirés du DOM (virtualisation)
-        // sans passer par dropWrap, laissant des ids fantômes dans mountedIds.
-        sweepDeadWraps();
-        id = pickId(poolKey);
-      }
+      if (!id) { sweepDeadWraps(); id = pickId(poolKey); }
       if (id) {
         const w = insertAfter(el, id, klass, key);
         if (w) { observePh(id); inserted++; }
@@ -531,7 +578,9 @@
 
   function observePh(id) {
     const ph = document.getElementById(`${PH_PREFIX}${id}`);
-    if (ph?.isConnected) try { getIO()?.observe(ph); } catch (_) {}
+    if (!ph?.isConnected) return;
+    watchPlaceholderFill(id);
+    try { getIO()?.observe(ph); } catch (_) {}
   }
 
   function enqueueShow(id) {
@@ -571,6 +620,8 @@
         const ph = document.getElementById(`${PH_PREFIX}${id}`);
         if (!ph?.isConnected || isFilled(ph)) { clearTimeout(timer); return release(); }
 
+        try { ph.closest?.(`.${WRAP_CLASS}`)?.classList.remove('is-empty'); } catch (_) {}
+
         const t = ts();
         if (t - (S.lastShow.get(id) ?? 0) < SHOW_THROTTLE_MS) { clearTimeout(timer); return release(); }
         S.lastShow.set(id, t);
@@ -581,7 +632,6 @@
         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();
@@ -589,17 +639,6 @@
     });
   }
 
-  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 ────────────────────────────────────────────────────
   //
@@ -726,6 +765,8 @@
     S.mountedIds.clear();
     S.lastShow.clear();
     S.wrapByKey.clear();
+    for (const obs of S.fillObsById.values()) { try { obs.disconnect(); } catch (_) {} }
+    S.fillObsById.clear();
     S.inflight     = 0;
     S.pending      = [];
     S.pendingSet.clear();
@@ -740,26 +781,25 @@
     const allSel = [SEL.post, SEL.topic, SEL.category];
     S.domObs = new MutationObserver(muts => {
       if (S.mutGuard > 0 || isBlocked()) return;
-      let sawRelevantAdd = false;
-      let sawWrapRemoval  = false;
       for (const m of muts) {
-        for (const n of m.removedNodes) {
+        let sawWrapRemoval = false;
+        for (const n of m.removedNodes || []) {
           if (n.nodeType !== 1) continue;
-          if ((n.matches && n.matches(`.${WRAP_CLASS}`)) || n.querySelector?.(`.${WRAP_CLASS}`)) {
-            sawWrapRemoval = true;
-          }
+          try {
+            if (n.matches?.(`.${WRAP_CLASS}`) || n.querySelector?.(`.${WRAP_CLASS}`)) { sawWrapRemoval = true; }
+          } catch (_) {}
         }
+        if (sawWrapRemoval) sweepDeadWraps();
+
         for (const n of m.addedNodes) {
           if (n.nodeType !== 1) continue;
           // matches() d'abord (O(1)), querySelector() seulement si nécessaire
           if (allSel.some(s => { try { return n.matches(s); } catch(_){return false;} }) ||
               allSel.some(s => { try { return !!n.querySelector(s); } catch(_){return false;} })) {
-            sawRelevantAdd = true;
+            requestBurst(); return;
           }
         }
       }
-      if (sawWrapRemoval) sweepDeadWraps();
-      if (sawRelevantAdd) requestBurst();
     });
     try { S.domObs.observe(document.body, { childList: true, subtree: true }); } catch (_) {}
   }
@@ -861,6 +901,12 @@
   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(); });
@@ -870,6 +916,7 @@
   // ── Boot ───────────────────────────────────────────────────────────────────
 
   S.pageKey = pageKey();
+  try { S.lastScrollY = window.scrollY || window.pageYOffset || 0; } catch (_) { S.lastScrollY = 0; }
   muteConsole();
   ensureTcfLocator();
   warmNetwork();

package/public/style.css

@@ -56,20 +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.
-*/
-.nodebb-ezoic-wrap.is-empty {
-  display: block !important;
-  height: 1px !important;
-  min-height: 1px !important;
-  max-height: 1px !important;
-  margin: 0 !important;
-  padding: 0 !important;
-  overflow: hidden !important;
-}
 
 /* ── Ezoic global (hors de nos wraps) ────────────────────────────────────── */
 .ezoic-ad {