nodebb-plugin-ezoic-infinite 1.8.16 → 1.8.17

package/library.js

@@ -21,34 +21,21 @@ function parseBool(v, def = false) {
 }
 
 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);
-  const valid = (data || []).filter(g => g && g.name);
+  // 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' }));
-
-  _groupsCacheAt = now;
-  _groupsCache = valid;
   return valid;
 }
-
 let _settingsCache = null;
 let _settingsCacheAt = 0;
 const SETTINGS_TTL = 30000; // 30s
 
-let _groupsCache = null;
-let _groupsCacheAt = 0;
-const GROUPS_TTL = 5 * 60 * 1000; // 5min
-
-const _excludedCache = new Map(); // uid -> { at, excluded }
-const EXCLUDED_TTL = 30 * 1000; // 30s
-
 async function getSettings() {
   const now = Date.now();
   if (_settingsCache && (now - _settingsCacheAt) < SETTINGS_TTL) return _settingsCache;
@@ -80,31 +67,17 @@ async function getSettings() {
 
 async function isUserExcluded(uid, excludedGroups) {
   if (!uid || !excludedGroups.length) return false;
-
-  const now = Date.now();
-  const cached = _excludedCache.get(uid);
-  if (cached && (now - cached.at) < EXCLUDED_TTL) return cached.excluded;
-
   const userGroups = await groups.getUserGroups([uid]);
-  const excluded = (userGroups[0] || []).some(g => excludedGroups.includes(g.name));
-
-  _excludedCache.set(uid, { at: now, excluded });
-  // petite hygiene : éviter une map qui grossit sans limite
-  if (_excludedCache.size > 5000) _excludedCache.clear();
-
-  return excluded;
+  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;
-    _excludedCache.clear();
   }
 };
 
-
 plugin.addAdminNavigation = async (header) => {
   header.plugins = header.plugins || [];
   header.plugins.push({

package/package.json

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

package/public/client.js

@@ -80,7 +80,6 @@
   const S = {
     pageKey: null,
     cfg: null,
-    poolSig: null,
 
     pools:      { topics: [], posts: [], categories: [] },
     cursors:    { topics: 0,  posts: 0,  categories: 0  },
@@ -88,7 +87,6 @@
     lastShow:   new Map(),      // id → timestamp dernier show
 
     io:      null,
-    ioMargin: null,
     domObs:  null,
     mutGuard: 0,                // compteur internalMutation
 
@@ -124,31 +122,14 @@
   }
 
   function initPools(cfg) {
-    // (Perf) Ne reparse les pools que si les strings ont changé.
-    const sig = `${cfg.placeholderIds || ''}§${cfg.messagePlaceholderIds || ''}§${cfg.categoryPlaceholderIds || ''}`;
-    if (S.poolSig === sig) return;
-    S.poolSig = sig;
-
     S.pools.topics     = parseIds(cfg.placeholderIds);
     S.pools.posts      = parseIds(cfg.messagePlaceholderIds);
     S.pools.categories = parseIds(cfg.categoryPlaceholderIds);
-
-    // Réinitialise les curseurs si une pool change
-    S.cursors.topics = 0;
-    S.cursors.posts = 0;
-    S.cursors.categories = 0;
   }
 
   function parseIds(raw) {
-    // Accepte : un ID par ligne, ou séparés par virgules/espaces (ACP le mentionne).
     const out = [], seen = new Set();
-    const parts = String(raw || '')
-      .replace(/\r/g, '\n')
-      .split(/[\n\s,]+/)
-      .map(s => s.trim())
-      .filter(Boolean);
-
-    for (const v of parts) {
+    for (const v of String(raw || '').split(/\r?\n/).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); }
     }
@@ -312,26 +293,23 @@
     const meta = KIND[klass];
     if (!meta) return;
 
-    // (Perf) Construire 1 set d'ancres présentes, au lieu de querySelector par wrap.
-    const present = new Set();
-    try {
-      document.querySelectorAll(meta.sel).forEach(el => {
-        const v = el.getAttribute(meta.anchorAttr);
-        if (v !== null && v !== '') present.add(String(v));
-      });
-    } catch (_) {}
+    const baseTag = meta.sel.split('[')[0]; // ex: "li", "[component=..." → "" (géré)
 
     document.querySelectorAll(`.${WRAP_CLASS}.${klass}`).forEach(w => {
       if (ts() - parseInt(w.getAttribute(A_CREATED) || '0', 10) < MIN_PRUNE_AGE_MS) return;
 
       const key = w.getAttribute(A_ANCHOR) ?? '';
-      const sid = key.slice(klass.length + 1); // après "kindClass:"
+      const sid = key.slice(klass.length + 1); // extrait la partie après "kindClass:"
       if (!sid) { mutate(() => dropWrap(w)); return; }
 
-      if (!present.has(String(sid))) mutate(() => dropWrap(w));
+      const anchorEl = document.querySelector(
+        `${baseTag}[${meta.anchorAttr}="${sid.replace(/"/g, '\\"')}"]`
+      );
+      if (!anchorEl || !anchorEl.isConnected) mutate(() => dropWrap(w));
     });
   }
-// ── Decluster ──────────────────────────────────────────────────────────────
+
+  // ── Decluster ──────────────────────────────────────────────────────────────
 
   /**
    * Deux wraps adjacents = situation anormale → supprimer le moins prioritaire.
@@ -411,14 +389,8 @@
   // ── IntersectionObserver & Show ────────────────────────────────────────────
 
   function getIO() {
+    if (S.io) return S.io;
     const margin = isMobile() ? IO_MARGIN_MOBILE : IO_MARGIN_DESKTOP;
-    if (S.io && S.ioMargin === margin) return S.io;
-    // Si la marge doit changer (resize/orientation), on recrée l'observer.
-    if (S.io && S.ioMargin !== margin) {
-      try { S.io.disconnect(); } catch (_) {}
-      S.io = null;
-    }
-    S.ioMargin = margin;
     try {
       S.io = new IntersectionObserver(entries => {
         for (const e of entries) {
@@ -622,7 +594,6 @@
     blockedUntil = ts() + 1500;
     mutate(() => document.querySelectorAll(`.${WRAP_CLASS}`).forEach(dropWrap));
     S.cfg          = null;
-    S.poolSig       = null;
     S.pools        = { topics: [], posts: [], categories: [] };
     S.cursors      = { topics: 0, posts: 0, categories: 0 };
     S.mountedIds.clear();
@@ -756,22 +727,6 @@
     } catch (_) {}
   }
 
-
-  function bindResize() {
-    let t = null;
-    window.addEventListener('resize', () => {
-      clearTimeout(t);
-      t = setTimeout(() => {
-        try { getIO(); } catch (_) {}
-        // Ré-observer les placeholders existants (si IO recréé)
-        try {
-          document.querySelectorAll(`.${WRAP_CLASS} [id^="${PH_PREFIX}"]`).forEach(ph => {
-            if (ph instanceof Element) { try { S.io?.observe(ph); } catch (_) {} }
-          });
-        } catch (_) {}
-      }, 200);
-    }, { passive: true });
-  }
   function bindScroll() {
     let ticking = false;
     window.addEventListener('scroll', () => {
@@ -791,7 +746,6 @@
   getIO();
   ensureDomObserver();
   bindNodeBB();
-  bindResize();
   bindScroll();
   blockedUntil = 0;
   requestBurst();