nodebb-plugin-ezoic-infinite 1.8.26 → 1.8.28

package/package.json

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

package/public/client.js

@@ -83,7 +83,7 @@
   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
-  const MIN_PLACEHOLDER_HEIGHT = 50; // réservation minimale perçue
+  const MIN_PLACEHOLDER_HEIGHT = 1; // placeholder minimal (test stabilité scroll)
 
   // Marges IO larges et fixes — observer créé une seule fois au boot
   const IO_MARGIN_DESKTOP = '2500px 0px 2500px 0px';
@@ -144,13 +144,51 @@
   const isBlocked = () => ts() < blockedUntil;
   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 FILL_SEL  = 'iframe, ins, img, video, [data-google-container-id], div[id$="__container__"]';
+  const isFilled  = n  => !!(n?.querySelector?.(FILL_SEL));
 
   function mutate(fn) {
     S.mutGuard++;
     try { fn(); } finally { S.mutGuard--; }
   }
 
+function clearEmptyIfFilled(wrap) {
+  try {
+    if (!wrap?.isConnected) return false;
+    const ph = wrap.querySelector(`[id^="${PH_PREFIX}"]`);
+    if (!ph) return false;
+    if (!isFilled(ph)) return false;
+    wrap.classList.remove('is-empty');
+    return true;
+  } catch (_) { return false; }
+}
+
+function scheduleUncollapseChecksForWrap(wrap) {
+  if (!wrap) return;
+  for (const ms of [500, 1500, 3000, 7000, 15000]) {
+    setTimeout(() => { try { clearEmptyIfFilled(wrap); } catch (_) {} }, ms);
+  }
+}
+
+
+  function clearEmptyIfFilled(wrap) {
+    try {
+      if (!wrap?.isConnected) return false;
+      const ph = wrap.querySelector(`[id^="${PH_PREFIX}"]`);
+      if (!ph) return false;
+      if (!isFilled(ph)) return false;
+      wrap.classList.remove('is-empty');
+      return true;
+    } catch (_) { return false; }
+  }
+
+  function scheduleUncollapseChecksForWrap(wrap) {
+    if (!wrap) return;
+    for (const ms of [500, 1500, 3000, 7000, 15000]) {
+      setTimeout(() => { try { clearEmptyIfFilled(wrap); } catch (_) {} }, ms);
+    }
+  }
+
   // ── Config ─────────────────────────────────────────────────────────────────
 
   async function fetchConfig() {
@@ -370,17 +408,30 @@
       best.setAttribute(A_CREATED, String(ts()));
       best.setAttribute(A_SHOWN,   '0');
       best.classList.remove('is-empty');
-      const ph = best.querySelector(`#${PH_PREFIX}${id}`);
-      if (ph) ph.innerHTML = '';
+      const oldPh = best.querySelector(`#${PH_PREFIX}${id}`);
+      if (oldPh) {
+        const fresh = document.createElement('div');
+        fresh.id = `${PH_PREFIX}${id}`;
+        fresh.setAttribute('data-ezoic-id', String(id));
+        fresh.style.minHeight = `${MIN_PLACEHOLDER_HEIGHT}px`;
+        oldPh.replaceWith(fresh);
+      }
       targetEl.insertAdjacentElement('afterend', best);
     });
     if (oldKey && S.wrapByKey.get(oldKey) === best) S.wrapByKey.delete(oldKey);
     S.wrapByKey.set(newKey, best);
 
-    // 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 (_) {} };
+    // Recyclage Ezoic : détruire l'ancien placeholder avant de réutiliser le même ID.
+    // Puis ré-observer + re-show (batché via patchShowAds) sur le placeholder recréé.
+    const doDestroy = () => {
+      try { ez.destroyPlaceholders(id); } catch (_) {
+        try { ez.destroyPlaceholders([id]); } catch (_) {}
+      }
+      setTimeout(() => {
+        try { observePh(id); } catch (_) {}
+        try { enqueueShow(id); } catch (_) {}
+      }, 450);
+    };
     try { (typeof ez.cmd?.push === 'function') ? ez.cmd.push(doDestroy) : doDestroy(); } catch (_) {}
 
     return { id, wrap: best };
@@ -585,7 +636,10 @@
         window.ezstandalone = window.ezstandalone || {};
         const ez = window.ezstandalone;
         const doShow = () => {
+          let wrap = null;
+          try { wrap = ph.closest?.(`.${WRAP_CLASS}`) || null; } catch (_) {}
           try { ez.showAds(id); } catch (_) {}
+          if (wrap) scheduleUncollapseChecksForWrap(wrap);
           scheduleEmptyCheck(id, t);
           setTimeout(() => { clearTimeout(timer); release(); }, 700);
         };
@@ -601,7 +655,8 @@
         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));
+        if (clearEmptyIfFilled(wrap)) return;
+        wrap.classList.add('is-empty');
       } catch (_) {}
     }, EMPTY_CHECK_MS);
   }
@@ -620,17 +675,34 @@
         if (window.__nbbEzPatched || typeof ez.showAds !== 'function') return;
         window.__nbbEzPatched = true;
         const orig = ez.showAds.bind(ez);
+        const q = new Set();
+        let flushTimer = null;
+        const BATCH_SIZE = 3;
+        const FLUSH_MS = 80;
+        const flush = () => {
+          flushTimer = null;
+          if (isBlocked() || !q.size) return;
+          const ids = Array.from(q).sort((a, b) => a - b);
+          q.clear();
+          const valid = ids.filter(id => document.getElementById(`${PH_PREFIX}${id}`)?.isConnected);
+          for (let i = 0; i < valid.length; i += BATCH_SIZE) {
+            const chunk = valid.slice(i, i + BATCH_SIZE);
+            try { orig(...chunk); } catch (_) {
+              for (const id of chunk) { try { orig(id); } catch (_) {} }
+            }
+          }
+        };
         ez.showAds = function (...args) {
           if (isBlocked()) return;
-          const ids  = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
-          const seen = new Set();
+          const ids = args.length === 1 && Array.isArray(args[0]) ? args[0] : args;
           for (const v of ids) {
             const id = parseInt(v, 10);
-            if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
+            if (!Number.isFinite(id) || id <= 0) continue;
             if (!document.getElementById(`${PH_PREFIX}${id}`)?.isConnected) continue;
-            seen.add(id);
-            try { orig(id); } catch (_) {}
+            q.add(id);
           }
+          if (!q.size) return;
+          if (!flushTimer) flushTimer = setTimeout(flush, FLUSH_MS);
         };
       } catch (_) {}
     };
@@ -746,6 +818,21 @@
     if (S.domObs) return;
     S.domObs = new MutationObserver(muts => {
       if (S.mutGuard > 0 || isBlocked()) return;
+      for (const m of muts) {
+        if (m.type !== 'childList') continue;
+        for (const node of m.addedNodes) {
+          if (!(node instanceof Element)) continue;
+          let hasAd = false;
+          try {
+            hasAd = !!(node.matches?.(FILL_SEL) || node.querySelector?.(FILL_SEL));
+          } catch (_) {}
+          if (!hasAd) continue;
+          try {
+            const wrap = node.closest?.(`.${WRAP_CLASS}.is-empty`) || m.target?.closest?.(`.${WRAP_CLASS}.is-empty`);
+            if (wrap) clearEmptyIfFilled(wrap);
+          } catch (_) {}
+        }
+      }
       const relevant = (() => {
         const k = getKind();
         if (k === 'topic') return [SEL.post];

package/public/style.css

@@ -1,5 +1,5 @@
 /*
- * NodeBB Ezoic Infinite Ads — style.css (v20.1)
+ * NodeBB Ezoic Infinite Ads — style.css (v20)
  */
 
 /* ── Wrapper ──────────────────────────────────────────────────────────────── */
@@ -39,9 +39,9 @@
 /* Ne pas écraser la hauteur réelle calculée par Ezoic */
 .nodebb-ezoic-wrap .ezoic-ad,
 .nodebb-ezoic-wrap span.ezoic-ad {
-  display: block !important;
   margin: 0 !important;
   padding: 0 !important;
+  display: block !important;
   height: auto !important;
   min-height: unset !important;
   max-height: none !important;
@@ -60,8 +60,8 @@
 
 /* ── État vide ────────────────────────────────────────────────────────────── */
 /*
-  Ajouté après le délai d'empty-check si aucun fill détecté.
-  Collapse à 1px : réserve minimale, reste observable par l'IO.
+  Ajouté 20s après showAds si aucun fill détecté.
+  Collapse à 1px : réserve minimale demandée, reste observable par l'IO.
 */
 .nodebb-ezoic-wrap.is-empty {
   display: block !important;
@@ -77,4 +77,15 @@
 .ezoic-ad {
   margin: 0 !important;
   padding: 0 !important;
-}
+}
+
+
+/* Anti-faux-empty : si une pub est présente, annule le collapse */
+.nodebb-ezoic-wrap.is-empty:has(iframe),
+.nodebb-ezoic-wrap.is-empty:has([data-google-container-id]),
+.nodebb-ezoic-wrap.is-empty:has(div[id$="__container__"]) {
+  height: auto !important;
+  min-height: 0 !important;
+  max-height: none !important;
+  overflow: visible !important;
+}