nodebb-plugin-ezoic-infinite 1.8.20 → 1.8.21

package/package.json

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

package/public/client.js

@@ -22,6 +22,11 @@
   const MAX_DESTROY_BATCH  = 4;       // ids max par destroyPlaceholders(...ids)
   const DESTROY_FLUSH_MS   = 30;      // micro-buffer destroy pour lisser les rafales
   const BURST_COOLDOWN_MS = 100;     // délai min entre deux déclenchements de burst
+  const CLEANUP_GRACE_MS   = 3_500;   // délai mini avant cleanup d'un wrap candidat
+  const SPECIAL_GRACE_MS   = 30_000;  // délai allongé pour sticky/fixed/adhesion
+  const RECENT_WRAP_ACTIVITY_MS = 5_000; // protège un wrap récemment muté/rafraîchi
+  const VIEWPORT_BUFFER_DESKTOP = 500;
+  const VIEWPORT_BUFFER_MOBILE  = 250;
 
   // Marges IO larges et fixes — observer créé une seule fois au boot
   const IO_MARGIN_DESKTOP = '2500px 0px 2500px 0px';
@@ -76,6 +81,8 @@
     wrapByKey:    new Map(),  // anchorKey → wrap DOM node
     ezActiveIds:  new Set(),  // ids actifs côté plugin (wrap présent / récemment show)
     ezShownSinceDestroy: new Set(), // ids déjà show depuis le dernier destroy Ezoic
+    wrapActivityAt: new Map(), // key/id -> ts activité DOM récente
+    lastWrapHeightByClass: new Map(),
     scrollDir:    1,          // 1=bas, -1=haut
     scrollSpeed:  0,          // px/s approx (EMA)
     lastScrollY:  0,
@@ -95,6 +102,102 @@
   const normBool  = v  => v === true || v === 'true' || v === 1 || v === '1' || v === 'on';
   const isFilled  = n  => !!(n?.querySelector?.(FILL_SEL));
 
+  function viewportBufferPx() {
+    return isMobile() ? VIEWPORT_BUFFER_MOBILE : VIEWPORT_BUFFER_DESKTOP;
+  }
+
+  function textSig(el) {
+    if (!(el instanceof Element)) return '';
+    const parts = [el.id || '', String(el.className || ''), el.getAttribute?.('name') || ''];
+    try {
+      for (const a of ['data-google-query-id', 'data-google-container-id', 'data-slot', 'data-ad-slot']) {
+        const v = el.getAttribute?.(a);
+        if (v) parts.push(v);
+      }
+    } catch (_) {}
+    return parts.join(' ').toLowerCase();
+  }
+
+  function isSpecialSlotLike(el) {
+    const sig = textSig(el);
+    return /adhesion|interstitial|anchor|sticky|outofpage/.test(sig);
+  }
+
+  function hasSpecialSlotMarkers(root) {
+    if (!(root instanceof Element)) return false;
+    if (isSpecialSlotLike(root)) return true;
+    try {
+      const nodes = root.querySelectorAll('[id],[class],[name],[data-slot],[data-ad-slot]');
+      for (const n of nodes) if (isSpecialSlotLike(n)) return true;
+    } catch (_) {}
+    return false;
+  }
+
+  function hasFixedLikeNode(root, maxScan = 24) {
+    if (!(root instanceof Element)) return false;
+    const q = [root];
+    let seen = 0;
+    while (q.length && seen < maxScan) {
+      const n = q.shift();
+      seen++;
+      try {
+        const cs = window.getComputedStyle(n);
+        if (cs.position === 'fixed' || cs.position === 'sticky') return true;
+      } catch (_) {}
+      for (const c of n.children || []) q.push(c);
+    }
+    return false;
+  }
+
+  function markWrapActivity(wrapOrId) {
+    const t = ts();
+    try {
+      if (wrapOrId instanceof Element) {
+        const key = wrapOrId.getAttribute(A_ANCHOR);
+        const id = parseInt(wrapOrId.getAttribute(A_WRAPID), 10);
+        if (key) S.wrapActivityAt.set(`k:${key}`, t);
+        if (Number.isFinite(id)) S.wrapActivityAt.set(`i:${id}`, t);
+        return;
+      }
+      const id = parseInt(wrapOrId, 10);
+      if (Number.isFinite(id)) S.wrapActivityAt.set(`i:${id}`, t);
+    } catch (_) {}
+  }
+
+  function wrapRecentActivity(w) {
+    try {
+      const key = w?.getAttribute?.(A_ANCHOR);
+      const id = parseInt(w?.getAttribute?.(A_WRAPID), 10);
+      const t1 = key ? (S.wrapActivityAt.get(`k:${key}`) || 0) : 0;
+      const t2 = Number.isFinite(id) ? (S.wrapActivityAt.get(`i:${id}`) || 0) : 0;
+      const t3 = parseInt(w?.getAttribute?.(A_SHOWN) || '0', 10) || 0;
+      return (ts() - Math.max(t1, t2, t3)) < RECENT_WRAP_ACTIVITY_MS;
+    } catch (_) { return false; }
+  }
+
+  function wrapCleanupGraceMs(w) {
+    return (hasSpecialSlotMarkers(w) || hasFixedLikeNode(w)) ? SPECIAL_GRACE_MS : CLEANUP_GRACE_MS;
+  }
+
+  function wrapNearViewport(w) {
+    try {
+      const r = w.getBoundingClientRect();
+      const b = viewportBufferPx();
+      const vh = window.innerHeight || 800;
+      return r.bottom > -b && r.top < vh + b;
+    } catch (_) { return true; }
+  }
+
+  function rememberWrapHeight(w) {
+    try {
+      if (!(w instanceof Element)) return;
+      const klass = [...(w.classList || [])].find(c => c.startsWith('ezoic-ad-'));
+      if (!klass) return;
+      const h = Math.round(w.getBoundingClientRect().height || 0);
+      if (h >= 40) S.lastWrapHeightByClass.set(klass, h);
+    } catch (_) {}
+  }
+
   function healFalseEmpty(root = document) {
     try {
       const list = [];
@@ -200,10 +303,20 @@ function destroyBeforeReuse(ids) {
     if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
     seen.add(id);
     out.push(id);
+    try {
+      const wrap = phEl(id)?.closest?.(WRAP_SEL) || null;
+      if (wrap && (wrapRecentActivity(wrap) || hasSpecialSlotMarkers(wrap) || hasFixedLikeNode(wrap))) {
+        continue;
+      }
+    } catch (_) {}
     if (S.ezShownSinceDestroy.has(id)) toDestroy.push(id);
   }
   if (toDestroy.length) {
-    try { window.ezstandalone?.destroyPlaceholders?.(toDestroy); } catch (_) {}
+    try {
+      const ez = window.ezstandalone;
+      const run = () => { try { ez?.destroyPlaceholders?.(toDestroy); } catch (_) {} };
+      try { (typeof ez?.cmd?.push === 'function') ? ez.cmd.push(run) : run(); } catch (_) {}
+    } catch (_) {}
     for (const id of toDestroy) S.ezShownSinceDestroy.delete(id);
   }
   return out;
@@ -408,6 +521,8 @@ function recycleAndMove(klass, targetEl, newKey) {
 
   for (const wrap of S.wrapByKey.values()) {
     if (!wrap?.isConnected || !wrap.classList?.contains(WRAP_CLASS) || !wrap.classList.contains(klass)) continue;
+    if (wrapRecentActivity(wrap)) continue;
+    if (hasSpecialSlotMarkers(wrap) || hasFixedLikeNode(wrap)) continue;
     try {
       const rect = wrap.getBoundingClientRect();
       const isAbove = rect.bottom <= farAbove;
@@ -442,6 +557,7 @@ function recycleAndMove(klass, targetEl, newKey) {
   const oldKey = best.getAttribute(A_ANCHOR);
   try { const ph = best.querySelector(`#${PH_PREFIX}${id}`); if (ph) S.io?.unobserve(ph); } catch (_) {}
   mutate(() => {
+    rememberWrapHeight(best);
     best.setAttribute(A_ANCHOR,  newKey);
     best.setAttribute(A_CREATED, String(ts()));
     best.setAttribute(A_SHOWN,   '0');
@@ -478,6 +594,8 @@ function recycleAndMove(klass, targetEl, newKey) {
     w.setAttribute(A_CREATED, String(ts()));
     w.setAttribute(A_SHOWN,   '0');
     w.style.cssText = 'width:100%;display:block;';
+    const cachedH = S.lastWrapHeightByClass.get(klass);
+    if (Number.isFinite(cachedH) && cachedH > 0) w.style.minHeight = `${cachedH}px`;
     const ph = document.createElement('div');
     ph.id = `${PH_PREFIX}${id}`;
     ph.setAttribute('data-ezoic-id', String(id));
@@ -499,11 +617,14 @@ function recycleAndMove(klass, targetEl, newKey) {
 
   function dropWrap(w) {
     try {
+      rememberWrapHeight(w);
       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.ezActiveIds.delete(id); S.mountedIds.delete(id); }
       const key = w.getAttribute(A_ANCHOR);
+      if (key) S.wrapActivityAt.delete(`k:${key}`);
+      if (Number.isFinite(id)) S.wrapActivityAt.delete(`i:${id}`);
       if (key && S.wrapByKey.get(key) === w) S.wrapByKey.delete(key);
       w.remove();
     } catch (_) {}
@@ -530,7 +651,8 @@ function recycleAndMove(klass, targetEl, newKey) {
 
     document.querySelectorAll(`${WRAP_SEL}.${klass}`).forEach(w => {
       const created = parseInt(w.getAttribute(A_CREATED) || '0', 10);
-      if (ts() - created < MIN_PRUNE_AGE_MS) return; // grâce post-création
+      if (ts() - created < Math.max(MIN_PRUNE_AGE_MS, wrapCleanupGraceMs(w))) return;
+      if (wrapRecentActivity(w) || wrapNearViewport(w)) return;
 
       const key = w.getAttribute(A_ANCHOR) ?? '';
       const sid = key.slice(klass.length + 1); // après "ezoic-ad-between:"
@@ -687,7 +809,7 @@ function startShowBatch(ids) {
         if (!canShowPlaceholderId(id, t)) continue;
 
         S.lastShow.set(id, t);
-        try { ph.closest?.(WRAP_SEL)?.setAttribute(A_SHOWN, String(t)); } catch (_) {}
+        try { const wrap = ph.closest?.(WRAP_SEL); wrap?.setAttribute(A_SHOWN, String(t)); if (wrap) markWrapActivity(wrap); } catch (_) {}
         valid.push(id);
       }
 
@@ -844,6 +966,7 @@ function startShowBatch(ids) {
     S.wrapByKey.clear();
     S.ezActiveIds.clear();
     S.ezShownSinceDestroy.clear();
+    S.wrapActivityAt.clear();
     S.inflight     = 0;
     S.pending      = [];
     S.pendingSet.clear();
@@ -887,12 +1010,21 @@ function startShowBatch(ids) {
           if (n.nodeType !== 1) continue;
           if (nodeMatchesAny(n, [WRAP_SEL]) || nodeContainsAny(n, [WRAP_SEL])) {
             sawWrapRemoval = true;
+            try {
+              if (n instanceof Element && n.classList?.contains(WRAP_CLASS)) markWrapActivity(n);
+              else if (n instanceof Element) { const inner = n.querySelector?.(WRAP_SEL); if (inner) markWrapActivity(inner); }
+            } catch (_) {}
           }
         }
         if (sawWrapRemoval) queueSweepDeadWraps();
         for (const n of m.addedNodes) {
           if (n.nodeType !== 1) continue;
           try { healFalseEmpty(n); } catch (_) {}
+          try {
+            const w = (n instanceof Element && (n.classList?.contains(WRAP_CLASS) ? n : n.closest?.(WRAP_SEL))) || null;
+            if (w) markWrapActivity(w);
+            else if (n instanceof Element) { const inner = n.querySelector?.(WRAP_SEL); if (inner) markWrapActivity(inner); }
+          } catch (_) {}
           // matches() d'abord (O(1)), querySelector() seulement si nécessaire
           if (nodeMatchesAny(n, CONTENT_SEL_LIST) || nodeContainsAny(n, CONTENT_SEL_LIST)) {
             requestBurst(); return;