nodebb-plugin-ezoic-infinite 1.9.3 → 1.9.5

package/library.js

@@ -83,27 +83,30 @@ async function getSettings() {
   if (_settingsInflight) return _settingsInflight;
   const gen = _settingsGen;
   _settingsInflight = (async () => {
+    let data = null;
     try {
       const s = await meta.settings.get(SETTINGS_KEY);
+      data = {
+        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),
+      };
+      data.excludedSet = new Set(data.excludedGroups);
       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),
-        };
+        _settingsCache = data;
       }
-      return _settingsCache;
+      return _settingsCache || data;
     } finally {
       if (_settingsGen === gen) _settingsInflight = null;
     }
@@ -111,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('|')}`;
@@ -119,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);
+      }
     }
   }
 
@@ -146,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 };
 }
 
@@ -166,12 +171,20 @@ function serializeInlineConfig(cfg) {
 // ── Head injection ───────────────────────────────────────────────────────────
 
 const HEAD_PRECONNECTS = [
+  // 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).
@@ -189,7 +202,7 @@ const EZOIC_SCRIPTS = [
   '<script data-cfasync="false" src="https://cmp.gatekeeperconsent.com/min.js"></script>',
   '<script data-cfasync="false" src="https://the.gatekeeperconsent.com/cmp.min.js"></script>',
   '<script data-cfasync="false" src="//www.ezojs.com/ezoic/sa.min.js"></script>',
-  '<script src="//ezoicanalytics.com/analytics.js"></script>',
+  '<script async src="//ezoicanalytics.com/analytics.js"></script>',
 ].join('\n');
 
 // ── Hooks ────────────────────────────────────────────────────────────────────
@@ -217,7 +230,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));
@@ -272,7 +285,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.3",
+  "version": "1.9.5",
   "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],
   };
@@ -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(); }
   }
 

package/public/templates/admin/plugins/ezoic-infinite.tpl

@@ -7,10 +7,10 @@
     <div class="form-check mb-3">
       <input class="form-check-input" type="checkbox" id="enableBetweenAds" name="enableBetweenAds" {enableBetweenAds_checked}>
       <label class="form-check-label" for="enableBetweenAds">Activer les pubs entre les posts</label>
-				<div class="form-check mt-2">
-					<input class="form-check-input" type="checkbox" name="showFirstTopicAd" {showFirstTopicAd_checked} />
-					<label class="form-check-label">Afficher une pub après le 1er sujet</label>
-				</div>
+      <div class="form-check mt-2">
+        <input class="form-check-input" type="checkbox" name="showFirstTopicAd" {showFirstTopicAd_checked} />
+        <label class="form-check-label">Afficher une pub après le 1er sujet</label>
+      </div>
     </div>
 
     <div class="mb-3">
@@ -52,13 +52,13 @@
     <h4 class="mt-3">Pubs “message” entre les réponses</h4>
     <p class="form-text">Insère un bloc qui ressemble à un post, toutes les N réponses (dans une page topic).</p>
 
-    <div class="form-check mb-3">
-      <input class="form-check-input" type="checkbox" id="enableMessageAds" name="enableMessageAds" {enableMessageAds_checked}>
-      <label class="form-check-label" for="enableMessageAds">Activer les pubs “message”</label>
-				<div class="form-check mt-2">
-					<input class="form-check-input" type="checkbox" name="showFirstMessageAd" {showFirstMessageAd_checked} />
-					<label class="form-check-label">Afficher une pub après le 1er message</label>
-				</div>
+    <div class=”form-check mb-3”>
+      <input class=”form-check-input” type=”checkbox” id=”enableMessageAds” name=”enableMessageAds” {enableMessageAds_checked}>
+      <label class=”form-check-label” for=”enableMessageAds”>Activer les pubs “message”</label>
+      <div class=”form-check mt-2”>
+        <input class=”form-check-input” type=”checkbox” name=”showFirstMessageAd” {showFirstMessageAd_checked} />
+        <label class=”form-check-label”>Afficher une pub après le 1er message</label>
+      </div>
     </div>
 
     <div class="mb-3">