nodebb-plugin-ezoic-infinite 1.7.96 → 1.7.97

package/package.json

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

package/public/client.js

@@ -79,15 +79,14 @@
 
   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 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]',
@@ -133,8 +132,6 @@
     burstDeadline: 0,
     burstCount:   0,
     lastBurstTs:  0,
-    scrollDir:    1,
-    lastScrollY:  0,
   };
 
   let blockedUntil = 0;
@@ -145,6 +142,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 ezCmd(fn) {
+    try {
+      window.ezstandalone = window.ezstandalone || {};
+      const ez = window.ezstandalone;
+      if (Array.isArray(ez.cmd)) ez.cmd.push(fn);
+      else fn();
+    } catch (_) {}
+  }
+
+  function destroyPlaceholderIds(ids) {
+    try {
+      const uniq = Array.from(new Set((ids || [])
+        .map(v => parseInt(v, 10))
+        .filter(v => Number.isFinite(v) && v > 0)));
+      if (!uniq.length) return;
+      ezCmd(() => {
+        try {
+          const ez = window.ezstandalone;
+          if (typeof ez?.destroyPlaceholders === 'function') ez.destroyPlaceholders(uniq);
+        } catch (_) {}
+      });
+    } catch (_) {}
+  }
+
+  function placeholderCount(id) {
+    try { return document.querySelectorAll(`#${PH_PREFIX}${id}`).length; } catch (_) { return 0; }
+  }
+
   function mutate(fn) {
     S.mutGuard++;
     try { fn(); } finally { S.mutGuard--; }
@@ -316,58 +341,33 @@
         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;
+    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;
 
-    for (const wrap of S.wrapByKey.values()) {
-      if (!wrap?.isConnected) continue;
-      if (!wrap.classList?.contains(WRAP_CLASS) || !wrap.classList.contains(klass)) continue;
+    document.querySelectorAll(`.${WRAP_CLASS}.${klass}`).forEach(wrap => {
       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); }
+        if (rect.bottom > threshold) return;
+        if (!isFilled(wrap)) {
+          if (rect.bottom < bestEmptyBottom) { bestEmptyBottom = rect.bottom; bestEmpty = wrap; }
         } else {
-          if (farBelow) { preferred = true; score = Math.abs(rect.top); }
-          else if (farAbove) { score = Math.abs(rect.bottom); }
-        }
-        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; }
-          }
+          if (rect.bottom < bestFilledBottom) { bestFilledBottom = rect.bottom; bestFilled = wrap; }
         }
       } catch (_) {}
-    }
+    });
 
-    const best = prefEmpty ?? prefFilled ?? altEmpty ?? altFilled;
+    const best = bestEmpty ?? bestFilled;
     if (!best) return null;
     const id = parseInt(best.getAttribute(A_WRAPID), 10);
     if (!Number.isFinite(id)) return null;
 
     const oldKey = best.getAttribute(A_ANCHOR);
+    // 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);
@@ -381,8 +381,9 @@
     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); };
+    // 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 (_) {}
 
@@ -423,7 +424,10 @@
       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)) {
+        destroyPlaceholderIds([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,16 +534,7 @@
 
   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 (_) {}
+    if (ph?.isConnected) try { getIO()?.observe(ph); } catch (_) {}
   }
 
   function enqueueShow(id) {
@@ -578,6 +573,7 @@
         if (isBlocked()) { clearTimeout(timer); return release(); }
         const ph = document.getElementById(`${PH_PREFIX}${id}`);
         if (!ph?.isConnected || isFilled(ph)) { clearTimeout(timer); return release(); }
+        if (placeholderCount(id) !== 1) { clearTimeout(timer); return release(); }
 
         const t = ts();
         if (t - (S.lastShow.get(id) ?? 0) < SHOW_THROTTLE_MS) { clearTimeout(timer); return release(); }
@@ -590,7 +586,7 @@
         const doShow = () => {
           try { ez.showAds(id); } catch (_) {}
           scheduleEmptyCheck(id, t);
-          setTimeout(() => { clearTimeout(timer); release(); }, 350);
+          setTimeout(() => { clearTimeout(timer); release(); }, 700);
         };
         Array.isArray(ez.cmd) ? ez.cmd.push(doShow) : doShow();
       } catch (_) { clearTimeout(timer); release(); }
@@ -631,6 +627,7 @@
             const id = parseInt(v, 10);
             if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
             if (!document.getElementById(`${PH_PREFIX}${id}`)?.isConnected) continue;
+            if (placeholderCount(id) !== 1) continue;
             seen.add(id);
             try { orig(id); } catch (_) {}
           }
@@ -715,7 +712,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();
@@ -725,6 +722,18 @@
 
   function cleanup() {
     blockedUntil = ts() + 1500;
+    try {
+      const ids = Array.from(document.querySelectorAll(`.${WRAP_CLASS}[${A_WRAPID}]`))
+        .map(w => parseInt(w.getAttribute(A_WRAPID), 10))
+        .filter(v => Number.isFinite(v) && v > 0);
+      destroyPlaceholderIds(ids);
+      ezCmd(() => {
+        try {
+          const ez = window.ezstandalone;
+          if (typeof ez?.destroyAll === 'function') ez.destroyAll();
+        } catch (_) {}
+      });
+    } catch (_) {}
     mutate(() => document.querySelectorAll(`.${WRAP_CLASS}`).forEach(dropWrap));
     S.cfg          = null;
     S.poolsReady   = false;
@@ -835,7 +844,9 @@
       S.pageKey    = pageKey();
       blockedUntil = 0;
       muteConsole(); ensureTcfLocator(); warmNetwork();
-      patchShowAds(); getIO(); ensureDomObserver(); requestBurst();
+      patchShowAds(); getIO(); ensureDomObserver();
+      ezCmd(() => { try { window.ezstandalone?.showAds?.(); } catch (_) {} });
+      requestBurst();
     });
 
     const burstEvts = [
@@ -860,22 +871,13 @@
     window.addEventListener('scroll', () => {
       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();