nodebb-plugin-ezoic-infinite 1.4.7 → 1.4.9

package/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', middleware.authenticate, async (req, res) => {
     const settings = await getSettings();
     const excluded = await isUserExcluded(req.uid, settings.excludedGroups);
 

package/package.json

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

package/plugin.json

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

package/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/client.js

@@ -31,7 +31,6 @@
     liveBetween: [],
     liveMessage: [],
     liveCategory: [],
-    usedCategories: new Set(),
 
     lastShowById: new Map(),
     pendingById: new Set(),
@@ -48,6 +47,8 @@
 
     obs: null,
     attempts: 0,
+    poolWaitAttempts: 0,
+    __scrollBound: false,
   };
 
   function normalizeBool(v) {
@@ -143,18 +144,9 @@
       else window.ezstandalone.cmd.push(call);
     } catch (e) {}
   }
-      } 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) {}
-  }
 
   function getRecyclable(liveArr) {
-    const margin = 1800;
+    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; }
@@ -167,17 +159,6 @@
     return null;
   }
 
-  function moveWrapAfter(wrap, target, kindClass, afterPos) {
-    try {
-      wrap.className = `${WRAP_CLASS} ${kindClass}`;
-      wrap.setAttribute('data-ezoic-after', String(afterPos));
-      target.insertAdjacentElement('afterend', wrap);
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-
   function pickId(pool, liveArr) {
     if (pool.length) return { id: pool.shift(), recycled: null };
     const recycled = getRecyclable(liveArr);
@@ -189,6 +170,8 @@
   function resetPlaceholderInWrap(wrap, id) {
     try {
       if (!wrap) return;
+      try { wrap.removeAttribute('data-ezoic-filled'); } catch (e) {}
+      try { if (wrap.__ezoicFillObs) { wrap.__ezoicFillObs.disconnect(); wrap.__ezoicFillObs = null; } } catch (e) {}
       const old = wrap.querySelector && wrap.querySelector(`#${PLACEHOLDER_PREFIX}${id}`);
       if (old) old.remove();
       // Remove any leftover markup inside wrapper
@@ -234,6 +217,7 @@
     if (findWrap(kindClass, afterPos)) return null;
     const wrap = buildWrap(id, kindClass, afterPos);
     target.insertAdjacentElement('afterend', wrap);
+    attachFillObserver(wrap, id);
     return wrap;
   }
 
@@ -242,30 +226,20 @@
     try {
       state.usedTopics.forEach((id) => ids.push(id));
       state.usedPosts.forEach((id) => ids.push(id));
-      state.usedCategories && state.usedCategories.forEach((id) => ids.push(id));
+      state.usedCategories.forEach((id) => ids.push(id));
     } catch (e) {}
     destroyPlaceholderIds(ids);
   }
-      } 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) {}
-  }
 
   function patchShowAds() {
     // Minimal safety net: batch showAds can be triggered by other scripts; split into individual calls.
     try {
       window.ezstandalone = window.ezstandalone || {};
       const ez = window.ezstandalone;
-      if (ez.__nodebbEzoicPatched) return;
+      if (window.__nodebbEzoicPatched) return;
       if (typeof ez.showAds !== 'function') return;
 
-      ez.__nodebbEzoicPatched = true;
+      window.__nodebbEzoicPatched = true;
       const orig = ez.showAds;
 
       ez.showAds = function (arg) {
@@ -285,14 +259,54 @@
   }
 
 
+
+  function markFilled(wrap) {
+    try {
+      if (!wrap) return;
+      // Disconnect the fill observer first (no need to remove+re-add the attribute)
+      try { if (wrap.__ezoicFillObs) { wrap.__ezoicFillObs.disconnect(); wrap.__ezoicFillObs = null; } } catch (e) {}
+      wrap.setAttribute('data-ezoic-filled', '1');
+    } catch (e) {}
+  }
+
+  function isWrapMarkedFilled(wrap) {
+    try { return wrap && wrap.getAttribute && wrap.getAttribute('data-ezoic-filled') === '1'; } catch (e) { return false; }
+  }
+
+  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);
+        return;
+      }
+      const obs = new MutationObserver(() => {
+        if (ph.childNodes && ph.childNodes.length > 0) {
+          markFilled(wrap);
+          try { state.definedIds && state.definedIds.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) {}
+  }
+
   function isPlaceholderFilled(id) {
     const ph = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
     if (!ph || !ph.isConnected) return false;
 
-    // Ezoic typically injects content inside the placeholder node.
+    const wrap = ph.parentElement;
+    if (wrap && isWrapMarkedFilled(wrap)) return true;
+
     const filled = !!(ph.childNodes && ph.childNodes.length > 0);
     if (filled) {
       try { state.definedIds && state.definedIds.add(id); } catch (e) {}
+      try { markFilled(wrap); } catch (e) {}
     }
     return filled;
   }
@@ -319,24 +333,19 @@
       const id = state.retryQueue.shift();
       if (!id) {
         state.retryQueueRunning = false;
-    state.badIds = new Set();
-    state.definedIds = new Set();
         return;
       }
       state.retryQueueSet.delete(id);
-      // If this id was previously attempted and still empty, force a full reset before re-requesting.
       const attempts = (state.retryById.get(id) || 0);
       const phNow = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
       const wrapNow = phNow && phNow.parentElement;
-      // If Ezoic already defined this id earlier but the placeholder is empty now, we must destroy+reset before re-showAds.
-      if (wrapNow && wrapNow.isConnected && state.definedIds && state.definedIds.has(id) && !isPlaceholderFilled(id)) {
-        destroyPlaceholderIds([id]);
-        resetPlaceholderInWrap(wrapNow, id);
-      }
-      // If this id was previously attempted and still empty, force a full reset before re-requesting.
-      if (attempts > 0 && wrapNow && wrapNow.isConnected && !isPlaceholderFilled(id)) {
+      // Reset before re-requesting if Ezoic already defined this id but placeholder is now empty,
+      // OR if a previous attempt already failed.
+      if (wrapNow && wrapNow.isConnected && !isPlaceholderFilled(id) && !isWrapMarkedFilled(wrapNow) &&
+          (state.definedIds.has(id) || attempts > 0)) {
         destroyPlaceholderIds([id]);
         resetPlaceholderInWrap(wrapNow, id);
+        attachFillObserver(wrapNow, id);
       }
       callShowAdsWhenReady(id);
       setTimeout(step, 1100);
@@ -360,6 +369,11 @@
         state.retryById.delete(id);
         continue;
       }
+      // If wrapper was marked filled, don't try to refill even if placeholder temporarily appears empty.
+      if (isWrapMarkedFilled(wrap)) {
+        state.retryById.delete(id);
+        continue;
+      }
 
       const tries = (state.retryById.get(id) || 0);
       if (tries >= 8) { state.badIds && state.badIds.add(id); continue; }
@@ -396,8 +410,11 @@
       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;
       attempts += 1;
       const el = document.getElementById(phId);
       if (el && el.isConnected) {
@@ -420,6 +437,7 @@
 
         let tries = 0;
         (function tick() {
+          if (state.pageKey !== startPageKey) { state.pendingById.delete(id); return; }
           tries += 1;
           if (doCall() || tries >= 5) {
             if (tries >= 5) state.pendingById.delete(id);
@@ -434,30 +452,28 @@
     })();
   }
 
-  function nextId(pool) {
-    // backward compatible: the injector passes the pool array
-    if (Array.isArray(pool) && pool.length) return pool.shift();
-    return null;
-  }
-
   async function fetchConfig() {
     if (state.cfg) return state.cfg;
     if (state.cfgPromise) return state.cfgPromise;
 
     state.cfgPromise = (async () => {
-      try {
-        const res = await fetch('/api/plugins/ezoic-infinite/config', { credentials: 'same-origin' });
-        if (!res.ok) return null;
-        state.cfg = await res.json();
-        return state.cfg;
-      } catch (e) {
-        return null;
-      } finally {
-        state.cfgPromise = null;
+      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;
     })();
 
-    return state.cfgPromise;
+    try { return await state.cfgPromise; } finally { state.cfgPromise = null; }
   }
 
   function initPools(cfg) {
@@ -512,9 +528,12 @@
         if (state.definedIds && state.definedIds.has(id)) {
           destroyPlaceholderIds([id]);
         }
-        wrap = pick.recycled.wrap;
-        if (!moveWrapAfter(wrap, el, kindClass, afterPos)) continue;
-        resetPlaceholderInWrap(wrap, 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;
         setTimeout(() => { enqueueRetry(id); }, 450);
       } else {
         usedSet.add(id);
@@ -524,14 +543,16 @@
 
       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))) {
+      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) {}
           try { usedSet.delete(id); } catch (e) {}
         }
-        inserted -= 0; // no-op
         continue;
       }
       if (!(pick.recycled && pick.recycled.wrap)) {
@@ -562,19 +583,24 @@
     state.poolTopics = [];
     state.poolPosts = [];
     state.poolCategories = [];
-    state.poolCategories = [];
     state.usedTopics.clear();
     state.usedPosts.clear();
-    state.usedCategories && state.usedCategories.clear();
+    state.usedCategories.clear();
     state.liveBetween = [];
     state.liveMessage = [];
     state.liveCategory = [];
-    state.usedCategories.clear();
 
     state.lastShowById = new Map();
     state.pendingById = new Set();
+    state.retryById = new Map();
+    state.retryQueue = [];
+    state.retryQueueSet = new Set();
+    state.retryQueueRunning = false;
+    state.badIds = new Set();
+    state.definedIds = new Set();
 
     state.attempts = 0;
+    state.poolWaitAttempts = 0;
 
     document.querySelectorAll(`.${WRAP_CLASS}`).forEach(el => el.remove());
 
@@ -582,13 +608,14 @@
     state.scheduled = false;
     clearTimeout(state.timer);
     state.timer = null;
+    clearTimeout(state.retryTimer);
+    state.retryTimer = null;
   }
 
   function ensureObserver() {
     if (state.obs) return;
     state.obs = new MutationObserver(() => scheduleRun('mutation'));
     try { state.obs.observe(document.body, { childList: true, subtree: true }); } catch (e) {}
-    setTimeout(() => { if (state.obs) { try { state.obs.disconnect(); } catch (e) {} state.obs = null; } }, 15000);
   }
 
   async function runCore() {
@@ -607,7 +634,7 @@
         inserted = injectBetween('ezoic-ad-message', getPostContainers(),
           Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3),
           normalizeBool(cfg.showFirstMessageAd),
-          'message',
+          state.poolPosts,
           state.usedPosts);
       }
     } else if (kind === 'categoryTopics') {
@@ -615,7 +642,7 @@
         inserted = injectBetween('ezoic-ad-between', getTopicItems(),
           Math.max(1, parseInt(cfg.intervalPosts, 10) || 6),
           normalizeBool(cfg.showFirstTopicAd),
-          'between',
+          state.poolTopics,
           state.usedTopics);
       }
     } else if (kind === 'categories') {
@@ -623,7 +650,7 @@
         inserted = injectBetween('ezoic-ad-categories', getCategoryItems(),
           Math.max(1, parseInt(cfg.intervalCategories, 10) || 4),
           normalizeBool(cfg.showFirstCategoryAd),
-          'categories',
+          state.poolCategories,
           state.usedCategories);
       }
     }
@@ -643,7 +670,22 @@
       return;
     }
 
-    if (inserted >= MAX_INSERTS_PER_RUN) setTimeout(() => scheduleRun('continue'), 140);
+    if (inserted >= MAX_INSERTS_PER_RUN) {
+      // Plus d'insertions possibles ce cycle, continuer immédiatement
+      setTimeout(() => scheduleRun('continue'), 140);
+    } 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(() => scheduleRun('pool-wait'), 400);
+      } else {
+        state.poolWaitAttempts = 0;
+      }
+    } else if (inserted > 0) {
+      state.poolWaitAttempts = 0;
+    }
   }
 
   function scheduleRun() {
@@ -699,13 +741,6 @@
     });
   }
 
-  cleanup();
-  bind();
-  ensureObserver();
-  state.pageKey = getPageKey();
-  scheduleRun();
-  setTimeout(scheduleRun, 250);
-})()
   function bindScroll() {
     if (state.__scrollBound) return;
     state.__scrollBound = true;
@@ -715,10 +750,21 @@
       ticking = true;
       window.requestAnimationFrame(() => {
         ticking = false;
+        // Réinitialiser le compteur d'attente de recyclage à chaque reprise de scroll
+        state.poolWaitAttempts = 0;
         enforceNoAdjacentAds();
         scheduleRefill(200);
+        // Tenter aussi d'insérer de nouvelles pubs si de nouveaux items sont apparus
+        scheduleRun();
       });
     }, { passive: true });
   }
 
-;
+  cleanup();
+  bind();
+  bindScroll();
+  ensureObserver();
+  state.pageKey = getPageKey();
+  scheduleRun();
+  setTimeout(scheduleRun, 250);
+})();