nodebb-plugin-ezoic-infinite 1.4.91 → 1.4.92

package/package.json

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

package/public/library.js

@@ -27,13 +27,21 @@ async function getAllGroups() {
   }
   const filtered = names.filter(name => !groups.isPrivilegeGroup(name));
   const data = await groups.getGroupsData(filtered);
-  // Sort alphabetically for ACP usability
-  data.sort((a, b) => String(a.name).localeCompare(String(b.name), 'fr', { sensitivity: 'base' }));
-  return data;
+  // Filter out nulls (groups deleted between the sorted-set read and getGroupsData)
+  const valid = data.filter(g => g && g.name);
+  valid.sort((a, b) => String(a.name).localeCompare(String(b.name), undefined, { sensitivity: 'base' }));
+  return valid;
 }
+let _settingsCache = null;
+let _settingsCacheAt = 0;
+const SETTINGS_TTL = 30000; // 30s
+
 async function getSettings() {
+  const now = Date.now();
+  if (_settingsCache && (now - _settingsCacheAt) < SETTINGS_TTL) return _settingsCache;
   const s = await meta.settings.get(SETTINGS_KEY);
-  return {
+  _settingsCacheAt = Date.now();
+  _settingsCache = {
     // Between-post ads (simple blocks) in category topic list
     enableBetweenAds: parseBool(s.enableBetweenAds, true),
     showFirstTopicAd: parseBool(s.showFirstTopicAd, false),
@@ -54,6 +62,7 @@ async function getSettings() {
 
     excludedGroups: normalizeExcludedGroups(s.excludedGroups),
   };
+  return _settingsCache;
 }
 
 async function isUserExcluded(uid, excludedGroups) {
@@ -62,6 +71,13 @@ async function isUserExcluded(uid, excludedGroups) {
   return (userGroups[0] || []).some(g => excludedGroups.includes(g.name));
 }
 
+plugin.onSettingsSet = function (data) {
+  // Invalider le cache dès que les settings de ce plugin sont sauvegardés via l'ACP
+  if (data && data.hash === SETTINGS_KEY) {
+    _settingsCache = null;
+  }
+};
+
 plugin.addAdminNavigation = async (header) => {
   header.plugins = header.plugins || [];
   header.plugins.push({
@@ -89,7 +105,7 @@ plugin.init = async ({ router, middleware }) => {
   router.get('/admin/plugins/ezoic-infinite', middleware.admin.buildHeader, render);
   router.get('/api/admin/plugins/ezoic-infinite', render);
 
-  router.get('/api/plugins/ezoic-infinite/config', middleware.buildHeader, async (req, res) => {
+  router.get('/api/plugins/ezoic-infinite/config', async (req, res) => {
     const settings = await getSettings();
     const excluded = await isUserExcluded(req.uid, settings.excludedGroups);
 

package/public/plugin.json

@@ -11,6 +11,10 @@
     {
       "hook": "filter:admin.header.build",
       "method": "addAdminNavigation"
+    },
+    {
+      "hook": "action:settings.set",
+      "method": "onSettingsSet"
     }
   ],
   "staticDirs": {

package/public/public/admin.js

@@ -13,11 +13,10 @@
         e.preventDefault();
 
         Settings.save('ezoic-infinite', $form, function () {
-          // Toast vert (NodeBB core)
           if (alerts && typeof alerts.success === 'function') {
-            alerts.success('Enregistré');
+            alerts.success('[[admin/settings:saved]]');
           } else if (window.app && typeof window.app.alertSuccess === 'function') {
-            window.app.alertSuccess('Enregistré');
+            window.app.alertSuccess('[[admin/settings:saved]]');
           }
         });
       });

package/public/public/client.js

@@ -1,371 +1,827 @@
 (function () {
   'use strict';
-
   const $ = (typeof window.jQuery === 'function') ? window.jQuery : null;
-
   const SELECTORS = {
-    topicItem: 'li[component="category/topic"]',
-    postItem: '[component="post"][data-pid]',
-    categoryItem: 'li[component="categories/category"]',
-  };
-
-  const WRAP_CLASS = 'ezoic-ad';
-  const PLACEHOLDER_PREFIX = 'ezoic-pub-ad-placeholder-';
-  const MAX_INSERTS_PER_RUN = 3;
-
-  const state = {
-    pageKey: null,
-    cfg: null,
-    cfgPromise: null,
-    poolTopics: [],
-    poolPosts: [],
-    poolCategories: [],
-    usedTopics: new Set(),
-    usedPosts: new Set(),
-    usedCategories: new Set(),
-    lastShowById: new Map(),
-    canShowAds: false,
-    scheduled: false,
-    timer: null,
-    obs: null,
-  };
+  topicItem: 'li[component="category/topic"]',
+  postItem: '[component="post"][data-pid]',
+  categoryItem: 'li[component="categories/category"]',
+  }, WRAP_CLASS = 'ezoic-ad';
+  const PLACEHOLDER_PREFIX = 'ezoic-pub-ad-placeholder-', MAX_INSERTS_PER_RUN = 3;
 
+  // Nécessaire pour savoir si on doit appeler destroyPlaceholders avant recyclage.
   const sessionDefinedIds = new Set();
 
+  const insertingIds = new Set(), state = {
+  pageKey: null,
+  cfg: null,
+  cfgPromise: null,
+
+  poolTopics: [],
+  poolPosts: [],
+  poolCategories: [],
+
+  usedTopics: new Set(),
+  usedPosts: new Set(),
+  usedCategories: new Set(),
+
+  lastShowById: new Map(),
+  pendingById: new Set(),
+  definedIds: new Set(),
+
+  scheduled: false,
+  timer: null,
+
+  obs: null,
+  activeTimeouts: new Set(),
+  lastScrollRun: 0, };
+
   function normalizeBool(v) {
-    return v === true || v === 'true' || v === 1 || v === '1' || v === 'on';
+  return v === true || v === 'true' || v === 1 || v === '1' || v === 'on';
   }
 
   function uniqInts(lines) {
-    const out = [], seen = new Set();
-    for (const v of lines) {
-      const n = parseInt(v, 10);
-      if (Number.isFinite(n) && n > 0 && !seen.has(n)) {
-        seen.add(n);
-        out.push(n);
-      }
-    }
-    return out;
+  const out = [], seen = new Set();
+  for (const v of lines) {
+  const n = parseInt(v, 10);
+  if (Number.isFinite(n) && n > 0 && !seen.has(n)) {
+  seen.add(n);
+  out.push(n);
+  }
+  }
+  return out;
   }
 
   function parsePool(raw) {
-    if (!raw) return [];
-    const lines = String(raw).split(/\r?\n/).map(s => s.trim()).filter(Boolean);
-    return uniqInts(lines);
+  if (!raw) return [];
+  const lines = String(raw).split(/\r?\n/).map(s => s.trim()).filter(Boolean);
+  return uniqInts(lines);
   }
 
   function getPageKey() {
-    try {
-      const ax = window.ajaxify;
-      if (ax && ax.data) {
-        if (ax.data.tid) return `topic:${ax.data.tid}`;
-        if (ax.data.cid) return `cid:${ax.data.cid}:${window.location.pathname}`;
-      }
-    } catch (e) {}
-    return window.location.pathname;
+  try {
+  const ax = window.ajaxify;
+  if (ax && ax.data) {
+  if (ax.data.tid) return `topic:${ax.data.tid}`;
+  if (ax.data.cid) return `cid:${ax.data.cid}:${window.location.pathname}`;
+  }
+  } catch (e) {}
+  return window.location.pathname;
   }
 
   function getKind() {
-    const p = window.location.pathname || '';
-    if (/^\/topic\//.test(p)) return 'topic';
-    if (/^\/category\//.test(p)) return 'categoryTopics';
-    if (p === '/' || /^\/categories/.test(p)) return 'categories';
-    return 'other';
+  const p = window.location.pathname || '';
+  if (/^\/topic\//.test(p)) return 'topic';
+  if (/^\/category\//.test(p)) return 'categoryTopics';
+  if (p === '/' || /^\/categories/.test(p)) return 'categories';
+  // fallback by DOM
+  if (document.querySelector(SELECTORS.categoryItem)) return 'categories';
+  if (document.querySelector(SELECTORS.postItem)) return 'topic';
+  if (document.querySelector(SELECTORS.topicItem)) return 'categoryTopics';
+  return 'other';
   }
 
   function getTopicItems() {
-    return Array.from(document.querySelectorAll(SELECTORS.topicItem));
+  return Array.from(document.querySelectorAll(SELECTORS.topicItem));
+  }
+
+  function getCategoryItems() {
+  return Array.from(document.querySelectorAll(SELECTORS.categoryItem));
   }
 
   function getPostContainers() {
-    return Array.from(document.querySelectorAll(SELECTORS.postItem));
+  const nodes = Array.from(document.querySelectorAll(SELECTORS.postItem));
+  return nodes.filter((el) => {
+  if (!el || !el.isConnected) return false;
+  if (!el.querySelector('[component="post/content"]')) return false;
+  const parentPost = el.parentElement && el.parentElement.closest('[component="post"][data-pid]');
+  if (parentPost && parentPost !== el) return false;
+  if (el.getAttribute('component') === 'post/parent') return false;
+  return true;
+  });
   }
 
-  function getCategoryItems() {
-    return Array.from(document.querySelectorAll(SELECTORS.categoryItem));
+  function safeRect(el) {
+  try { return el.getBoundingClientRect(); } catch (e) { return null; }
   }
 
-  async function fetchConfig() {
-    if (state.cfg) return state.cfg;
-    if (state.cfgPromise) return state.cfgPromise;
+  function destroyPlaceholderIds(ids) {
+  if (!ids || !ids.length) return;
+  // Only destroy ids that were actually "defined" (filled at least once) to avoid Ezoic warnings.
+  const filtered = ids.filter((id) => {
+  // Utiliser sessionDefinedIds (survit aux navigations) plutôt que state.definedIds
+  try { return sessionDefinedIds.has(id); } catch (e) { return true; }
+  });
+  if (!filtered.length) return;
+
+  const call = () => {
+  try {
+  if (window.ezstandalone && typeof window.ezstandalone.destroyPlaceholders === 'function') {
+  window.ezstandalone.destroyPlaceholders(filtered);
+  }
+  } catch (e) {}
+  };
+  try {
+  window.ezstandalone = window.ezstandalone || {};
+  window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+  if (window.ezstandalone && typeof window.ezstandalone.destroyPlaceholders === 'function') call();
+  else window.ezstandalone.cmd.push(call);
+  } catch (e) {}
+  }
 
-    state.cfgPromise = (async () => {
-      try {
-        const res = await fetch('/api/ezoic-infinite/config');
-        if (!res.ok) return null;
-        const cfg = await res.json();
-        state.cfg = cfg;
-        return cfg;
-      } catch (e) {
-        return null;
-      }
-    })();
+  
+  // Nettoyer les wrappers vides (sans pub) pour éviter espaces verticaux
+  function cleanupEmptyWrappers() {
+  try {
+  document.querySelectorAll('.ezoic-ad').forEach(wrapper => {
+  const ph = wrapper.querySelector('[id^="ezoic-pub-ad-placeholder-"]');
+  if (ph && ph.children.length === 0) {
+  // Placeholder vide après 3s = pub non chargée
+  setTimeout(() => {
+  if (ph.children.length === 0) {
+  wrapper.remove();
+  }
+  }, 3000);
+  }
+  });
+  } catch (e) {}
+  }
 
-    return state.cfgPromise;
+  function getRecyclable(liveArr) {
+  const margin = 600;
+  for (let i = 0; i < liveArr.length; i++) {
+  const entry = liveArr[i];
+  if (!entry || !entry.wrap || !entry.wrap.isConnected) { liveArr.splice(i, 1); i--; continue; }
+  const r = safeRect(entry.wrap);
+  if (r && r.bottom < -margin) {
+  liveArr.splice(i, 1);
+  return entry;
+  }
+  }
+  return null;
   }
 
-  function initPools(cfg) {
-    if (!state.poolTopics.length) state.poolTopics = parsePool(cfg.poolTopics);
-    if (!state.poolPosts.length) state.poolPosts = parsePool(cfg.poolPosts);
-    if (!state.poolCategories.length) state.poolCategories = parsePool(cfg.poolCategories);
+  function pickId(pool, liveArr) {
+  if (pool.length) return { id: pool.shift(), recycled: null };
+  const recycled = getRecyclable(liveArr);
+  if (recycled) return { id: recycled.id, recycled };
+  return { id: null, recycled: null };
   }
 
-  function destroyPlaceholderIds(ids) {
-    if (!ids || !ids.length) return;
-    const filtered = ids.filter(id => Number.isFinite(id) && id > 0);
-    if (!filtered.length) return;
-
-    try {
-      window.ezstandalone = window.ezstandalone || {};
-      window.ezstandalone.cmd = window.ezstandalone.cmd || [];
-      
-      const call = () => {
-        if (typeof window.ezstandalone.destroyPlaceholders === 'function') {
-          window.ezstandalone.destroyPlaceholders(filtered);
-        }
-      };
-
-      if (window.ezstandalone && typeof window.ezstandalone.destroyPlaceholders === 'function') {
-        call();
-      } else {
-        window.ezstandalone.cmd.push(call);
-      }
-
-      // Recyclage: libérer après 100ms
-      setTimeout(() => {
-        filtered.forEach(id => sessionDefinedIds.delete(id));
-      }, 100);
-    } catch (e) {}
+  function resetPlaceholderInWrap(wrap, id) {
+  try {
+  if (!wrap) return;
+  try { wrap.removeAttribute('data-ezoic-filled'); } catch (e) {}
+  if (wrap.__ezoicFillObs) { wrap.__ezoicFillObs.disconnect(); wrap.__ezoicFillObs = null; }
+  const old = wrap.querySelector && wrap.querySelector(`#${PLACEHOLDER_PREFIX}${id}`);
+  if (old) old.remove();
+  // Remove any leftover markup inside wrapper
+  wrap.querySelectorAll && wrap.querySelectorAll('iframe, ins').forEach(n => n.remove());
+  const ph = document.createElement('div');
+  ph.id = `${PLACEHOLDER_PREFIX}${id}`;
+  wrap.appendChild(ph);
+  } catch (e) {}
   }
 
-  function buildWrap(id, kindClass, afterPos) {
-    const wrap = document.createElement('div');
-    wrap.className = `${WRAP_CLASS} ${kindClass}`;
-    wrap.setAttribute('data-ezoic-after', String(afterPos));
-    wrap.style.width = '100%';
+  function isAdjacentAd(target) {
+  if (!target || !target.nextElementSibling) return false;
+  const next = target.nextElementSibling;
+  if (next && next.classList && next.classList.contains(WRAP_CLASS)) return true;
+  return false;
+  }
+
+  function isPrevAd(target) {
+  if (!target || !target.previousElementSibling) return false;
+  const prev = target.previousElementSibling;
+  if (prev && prev.classList && prev.classList.contains(WRAP_CLASS)) return true;
+  return false;
+  }
 
-    const ph = document.createElement('div');
-    ph.id = `${PLACEHOLDER_PREFIX}${id}`;
-    wrap.appendChild(ph);
-    return wrap;
+  function buildWrap(id, kindClass, afterPos) {
+  const wrap = document.createElement('div');
+  wrap.className = `${WRAP_CLASS} ${kindClass}`;
+  wrap.setAttribute('data-ezoic-after', String(afterPos));
+  wrap.style.width = '100%';
+
+  const ph = document.createElement('div');
+  ph.id = `${PLACEHOLDER_PREFIX}${id}`;
+  wrap.appendChild(ph);
+  return wrap;
   }
 
   function findWrap(kindClass, afterPos) {
-    return document.querySelector(`.${WRAP_CLASS}.${kindClass}[data-ezoic-after="${afterPos}"]`);
+  return document.querySelector(`.${WRAP_CLASS}.${kindClass}[data-ezoic-after="${afterPos}"]`);
   }
 
   function insertAfter(target, id, kindClass, afterPos) {
-    if (!target || !target.insertAdjacentElement) return null;
-    if (findWrap(kindClass, afterPos)) return null;
+  if (!target || !target.insertAdjacentElement) return null;
+  if (findWrap(kindClass, afterPos)) return null;
+
+  // CRITICAL: Double-lock pour éviter race conditions sur les doublons
+  // 1. Vérifier qu'aucun autre thread n'est en train d'insérer cet ID
+  if (insertingIds.has(id)) return null;
+
+  // 2. Vérifier qu'aucun placeholder avec cet ID n'existe déjà dans le DOM
+  const existingPh = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
+  if (existingPh && existingPh.isConnected) return null;
+
+  // Acquérir le lock
+  insertingIds.add(id);
+
+  try {
+  const wrap = buildWrap(id, kindClass, afterPos);
+  target.insertAdjacentElement('afterend', wrap);
+  attachFillObserver(wrap, id);
+  return wrap;
+  } finally {
+  // Libérer le lock après 100ms (le temps que le DOM soit stable)
+  setTimeout(() => insertingIds.delete(id), 50);
+  }
+  }
 
-    try {
-      const wrap = buildWrap(id, kindClass, afterPos);
-      target.insertAdjacentElement('afterend', wrap);
-      return wrap;
-    } catch (e) {
-      return null;
-    }
+  function destroyUsedPlaceholders() {
+  const ids = [...state.usedTopics, ...state.usedPosts, ...state.usedCategories];
+  if (ids.length) destroyPlaceholderIds(ids);
   }
 
-  function pickId(pool) {
-    if (!pool || !pool.length) return null;
-    return pool.shift();
+  function patchShowAds() {
+  // Minimal safety net: batch showAds can be triggered by other scripts; split into individual calls.
+  // Also ensures the patch is applied even if Ezoic loads after our script.
+  const applyPatch = () => {
+  try {
+  window.ezstandalone = window.ezstandalone || {}, ez = window.ezstandalone;
+  if (window.__nodebbEzoicPatched) return;
+  if (typeof ez.showAds !== 'function') return;
+
+  window.__nodebbEzoicPatched = true;
+  const orig = ez.showAds;
+
+  ez.showAds = function (arg) {
+  if (Array.isArray(arg)) {
+  const seen = new Set();
+  for (const v of arg) {
+  const id = parseInt(v, 10);
+  if (!Number.isFinite(id) || id <= 0 || seen.has(id)) continue;
+  seen.add(id);
+  try { orig.call(ez, id); } catch (e) {}
+  }
+  return;
   }
+  return orig.apply(ez, arguments);
+  };
+  } catch (e) {}
+  };
 
-  function callShowAds(id) {
-    if (!id) return;
-    
-    try {
-      window.ezstandalone = window.ezstandalone || {};
-      window.ezstandalone.cmd = window.ezstandalone.cmd || [];
-      
-      window.ezstandalone.cmd.push(function() {
-        if (typeof window.ezstandalone.showAds === 'function') {
-          window.ezstandalone.showAds(id);
-          sessionDefinedIds.add(id);
-        }
-      });
-    } catch (e) {}
+  applyPatch();
+  // Si Ezoic n'est pas encore chargé, appliquer le patch via sa cmd queue
+  if (!window.__nodebbEzoicPatched) {
+  try {
+  window.ezstandalone = window.ezstandalone || {};
+  window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+  window.ezstandalone.cmd.push(applyPatch);
+  } catch (e) {}
+  }
   }
 
-  function injectBetween(kindClass, items, interval, showFirst, pool, usedSet) {
-    if (!items || items.length === 0) return 0;
+  function markFilled(wrap) {
+  try {
+  if (!wrap) return;
+  // Disconnect the fill observer first (no need to remove+re-add the attribute)
+  if (wrap.__ezoicFillObs) { wrap.__ezoicFillObs.disconnect(); wrap.__ezoicFillObs = null; }
+  wrap.setAttribute('data-ezoic-filled', '1');
+  } catch (e) {}
+  }
 
-    let inserted = 0;
-    const targets = [];
+  function isWrapMarkedFilled(wrap) {
+  try { return wrap && wrap.getAttribute && wrap.getAttribute('data-ezoic-filled') === '1'; } catch (e) { return false; }
+  }
 
-    for (let i = 0; i < items.length; i++) {
-      const afterPos = i + 1;
-      if (afterPos === 1 && !showFirst) continue;
-      if (afterPos % interval !== (showFirst ? 1 : 0)) continue;
-      targets.push(afterPos);
-    }
+  function attachFillObserver(wrap, id) {
+  try {
+  const ph = wrap && wrap.querySelector && wrap.querySelector(`#${PLACEHOLDER_PREFIX}${id}`);
+  if (!ph) return;
+  // Already filled?
+  if (ph.childNodes && ph.childNodes.length > 0) {
+  markFilled(wrap);
+  state.definedIds && state.definedIds.add(id); sessionDefinedIds.add(id);
+  return;
+  }
+  const obs = new MutationObserver(() => {
+  if (ph.childNodes && ph.childNodes.length > 0) {
+  markFilled(wrap);
+  try { state.definedIds && state.definedIds.add(id); sessionDefinedIds.add(id); } catch (e) {}
+  try { obs.disconnect(); } catch (e) {}
+  }
+  });
+  obs.observe(ph, { childList: true, subtree: true });
+  // Keep a weak reference on the wrapper so we can disconnect on recycle/remove
+  wrap.__ezoicFillObs = obs;
+  } catch (e) {}
+  }
 
-    for (const afterPos of targets) {
-      if (inserted >= MAX_INSERTS_PER_RUN) break;
+  function isPlaceholderFilled(id) {
+  const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
+  if (!ph || !ph.isConnected) return false;
 
-      const el = items[afterPos - 1];
-      if (!el || !el.isConnected) continue;
-      if (findWrap(kindClass, afterPos)) continue;
+  const wrap = ph.parentElement;
+  if (wrap && isWrapMarkedFilled(wrap)) return true;
 
-      const id = pickId(pool);
-      if (!id) break;
+  const filled = !!(ph.childNodes && ph.childNodes.length > 0);
+  if (filled) {
+  try { state.definedIds && state.definedIds.add(id); sessionDefinedIds.add(id); } catch (e) {}
+  try { markFilled(wrap); } catch (e) {}
+  }
+  return filled;
+  }
 
-      const wrap = insertAfter(el, id, kindClass, afterPos);
-      if (!wrap) continue;
+  // Appeler showAds() en batch selon recommandations Ezoic
+  // Au lieu de showAds(id1), showAds(id2)... faire showAds(id1, id2, id3...)
+  let batchShowAdsTimer = null;
+  const pendingShowAdsIds = new Set();
 
-      usedSet.add(id);
-      callShowAds(id);
-      inserted += 1;
-    }
+  function scheduleShowAdsBatch(id) {
+  if (!id) return;
 
-    return inserted;
+  // CRITIQUE: Si cet ID a déjà été défini (sessionDefinedIds), le détruire d'abord
+  if (sessionDefinedIds.has(id)) {
+  try {
+  destroyPlaceholderIds([id]);
+  sessionDefinedIds.delete(id);
+  } catch (e) {}
   }
 
-  async function runCore() {
-    if (!state.canShowAds) return;
-
-    const cfg = await fetchConfig();
-    if (!cfg || cfg.excluded) return;
-
-    initPools(cfg);
-
-    const kind = getKind();
-    let inserted = 0;
-
-    if (kind === 'topic' && normalizeBool(cfg.enableMessageAds)) {
-      inserted = injectBetween(
-        'ezoic-ad-message',
-        getPostContainers(),
-        Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3),
-        normalizeBool(cfg.showFirstMessageAd),
-        state.poolPosts,
-        state.usedPosts
-      );
-    } else if (kind === 'categoryTopics' && normalizeBool(cfg.enableBetweenAds)) {
-      inserted = injectBetween(
-        'ezoic-ad-between',
-        getTopicItems(),
-        Math.max(1, parseInt(cfg.intervalPosts, 10) || 6),
-        normalizeBool(cfg.showFirstTopicAd),
-        state.poolTopics,
-        state.usedTopics
-      );
-    } else if (kind === 'categories' && normalizeBool(cfg.enableCategoryAds)) {
-      inserted = injectBetween(
-        'ezoic-ad-category',
-        getCategoryItems(),
-        Math.max(1, parseInt(cfg.intervalCategories, 10) || 6),
-        normalizeBool(cfg.showFirstCategoryAd),
-        state.poolCategories,
-        state.usedCategories
-      );
-    }
+  // Throttle: ne pas rappeler le même ID trop vite
+  const now = Date.now(), last = state.lastShowById.get(id) || 0;
+  if (now - last < 3500) return;
+
+  // Ajouter à la batch
+  pendingShowAdsIds.add(id);
+
+  // Debounce: attendre 100ms pour collecter tous les IDs
+  clearTimeout(batchShowAdsTimer);
+  batchShowAdsTimer = setTimeout(() => {
+  if (pendingShowAdsIds.size === 0) return;
+
+  const idsArray = Array.from(pendingShowAdsIds);
+  pendingShowAdsIds.clear();
+
+  // Appeler showAds avec TOUS les IDs en une fois
+  try {
+  window.ezstandalone = window.ezstandalone || {};
+  window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+  window.ezstandalone.cmd.push(function() {
+  if (typeof window.ezstandalone.showAds === 'function') {
+  // Appel batch: showAds(id1, id2, id3...)
+  window.ezstandalone.showAds(...idsArray);
+  // Tracker tous les IDs
+  idsArray.forEach(id => {
+  state.lastShowById.set(id, Date.now());
+  sessionDefinedIds.add(id);
+  });
+  }
+  });
+  } catch (e) {}
+  }, 100);
   }
 
-  function scheduleRun() {
-    if (state.scheduled) return;
-    state.scheduled = true;
+  function callShowAdsWhenReady(id) {
+  if (!id) return;
+
+  const now = Date.now(), last = state.lastShowById.get(id) || 0;
+  if (now - last < 3500) return;
+
+  const phId = `${PLACEHOLDER_PREFIX}${id}`, doCall = () => {
+  try {
+  window.ezstandalone = window.ezstandalone || {};
+  if (typeof window.ezstandalone.showAds === 'function') {
 
-    clearTimeout(state.timer);
-    state.timer = setTimeout(() => {
-      state.scheduled = false;
-      const pk = getPageKey();
-      if (state.pageKey && pk !== state.pageKey) return;
-      runCore().catch(() => {});
-    }, 50);
+  state.lastShowById.set(id, Date.now());
+  window.ezstandalone.showAds(id);
+  sessionDefinedIds.add(id);
+  return true;
+  }
+  } catch (e) {}
+  return false;
+  };
+
+  const startPageKey = state.pageKey;
+  let attempts = 0;
+  (function waitForPh() {
+  // Abort if the user navigated away since this showAds was scheduled
+  if (state.pageKey !== startPageKey) return;
+  // Abort if another concurrent call is already handling this id
+  if (state.pendingById.has(id)) return;
+
+  attempts += 1;
+  const el = document.getElementById(phId);
+  if (el && el.isConnected) {
+  // CRITIQUE: Vérifier que le placeholder est VISIBLE
+
+  // Si on arrive ici, soit visible, soit timeout
+
+  // Si doCall() réussit, Ezoic est chargé et showAds a été appelé → sortir
+  if (doCall()) {
+  state.pendingById.delete(id);
+  return;
+  }
+
+  }
+
+  if (attempts < 100) {
+  const timeoutId = setTimeout(waitForPh, 50);
+  state.activeTimeouts.add(timeoutId);
+  }
+  })();
+  }
+
+  async function fetchConfig() {
+  if (state.cfg) return state.cfg;
+  if (state.cfgPromise) return state.cfgPromise;
+
+  state.cfgPromise = (async () => {
+  const MAX_TRIES = 3;
+  let delay = 800;
+  for (let attempt = 1; attempt <= MAX_TRIES; attempt++) {
+  try {
+  const res = await fetch('/api/plugins/ezoic-infinite/config', { credentials: 'same-origin' });
+  if (res.ok) {
+  state.cfg = await res.json();
+  return state.cfg;
+  }
+  } catch (e) {}
+  if (attempt < MAX_TRIES) await new Promise(r => setTimeout(r, delay));
+  delay *= 2;
+  }
+  return null;
+  })();
+
+  try { return await state.cfgPromise; } finally { state.cfgPromise = null; }
+  }
+
+  function initPools(cfg) {
+  if (state.poolTopics.length === 0) state.poolTopics = parsePool(cfg.placeholderIds);
+  if (state.poolPosts.length === 0) state.poolPosts = parsePool(cfg.messagePlaceholderIds);
+  if (state.poolCategories.length === 0) state.poolCategories = parsePool(cfg.categoryPlaceholderIds);
+  }
+
+  function computeTargets(count, interval, showFirst) {
+  const out = [];
+  if (count <= 0) return out;
+  if (showFirst) out.push(1);
+  for (let i = 1; i <= count; i++) {
+  if (i % interval === 0) out.push(i);
+  }
+  return Array.from(new Set(out)).sort((a, b) => a - b);
+  }
+
+  function injectBetween(kindClass, items, interval, showFirst, kindPool, usedSet) {
+  if (!items.length) return 0;
+  const targets = computeTargets(items.length, interval, showFirst);
+
+  let inserted = 0;
+  for (const afterPos of targets) {
+  if (inserted >= MAX_INSERTS_PER_RUN) break;
+
+  const el = items[afterPos - 1];
+  if (!el || !el.isConnected) continue;
+
+  // Prevent adjacent ads (DOM-based, robust against virtualization)
+  if (isAdjacentAd(el) || isPrevAd(el)) {
+  continue;
+  }
+
+  // Prevent back-to-back at load
+  const prevWrap = findWrap(kindClass, afterPos - 1);
+  if (prevWrap) continue;
+
+  if (findWrap(kindClass, afterPos)) continue;
+
+  const pick = pickId(kindPool, []);
+  const id = pick.id;
+  if (!id) break;
+
+  let wrap = null;
+  if (pick.recycled && pick.recycled.wrap) {
+  // Only destroy if Ezoic has actually defined this placeholder before
+  if (sessionDefinedIds.has(id)) {
+  destroyPlaceholderIds([id]);
+  }
+  // Remove the old wrapper entirely, then create a fresh wrapper at the new position (same id)
+  const oldWrap = pick.recycled.wrap;
+  try { if (oldWrap && oldWrap.__ezoicFillObs) { oldWrap.__ezoicFillObs.disconnect(); } } catch (e) {}
+  try { oldWrap && oldWrap.remove(); } catch (e) {}
+  wrap = insertAfter(el, id, kindClass, afterPos);
+  if (!wrap) continue;
+  // Attendre que le wrapper soit dans le DOM puis appeler showAds
+  setTimeout(() => {
+  callShowAdsWhenReady(id);
+  }, 50);
+  } else {
+  usedSet.add(id);
+  wrap = insertAfter(el, id, kindClass, afterPos);
+  if (!wrap) continue;
+  // Micro-délai pour laisser le DOM se synchroniser
+  // Appel immédiat au lieu de 10ms delay
+  callShowAdsWhenReady(id);
+  }
+
+  liveArr.push({ id, wrap });
+  // If adjacency ended up happening (e.g. DOM shifts), rollback this placement.
+  if (wrap && (
+  (wrap.previousElementSibling && wrap.previousElementSibling.classList && wrap.previousElementSibling.classList.contains(WRAP_CLASS)) || (wrap.nextElementSibling && wrap.nextElementSibling.classList && wrap.nextElementSibling.classList.contains(WRAP_CLASS))
+  )) {
+  try { wrap.remove(); } catch (e) {}
+  // Put id back if it was newly consumed (not recycled)
+  if (!(pick.recycled && pick.recycled.wrap)) {
+  try { kindPool.unshift(id); } catch (e) {}
+  usedSet.delete(id);
+  }
+  continue;
+  }
+  inserted += 1;
+  }
+  return inserted;
+  }
+
+  function enforceNoAdjacentAds() {
+  const ads = Array.from(document.querySelectorAll(`.${WRAP_CLASS}`));
+  for (let i = 0; i < ads.length; i++) {
+  const ad = ads[i], prev = ad.previousElementSibling;
+  if (prev && prev.classList && prev.classList.contains(WRAP_CLASS)) {
+  // Supprimer le wrapper adjacent au lieu de le cacher
+  try {
+  const ph = ad.querySelector && ad.querySelector(`[id^="${PLACEHOLDER_PREFIX}"]`);
+  if (ph) {
+  const id = parseInt(ph.id.replace(PLACEHOLDER_PREFIX, ''), 10);
+  if (Number.isFinite(id) && id > 0) {
+  // Détruire le placeholder si Ezoic l'a déjà défini
+  if (sessionDefinedIds.has(id)) {
+  destroyPlaceholderIds([id]);
+  }
+  }
+  }
+  ad.remove();
+  } catch (e) {}
+  }
+  }
   }
 
   function cleanup() {
-    const allIds = [...state.usedTopics, ...state.usedPosts, ...state.usedCategories];
-    if (allIds.length) destroyPlaceholderIds(allIds);
-
-    document.querySelectorAll('.ezoic-ad').forEach(el => {
-      try { el.remove(); } catch (e) {}
-    });
-
-    state.pageKey = getPageKey();
-    state.cfg = null;
-    state.cfgPromise = null;
-    state.poolTopics = [];
-    state.poolPosts = [];
-    state.poolCategories = [];
-    state.usedTopics.clear();
-    state.usedPosts.clear();
-    state.usedCategories.clear();
-    state.lastShowById.clear();
-    sessionDefinedIds.clear();
-
-    if (state.obs) {
-      state.obs.disconnect();
-      state.obs = null;
-    }
-
-    state.scheduled = false;
-    clearTimeout(state.timer);
-    state.timer = null;
+  destroyUsedPlaceholders();
+
+  // CRITIQUE: Supprimer TOUS les wrappers .ezoic-ad du DOM
+  // Sinon ils restent et deviennent "unused" sur la nouvelle page
+  document.querySelectorAll('.ezoic-ad').forEach(el => {
+  try { el.remove(); } catch (e) {}
+  });
+
+  state.pageKey = getPageKey();
+  state.cfg = null;
+  state.cfgPromise = null;
+
+  state.poolTopics = [];
+  state.poolPosts = [];
+  state.poolCategories = [];
+  state.usedTopics.clear();
+  state.usedPosts.clear();
+  state.usedCategories.clear();
+  state.lastShowById.clear();
+  // CRITIQUE: Vider pendingById pour annuler tous les showAds en cours
+  // Sinon Ezoic essaie d'accéder aux placeholders pendant que NodeBB vide le DOM
+  state.pendingById.clear();
+  state.definedIds.clear();
+
+  // NE PAS supprimer les wrappers Ezoic ici - ils seront supprimés naturellement
+  // quand NodeBB vide le DOM lors de la navigation ajaxify
+  // Les supprimer manuellement cause des problèmes avec l'état interne d'Ezoic
+
+  // CRITIQUE: Annuler TOUS les timeouts en cours pour éviter que les anciens
+  // showAds() continuent à s'exécuter après la navigation
+  state.activeTimeouts.forEach(id => {
+  try { clearTimeout(id); } catch (e) {}
+  });
+  state.activeTimeouts.clear();
+
+  // Vider aussi pendingById pour annuler les showAds en attente
+  state.pendingById.clear();
+
+  if (state.obs) { state.obs.disconnect(); state.obs = null; }
+
+  state.scheduled = false;
+  clearTimeout(state.timer);
+  state.timer = null;
   }
 
   function ensureObserver() {
-    if (state.obs) return;
-    state.obs = new MutationObserver(() => scheduleRun());
-    try {
-      state.obs.observe(document.body, { childList: true, subtree: true });
-    } catch (e) {}
+  if (state.obs) return;
+  state.obs = new MutationObserver(() => scheduleRun('mutation'));
+  try { state.obs.observe(document.body, { childList: true, subtree: true }); } catch (e) {}
   }
 
-  function waitForContentThenRun() {
-    const kind = getKind();
-    let selector = SELECTORS.postItem;
-    if (kind === 'categoryTopics') selector = SELECTORS.topicItem;
-    else if (kind === 'categories') selector = SELECTORS.categoryItem;
+  async function runCore() {
+  // Attendre que canInsert soit true (protection race condition navigation)
+  if (!state.canShowAds) {
+  return;
+  }
+
+  patchShowAds();
 
-    const check = () => {
-      if (document.querySelector(selector)) {
-        scheduleRun();
-      } else {
-        setTimeout(check, 200);
-      }
-    };
-    check();
+  const cfg = await fetchConfig();
+  if (!cfg || cfg.excluded) return;
+
+  initPools(cfg);
+
+  const kind = getKind();
+  let inserted = 0;
+
+  if (kind === 'topic') {
+  if (normalizeBool(cfg.enableMessageAds)) {
+  inserted = injectBetween('ezoic-ad-message', getPostContainers(),
+  Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3),
+  normalizeBool(cfg.showFirstMessageAd),
+  state.poolPosts,
+  state.usedPosts);
+  }
+  } else if (kind === 'categoryTopics') {
+  if (normalizeBool(cfg.enableBetweenAds)) {
+  inserted = injectBetween('ezoic-ad-between', getTopicItems(),
+  Math.max(1, parseInt(cfg.intervalPosts, 10) || 6),
+  normalizeBool(cfg.showFirstTopicAd),
+  state.poolTopics,
+  state.usedTopics);
+  }
+  } else if (kind === 'categories') {
+  if (normalizeBool(cfg.enableCategoryAds)) {
+  inserted = injectBetween('ezoic-ad-categories', getCategoryItems(),
+  Math.max(1, parseInt(cfg.intervalCategories, 10) || 4),
+  normalizeBool(cfg.showFirstCategoryAd),
+  state.poolCategories,
+  state.usedCategories);
+  }
   }
 
-  function bind() {
-    if (!$) return;
-
-    $(window).off('.ezoicInfinite');
-    $(window).on('action:ajaxify.start.ezoicInfinite', () => cleanup());
-    $(window).on('action:ajaxify.end.ezoicInfinite', () => {
-      state.pageKey = getPageKey();
-      ensureObserver();
-      state.canShowAds = true;
-      scheduleRun();
-    });
-
-    $(window).on('action:category.loaded.ezoicInfinite', () => {
-      ensureObserver();
-      waitForContentThenRun();
-    });
-
-    $(window).on('action:topics.loaded.ezoicInfinite', () => {
-      ensureObserver();
-      waitForContentThenRun();
-    });
-  }
-
-  function init() {
-    state.pageKey = getPageKey();
-    state.canShowAds = true;
-    bind();
-    ensureObserver();
-    waitForContentThenRun();
-  }
-
-  if ($ && $(document).ready) {
-    $(document).ready(init);
-  } else if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', init);
+  enforceNoAdjacentAds();
+
+  // If nothing inserted and list isn't in DOM yet (first click), retry a bit
+  let count = 0;
+  if (kind === 'topic') count = getPostContainers().length;
+  else if (kind === 'categoryTopics') count = getTopicItems().length;
+  else if (kind === 'categories') count = getCategoryItems().length;
+
+  if (count === 0 && 0 < 25) {
+  setTimeout(arguments[0], 50);
+  return;
+  }
+
+  if (inserted >= MAX_INSERTS_PER_RUN) {
+  // Plus d'insertions possibles ce cycle, continuer immédiatement
+  setTimeout(arguments[0], 50);
+  } else if (inserted === 0 && count > 0) {
+  // Pool épuisé ou recyclage pas encore disponible.
+  // Réessayer jusqu'à 8 fois (toutes les 400ms) pour laisser aux anciens wrappers
+  // le temps de défiler hors écran et devenir recyclables.
+  if (state.poolWaitAttempts < 8) {
+  state.poolWaitAttempts += 1;
+  setTimeout(arguments[0], 50);
   } else {
-    init();
   }
-})();
+  } else if (inserted > 0) {
+  }
+  }
+
+  function scheduleRun() {
+  if (state.scheduled) return;
+  state.scheduled = true;
+
+  clearTimeout(state.timer);
+  state.timer = setTimeout(() => {
+  state.scheduled = false;
+  const pk = getPageKey();
+  if (state.pageKey && pk !== state.pageKey) return;
+  runCore().catch(() => {});
+  }, 50);
+  }
+
+  function bind() {
+  if (!$) return;
+
+  $(window).off('.ezoicInfinite');
+
+  $(window).on('action:ajaxify.start.ezoicInfinite', () => cleanup());
+
+  $(window).on('action:ajaxify.end.ezoicInfinite', () => {
+  state.pageKey = getPageKey();
+  ensureObserver();
+
+  // CRITIQUE: Attendre 300ms avant de permettre l'insertion de nouveaux placeholders
+  // pour laisser les anciens showAds() (en cours) se terminer ou échouer proprement
+  // Sinon race condition: NodeBB vide le DOM pendant que Ezoic essaie d'accéder aux placeholders
+  state.canShowAds = true;
+  });
+
+  $(window).on('action:category.loaded.ezoicInfinite', () => {
+  ensureObserver();
+  // category.loaded = infinite scroll, Ezoic déjà chargé normalement
+  waitForContentThenRun();
+  });
+  $(window).on('action:topics.loaded.ezoicInfinite', () => {
+  ensureObserver();
+  waitForContentThenRun();
+  });
+
+  $(window).on('action:topic.loaded.ezoicInfinite', () => {
+  ensureObserver();
+  waitForContentThenRun();
+  });
+
+  $(window).on('action:posts.loaded.ezoicInfinite', () => {
+  ensureObserver();
+  // posts.loaded = infinite scroll
+  waitForContentThenRun();
+  });
+  }
+
+  function bindScroll() {
+  if (state.lastScrollRun > 0) return;
+  state.lastScrollRun = Date.now();
+  let ticking = false;
+  window.addEventListener('scroll', () => {
+  if (ticking) return;
+  ticking = true;
+  window.requestAnimationFrame(() => {
+  ticking = false;
+  enforceNoAdjacentAds();
+  // Debounce scheduleRun - une fois toutes les 2 secondes max au scroll
+  const now = Date.now();
+  if (!state.lastScrollRun || now - state.lastScrollRun > 2000) {
+  state.lastScrollRun = now;
+  scheduleRun();
+  }
+  });
+  }, { passive: true });
+  }
+
+  // Fonction qui attend que la page ait assez de contenu avant d'insérer les pubs
+  function waitForContentThenRun() {
+  const MIN_WORDS = 250;
+  let attempts = 0;
+  const maxAttempts = 20; // 20 × 200ms = 4s max
+
+  (function check() {
+  attempts++;
+
+  // Compter les mots sur la page
+  const text = document.body.innerText || '';
+  const wordCount = text.split(/\s+/).filter(Boolean).length;
+
+  if (wordCount >= MIN_WORDS) {
+  // Assez de contenu → lancer l'insertion
+  scheduleRun();
+  return;
+  }
+
+  // Pas assez de contenu
+  if (attempts >= maxAttempts) {
+  // Timeout après 4s → tenter quand même
+  scheduleRun();
+  return;
+  }
+
+  // Réessayer dans 200ms
+  setTimeout(check, 50);
+  })();
+  }
+
+  // Fonction qui attend que Ezoic soit vraiment chargé
+  function waitForEzoicThenRun() {
+  let attempts = 0;
+  const maxAttempts = 50; // 50 × 200ms = 10s max
+
+  (function check() {
+  attempts++;
+  // Vérifier si Ezoic est chargé
+  if (window.ezstandalone && typeof window.ezstandalone.showAds === 'function') {
+  // Ezoic est prêt → lancer l'insertion
+  scheduleRun();
+  waitForContentThenRun();
+  return;
+  }
+  // Ezoic pas encore prêt
+  if (attempts >= maxAttempts) {
+  // Tenter quand même
+  scheduleRun();
+  return;
+  }
+  // Réessayer dans 200ms
+  setTimeout(check, 50);
+  })();
+  }
+
+  cleanup();
+  bind();
+  bindScroll();
+  ensureObserver();
+  state.pageKey = getPageKey();
+
+  // Attendre que Ezoic soit chargé avant d'insérer
+  waitForEzoicThenRun();
+})();

package/public/public/style.css

@@ -1,11 +1,3 @@
-.ezoic-ad {
-  padding: 0 !important;
-  margin: 0 !important;
-  min-height: 0 !important;
-  min-width: 0 !important;
-}
-
-.ezoic-ad * {
-  min-height: 0 !important;
-  min-width: 0 !important;
-}
+.ezoic-ad{height:auto !important; padding:0 !important; margin: 0.25rem 0;}
+.ezoic-ad .ezoic-ad-inner{padding:0;margin:0;}
+.ezoic-ad .ezoic-ad-inner > div{padding:0;margin:0;}