nodebb-plugin-ezoic-infinite 1.8.19 → 1.8.21

package/library.js

@@ -1,159 +1,205 @@
 'use strict';
 
-const meta   = require.main.require('./src/meta');
+const meta = require.main.require('./src/meta');
 const groups = require.main.require('./src/groups');
-const db     = require.main.require('./src/database');
+const db = require.main.require('./src/database');
 
 const SETTINGS_KEY = 'ezoic-infinite';
-const plugin = {};
+const SETTINGS_TTL_MS = 30_000;
 
-// ── Helpers ────────────────────────────────────────────────────────────────
+const EZOIC_SCRIPTS = `<script data-cfasync="false" src="https://cmp.gatekeeperconsent.com/min.js"></script>
+<script data-cfasync="false" src="https://the.gatekeeperconsent.com/cmp.min.js"></script>
+<script async src="//www.ezojs.com/ezoic/sa.min.js"></script>
+<script>
+window.ezstandalone = window.ezstandalone || {};
+ezstandalone.cmd = ezstandalone.cmd || [];
+</script>`;
+
+const DEFAULTS = Object.freeze({
+  enableBetweenAds: true,
+  showFirstTopicAd: false,
+  placeholderIds: '',
+  intervalPosts: 6,
+  enableCategoryAds: false,
+  showFirstCategoryAd: false,
+  categoryPlaceholderIds: '',
+  intervalCategories: 4,
+  enableMessageAds: false,
+  showFirstMessageAd: false,
+  messagePlaceholderIds: '',
+  messageIntervalPosts: 3,
+  excludedGroups: [],
+});
+
+const CONFIG_FIELDS = Object.freeze([
+  'enableBetweenAds', 'showFirstTopicAd', 'placeholderIds', 'intervalPosts',
+  'enableCategoryAds', 'showFirstCategoryAd', 'categoryPlaceholderIds', 'intervalCategories',
+  'enableMessageAds', 'showFirstMessageAd', 'messagePlaceholderIds', 'messageIntervalPosts',
+]);
+
+const plugin = {
+  _settingsCache: null,
+  _settingsCacheAt: 0,
+};
+
+function toBool(value, fallback = false) {
+  if (value === undefined || value === null || value === '') return fallback;
+  if (typeof value === 'boolean') return value;
+  switch (String(value).trim().toLowerCase()) {
+    case '1':
+    case 'true':
+    case 'on':
+    case 'yes':
+      return true;
+    default:
+      return false;
+  }
+}
+
+function toPositiveInt(value, fallback) {
+  const parsed = Number.parseInt(value, 10);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
+}
+
+function toStringTrim(value) {
+  return typeof value === 'string' ? value.trim() : '';
+}
 
 function normalizeExcludedGroups(value) {
   if (!value) return [];
-  if (Array.isArray(value)) return value;
-  // NodeBB stocke les settings multi-valeurs comme string JSON "[\"group1\",\"group2\"]"
-  const s = String(value).trim();
-  if (s.startsWith('[')) {
-    try { const parsed = JSON.parse(s); if (Array.isArray(parsed)) return parsed.map(String).filter(Boolean); } catch (_) {}
+  if (Array.isArray(value)) {
+    return value.map(String).map(v => v.trim()).filter(Boolean);
   }
-  // Fallback : séparation par virgule
-  return s.split(',').map(v => v.trim()).filter(Boolean);
+
+  const raw = String(value).trim();
+  if (!raw) return [];
+
+  if (raw.startsWith('[')) {
+    try {
+      const parsed = JSON.parse(raw);
+      if (Array.isArray(parsed)) {
+        return parsed.map(String).map(v => v.trim()).filter(Boolean);
+      }
+    } catch {}
+  }
+
+  return raw.split(',').map(v => v.trim()).filter(Boolean);
 }
 
-function parseBool(v, def = false) {
-  if (v === undefined || v === null || v === '') return def;
-  if (typeof v === 'boolean') return v;
-  const s = String(v).toLowerCase();
-  return s === '1' || s === 'true' || s === 'on' || s === 'yes';
+function buildSettings(raw = {}) {
+  return {
+    enableBetweenAds: toBool(raw.enableBetweenAds, DEFAULTS.enableBetweenAds),
+    showFirstTopicAd: toBool(raw.showFirstTopicAd, DEFAULTS.showFirstTopicAd),
+    placeholderIds: toStringTrim(raw.placeholderIds),
+    intervalPosts: toPositiveInt(raw.intervalPosts, DEFAULTS.intervalPosts),
+    enableCategoryAds: toBool(raw.enableCategoryAds, DEFAULTS.enableCategoryAds),
+    showFirstCategoryAd: toBool(raw.showFirstCategoryAd, DEFAULTS.showFirstCategoryAd),
+    categoryPlaceholderIds: toStringTrim(raw.categoryPlaceholderIds),
+    intervalCategories: toPositiveInt(raw.intervalCategories, DEFAULTS.intervalCategories),
+    enableMessageAds: toBool(raw.enableMessageAds, DEFAULTS.enableMessageAds),
+    showFirstMessageAd: toBool(raw.showFirstMessageAd, DEFAULTS.showFirstMessageAd),
+    messagePlaceholderIds: toStringTrim(raw.messagePlaceholderIds),
+    messageIntervalPosts: toPositiveInt(raw.messageIntervalPosts, DEFAULTS.messageIntervalPosts),
+    excludedGroups: normalizeExcludedGroups(raw.excludedGroups),
+  };
 }
 
-async function getAllGroups() {
+async function listNonPrivilegeGroups() {
   let names = await db.getSortedSetRange('groups:createtime', 0, -1);
-  if (!names || !names.length) {
+  if (!Array.isArray(names) || !names.length) {
     names = await db.getSortedSetRange('groups:visible:createtime', 0, -1);
   }
-  const filtered = names.filter(name => !groups.isPrivilegeGroup(name));
-  const data = await groups.getGroupsData(filtered);
-  const valid = data.filter(g => g && g.name);
-  valid.sort((a, b) => String(a.name).localeCompare(String(b.name), undefined, { sensitivity: 'base' }));
-  return valid;
-}
 
-// ── Settings cache (30s TTL) ────────────────────────────────────────────────
+  const publicNames = (names || []).filter(name => !groups.isPrivilegeGroup(name));
+  const groupData = await groups.getGroupsData(publicNames);
 
-let _settingsCache   = null;
-let _settingsCacheAt = 0;
-const SETTINGS_TTL   = 30_000;
+  return (groupData || [])
+    .filter(group => group && group.name)
+    .sort((a, b) => String(a.name).localeCompare(String(b.name), undefined, { sensitivity: 'base' }));
+}
 
 async function getSettings() {
   const now = Date.now();
-  if (_settingsCache && (now - _settingsCacheAt) < SETTINGS_TTL) return _settingsCache;
-  const s = await meta.settings.get(SETTINGS_KEY);
-  _settingsCacheAt = Date.now();
-  _settingsCache = {
-    enableBetweenAds:       parseBool(s.enableBetweenAds, true),
-    showFirstTopicAd:       parseBool(s.showFirstTopicAd, false),
-    placeholderIds:         (s.placeholderIds || '').trim(),
-    intervalPosts:          Math.max(1, parseInt(s.intervalPosts, 10) || 6),
-    enableCategoryAds:      parseBool(s.enableCategoryAds, false),
-    showFirstCategoryAd:    parseBool(s.showFirstCategoryAd, false),
-    categoryPlaceholderIds: (s.categoryPlaceholderIds || '').trim(),
-    intervalCategories:     Math.max(1, parseInt(s.intervalCategories, 10) || 4),
-    enableMessageAds:       parseBool(s.enableMessageAds, false),
-    showFirstMessageAd:     parseBool(s.showFirstMessageAd, false),
-    messagePlaceholderIds:  (s.messagePlaceholderIds || '').trim(),
-    messageIntervalPosts:   Math.max(1, parseInt(s.messageIntervalPosts, 10) || 3),
-    excludedGroups:         normalizeExcludedGroups(s.excludedGroups),
-  };
-  return _settingsCache;
-}
+  if (plugin._settingsCache && (now - plugin._settingsCacheAt) < SETTINGS_TTL_MS) {
+    return plugin._settingsCache;
+  }
 
-async function isUserExcluded(uid, excludedGroups) {
-  if (!uid || !excludedGroups.length) return false;
-  const userGroups = await groups.getUserGroups([uid]);
-  return (userGroups[0] || []).some(g => excludedGroups.includes(g.name));
+  const raw = await meta.settings.get(SETTINGS_KEY);
+  const settings = buildSettings(raw);
+
+  plugin._settingsCache = settings;
+  plugin._settingsCacheAt = now;
+  return settings;
 }
 
-// ── Scripts Ezoic ──────────────────────────────────────────────────────────
+async function isUserExcluded(uid, excludedGroups) {
+  if (!uid || !Array.isArray(excludedGroups) || !excludedGroups.length) return false;
 
-const EZOIC_SCRIPTS = `<script data-cfasync="false" src="https://cmp.gatekeeperconsent.com/min.js"></script>
-<script data-cfasync="false" src="https://the.gatekeeperconsent.com/cmp.min.js"></script>
-<script async src="//www.ezojs.com/ezoic/sa.min.js"></script>
-<script>
-window.ezstandalone = window.ezstandalone || {};
-ezstandalone.cmd = ezstandalone.cmd || [];
-</script>`;
+  const userGroups = await groups.getUserGroups([uid]);
+  const names = (userGroups && userGroups[0]) || [];
+  const excludedSet = new Set(excludedGroups);
 
-// ── Hooks ──────────────────────────────────────────────────────────────────
+  return names.some(group => group && excludedSet.has(group.name));
+}
 
-plugin.onSettingsSet = function (data) {
-  if (data && data.hash === SETTINGS_KEY) _settingsCache = null;
+plugin.onSettingsSet = function onSettingsSet(data) {
+  if (data && data.hash === SETTINGS_KEY) {
+    plugin._settingsCache = null;
+    plugin._settingsCacheAt = 0;
+  }
 };
 
-plugin.addAdminNavigation = async (header) => {
+plugin.addAdminNavigation = async function addAdminNavigation(header) {
   header.plugins = header.plugins || [];
-  header.plugins.push({ route: '/plugins/ezoic-infinite', icon: 'fa-ad', name: 'Ezoic Infinite Ads' });
+  header.plugins.push({
+    route: '/plugins/ezoic-infinite',
+    icon: 'fa-ad',
+    name: 'Ezoic Infinite Ads',
+  });
   return header;
 };
 
-/**
- * Injecte les scripts Ezoic dans le <head> via templateData.customHTML.
- *
- * NodeBB v4 / thème Harmony : header.tpl contient {{customHTML}} dans le <head>
- * (render.js ligne 232 : templateValues.customHTML = meta.config.customHTML).
- * Le hook filter:middleware.renderHeader reçoit templateData = headerFooterData
- * et est rendu via req.app.renderAsync('header', hookReturn.templateData).
- * On préfixe customHTML pour que nos scripts passent AVANT le customHTML admin,
- * tout en préservant ce dernier.
- */
-plugin.injectEzoicHead = async (data) => {
+plugin.injectEzoicHead = async function injectEzoicHead(data) {
   try {
     const settings = await getSettings();
-    const uid      = data.req?.uid ?? 0;
-    const excluded = await isUserExcluded(uid, settings.excludedGroups);
-    if (!excluded) {
-      // Préfixer : nos scripts d'abord, puis le customHTML existant de l'admin
-      data.templateData.customHTML = EZOIC_SCRIPTS + (data.templateData.customHTML || '');
+    const uid = data?.req?.uid || 0;
+    if (await isUserExcluded(uid, settings.excludedGroups)) {
+      return data;
     }
-  } catch (_) {}
+
+    const templateData = data.templateData || (data.templateData = {});
+    templateData.customHTML = `${EZOIC_SCRIPTS}${templateData.customHTML || ''}`;
+  } catch {}
+
   return data;
 };
 
-plugin.init = async ({ router, middleware }) => {
-  async function render(req, res) {
-    const settings  = await getSettings();
-    const allGroups = await getAllGroups();
+plugin.init = async function init({ router, middleware }) {
+  async function renderAdmin(req, res) {
+    const [settings, allGroups] = await Promise.all([
+      getSettings(),
+      listNonPrivilegeGroups(),
+    ]);
+
     res.render('admin/plugins/ezoic-infinite', {
       title: 'Ezoic Infinite Ads',
       ...settings,
       enableBetweenAds_checked: settings.enableBetweenAds ? 'checked' : '',
-      enableMessageAds_checked:  settings.enableMessageAds  ? 'checked' : '',
+      enableMessageAds_checked: settings.enableMessageAds ? 'checked' : '',
       allGroups,
     });
   }
 
-  router.get('/admin/plugins/ezoic-infinite',     middleware.admin.buildHeader, render);
-  router.get('/api/admin/plugins/ezoic-infinite', render);
+  router.get('/admin/plugins/ezoic-infinite', middleware.admin.buildHeader, renderAdmin);
+  router.get('/api/admin/plugins/ezoic-infinite', renderAdmin);
 
   router.get('/api/plugins/ezoic-infinite/config', async (req, res) => {
     const settings = await getSettings();
     const excluded = await isUserExcluded(req.uid, settings.excludedGroups);
-    res.json({
-      excluded,
-      enableBetweenAds:       settings.enableBetweenAds,
-      showFirstTopicAd:       settings.showFirstTopicAd,
-      placeholderIds:         settings.placeholderIds,
-      intervalPosts:          settings.intervalPosts,
-      enableCategoryAds:      settings.enableCategoryAds,
-      showFirstCategoryAd:    settings.showFirstCategoryAd,
-      categoryPlaceholderIds: settings.categoryPlaceholderIds,
-      intervalCategories:     settings.intervalCategories,
-      enableMessageAds:       settings.enableMessageAds,
-      showFirstMessageAd:     settings.showFirstMessageAd,
-      messagePlaceholderIds:  settings.messagePlaceholderIds,
-      messageIntervalPosts:   settings.messageIntervalPosts,
-    });
+
+    const payload = { excluded };
+    for (const key of CONFIG_FIELDS) payload[key] = settings[key];
+    res.json(payload);
   });
 };
 

package/package.json

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

package/public/admin.js

@@ -1,28 +1,44 @@
 /* globals ajaxify */
 'use strict';
 
-(function () {
-  function init() {
-    const $form = $('.ezoic-infinite-settings');
-    if (!$form.length) return;
+(function initAdminEzoicSettings() {
+  const FORM_SELECTOR = '.ezoic-infinite-settings';
+  const SAVE_SELECTOR = '#save';
+  const SETTINGS_KEY = 'ezoic-infinite';
+  const EVENT_NS = '.ezoicInfinite';
+
+  function showSaved(alerts) {
+    if (alerts && typeof alerts.success === 'function') {
+      alerts.success('[[admin/settings:saved]]');
+      return;
+    }
+    if (window.app && typeof window.app.alertSuccess === 'function') {
+      window.app.alertSuccess('[[admin/settings:saved]]');
+    }
+  }
 
-    require(['settings', 'alerts'], function (Settings, alerts) {
-      Settings.load('ezoic-infinite', $form);
+  function bind(Settings, alerts, $form) {
+    Settings.load(SETTINGS_KEY, $form);
 
-      $('#save').off('click.ezoicInfinite').on('click.ezoicInfinite', function (e) {
+    $(SAVE_SELECTOR)
+      .off(`click${EVENT_NS}`)
+      .on(`click${EVENT_NS}`, function onSave(e) {
         e.preventDefault();
-
-        Settings.save('ezoic-infinite', $form, function () {
-          if (alerts && typeof alerts.success === 'function') {
-            alerts.success('[[admin/settings:saved]]');
-          } else if (window.app && typeof window.app.alertSuccess === 'function') {
-            window.app.alertSuccess('[[admin/settings:saved]]');
-          }
+        Settings.save(SETTINGS_KEY, $form, function onSaved() {
+          showSaved(alerts);
         });
       });
+  }
+
+  function boot() {
+    const $form = $(FORM_SELECTOR);
+    if (!$form.length) return;
+
+    require(['settings', 'alerts'], function onModules(Settings, alerts) {
+      bind(Settings, alerts, $form);
     });
   }
 
-  $(document).ready(init);
-  $(window).on('action:ajaxify.end', init);
+  $(document).ready(boot);
+  $(window).on('action:ajaxify.end', boot);
 })();

package/public/client.js

@@ -1,70 +1,3 @@
-/**
- * NodeBB Ezoic Infinite Ads — client.js v36
- *
- * Historique des corrections majeures
- * ────────────────────────────────────
- * v18  Ancrage stable par data-pid / data-index au lieu d'ordinalMap fragile.
- *
- * v19  Intervalle global basé sur l'ordinal absolu (data-index), pas sur
- *      la position dans le batch courant.
- *
- * v20  Table KIND : anchorAttr / ordinalAttr / baseTag par kindClass.
- *      Fix fatal catégories : data-cid au lieu de data-index inexistant.
- *      IO fixe (une instance, jamais recréée).
- *      Fix TCF locator : MutationObserver recrée l'iframe si ajaxify la retire.
- *
- * v25  Fix scroll-up / virtualisation NodeBB : decluster + grace period.
- *
- * v26  Suppression définitive du recyclage d'id (causait réinjection en haut).
- *
- * v27  pruneOrphans supprimé (faux-orphelins sur virtualisation NodeBB posts).
- *
- * v28  decluster supprimé. Wraps persistants pendant la session.
- *
- * v32  Retour anchorAttr = data-index pour ezoic-ad-between.
- *      data-tid peut être absent → clés invalides → wraps empilés.
- *      pruneOrphansBetween réactivé uniquement pour topics de catégorie :
- *        – NodeBB NE virtualise PAS les topics dans une liste de catégorie,
- *          les ancres (data-index) restent en DOM → prune safe et nécessaire
- *          pour éviter l'empilement après scroll long.
- *        – Toujours désactivé pour les posts : NodeBB virtualise les posts
- *          hors-viewport → faux-orphelins → bug réinjection en haut.
- *
- * v34  moveDistantWrap — voir v38.
- *
- * v50  Suppression de bindLoginCheck() : NodeBB fait un rechargement complet
- *      après login — filter:middleware.renderHeader re-évalue l'exclusion au
- *      rechargement. Redondant depuis le fix normalizeExcludedGroups (v49).
- *
- * v43  Seuil de recyclage abaissé à -vh + unobserve avant recyclage.
- *
- * v42  Seuil -(IO_MARGIN + vh) (trop strict, peu de wraps éligibles).
- *
- * v41  Seuil -1vh (trop permissif sur mobile, ignorait IO_MARGIN).
- *
- * v40  Recyclage slots via destroyPlaceholders+define+displayMore avec délais.
- *      Séquence : destroy → 300ms → define → 300ms → displayMore.
- *      Testé manuellement : fonctionne. displayMore = API Ezoic infinite scroll.
- *
- * v38  Pool épuisé = fin de quota Ezoic par page-view. ez.refresh() interdit
- *      sur la même page que ez.enable() — supprimé. moveDistantWrap supprimé :
- *      déplacer un wrap "already defined" ne re-sert aucune pub. Pool épuisé →
- *      break propre dans injectBetween. muteConsole : ajout warnings refresh.
- *
- * v36  Optimisations chemin critique (scroll → injectBetween) :
- *      – S.wrapByKey Map<anchorKey,wrap> : findWrap() passe de querySelector
- *        sur tout le doc à un lookup O(1). Mis à jour dans insertAfter,
- *        dropWrap et cleanup.
- *      – wrapIsLive allégé : pour les voisins immédiats on vérifie les
- *        attributs du nœud lui-même sans querySelector global.
- *      – MutationObserver : matches() vérifié avant querySelector() pour
- *        court-circuiter les sous-arbres entiers ajoutés par NodeBB.
- *
- * v35  Revue complète prod-ready :
- *      – initPools protégé contre ré-initialisation inutile (S.poolsReady).
- *      – muteConsole élargit à "No valid placeholders for loadMore".
- *      – Commentaires et historique nettoyés.
- */
 (function nbbEzoicInfinite() {
   'use strict';
 
@@ -89,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';
@@ -99,6 +37,9 @@
     topic:    'li[component="category/topic"]',
     category: 'li[component="categories/category"]',
   };
+  const WRAP_SEL = `.${WRAP_CLASS}`;
+  const FILL_SEL = 'iframe, ins, img, video, [data-google-container-id]';
+  const CONTENT_SEL_LIST = [SEL.post, SEL.topic, SEL.category];
 
   /**
    * Table KIND — source de vérité par kindClass.
@@ -140,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,
@@ -157,7 +100,103 @@
   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 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 {
@@ -196,7 +235,7 @@
     requestAnimationFrame(() => {
       S.sweepQueued = false;
       sweepDeadWraps();
-    healFalseEmpty();
+      healFalseEmpty();
     });
   }
 
@@ -264,16 +303,25 @@ 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;
 }
 
-
   // ── Config ─────────────────────────────────────────────────────────────────
 
   async function fetchConfig() {
@@ -430,8 +478,10 @@ function destroyBeforeReuse(ids) {
   function sweepDeadWraps() {
     // NodeBB peut retirer des nœuds sans passer par dropWrap() (virtualisation / rerender).
     // On libère alors les IDs/keys fantômes pour éviter l'épuisement du pool.
-    for (const [key, wrap] of Array.from(S.wrapByKey.entries())) {
+    let changed = false;
+    for (const [key, wrap] of S.wrapByKey) {
       if (wrap?.isConnected) continue;
+      changed = true;
       S.wrapByKey.delete(key);
       const id = parseInt(wrap?.getAttribute?.(A_WRAPID), 10);
       if (Number.isFinite(id)) {
@@ -441,7 +491,7 @@ function destroyBeforeReuse(ids) {
         S.ezActiveIds.delete(id);
       }
     }
-    if (S.pending.length) {
+    if (changed && S.pending.length) {
       S.pending = S.pending.filter(id => S.pendingSet.has(id));
     }
   }
@@ -471,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;
@@ -505,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');
@@ -531,7 +584,6 @@ function recycleAndMove(klass, targetEl, newKey) {
   return { id, wrap: best };
 }
 
-
   // ── Wraps DOM — création / suppression ────────────────────────────────────
 
   function makeWrap(id, klass, key) {
@@ -542,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));
@@ -563,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 (_) {}
@@ -592,9 +649,10 @@ function recycleAndMove(klass, targetEl, newKey) {
     const klass = 'ezoic-ad-between';
     const cfg   = KIND[klass];
 
-    document.querySelectorAll(`.${WRAP_CLASS}.${klass}`).forEach(w => {
+    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:"
@@ -751,7 +809,7 @@ function startShowBatch(ids) {
         if (!canShowPlaceholderId(id, t)) continue;
 
         S.lastShow.set(id, t);
-        try { ph.closest?.(`.${WRAP_CLASS}`)?.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);
       }
 
@@ -774,7 +832,6 @@ function startShowBatch(ids) {
   });
 }
 
-
   // ── Patch Ezoic showAds ────────────────────────────────────────────────────
   //
   // Intercepte ez.showAds() pour :
@@ -899,7 +956,7 @@ function startShowBatch(ids) {
 
   function cleanup() {
     blockedUntil = ts() + 1500;
-    mutate(() => document.querySelectorAll(`.${WRAP_CLASS}`).forEach(dropWrap));
+    mutate(() => document.querySelectorAll(WRAP_SEL).forEach(dropWrap));
     S.cfg          = null;
     S.poolsReady   = false;
     S.pools        = { topics: [], posts: [], categories: [] };
@@ -909,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();
@@ -924,28 +982,51 @@ function startShowBatch(ids) {
     S.lastScrollTs = 0;
   }
 
+  function nodeMatchesAny(node, selectors) {
+    if (!(node instanceof Element)) return false;
+    for (const sel of selectors) {
+      try { if (node.matches(sel)) return true; } catch (_) {}
+    }
+    return false;
+  }
+
+  function nodeContainsAny(node, selectors) {
+    if (!(node instanceof Element)) return false;
+    for (const sel of selectors) {
+      try { if (node.querySelector(sel)) return true; } catch (_) {}
+    }
+    return false;
+  }
+
   // ── MutationObserver ───────────────────────────────────────────────────────
 
   function ensureDomObserver() {
     if (S.domObs) return;
-    const allSel = [SEL.post, SEL.topic, SEL.category];
     S.domObs = new MutationObserver(muts => {
       if (S.mutGuard > 0 || isBlocked()) return;
       for (const m of muts) {
         let sawWrapRemoval = false;
         for (const n of m.removedNodes) {
           if (n.nodeType !== 1) continue;
-          if ((n.matches && n.matches(`.${WRAP_CLASS}`)) || (n.querySelector && n.querySelector(`.${WRAP_CLASS}`))) {
+          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 (allSel.some(s => { try { return n.matches(s); } catch(_){return false;} }) ||
-              allSel.some(s => { try { return !!n.querySelector(s); } catch(_){return false;} })) {
+          if (nodeMatchesAny(n, CONTENT_SEL_LIST) || nodeContainsAny(n, CONTENT_SEL_LIST)) {
             requestBurst(); return;
           }
         }
@@ -956,27 +1037,6 @@ function startShowBatch(ids) {
 
   // ── Utilitaires ────────────────────────────────────────────────────────────
 
-  function muteConsole() {
-    if (window.__nbbEzMuted) return;
-    window.__nbbEzMuted = true;
-    const MUTED = [
-      '[EzoicAds JS]: Placeholder Id',
-      'No valid placeholders for loadMore',
-      'cannot call refresh on the same page',
-      'no placeholders are currently defined in Refresh',
-      'Debugger iframe already exists',
-      `with id ${PH_PREFIX}`,
-    ];
-    for (const m of ['log', 'info', 'warn', 'error']) {
-      const orig = console[m];
-      if (typeof orig !== 'function') continue;
-      console[m] = function (...a) {
-        if (typeof a[0] === 'string' && MUTED.some(p => a[0].includes(p))) return;
-        orig.apply(console, a);
-      };
-    }
-  }
-
   function ensureTcfLocator() {
     try {
       if (!window.__tcfapi && !window.__cmp) return;
@@ -998,6 +1058,7 @@ function startShowBatch(ids) {
   function warmNetwork() {
     const head = document.head;
     if (!head) return;
+    const frag = document.createDocumentFragment();
     for (const [rel, href, cors] of [
       ['preconnect',   'https://g.ezoic.net',                    true ],
       ['preconnect',   'https://go.ezoic.net',                   true ],
@@ -1012,8 +1073,9 @@ function startShowBatch(ids) {
       const l = document.createElement('link');
       l.rel = rel; l.href = href;
       if (cors) l.crossOrigin = 'anonymous';
-      head.appendChild(l);
+      frag.appendChild(l);
     }
+    head.appendChild(frag);
   }
 
   // ── Bindings ───────────────────────────────────────────────────────────────
@@ -1027,7 +1089,7 @@ function startShowBatch(ids) {
     $(window).on('action:ajaxify.end.nbbEzoic', () => {
       S.pageKey    = pageKey();
       blockedUntil = 0;
-      muteConsole(); ensureTcfLocator(); warmNetwork();
+      ensureTcfLocator(); warmNetwork();
       patchShowAds(); getIO(); ensureDomObserver(); sweepDeadWraps(); requestBurst();
     });
 
@@ -1075,7 +1137,6 @@ function startShowBatch(ids) {
   // ── Boot ───────────────────────────────────────────────────────────────────
 
   S.pageKey = pageKey();
-  muteConsole();
   ensureTcfLocator();
   warmNetwork();
   patchShowAds();