nodebb-plugin-ezoic-infinite 1.9.2 → 1.9.4

package/library.js

@@ -83,27 +83,29 @@ 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),
+      };
       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;
     }
@@ -189,7 +191,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 ────────────────────────────────────────────────────────────────────

package/package.json

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

package/public/client.js

@@ -1,5 +1,5 @@
 /**
- * NodeBB Ezoic Infinite Ads — client.js v2.5.4
+ * NodeBB Ezoic Infinite Ads — client.js v2.6.0
  *
  * Architecture: proven v50 core + targeted improvements.
  * Ezoic API: showAds() + destroyPlaceholders() per official docs.
@@ -32,13 +32,13 @@
     BURST_COOLDOWN_MS:      200,
     BLOCK_DURATION_MS:    1_000,
     SHOW_TIMEOUT_MS:      4_500,
-    SHOW_RELEASE_MS:        400,
-    RECYCLE_DELAY_MS:       150,
+    SHOW_RELEASE_MS:        150,
+    RECYCLE_DELAY_MS:        50,
     UNCOLLAPSE_CHECK_MS: [500, 5_000],
   };
 
   const MAX_INSERTS_RUN = 6;
-  const MAX_INFLIGHT    = 4;
+  const MAX_INFLIGHT    = 6;
   const MAX_BURST_STEPS = 8;
   const BURST_WINDOW_MS = 2_000;
 
@@ -562,28 +562,26 @@
     };
     const timer = setTimeout(release, TIMING.SHOW_TIMEOUT_MS);
 
-    requestAnimationFrame(() => {
-      try {
-        if (isBlocked()) { clearTimeout(timer); return release(); }
-        const ph = document.getElementById(`${PH_PREFIX}${id}`);
-        if (!ph?.isConnected || isFilled(ph)) { clearTimeout(timer); return release(); }
-        const t = now();
-        if (t - (S.lastShow.get(id) ?? 0) < TIMING.SHOW_THROTTLE_MS) { clearTimeout(timer); return release(); }
-        S.lastShow.set(id, t);
-        const wrap = ph.closest(`.${WRAP_CLASS}`);
-        try { wrap?.setAttribute(ATTR.SHOWN, String(t)); } catch (_) {}
+    try {
+      if (isBlocked()) { clearTimeout(timer); return release(); }
+      const ph = document.getElementById(`${PH_PREFIX}${id}`);
+      if (!ph?.isConnected || isFilled(ph)) { clearTimeout(timer); return release(); }
+      const t = now();
+      if (t - (S.lastShow.get(id) ?? 0) < TIMING.SHOW_THROTTLE_MS) { clearTimeout(timer); return release(); }
+      S.lastShow.set(id, t);
+      const wrap = ph.closest(`.${WRAP_CLASS}`);
+      try { wrap?.setAttribute(ATTR.SHOWN, String(t)); } catch (_) {}
 
-        window.ezstandalone = window.ezstandalone || {};
-        const ez = window.ezstandalone;
-        const doShow = () => {
-          try { ez.showAds(id); } catch (_) {}
-          if (wrap) scheduleUncollapseChecks(wrap, id);
-          scheduleEmptyCheck(id, t);
-          setTimeout(() => { clearTimeout(timer); release(); }, TIMING.SHOW_RELEASE_MS);
-        };
-        typeof ez.cmd?.push === 'function' ? ez.cmd.push(doShow) : doShow();
-      } catch (_) { clearTimeout(timer); release(); }
-    });
+      window.ezstandalone = window.ezstandalone || {};
+      const ez = window.ezstandalone;
+      const doShow = () => {
+        try { ez.showAds(id); } catch (_) {}
+        if (wrap) scheduleUncollapseChecks(wrap, id);
+        scheduleEmptyCheck(id, t);
+        setTimeout(() => { clearTimeout(timer); release(); }, TIMING.SHOW_RELEASE_MS);
+      };
+      typeof ez.cmd?.push === 'function' ? ez.cmd.push(doShow) : doShow();
+    } catch (_) { clearTimeout(timer); release(); }
   }
 
   function scheduleEmptyCheck(id, showTs) {
@@ -854,7 +852,7 @@
       ensureTcfLocator(); protectAriaHidden();
       patchShowAds(); getIO(); ensureDomObserver();
       RETRY.count = 0; RETRY.scriptReloaded = false; RETRY.postReloadShown = false; RETRY.gen++;
-      setTimeout(() => retryBoot(RETRY.gen), 250);
+      setTimeout(() => retryBoot(RETRY.gen), 100);
       requestBurst();
     });
     // action:ajaxify.contentLoaded et action:category.loaded ne passent pas par hooks → jQuery uniquement
@@ -898,6 +896,13 @@
   // ── Boot ───────────────────────────────────────────────────────────────────
 
   S.pageKey = pageKey();
+  (function () {
+    const _bootCfg = window.__nbbEzoicCfg;
+    if (_bootCfg && typeof _bootCfg === 'object' && !_bootCfg.excluded) {
+      S.cfg = _bootCfg;
+      initPools(_bootCfg);
+    }
+  }());
   ensureTcfLocator();
   protectAriaHidden();
   patchShowAds();
@@ -907,10 +912,10 @@
   bindScroll();
   bindResize();
   S.blockedUntil = 0;
-  if (document.readyState === 'complete') {
-    requestBurst();
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', requestBurst, { once: true });
   } else {
-    window.addEventListener('load', requestBurst, { once: true });
+    requestBurst();
   }
 
   // Retry boot: sa.min.js async + Cloudflare Rocket Loader + NodeBB SPA
@@ -982,6 +987,6 @@
     }
     setTimeout(() => retryBoot(gen), RETRY.count <= 4 ? 300 : 1000);
   }
-  setTimeout(() => retryBoot(RETRY.gen), 250);
+  setTimeout(() => retryBoot(RETRY.gen), 100);
 
 })();

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">