nodebb-plugin-ezoic-infinite 1.7.16 → 1.7.17

package/library.js

@@ -9,8 +9,10 @@ const plugin = {};
 
 function normalizeExcludedGroups(value) {
   if (!value) return [];
-  if (Array.isArray(value)) return value;
-  return String(value).split(',').map(s => s.trim()).filter(Boolean);
+  const arr = Array.isArray(value) ? value : String(value).split(',');
+  return arr
+    .map(s => String(s).trim())
+    .filter(Boolean);
 }
 
 function parseBool(v, def = false) {
@@ -20,18 +22,30 @@ function parseBool(v, def = false) {
   return s === '1' || s === 'true' || s === 'on' || s === 'yes';
 }
 
+let _groupsCache = null;
+let _groupsCacheAt = 0;
+const GROUPS_TTL = 60000; // 60s
+
 async function getAllGroups() {
+  const now = Date.now();
+  if (_groupsCache && (now - _groupsCacheAt) < GROUPS_TTL) return _groupsCache;
+
   let names = await db.getSortedSetRange('groups:createtime', 0, -1);
   if (!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);
+
   // Filter out nulls (groups deleted between the sorted-set read and getGroupsData)
-  const valid = data.filter(g => g && g.name);
+  const valid = (data || []).filter(g => g && g.name);
   valid.sort((a, b) => String(a.name).localeCompare(String(b.name), undefined, { sensitivity: 'base' }));
-  return valid;
+
+  _groupsCache = valid;
+  _groupsCacheAt = now;
+  return _groupsCache;
 }
+
 let _settingsCache = null;
 let _settingsCacheAt = 0;
 const SETTINGS_TTL = 30000; // 30s
@@ -39,8 +53,13 @@ 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);
-  _settingsCacheAt = Date.now();
+  let s = {};
+  try {
+    s = await meta.settings.get(SETTINGS_KEY);
+  } catch (err) {
+    s = {};
+  }
+  _settingsCacheAt = now;
   _settingsCache = {
     // Between-post ads (simple blocks) in category topic list
     enableBetweenAds: parseBool(s.enableBetweenAds, true),
@@ -60,6 +79,9 @@ async function getSettings() {
     messagePlaceholderIds: (s.messagePlaceholderIds || '').trim(),
     messageIntervalPosts: Math.max(1, parseInt(s.messageIntervalPosts, 10) || 3),
 
+    // Avoid globally muting console unless explicitly enabled
+    muteEzoicConsole: parseBool(s.muteEzoicConsole, false),
+
     excludedGroups: normalizeExcludedGroups(s.excludedGroups),
   };
   return _settingsCache;
@@ -68,7 +90,8 @@ async function getSettings() {
 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 excluded = new Set(excludedGroups.map(n => String(n).toLowerCase().trim()).filter(Boolean));
+  return (userGroups[0] || []).some(g => excluded.has(String(g.name).toLowerCase().trim()));
 }
 
 plugin.onSettingsSet = function (data) {
@@ -93,21 +116,53 @@ plugin.init = async ({ router, middleware }) => {
     const settings = await getSettings();
     const allGroups = await getAllGroups();
 
+    const excludedSet = new Set((settings.excludedGroups || []).map(n => String(n).toLowerCase().trim()).filter(Boolean));
+    const allGroupsWithSelected = (allGroups || []).map(g => ({
+      ...g,
+      selected: excludedSet.has(String(g.name).toLowerCase().trim()) ? 'selected' : '',
+    }));
+
     res.render('admin/plugins/ezoic-infinite', {
       title: 'Ezoic Infinite Ads',
       ...settings,
+
+      // SSR-friendly checkbox states
       enableBetweenAds_checked: settings.enableBetweenAds ? 'checked' : '',
+      showFirstTopicAd_checked: settings.showFirstTopicAd ? 'checked' : '',
+
+      enableCategoryAds_checked: settings.enableCategoryAds ? 'checked' : '',
+      showFirstCategoryAd_checked: settings.showFirstCategoryAd ? 'checked' : '',
+
       enableMessageAds_checked: settings.enableMessageAds ? 'checked' : '',
-      allGroups,
+      showFirstMessageAd_checked: settings.showFirstMessageAd ? 'checked' : '',
+
+      muteEzoicConsole_checked: settings.muteEzoicConsole ? 'checked' : '',
+
+      allGroups: allGroupsWithSelected,
     });
   }
 
-  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.ensureLoggedIn, middleware.admin.checkPrivileges, middleware.admin.buildHeader, render);
+  router.get('/api/admin/plugins/ezoic-infinite', middleware.ensureLoggedIn, middleware.admin.checkPrivileges, render);
 
   router.get('/api/plugins/ezoic-infinite/config', async (req, res) => {
-    const settings = await getSettings();
-    const excluded = await isUserExcluded(req.uid, settings.excludedGroups);
+    let settings;
+    try {
+      settings = await getSettings();
+    } catch (err) {
+      settings = null;
+    }
+
+    if (!settings) {
+      return res.json({ excluded: false });
+    }
+
+    let excluded = false;
+    try {
+      excluded = await isUserExcluded(req.uid, settings.excludedGroups);
+    } catch (err) {
+      excluded = false;
+    }
 
     res.json({
       excluded,
@@ -123,6 +178,7 @@ plugin.init = async ({ router, middleware }) => {
       showFirstMessageAd: settings.showFirstMessageAd,
       messagePlaceholderIds: settings.messagePlaceholderIds,
       messageIntervalPosts: settings.messageIntervalPosts,
+      muteEzoicConsole: settings.muteEzoicConsole,
     });
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.7.16",
+  "version": "1.7.17",
   "description": "Production-ready Ezoic infinite ads integration for NodeBB 4.x",
   "main": "library.js",
   "license": "MIT",
@@ -12,10 +12,19 @@
     "infinite-scroll"
   ],
   "engines": {
-    "nodebb": ">=4.0.0"
+    "nodebb": ">=4.0.0",
+    "node": ">=18"
   },
   "nbbpm": {
     "compatibility": "^4.0.0"
   },
-  "private": false
-}
+  "private": false,
+  "files": [
+    "library.js",
+    "plugin.json",
+    "public/"
+  ],
+  "scripts": {
+    "lint": "node -c library.js && node -c public/admin.js && node -c public/client.js"
+  }
+}

package/public/client.js

@@ -84,6 +84,7 @@
     pools:      { topics: [], posts: [], categories: [] },
     cursors:    { topics: 0,  posts: 0,  categories: 0  },
     mountedIds: new Set(),      // IDs Ezoic actuellement dans le DOM
+    reuseSeq:   new Map(),      // id → compteur pour générer des IDs DOM uniques
     lastShow:   new Map(),      // id → timestamp dernier show
 
     io:      null,
@@ -129,14 +130,17 @@
 
   function parseIds(raw) {
     const out = [], seen = new Set();
-    for (const v of String(raw || '').split(/\r?\n/).map(s => s.trim()).filter(Boolean)) {
+    for (const v of String(raw || '').split(/[\s,]+/).map(s => s.trim()).filter(Boolean)) {
       const n = parseInt(v, 10);
       if (n > 0 && Number.isFinite(n) && !seen.has(n)) { seen.add(n); out.push(n); }
     }
     return out;
   }
 
-  const normBool = (v) => v === true || v === 'true' || v === 1 || v === '1' || v === 'on';
+  // La réutilisation des IDs du pool est toujours autorisée pour éviter les
+  // situations "pool épuisé". Les IDs HTML des placeholders sont rendus uniques
+  // (suffixés) afin de ne pas dupliquer d'ID dans le DOM.
+  const allowReuse = () => true;
 
   const isFilled = (n) =>
     !!(n?.querySelector?.('iframe, ins, img, video, [data-google-container-id]'));
@@ -229,13 +233,19 @@
       const i  = S.cursors[poolKey] % pool.length;
       S.cursors[poolKey] = (S.cursors[poolKey] + 1) % pool.length;
       const id = pool[i];
-      if (!S.mountedIds.has(id)) return id;
+      return id;
     }
     return null;
   }
 
   // ── Wraps DOM ──────────────────────────────────────────────────────────────
 
+  function nextDomPlaceholderId(id) {
+    const cur = (S.reuseSeq.get(id) || 0) + 1;
+    S.reuseSeq.set(id, cur);
+    return `${PH_PREFIX}${id}-${cur}`;
+  }
+
   function makeWrap(id, klass, key) {
     const w = document.createElement('div');
     w.className = `${WRAP_CLASS} ${klass}`;
@@ -244,7 +254,7 @@
     w.setAttribute(A_CREATED, String(ts()));
     w.style.cssText = 'width:100%;display:block;';
     const ph = document.createElement('div');
-    ph.id = `${PH_PREFIX}${id}`;
+    ph.id = nextDomPlaceholderId(id);
     ph.setAttribute('data-ezoic-id', String(id));
     w.appendChild(ph);
     return w;
@@ -253,8 +263,6 @@
   function insertAfter(el, id, klass, key) {
     if (!el?.insertAdjacentElement) return null;
     if (findWrap(key))            return null; // ancre déjà présente
-    if (S.mountedIds.has(id))     return null; // id déjà monté
-    if (document.getElementById(`${PH_PREFIX}${id}`)?.isConnected) return null;
     const w = makeWrap(id, klass, key);
     mutate(() => el.insertAdjacentElement('afterend', w));
     S.mountedIds.add(id);
@@ -269,7 +277,7 @@
       // unobserve(null) corrompt l'état interne de l'IO (pubads lève ensuite
       // "parameter 1 is not of type Element" sur le prochain observe).
       try {
-        const ph = w.querySelector(`[id^="${PH_PREFIX}"]`);
+        const ph = w.querySelector('[data-ezoic-id]') || w.querySelector(`[id^="${PH_PREFIX}"]`);
         if (ph instanceof Element) S.io?.unobserve(ph);
       } catch (_) {}
       w.remove();
@@ -592,6 +600,10 @@
 
   function cleanup() {
     blockedUntil = ts() + 1500;
+
+    // Disconnect observers to avoid doing work while ajaxify swaps content
+    try { if (S.domObs) { S.domObs.disconnect(); S.domObs = null; } } catch (_) {}
+    try { if (window.__nbbTcfObs) { window.__nbbTcfObs.disconnect(); window.__nbbTcfObs = null; } } catch (_) {}
     mutate(() => document.querySelectorAll(`.${WRAP_CLASS}`).forEach(dropWrap));
     S.cfg          = null;
     S.pools        = { topics: [], posts: [], categories: [] };
@@ -629,6 +641,7 @@
   // ── Utilitaires ────────────────────────────────────────────────────────────
 
   function muteConsole() {
+    if (!S.cfg || !S.cfg.muteEzoicConsole) return;
     if (window.__nbbEzMuted) return;
     window.__nbbEzMuted = true;
     const MUTED = ['[EzoicAds JS]: Placeholder Id', 'Debugger iframe already exists', `with id ${PH_PREFIX}`];
@@ -731,6 +744,11 @@
     let ticking = false;
     window.addEventListener('scroll', () => {
       if (ticking) return;
+      // Scroll bursts only matter on pages where content streams in
+      const kind = getKind();
+      if (kind !== 'topic' && kind !== 'categoryTopics' && kind !== 'categories') return;
+      if (isBlocked()) return;
+
       ticking = true;
       requestAnimationFrame(() => { ticking = false; requestBurst(); });
     }, { passive: true });

package/public/style.css

@@ -71,8 +71,8 @@
   overflow: hidden !important;
 }
 
-/* ── Ezoic global (hors de nos wraps) ────────────────────────────────────── */
-.ezoic-ad {
-  margin: 0 !important;
-  padding: 0 !important;
-}
+/* ── Note ───────────────────────────────────────────────────────────── */
+/*
+  On évite volontairement de cibler .ezoic-ad globalement,
+  pour ne pas impacter d'autres emplacements/optimisations Ezoic hors plugin.
+*/

package/public/templates/admin/plugins/ezoic-infinite.tpl

@@ -8,7 +8,7 @@
       <input class="form-check-input" type="checkbox" id="enableBetweenAds" name="enableBetweenAds" {enableBetweenAds_checked}>
       <label class="form-check-label" for="enableBetweenAds">Activer les pubs entre les posts</label>
 				<div class="form-check mt-2">
-					<input class="form-check-input" type="checkbox" name="showFirstTopicAd" />
+					<input class="form-check-input" type="checkbox" name="showFirstTopicAd" {showFirstTopicAd_checked} />
 					<label class="form-check-label">Afficher une pub après le 1er sujet</label>
 				</div>
     </div>
@@ -16,7 +16,7 @@
     <div class="mb-3">
       <label class="form-label" for="placeholderIds">Pool d’IDs Ezoic (entre posts)</label>
       <textarea id="placeholderIds" name="placeholderIds" class="form-control" rows="4">{placeholderIds}</textarea>
-      <p class="form-text">Un ID par ligne (ou séparé par virgules/espaces). Le nombre d’IDs = nombre max de pubs simultanées.</p>
+      <p class="form-text">Un ID par ligne (ou séparé par virgules/espaces).</p>
     </div>
 
     <div class="mb-3">
@@ -33,10 +33,10 @@
     <p class="form-text">Insère des pubs entre les catégories sur la page d’accueil (liste des catégories).</p>
 
     <div class="form-check mb-3">
-      <input class="form-check-input" type="checkbox" id="enableCategoryAds" name="enableCategoryAds">
+      <input class="form-check-input" type="checkbox" id="enableCategoryAds" name="enableCategoryAds" {enableCategoryAds_checked}>
       <label class="form-check-label" for="enableCategoryAds">Activer les pubs entre les catégories</label>
       <div class="form-check mt-2">
-        <input class="form-check-input" type="checkbox" name="showFirstCategoryAd" />
+        <input class="form-check-input" type="checkbox" name="showFirstCategoryAd" {showFirstCategoryAd_checked} />
         <label class="form-check-label">Afficher une pub après la 1ère catégorie</label>
       </div>
     </div>
@@ -44,7 +44,7 @@
     <div class="mb-3">
       <label class="form-label" for="categoryPlaceholderIds">Pool d’IDs Ezoic (catégories)</label>
       <textarea id="categoryPlaceholderIds" name="categoryPlaceholderIds" class="form-control" rows="4">{categoryPlaceholderIds}</textarea>
-      <p class="form-text">IDs numériques, un par ligne. Utilise un pool dédié (différent des pools topics/messages).</p>
+      <p class="form-text">IDs numériques, un par ligne (ou séparés par virgules/espaces). Utilise un pool dédié (différent des pools topics/messages).</p>
     </div>
 
     <div class="mb-3">
@@ -59,7 +59,7 @@
       <input class="form-check-input" type="checkbox" id="enableMessageAds" name="enableMessageAds" {enableMessageAds_checked}>
       <label class="form-check-label" for="enableMessageAds">Activer les pubs “message”</label>
 				<div class="form-check mt-2">
-					<input class="form-check-input" type="checkbox" name="showFirstMessageAd" />
+					<input class="form-check-input" type="checkbox" name="showFirstMessageAd" {showFirstMessageAd_checked} />
 					<label class="form-check-label">Afficher une pub après le 1er message</label>
 				</div>
     </div>
@@ -67,7 +67,7 @@
     <div class="mb-3">
       <label class="form-label" for="messagePlaceholderIds">Pool d’IDs Ezoic (message)</label>
       <textarea id="messagePlaceholderIds" name="messagePlaceholderIds" class="form-control" rows="4">{messagePlaceholderIds}</textarea>
-      <p class="form-text">Pool séparé recommandé pour éviter la réutilisation d’IDs. IMPORTANT : ne réutilise pas les mêmes IDs dans les deux pools.</p>
+      <p class="form-text">Pool séparé recommandé pour limiter la réutilisation d’IDs entre emplacements.</p>
     </div>
 
     <div class="mb-3">
@@ -82,12 +82,22 @@
       <label class="form-label" for="excludedGroups">Groupes exclus</label>
       <select id="excludedGroups" name="excludedGroups" class="form-select" multiple>
         <!-- BEGIN allGroups -->
-        <option value="{allGroups.name}">{allGroups.name}</option>
+        <option value="{allGroups.name}" {allGroups.selected}>{allGroups.name}</option>
         <!-- END allGroups -->
       </select>
       <p class="form-text">Si l’utilisateur appartient à un de ces groupes, aucune pub n’est injectée.</p>
     </div>
 
+    
+    <hr/>
+
+    <h4 class="mt-3">Options avancées</h4>
+
+    <div class="form-check mb-3">
+      <input class="form-check-input" type="checkbox" id="muteEzoicConsole" name="muteEzoicConsole" {muteEzoicConsole_checked}>
+      <label class="form-check-label" for="muteEzoicConsole">Filtrer certains logs Ezoic dans la console (évite le bruit)</label>
+      <p class="form-text">Désactivé par défaut pour ne pas impacter les logs d’autres plugins.</p>
+    </div>
     <button id="save" class="btn btn-primary">Enregistrer</button>
   </form>
 </div>