nodebb-plugin-ezoic-infinite 1.8.94 → 1.8.96

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 [];
@@ -108,10 +116,17 @@ async function isUserExcluded(uid, excludedGroups) {
   return value;
 }
 
+let _inlineCfgNormal   = null;
+let _inlineCfgExcluded = null;
+
 function clearCaches() {
   _settingsCache = null;
   _settingsCacheAt = 0;
   _excludeCache.clear();
+  _inlineCfgNormal   = null;
+  _inlineCfgExcluded = null;
+  _allGroupsCache    = null;
+  _allGroupsCacheAt  = 0;
 }
 
 // ── Client config ────────────────────────────────────────────────────────────
@@ -176,8 +191,12 @@ plugin.injectEzoicHead = async (data) => {
     const uid      = data.req?.uid ?? 0;
     const excluded = await isUserExcluded(uid, settings.excludedGroups);
 
+    if (!_inlineCfgNormal) {
+      _inlineCfgNormal   = serializeInlineConfig(buildClientConfig(settings, false));
+      _inlineCfgExcluded = serializeInlineConfig(buildClientConfig(settings, true));
+    }
+
     if (excluded) {
-      const cfg = buildClientConfig(settings, true);
       const stub = '<script data-cfasync="false">'
         + 'window._ezaq=window._ezaq||{};'
         + 'window.ezstandalone=window.ezstandalone||{};'
@@ -185,14 +204,13 @@ plugin.injectEzoicHead = async (data) => {
         + '</script>';
       data.templateData.customHTML =
         stub + '\n' +
-        serializeInlineConfig(cfg) +
+        _inlineCfgExcluded +
         (data.templateData.customHTML || '');
     } else {
-      const cfg = buildClientConfig(settings, false);
       data.templateData.customHTML =
         HEAD_PRECONNECTS + '\n' +
         EZOIC_SCRIPTS + '\n' +
-        serializeInlineConfig(cfg) +
+        _inlineCfgNormal +
         (data.templateData.customHTML || '');
     }
   } catch (err) {

package/package.json

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

package/public/client.js

@@ -1,11 +1,12 @@
 /**
- * NodeBB Ezoic Infinite Ads — client.js v2.5.1
+ * NodeBB Ezoic Infinite Ads — client.js v2.5.2
  *
  * Architecture: proven v50 core + targeted improvements.
  * Ezoic API: showAds() + destroyPlaceholders() per official docs.
  * Key features: O(1) recycle via wrapsByClass, MutationObserver fill detect,
  * conservative empty check, aria-hidden + TCF protection, retry boot for
  * Cloudflare/async timing.
+ * v2.5.2: removed redundant warmNetwork() — preconnects are server-injected.
  */
 (function nbbEzoicInfinite() {
   'use strict';
@@ -80,6 +81,7 @@
     pageKey:      null,
     kind:         null,
     cfg:          null,
+    opts:         null,
     poolsReady:   false,
     pools:        { topics: [], posts: [], categories: [] },
     cursors:      { topics: 0,  posts: 0,  categories: 0  },
@@ -131,6 +133,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;
   }
 
@@ -168,6 +181,7 @@
     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;
@@ -620,18 +634,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 ──────────────────────────────────────────────────────────────
@@ -687,6 +702,7 @@
     S.domObs?.disconnect(); S.domObs = null;
     S.io?.disconnect();     S.io     = null;
     S.cfg        = null;
+    S.opts       = null;
     S.poolsReady = false;
     S.pools      = { topics: [], posts: [], categories: [] };
     S.cursors    = { topics: 0, posts: 0, categories: 0 };
@@ -727,16 +743,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) {
@@ -798,30 +819,6 @@
     try { window.__nbbAriaObs.observe(document.body, { attributes: true, attributeFilter: ['aria-hidden'] }); } catch (_) {}
   }
 
-  // ── Network warmup ─────────────────────────────────────────────────────────
-
-  let _warmed = false;
-  function warmNetwork() {
-    if (_warmed) return;
-    _warmed = true;
-    const head = document.head;
-    if (!head) return;
-    for (const [rel, href, cors] of [
-      ['preconnect',   'https://g.ezoic.net',                    true ],
-      ['preconnect',   'https://go.ezoic.net',                   true ],
-      ['preconnect',   'https://securepubads.g.doubleclick.net', true ],
-      ['preconnect',   'https://pagead2.googlesyndication.com',  true ],
-      ['dns-prefetch', 'https://g.ezoic.net',                    false],
-      ['dns-prefetch', 'https://securepubads.g.doubleclick.net', false],
-    ]) {
-      if (head.querySelector(`link[rel="${rel}"][href="${href}"]`)) continue;
-      const l = document.createElement('link');
-      l.rel = rel; l.href = href;
-      if (cors) l.crossOrigin = 'anonymous';
-      head.appendChild(l);
-    }
-  }
-
   // ── Bindings ───────────────────────────────────────────────────────────────
 
   function bindNodeBB() {
@@ -832,7 +829,7 @@
     $(window).on('action:ajaxify.end.nbbEzoic', () => {
       S.pageKey = pageKey(); S.kind = null; S.blockedUntil = 0;
       ensureTcfLocator(); protectAriaHidden();
-      warmNetwork(); patchShowAds(); getIO(); ensureDomObserver();
+      patchShowAds(); getIO(); ensureDomObserver();
       requestBurst();
     });
     // action:ajaxify.contentLoaded et action:category.loaded ne passent pas par hooks → jQuery uniquement
@@ -863,7 +860,6 @@
   S.pageKey = pageKey();
   ensureTcfLocator();
   protectAriaHidden();
-  warmNetwork();
   patchShowAds();
   getIO();
   ensureDomObserver();
@@ -890,6 +886,8 @@
   function retryBoot() {
     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;