nodebb-plugin-ezoic-infinite 1.7.86 → 1.7.88

package/package.json

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

package/public/client.js

@@ -76,14 +76,8 @@
   const A_WRAPID    = 'data-ezoic-wrapid';   // id Ezoic
   const A_CREATED   = 'data-ezoic-created';  // timestamp création ms
   const A_SHOWN     = 'data-ezoic-shown';    // timestamp dernier showAds ms
-  const A_FILLED    = 'data-ezoic-filled';   // timestamp premier fill réel
-  const A_LAST_H    = 'data-ezoic-lasth';    // dernière hauteur pub vue
 
   const EMPTY_CHECK_MS    = 20_000;  // délai avant collapse d'un wrap vide post-show
-  const MIN_LIVE_AFTER_SHOW_MS = 15_000;
-  const MIN_LIVE_AFTER_FILL_MS = 25_000;
-  const KEEP_SHELL_AFTER_UNUSED_MS = 90_000;
-  const MIN_SHELL_HEIGHT = 120;
   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
@@ -133,8 +127,6 @@
     pending:      [],    // ids en attente de slot inflight
     pendingSet:   new Set(),
     wrapByKey:    new Map(),  // anchorKey → wrap DOM node
-    emptyChecks:  new Map(),  // id → [timerIds]
-    fillObsById:  new Map(),  // id → MutationObserver
     runQueued:    false,
     burstActive:  false,
     burstDeadline: 0,
@@ -150,86 +142,6 @@
   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 clearEmptyChecks(id) {
-  const timers = S.emptyChecks.get(id);
-  if (!timers) return;
-  for (const t of timers) { try { clearTimeout(t); } catch (_) {} }
-  S.emptyChecks.delete(id);
-}
-function queueEmptyCheck(id, timerId) {
-  const arr = S.emptyChecks.get(id) || [];
-  arr.push(timerId);
-  S.emptyChecks.set(id, arr);
-}
-function markFilledOnce(ph) {
-  try {
-    const wrap = ph?.closest?.(`.${WRAP_CLASS}`);
-    if (!wrap || !isFilled(ph)) return;
-    if (!wrap.getAttribute(A_FILLED)) wrap.setAttribute(A_FILLED, String(ts()));
-    const h = Math.round(ph.getBoundingClientRect?.().height || ph.offsetHeight || 0);
-    if (h > 0) wrap.setAttribute(A_LAST_H, String(h));
-  } catch (_) {}
-}
-function shouldKeepShellAfterUnused(wrap) {
-  try {
-    const filledTs = parseInt(wrap?.getAttribute?.(A_FILLED) || '0', 10) || 0;
-    return !!filledTs && (ts() - filledTs) < KEEP_SHELL_AFTER_UNUSED_MS;
-  } catch (_) { return false; }
-}
-function applyUnusedShell(wrap, ph) {
-  try {
-    const lastH = parseInt(wrap.getAttribute(A_LAST_H) || '0', 10) || 0;
-    const h = Math.max(MIN_SHELL_HEIGHT, lastH || 0);
-    wrap.classList.remove('is-empty');
-    wrap.classList.add('is-unused-shell');
-    wrap.style.minHeight = `${h}px`;
-    if (ph) ph.style.minHeight = `${h}px`;
-  } catch (_) {}
-}
-function clearUnusedShell(wrap, ph) {
-  try {
-    wrap?.classList?.remove('is-unused-shell');
-    wrap?.style?.removeProperty('min-height');
-    ph?.style?.removeProperty('min-height');
-  } catch (_) {}
-}
-function isProtectedFromDrop(wrap) {
-  try {
-    const now = ts();
-    const shownTs = parseInt(wrap?.getAttribute?.(A_SHOWN) || '0', 10) || 0;
-    const filledTs = parseInt(wrap?.getAttribute?.(A_FILLED) || '0', 10) || 0;
-    if (shownTs && (now - shownTs) < MIN_LIVE_AFTER_SHOW_MS) return true;
-    if (filledTs && (now - filledTs) < MIN_LIVE_AFTER_FILL_MS) return true;
-    return false;
-  } catch (_) { return false; }
-}
-function uncollapseIfFilled(ph) {
-  try {
-    const wrap = ph?.closest?.(`.${WRAP_CLASS}`);
-    if (!wrap) return;
-    if (isFilled(ph)) {
-      wrap.classList.remove('is-empty');
-      clearUnusedShell(wrap, ph);
-      markFilledOnce(ph);
-    }
-  } catch (_) {}
-}
-function unwatchPlaceholderFill(id) {
-  const obs = S.fillObsById.get(id);
-  if (obs) { try { obs.disconnect(); } catch (_) {} S.fillObsById.delete(id); }
-}
-function watchPlaceholderFill(id) {
-  try {
-    const ph = document.getElementById(`${PH_PREFIX}${id}`);
-    if (!ph || !ph.isConnected || S.fillObsById.has(id)) return;
-    const obs = new MutationObserver(() => uncollapseIfFilled(ph));
-    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--; }
@@ -434,11 +346,8 @@ function watchPlaceholderFill(id) {
       best.setAttribute(A_CREATED, String(ts()));
       best.setAttribute(A_SHOWN,   '0');
       best.classList.remove('is-empty');
-      best.classList.remove('is-unused-shell');
-      best.removeAttribute(A_FILLED);
-      best.removeAttribute(A_LAST_H);
       const ph = best.querySelector(`#${PH_PREFIX}${id}`);
-      if (ph) { ph.innerHTML = ''; ph.style.removeProperty('min-height'); }
+      if (ph) ph.innerHTML = '';
       targetEl.insertAdjacentElement('afterend', best);
     });
     if (oldKey && S.wrapByKey.get(oldKey) === best) S.wrapByKey.delete(oldKey);
@@ -479,24 +388,15 @@ function watchPlaceholderFill(id) {
     mutate(() => el.insertAdjacentElement('afterend', w));
     S.mountedIds.add(id);
     S.wrapByKey.set(key, w);
-    watchPlaceholderFill(id);
     return w;
   }
 
   function dropWrap(w) {
     try {
       const ph = w.querySelector(`[id^="${PH_PREFIX}"]`);
-      const id = parseInt(w.getAttribute(A_WRAPID), 10);
-      if (isProtectedFromDrop(w) || shouldKeepShellAfterUnused(w)) {
-        if (ph) applyUnusedShell(w, ph);
-        return;
-      }
       if (ph instanceof Element) S.io?.unobserve(ph);
-      if (Number.isFinite(id)) {
-        clearEmptyChecks(id);
-        unwatchPlaceholderFill(id);
-        S.mountedIds.delete(id);
-      }
+      const id = parseInt(w.getAttribute(A_WRAPID), 10);
+      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);
       w.remove();
@@ -603,10 +503,7 @@ function watchPlaceholderFill(id) {
 
   function observePh(id) {
     const ph = document.getElementById(`${PH_PREFIX}${id}`);
-    if (ph?.isConnected) {
-      watchPlaceholderFill(id);
-      try { getIO()?.observe(ph); } catch (_) {}
-    }
+    if (ph?.isConnected) try { getIO()?.observe(ph); } catch (_) {}
   }
 
   function enqueueShow(id) {
@@ -645,8 +542,6 @@ function watchPlaceholderFill(id) {
         if (isBlocked()) { clearTimeout(timer); return release(); }
         const ph = document.getElementById(`${PH_PREFIX}${id}`);
         if (!ph?.isConnected || isFilled(ph)) { clearTimeout(timer); return release(); }
-        clearEmptyChecks(id);
-        try { const wrap = ph.closest?.(`.${WRAP_CLASS}`); wrap?.classList?.remove('is-empty'); clearUnusedShell(wrap, ph); } catch (_) {}
 
         const t = ts();
         if (t - (S.lastShow.get(id) ?? 0) < SHOW_THROTTLE_MS) { clearTimeout(timer); return release(); }
@@ -667,35 +562,15 @@ function watchPlaceholderFill(id) {
   }
 
   function scheduleEmptyCheck(id, showTs) {
-    const runCheck = () => {
+    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;
-
-        if (isFilled(ph)) {
-          wrap.classList.remove('is-empty');
-          clearUnusedShell(wrap, ph);
-          markFilledOnce(ph);
-          return;
-        }
-
-        if (shouldKeepShellAfterUnused(wrap)) {
-          applyUnusedShell(wrap, ph);
-          return;
-        }
-
-        clearUnusedShell(wrap, ph);
-        wrap.classList.add('is-empty');
+        wrap.classList.toggle('is-empty', !isFilled(ph));
       } catch (_) {}
-    };
-
-    clearEmptyChecks(id);
-    [EMPTY_CHECK_MS, EMPTY_CHECK_MS + 5000, EMPTY_CHECK_MS + 15000].forEach(delay => {
-      const t = setTimeout(runCheck, delay);
-      queueEmptyCheck(id, t);
-    });
+    }, EMPTY_CHECK_MS);
   }
 
   // ── Patch Ezoic showAds ────────────────────────────────────────────────────
@@ -821,8 +696,6 @@ function watchPlaceholderFill(id) {
     S.cursors      = { topics: 0, posts: 0, categories: 0 };
     S.mountedIds.clear();
     S.lastShow.clear();
-    for (const id of Array.from(S.emptyChecks.keys())) clearEmptyChecks(id);
-    for (const id of Array.from(S.fillObsById.keys())) unwatchPlaceholderFill(id);
     S.wrapByKey.clear();
     S.inflight     = 0;
     S.pending      = [];

package/public/style.css

@@ -8,7 +8,7 @@
   width: 100%;
   margin: 0 !important;
   padding: 0 !important;
-  overflow: visible;
+  overflow: hidden;
   contain: layout style;
 }
 
@@ -76,40 +76,3 @@
   margin: 0 !important;
   padding: 0 !important;
 }
-
-
-/* Filet de sécurité : si un fill arrive tard alors que .is-empty est resté, ne pas écraser */
-.nodebb-ezoic-wrap.is-empty:has(iframe, ins, img, video, [data-google-container-id]) {
-  height: auto !important;
-  min-height: 1px !important;
-  max-height: none !important;
-  overflow: visible !important;
-}
-
-/* Shell conservé quand Ezoic repasse en "unused" après un affichage initial */
-.nodebb-ezoic-wrap.is-unused-shell {
-  overflow: hidden !important;
-}
-.nodebb-ezoic-wrap.is-unused-shell > [id^="ezoic-pub-ad-placeholder-"] {
-  display: block;
-  width: 100%;
-}
-
-/* Responsive hardening conservatif (sans scale JS) */
-.nodebb-ezoic-wrap,
-.nodebb-ezoic-wrap > [id^="ezoic-pub-ad-placeholder-"] {
-  max-width: 100%;
-}
-.nodebb-ezoic-wrap .ezoic-ad,
-.nodebb-ezoic-wrap span.ezoic-ad {
-  max-width: 100% !important;
-  min-width: 0 !important;
-  box-sizing: border-box !important;
-}
-
-/* Neutralisation sticky plus défensive dans les wraps du plugin */
-.nodebb-ezoic-wrap .ezads-sticky-intradiv,
-.nodebb-ezoic-wrap [style*="position: sticky"] {
-  position: static !important;
-  top: auto !important;
-}