nodebb-plugin-ezoic-infinite 1.8.95 → 1.8.97

package/.claude/settings.local.json

@@ -4,7 +4,10 @@
       "WebFetch(domain:registry.npmjs.org)",
       "Bash(curl -sL \"https://registry.npmjs.org/nodebb-plugin-ezoic-infinite/-/nodebb-plugin-ezoic-infinite-1.8.81.tgz\" -o /tmp/ezoic-1.8.81.tgz && tar -tzf /tmp/ezoic-1.8.81.tgz)",
       "Bash(tar -xzf /tmp/ezoic-1.8.81.tgz -C /tmp/ package/library.js package/public/client.js package/package.json)",
-      "Bash(cd /tmp && curl -sL \"https://registry.npmjs.org/nodebb-plugin-ezoic-infinite/-/nodebb-plugin-ezoic-infinite-1.8.81.tgz\" -o ezoic-1.8.81.tgz && tar -xzf ezoic-1.8.81.tgz && echo \"Extracted OK\")"
+      "Bash(cd /tmp && curl -sL \"https://registry.npmjs.org/nodebb-plugin-ezoic-infinite/-/nodebb-plugin-ezoic-infinite-1.8.81.tgz\" -o ezoic-1.8.81.tgz && tar -xzf ezoic-1.8.81.tgz && echo \"Extracted OK\")",
+      "Bash(node -e \"require\\(''./library.js''\\)\")",
+      "Bash(node --check \"C:\\\\Users\\\\arnau\\\\OneDrive\\\\Dev\\\\nodebb-plugin-onekite-ezoic\\\\public\\\\client.js\")",
+      "Bash(node --check \"C:\\\\Users\\\\arnau\\\\OneDrive\\\\Dev\\\\nodebb-plugin-onekite-ezoic\\\\library.js\")"
     ]
   }
 }

package/library.js

@@ -29,17 +29,25 @@ 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
+
 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);
     }
-    return (await groups.getGroupsData(
+    _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 [];
@@ -93,15 +101,10 @@ async function isUserExcluded(uid, excludedGroups) {
 
   _excludeCache.set(key, { value, at: Date.now() });
   if (_excludeCache.size > 1000) {
-    let toDel = 100;
-    const t = Date.now();
-    for (const [k, v] of _excludeCache) {
-      if (!toDel) break;
-      if (t - v.at >= EXCLUDE_TTL) { _excludeCache.delete(k); toDel--; }
-    }
+    let n = 100;
     for (const k of _excludeCache.keys()) {
-      if (!toDel) break;
-      _excludeCache.delete(k); toDel--;
+      if (!n--) break;
+      _excludeCache.delete(k);
     }
   }
 
@@ -117,6 +120,8 @@ function clearCaches() {
   _excludeCache.clear();
   _inlineCfgNormal   = null;
   _inlineCfgExcluded = null;
+  _allGroupsCache    = null;
+  _allGroupsCacheAt  = 0;
 }
 
 // ── Client config ────────────────────────────────────────────────────────────

package/package.json

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

package/public/client.js

@@ -34,7 +34,7 @@
     SHOW_TIMEOUT_MS:      4_500,
     SHOW_RELEASE_MS:        700,
     RECYCLE_DELAY_MS:       300,
-    UNCOLLAPSE_CHECK_MS: [500, 3_000, 10_000],
+    UNCOLLAPSE_CHECK_MS: [500, 5_000],
   };
 
   const MAX_INSERTS_RUN = 6;
@@ -81,6 +81,7 @@
     pageKey:      null,
     kind:         null,
     cfg:          null,
+    opts:         null,
     poolsReady:   false,
     pools:        { topics: [], posts: [], categories: [] },
     cursors:      { topics: 0,  posts: 0,  categories: 0  },
@@ -104,6 +105,12 @@
 
   const isBlocked = () => now() < S.blockedUntil;
 
+  // ── Posts cache (burst-scoped) ─────────────────────────────────────────────
+
+  let _postsCache   = null;
+  let _postsCacheTs = 0;
+  const POSTS_CACHE_MS = 200;
+
   function mutate(fn) {
     S.mutGuard++;
     try { fn(); } finally { S.mutGuard--; }
@@ -132,6 +139,17 @@
     S.pools.topics     = parseIds(cfg.placeholderIds);
     S.pools.posts      = parseIds(cfg.messagePlaceholderIds);
     S.pools.categories = parseIds(cfg.categoryPlaceholderIds);
+    S.opts = {
+      enableBetweenAds:    normBool(cfg.enableBetweenAds),
+      showFirstTopicAd:    normBool(cfg.showFirstTopicAd),
+      intervalTopics:      Math.max(1, parseInt(cfg.intervalPosts,        10) || 3),
+      enableCategoryAds:   normBool(cfg.enableCategoryAds),
+      showFirstCategoryAd: normBool(cfg.showFirstCategoryAd),
+      intervalCategories:  Math.max(1, parseInt(cfg.intervalCategories,   10) || 3),
+      enableMessageAds:    normBool(cfg.enableMessageAds),
+      showFirstMessageAd:  normBool(cfg.showFirstMessageAd),
+      messageInterval:     Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3),
+    };
     S.poolsReady = true;
   }
 
@@ -164,17 +182,22 @@
   // ── DOM queries ────────────────────────────────────────────────────────────
 
   function getPosts() {
+    const t = now();
+    if (_postsCache && t - _postsCacheTs < POSTS_CACHE_MS) return _postsCache;
     const all = document.querySelectorAll(SEL.post);
     const out = [];
     for (let i = 0; i < all.length; i++) {
       const el = all[i];
       if (!el.isConnected) continue;
+      if (el.childElementCount === 0) continue;
       if (!el.querySelector('[component="post/content"]')) continue;
       const parent = el.parentElement?.closest(SEL.post);
       if (parent && parent !== el) continue;
       if (el.getAttribute('component') === 'post/parent') continue;
       out.push(el);
     }
+    _postsCache = out;
+    _postsCacheTs = t;
     return out;
   }
 
@@ -243,17 +266,14 @@
     const cfg = KIND[klass];
     if (!cfg) return false;
     const parent = wrap.parentElement;
-    if (parent) {
-      const sel = `${cfg.baseTag || ''}[${cfg.anchorAttr}="${anchorId}"]`;
-      for (const sib of parent.children) {
-        if (sib !== wrap) {
-          try { if (sib.matches(sel)) return sib.isConnected; } catch (_) {}
-        }
+    if (!parent) return false;
+    const sel = `${cfg.baseTag || ''}[${cfg.anchorAttr}="${anchorId}"]`;
+    for (const sib of parent.children) {
+      if (sib !== wrap) {
+        try { if (sib.matches(sel)) return sib.isConnected; } catch (_) {}
       }
     }
-    try {
-      return document.querySelector(`${cfg.sel}[${cfg.anchorAttr}="${anchorId}"]`)?.isConnected === true;
-    } catch (_) { return false; }
+    return false;
   }
 
   const adjacentWrap = el => wrapIsLive(el.nextElementSibling) || wrapIsLive(el.previousElementSibling);
@@ -476,9 +496,12 @@
 
   // ── IntersectionObserver ───────────────────────────────────────────────────
 
+  let _ioMobile = null;
+
   function getIO() {
     if (S.io) return S.io;
     try {
+      _ioMobile = isMobile();
       S.io = new IntersectionObserver(entries => {
         for (const e of entries) {
           if (!e.isIntersecting) continue;
@@ -488,7 +511,7 @@
         }
       }, {
         root: null,
-        rootMargin: isMobile() ? IO_MARGIN_MOBILE : IO_MARGIN_DESKTOP,
+        rootMargin: _ioMobile ? IO_MARGIN_MOBILE : IO_MARGIN_DESKTOP,
         threshold: 0,
       });
     } catch (_) { S.io = null; }
@@ -621,18 +644,19 @@
     const kind = getKind();
     if (kind === 'other') return 0;
 
-    const exec = (klass, getItems, cfgEnable, cfgInterval, cfgShowFirst, poolKey) => {
-      if (!normBool(cfgEnable)) return 0;
-      return injectBetween(klass, getItems(), Math.max(1, parseInt(cfgInterval, 10) || 3), normBool(cfgShowFirst), poolKey);
+    const exec = (klass, getItems, enable, interval, showFirst, poolKey) => {
+      if (!enable) return 0;
+      return injectBetween(klass, getItems(), interval, showFirst, poolKey);
     };
 
+    const o = S.opts;
     if (kind === 'topic')
-      return exec('ezoic-ad-message', getPosts, cfg.enableMessageAds, cfg.messageIntervalPosts, cfg.showFirstMessageAd, 'posts');
+      return exec('ezoic-ad-message', getPosts, o.enableMessageAds, o.messageInterval, o.showFirstMessageAd, 'posts');
     if (kind === 'categoryTopics') {
       pruneOrphansBetween();
-      return exec('ezoic-ad-between', getTopics, cfg.enableBetweenAds, cfg.intervalPosts, cfg.showFirstTopicAd, 'topics');
+      return exec('ezoic-ad-between', getTopics, o.enableBetweenAds, o.intervalTopics, o.showFirstTopicAd, 'topics');
     }
-    return exec('ezoic-ad-categories', getCategories, cfg.enableCategoryAds, cfg.intervalCategories, cfg.showFirstCategoryAd, 'categories');
+    return exec('ezoic-ad-categories', getCategories, o.enableCategoryAds, o.intervalCategories, o.showFirstCategoryAd, 'categories');
   }
 
   // ── Scheduler ──────────────────────────────────────────────────────────────
@@ -686,8 +710,10 @@
     for (const timers of S.wrapTimers.values()) { for (const t of timers) clearTimeout(t); }
     S.wrapTimers.clear();
     S.domObs?.disconnect(); S.domObs = null;
-    S.io?.disconnect();     S.io     = null;
+    S.io?.disconnect();     S.io     = null; _ioMobile = null;
+    _postsCache = null; _postsCacheTs = 0;
     S.cfg        = null;
+    S.opts       = null;
     S.poolsReady = false;
     S.pools      = { topics: [], posts: [], categories: [] };
     S.cursors    = { topics: 0, posts: 0, categories: 0 };
@@ -728,16 +754,21 @@
         for (const node of m.addedNodes) {
           if (!(node instanceof Element)) continue;
           try {
-            if (node.matches?.(FILL_SEL) || node.querySelector?.(FILL_SEL)) {
-              const wrap = node.closest?.(`.${WRAP_CLASS}.is-empty`) || m.target?.closest?.(`.${WRAP_CLASS}.is-empty`);
-              if (wrap) clearEmptyIfFilled(wrap);
+            // Check closest first (cheap) before doing FILL_SEL querySelector on every added node
+            const emptyWrap = node.closest?.(`.${WRAP_CLASS}.is-empty`) ?? m.target?.closest?.(`.${WRAP_CLASS}.is-empty`);
+            if (emptyWrap && (node.matches?.(FILL_SEL) || node.querySelector?.(FILL_SEL))) {
+              clearEmptyIfFilled(emptyWrap);
             }
           } catch (_) {}
           try {
-            const reinserted = node.classList?.contains(WRAP_CLASS) ? [node] : Array.from(node.querySelectorAll?.(`.${WRAP_CLASS}`) || []);
-            for (const wrap of reinserted) {
-              const id = parseInt(wrap.getAttribute(ATTR.WRAPID), 10);
-              if (id > 0) { const ph = wrap.querySelector(`[id^="${PH_PREFIX}"]`); if (ph) try { getIO()?.observe(ph); } catch (_) {} }
+            if (node.classList?.contains(WRAP_CLASS)) {
+              const id = parseInt(node.getAttribute(ATTR.WRAPID), 10);
+              if (id > 0) { const ph = node.querySelector(`[id^="${PH_PREFIX}"]`); if (ph) try { getIO()?.observe(ph); } catch (_) {} }
+            } else if (node.childElementCount > 0) {
+              for (const wrap of node.querySelectorAll(`.${WRAP_CLASS}`)) {
+                const id = parseInt(wrap.getAttribute(ATTR.WRAPID), 10);
+                if (id > 0) { const ph = wrap.querySelector(`[id^="${PH_PREFIX}"]`); if (ph) try { getIO()?.observe(ph); } catch (_) {} }
+              }
             }
           } catch (_) {}
           if (!needsBurst) {
@@ -747,9 +778,12 @@
           }
         }
       }
-      if (needsBurst) requestBurst();
+      if (needsBurst) { _postsCacheTs = 0; requestBurst(); }
     });
-    try { S.domObs.observe(document.body, { childList: true, subtree: true }); } catch (_) {}
+    try {
+      const target = document.getElementById('content') || document.body;
+      S.domObs.observe(target, { childList: true, subtree: true });
+    } catch (_) {}
   }
 
   // ── TCF / CMP Protection ───────────────────────────────────────────────────
@@ -810,6 +844,8 @@
       S.pageKey = pageKey(); S.kind = null; S.blockedUntil = 0;
       ensureTcfLocator(); protectAriaHidden();
       patchShowAds(); getIO(); ensureDomObserver();
+      RETRY.count = 0; RETRY.scriptReloaded = false; RETRY.postReloadShown = false; RETRY.gen++;
+      setTimeout(() => retryBoot(RETRY.gen), 250);
       requestBurst();
     });
     // action:ajaxify.contentLoaded et action:category.loaded ne passent pas par hooks → jQuery uniquement
@@ -821,7 +857,7 @@
     try {
       require(['hooks'], hooks => {
         if (typeof hooks?.on !== 'function') return;
-        for (const ev of ['action:ajaxify.end', 'action:posts.loaded', 'action:topics.loaded', 'action:categories.loaded', 'action:topic.loaded'])
+        for (const ev of ['action:posts.loaded', 'action:topics.loaded', 'action:categories.loaded', 'action:topic.loaded'])
           try { hooks.on(ev, () => { if (!isBlocked()) requestBurst(); }); } catch (_) {}
       });
     } catch (_) {}
@@ -835,6 +871,21 @@
     }, { passive: true });
   }
 
+  function bindResize() {
+    let timer = null;
+    window.addEventListener('resize', () => {
+      clearTimeout(timer);
+      timer = setTimeout(() => {
+        if (!S.io || _ioMobile === null) return;
+        const m = isMobile();
+        if (m === _ioMobile) return;
+        S.io.disconnect(); S.io = null; _ioMobile = null;
+        getIO();
+        for (const id of S.mountedIds) observePh(id);
+      }, 250);
+    }, { passive: true });
+  }
+
   // ── Boot ───────────────────────────────────────────────────────────────────
 
   S.pageKey = pageKey();
@@ -845,6 +896,7 @@
   ensureDomObserver();
   bindNodeBB();
   bindScroll();
+  bindResize();
   S.blockedUntil = 0;
   if (document.readyState === 'complete') {
     requestBurst();
@@ -862,10 +914,13 @@
   //    in ez-standalone.js → onStandaloneLoadEvent crash). After ~6s, remove and reload
   //    sa.min.js; Ezoic's partial first-run state may let the second run succeed.
   //    Once recovered, re-enqueue all mounted placeholders so showAds() fires.
-  const RETRY = { count: 0, scriptReloaded: false, postReloadShown: false };
-  function retryBoot() {
+  const RETRY = { count: 0, scriptReloaded: false, postReloadShown: false, gen: 0 };
+  function retryBoot(gen) {
+    if (gen !== RETRY.gen) return;
     if (RETRY.count >= 12) return;
     RETRY.count++;
+    // On pages that never show ads, no need to retry (unless mid-reload recovery)
+    if (!RETRY.scriptReloaded && getKind() === 'other') return;
     patchShowAds();
 
     const ez = window.ezstandalone;
@@ -916,8 +971,8 @@
       S.lastBurstTs = now() - TIMING.BURST_COOLDOWN_MS;
       requestBurst();
     }
-    setTimeout(retryBoot, RETRY.count <= 4 ? 300 : 1000);
+    setTimeout(() => retryBoot(gen), RETRY.count <= 4 ? 300 : 1000);
   }
-  setTimeout(retryBoot, 250);
+  setTimeout(() => retryBoot(RETRY.gen), 250);
 
 })();