nodebb-plugin-ezoic-infinite 1.8.98 → 1.9.0

package/library.js

@@ -29,36 +29,50 @@ function parseBool(v, def = false) {
   return s === '1' || s === 'true' || s === 'on' || s === 'yes';
 }
 
-let _allGroupsCache   = null;
-let _allGroupsCacheAt = 0;
-const ALL_GROUPS_TTL  = 300_000; // 5 min — admin-only route
+let _allGroupsCache    = null;
+let _allGroupsCacheAt  = 0;
+let _allGroupsInflight = null;
+let _allGroupsGen      = 0;
+const ALL_GROUPS_TTL   = 300_000; // 5 min — admin-only route
 
 async function getAllGroups() {
   const t = Date.now();
   if (_allGroupsCache && (t - _allGroupsCacheAt) < ALL_GROUPS_TTL) return _allGroupsCache;
-  try {
-    let names = await db.getSortedSetRange('groups:createtime', 0, -1);
-    if (!names?.length) {
-      names = await db.getSortedSetRange('groups:visible:createtime', 0, -1);
+  if (_allGroupsInflight) return _allGroupsInflight;
+  const gen = _allGroupsGen;
+  _allGroupsInflight = (async () => {
+    try {
+      let names = await db.getSortedSetRange('groups:createtime', 0, -1);
+      if (!names?.length) {
+        names = await db.getSortedSetRange('groups:visible:createtime', 0, -1);
+      }
+      const data = (await groups.getGroupsData(
+        (names || []).filter(name => !groups.isPrivilegeGroup(name))
+      ))
+        .filter(g => g?.name)
+        .sort((a, b) => String(a.name).localeCompare(String(b.name), undefined, { sensitivity: 'base' }));
+      if (_allGroupsGen === gen) {
+        _allGroupsCache   = data;
+        _allGroupsCacheAt = Date.now();
+      }
+      return _allGroupsCache || data;
+    } catch (err) {
+      console.error('[ezoic-infinite] getAllGroups error:', err.message);
+      return [];
+    } finally {
+      if (_allGroupsGen === gen) _allGroupsInflight = null;
     }
-    _allGroupsCache = (await groups.getGroupsData(
-      (names || []).filter(name => !groups.isPrivilegeGroup(name))
-    ))
-      .filter(g => g?.name)
-      .sort((a, b) => String(a.name).localeCompare(String(b.name), undefined, { sensitivity: 'base' }));
-    _allGroupsCacheAt = Date.now();
-    return _allGroupsCache;
-  } catch (err) {
-    console.error('[ezoic-infinite] getAllGroups error:', err.message);
-    return [];
-  }
+  })();
+  return _allGroupsInflight;
 }
 
 // ── Settings cache ───────────────────────────────────────────────────────────
 
-let _settingsCache   = null;
-let _settingsCacheAt = 0;
-const SETTINGS_TTL   = 30_000;
+let _settingsCache    = null;
+let _settingsCacheAt  = 0;
+let _settingsInflight = null;
+let _settingsGen      = 0;
+const SETTINGS_TTL    = 30_000;
 
 const _excludeCache = new Map();
 const EXCLUDE_TTL   = 60_000;
@@ -66,25 +80,35 @@ const EXCLUDE_TTL   = 60_000;
 async function getSettings() {
   const t = Date.now();
   if (_settingsCache && (t - _settingsCacheAt) < SETTINGS_TTL) return _settingsCache;
-
-  const s = await meta.settings.get(SETTINGS_KEY);
-  _settingsCacheAt = t;
-  _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 (_settingsInflight) return _settingsInflight;
+  const gen = _settingsGen;
+  _settingsInflight = (async () => {
+    try {
+      const s = await meta.settings.get(SETTINGS_KEY);
+      if (_settingsGen === gen) {
+        _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;
+    } finally {
+      if (_settingsGen === gen) _settingsInflight = null;
+    }
+  })();
+  return _settingsInflight;
 }
 
 async function isUserExcluded(uid, excludedGroups) {
@@ -115,13 +139,17 @@ let _inlineCfgNormal   = null;
 let _inlineCfgExcluded = null;
 
 function clearCaches() {
-  _settingsCache = null;
-  _settingsCacheAt = 0;
+  _settingsGen++;
+  _settingsCache    = null;
+  _settingsCacheAt  = 0;
+  _settingsInflight = null;
   _excludeCache.clear();
   _inlineCfgNormal   = null;
   _inlineCfgExcluded = null;
+  _allGroupsGen++;
   _allGroupsCache    = null;
   _allGroupsCacheAt  = 0;
+  _allGroupsInflight = null;
 }
 
 // ── Client config ────────────────────────────────────────────────────────────
@@ -215,6 +243,8 @@ plugin.injectEzoicHead = async (data) => {
 };
 
 plugin.init = async ({ router, middleware }) => {
+  getSettings().catch(() => {});
+
   async function render(req, res) {
     const settings  = await getSettings();
     const allGroups = await getAllGroups();

package/package.json

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

package/public/client.js

@@ -101,6 +101,7 @@
     burstDeadline: 0,
     burstCount:   0,
     lastBurstTs:  0,
+    cleaningUp:   false,
   };
 
   const isBlocked = () => now() < S.blockedUntil;
@@ -121,10 +122,8 @@
 
   async function fetchConfig() {
     if (S.cfg) return S.cfg;
-    try {
-      const inline = window.__nbbEzoicCfg;
-      if (inline && typeof inline === 'object') { S.cfg = inline; return S.cfg; }
-    } catch (_) {}
+    const inline = window.__nbbEzoicCfg;
+    if (inline && typeof inline === 'object') { S.cfg = inline; return S.cfg; }
     try {
       const ctrl = new AbortController();
       const t = setTimeout(() => ctrl.abort(), 5_000);
@@ -205,14 +204,14 @@
   function getTopics() {
     const t = now();
     if (_topicsCache && t - _topicsCacheTs < POSTS_CACHE_MS) return _topicsCache;
-    _topicsCache = document.querySelectorAll(SEL.topic);
+    _topicsCache = Array.from(document.querySelectorAll(SEL.topic));
     _topicsCacheTs = t;
     return _topicsCache;
   }
   function getCategories() {
     const t = now();
     if (_catsCache && t - _catsCacheTs < POSTS_CACHE_MS) return _catsCache;
-    _catsCache = document.querySelectorAll(SEL.category);
+    _catsCache = Array.from(document.querySelectorAll(SEL.category));
     _catsCacheTs = t;
     return _catsCache;
   }
@@ -435,15 +434,19 @@
       if (ph instanceof Element) S.io?.unobserve(ph);
       const id = parseInt(w.getAttribute(ATTR.WRAPID), 10);
       if (Number.isFinite(id)) {
-        S.mountedIds.delete(id);
-        S.lastShow.delete(id);
         const timers = S.wrapTimers.get(id);
         if (timers) { for (const t of timers) clearTimeout(t); S.wrapTimers.delete(id); }
+        if (!S.cleaningUp) {
+          S.mountedIds.delete(id);
+          S.lastShow.delete(id);
+        }
+      }
+      if (!S.cleaningUp) {
+        const key = w.getAttribute(ATTR.ANCHOR);
+        if (key && S.wrapByKey.get(key) === w) S.wrapByKey.delete(key);
+        const colonIdx = key?.indexOf(':') ?? -1;
+        if (colonIdx > 0) S.wrapsByClass.get(key.slice(0, colonIdx))?.delete(w);
       }
-      const key = w.getAttribute(ATTR.ANCHOR);
-      if (key && S.wrapByKey.get(key) === w) S.wrapByKey.delete(key);
-      const colonIdx = key?.indexOf(':') ?? -1;
-      if (colonIdx > 0) S.wrapsByClass.get(key.slice(0, colonIdx))?.delete(w);
       w.remove();
     } catch (_) {}
   }
@@ -722,9 +725,12 @@
       const ez = window.ezstandalone;
       if (typeof ez?.destroyPlaceholders === 'function') ez.destroyPlaceholders();
     } catch (_) {}
+    S.cleaningUp = true;
     mutate(() => {
       for (const w of document.querySelectorAll(`.${WRAP_CLASS}`)) dropWrap(w);
     });
+    S.cleaningUp = false;
+    // Safety net: wrapTimers should be empty after dropWrap loop, but clear any orphans.
     for (const timers of S.wrapTimers.values()) { for (const t of timers) clearTimeout(t); }
     S.wrapTimers.clear();
     S.domObs?.disconnect(); S.domObs = null;