nodebb-plugin-ezoic-infinite 1.7.89 → 1.7.90

package/package.json

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

package/public/client.js

@@ -132,6 +132,8 @@
     burstDeadline: 0,
     burstCount:   0,
     lastBurstTs:  0,
+    lastScrollY:  0,
+    scrollDir:    1,     // 1=down, -1=up
   };
 
   let blockedUntil = 0;
@@ -282,28 +284,6 @@
     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)) {
-        S.mountedIds.delete(id);
-        S.lastShow.delete(id);
-        S.pendingSet.delete(id);
-      }
-      S.wrapByKey.delete(key);
-    }
-    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);
-    }
-  }
-
   // ── Pool ───────────────────────────────────────────────────────────────────
 
   /**
@@ -335,26 +315,49 @@
         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 => {
       try {
+        if (!wrap?.isConnected) return;
         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; }
+          }
+          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 (_) {}
     });
 
-    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;
@@ -493,13 +496,7 @@
       const key = anchorKey(klass, el);
       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);
-      }
+      const id = pickId(poolKey);
       if (id) {
         const w = insertAfter(el, id, klass, key);
         if (w) { observePh(id); inserted++; }
@@ -641,7 +638,6 @@
   async function runCore() {
     if (isBlocked()) return 0;
     patchShowAds();
-    sweepDeadWraps();
 
     const cfg = await fetchConfig();
     if (!cfg || cfg.excluded) return 0;
@@ -740,26 +736,16 @@
     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) {
-          if (n.nodeType !== 1) continue;
-          if ((n.matches && n.matches(`.${WRAP_CLASS}`)) || n.querySelector?.(`.${WRAP_CLASS}`)) {
-            sawWrapRemoval = true;
-          }
-        }
         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 +847,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 +862,7 @@
   // ── Boot ───────────────────────────────────────────────────────────────────
 
   S.pageKey = pageKey();
+  try { S.lastScrollY = window.scrollY || window.pageYOffset || 0; } catch (_) { S.lastScrollY = 0; }
   muteConsole();
   ensureTcfLocator();
   warmNetwork();