nodebb-plugin-ezoic-infinite 1.8.27 → 1.8.29

package/package.json

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

package/public/client.js

@@ -136,6 +136,7 @@
     firstShown:   false,
     wrapsByClass: new Map(),
     kind:         null,
+    phState:      new Map(), // id -> new|show-queued|shown|destroyed
   };
 
   let blockedUntil = 0;
@@ -144,13 +145,42 @@
   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 placeholderLooksUsed(ph) {
+    try {
+      if (!ph?.isConnected) return false;
+      return !!ph.querySelector('ins.adsbygoogle, iframe, [data-google-container-id], div[id$="__container__"]');
+    } catch (_) { return false; }
+  }
+
 
   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');
+      const id = parseInt(wrap.getAttribute(A_WRAPID) || '0', 10);
+      if (Number.isFinite(id) && id > 0) S.phState.set(id, 'shown');
+      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,14 +400,12 @@
       best.setAttribute(A_CREATED, String(ts()));
       best.setAttribute(A_SHOWN,   '0');
       best.classList.remove('is-empty');
-      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);
-      }
+      best.replaceChildren();
+      const fresh = document.createElement('div');
+      fresh.id = `${PH_PREFIX}${id}`;
+      fresh.setAttribute('data-ezoic-id', String(id));
+      fresh.style.minHeight = `${MIN_PLACEHOLDER_HEIGHT}px`;
+      best.appendChild(fresh);
       targetEl.insertAdjacentElement('afterend', best);
     });
     if (oldKey && S.wrapByKey.get(oldKey) === best) S.wrapByKey.delete(oldKey);
@@ -386,11 +414,13 @@
     // 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 = () => {
+      S.phState.set(id, 'destroyed');
       try { ez.destroyPlaceholders(id); } catch (_) {
         try { ez.destroyPlaceholders([id]); } catch (_) {}
       }
       setTimeout(() => {
         try { observePh(id); } catch (_) {}
+        S.phState.set(id, 'new');
         try { enqueueShow(id); } catch (_) {}
       }, 450);
     };
@@ -425,6 +455,7 @@
     const w = makeWrap(id, klass, key);
     mutate(() => el.insertAdjacentElement('afterend', w));
     S.mountedIds.add(id);
+    S.phState.set(id, 'new');
     S.wrapByKey.set(key, w);
     registerWrap(klass, w);
     return w;
@@ -435,7 +466,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); S.phState.delete(id); }
       const key = w.getAttribute(A_ANCHOR);
       if (key && S.wrapByKey.get(key) === w) S.wrapByKey.delete(key);
       const klass = Array.from(w.classList || []).find(c => c !== WRAP_CLASS && c.startsWith('ezoic-ad-'));
@@ -554,11 +585,14 @@
 
   function enqueueShow(id) {
     if (!id || isBlocked()) return;
+    const st = S.phState.get(id);
+    if (st === 'show-queued' || st === 'shown') return;
     if (ts() - (S.lastShow.get(id) ?? 0) < SHOW_THROTTLE_MS) return;
     if (S.inflight >= MAX_INFLIGHT) {
-      if (!S.pendingSet.has(id)) { S.pending.push(id); S.pendingSet.add(id); }
+      if (!S.pendingSet.has(id)) { S.pending.push(id); S.pendingSet.add(id); S.phState.set(id, 'show-queued'); }
       return;
     }
+    S.phState.set(id, 'show-queued');
     startShow(id);
   }
 
@@ -587,18 +621,23 @@
       try {
         if (isBlocked()) { clearTimeout(timer); return release(); }
         const ph = document.getElementById(`${PH_PREFIX}${id}`);
-        if (!ph?.isConnected || isFilled(ph)) { clearTimeout(timer); return release(); }
+        if (!ph?.isConnected) { S.phState.delete(id); clearTimeout(timer); return release(); }
+        if (isFilled(ph) || placeholderLooksUsed(ph)) { S.phState.set(id, 'shown'); clearTimeout(timer); return release(); }
 
         const t = ts();
         if (t - (S.lastShow.get(id) ?? 0) < SHOW_THROTTLE_MS) { clearTimeout(timer); return release(); }
         S.lastShow.set(id, t);
 
         try { ph.closest?.(`.${WRAP_CLASS}`)?.setAttribute(A_SHOWN, String(t)); } catch (_) {}
+        S.phState.set(id, 'shown');
 
         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);
         };
@@ -614,7 +653,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);
   }
@@ -642,7 +682,12 @@
           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);
+          const valid = ids.filter(id => {
+            const ph = document.getElementById(`${PH_PREFIX}${id}`);
+            if (!ph?.isConnected) { S.phState.delete(id); return false; }
+            if (placeholderLooksUsed(ph)) { S.phState.set(id, 'shown'); return false; }
+            return true;
+          });
           for (let i = 0; i < valid.length; i += BATCH_SIZE) {
             const chunk = valid.slice(i, i + BATCH_SIZE);
             try { orig(...chunk); } catch (_) {
@@ -656,7 +701,10 @@
           for (const v of ids) {
             const id = parseInt(v, 10);
             if (!Number.isFinite(id) || id <= 0) continue;
-            if (!document.getElementById(`${PH_PREFIX}${id}`)?.isConnected) continue;
+            const ph = document.getElementById(`${PH_PREFIX}${id}`);
+            if (!ph?.isConnected) continue;
+            if (placeholderLooksUsed(ph)) { S.phState.set(id, 'shown'); continue; }
+            S.phState.set(id, 'show-queued');
             q.add(id);
           }
           if (!q.size) return;
@@ -762,6 +810,7 @@
     S.wrapByKey.clear();
     S.wrapsByClass.clear();
     S.kind = null;
+    S.phState.clear();
     S.inflight     = 0;
     S.pending      = [];
     S.pendingSet.clear();
@@ -776,6 +825,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

@@ -78,3 +78,14 @@
   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;
+}