nodebb-plugin-ezoic-infinite 1.9.4 → 1.9.6

package/library.js

@@ -101,6 +101,7 @@ async function getSettings() {
         messageIntervalPosts:   Math.max(1, parseInt(s.messageIntervalPosts, 10) || 3),
         excludedGroups:         normalizeExcludedGroups(s.excludedGroups),
       };
+      data.excludedSet = new Set(data.excludedGroups);
       if (_settingsGen === gen) {
         _settingsCacheAt = Date.now();
         _settingsCache = data;
@@ -113,7 +114,7 @@ async function getSettings() {
   return _settingsInflight;
 }
 
-async function isUserExcluded(uid, excludedGroups) {
+async function isUserExcluded(uid, excludedGroups, excludedSet) {
   if (!uid || !excludedGroups.length) return false;
 
   const key = `${uid}|${excludedGroups.join('|')}`;
@@ -121,16 +122,21 @@ async function isUserExcluded(uid, excludedGroups) {
   const hit = _excludeCache.get(key);
   if (hit && (t - hit.at) < EXCLUDE_TTL) return hit.value;
 
-  const excludedSet = new Set(excludedGroups);
   const userGroups = await groups.getUserGroups([uid]);
   const value = (userGroups[0] || []).some(g => excludedSet.has(g.name));
 
   _excludeCache.set(key, { value, at: Date.now() });
   if (_excludeCache.size > 1000) {
-    let n = 100;
-    for (const k of _excludeCache.keys()) {
-      if (!n--) break;
-      _excludeCache.delete(k);
+    const expire = Date.now() - EXCLUDE_TTL;
+    for (const [k, v] of _excludeCache) {
+      if (v.at < expire) _excludeCache.delete(k);
+    }
+    if (_excludeCache.size > 900) {
+      let n = 100;
+      for (const k of _excludeCache.keys()) {
+        if (!n--) break;
+        _excludeCache.delete(k);
+      }
     }
   }
 
@@ -148,16 +154,13 @@ function clearCaches() {
   _excludeCache.clear();
   _inlineCfgNormal   = null;
   _inlineCfgExcluded = null;
-  _allGroupsGen++;
-  _allGroupsCache    = null;
-  _allGroupsCacheAt  = 0;
-  _allGroupsInflight = null;
+  // _allGroupsCache is NOT cleared: the group list is independent of plugin settings.
 }
 
 // ── Client config ────────────────────────────────────────────────────────────
 
 function buildClientConfig(settings, excluded) {
-  const { excludedGroups, ...rest } = settings;
+  const { excludedGroups, excludedSet, ...rest } = settings;
   return { excluded, ...rest };
 }
 
@@ -168,12 +171,24 @@ function serializeInlineConfig(cfg) {
 // ── Head injection ───────────────────────────────────────────────────────────
 
 const HEAD_PRECONNECTS = [
+  // Preload blocking scripts so the download starts before the parser reaches <script> tags
+  '<link rel="preload" as="script" href="https://cmp.gatekeeperconsent.com/min.js" crossorigin>',
+  '<link rel="preload" as="script" href="https://the.gatekeeperconsent.com/cmp.min.js" crossorigin>',
+  '<link rel="preload" as="script" href="https://www.ezojs.com/ezoic/sa.min.js" crossorigin>',
+  // Ezoic ad serving
   '<link rel="preconnect" href="https://g.ezoic.net" crossorigin>',
   '<link rel="preconnect" href="https://go.ezoic.net" crossorigin>',
   '<link rel="preconnect" href="https://securepubads.g.doubleclick.net" crossorigin>',
   '<link rel="preconnect" href="https://pagead2.googlesyndication.com" crossorigin>',
+  // Synchronous blocking scripts — preconnect to establish TCP+TLS before the parser reaches them
+  '<link rel="preconnect" href="https://cmp.gatekeeperconsent.com" crossorigin>',
+  '<link rel="preconnect" href="https://the.gatekeeperconsent.com" crossorigin>',
+  '<link rel="preconnect" href="https://www.ezojs.com" crossorigin>',
   '<link rel="dns-prefetch" href="https://g.ezoic.net">',
   '<link rel="dns-prefetch" href="https://securepubads.g.doubleclick.net">',
+  '<link rel="dns-prefetch" href="https://cmp.gatekeeperconsent.com">',
+  '<link rel="dns-prefetch" href="https://the.gatekeeperconsent.com">',
+  '<link rel="dns-prefetch" href="https://www.ezojs.com">',
 ].join('\n');
 
 // Working config: sa.min.js loaded synchronously (no async).
@@ -219,7 +234,7 @@ plugin.injectEzoicHead = async (data) => {
 
     const settings = await getSettings();
     const uid      = data.req?.uid ?? 0;
-    const excluded = await isUserExcluded(uid, settings.excludedGroups);
+    const excluded = await isUserExcluded(uid, settings.excludedGroups, settings.excludedSet);
 
     if (!_inlineCfgNormal) {
       _inlineCfgNormal   = serializeInlineConfig(buildClientConfig(settings, false));
@@ -274,7 +289,7 @@ plugin.init = async ({ router, middleware }) => {
   router.get('/api/plugins/ezoic-infinite/config', async (req, res) => {
     try {
       const settings = await getSettings();
-      const excluded = await isUserExcluded(req.uid, settings.excludedGroups);
+      const excluded = await isUserExcluded(req.uid, settings.excludedGroups, settings.excludedSet);
       res.json(buildClientConfig(settings, excluded));
     } catch (err) {
       console.error('[ezoic-infinite] config API error:', err.message);

package/package.json

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

package/public/client.js

@@ -32,7 +32,7 @@
     BURST_COOLDOWN_MS:      200,
     BLOCK_DURATION_MS:    1_000,
     SHOW_TIMEOUT_MS:      4_500,
-    SHOW_RELEASE_MS:        150,
+    SHOW_RELEASE_MS:         50,
     RECYCLE_DELAY_MS:        50,
     UNCOLLAPSE_CHECK_MS: [500, 5_000],
   };
@@ -42,8 +42,8 @@
   const MAX_BURST_STEPS = 8;
   const BURST_WINDOW_MS = 2_000;
 
-  const IO_MARGIN_DESKTOP = '1200px 0px 1200px 0px';
-  const IO_MARGIN_MOBILE  = '1500px 0px 1500px 0px';
+  const IO_MARGIN_DESKTOP = '1500px 0px 1500px 0px';
+  const IO_MARGIN_MOBILE  = '2000px 0px 2000px 0px';
 
   const SEL = {
     post:     '[component="post"][data-pid]',
@@ -491,7 +491,7 @@
       const id = pickId(poolKey);
       if (id) {
         const w = insertAfter(el, id, klass, key);
-        if (w) { observePh(id); inserted++; }
+        if (w) { observePh(id); enqueueShow(id); inserted++; }
       } else {
         if (!recycleWrap(klass, el, key)) break;
         inserted++;
@@ -580,7 +580,8 @@
         scheduleEmptyCheck(id, t);
         setTimeout(() => { clearTimeout(timer); release(); }, TIMING.SHOW_RELEASE_MS);
       };
-      typeof ez.cmd?.push === 'function' ? ez.cmd.push(doShow) : doShow();
+      const ezReady = ez.loadingStatus === 'complete';
+      typeof ez.cmd?.push === 'function' && !ezReady ? ez.cmd.push(doShow) : doShow();
     } catch (_) { clearTimeout(timer); release(); }
   }
 
@@ -694,7 +695,7 @@
       S.burstCount++;
       scheduleRun(n => {
         if (!n && !S.pending.size) { S.burstActive = false; return; }
-        setTimeout(step, n > 0 ? 100 : 250);
+        setTimeout(step, n > 0 ? 50 : 100);
       });
     };
     step();