nodebb-plugin-ezoic-infinite 1.8.93 → 1.8.95

package/library.js

@@ -93,47 +93,37 @@ async function isUserExcluded(uid, excludedGroups) {
 
   _excludeCache.set(key, { value, at: Date.now() });
   if (_excludeCache.size > 1000) {
-    const now = Date.now();
     let toDel = 100;
-    // Supprimer en priorité les entrées expirées, puis les plus anciennes
+    const t = Date.now();
     for (const [k, v] of _excludeCache) {
-      if (now - v.at >= EXCLUDE_TTL) { _excludeCache.delete(k); if (--toDel <= 0) break; }
+      if (!toDel) break;
+      if (t - v.at >= EXCLUDE_TTL) { _excludeCache.delete(k); toDel--; }
     }
-    if (toDel > 0) {
-      for (const k of _excludeCache.keys()) {
-        _excludeCache.delete(k);
-        if (--toDel <= 0) break;
-      }
+    for (const k of _excludeCache.keys()) {
+      if (!toDel) break;
+      _excludeCache.delete(k); toDel--;
     }
   }
 
   return value;
 }
 
+let _inlineCfgNormal   = null;
+let _inlineCfgExcluded = null;
+
 function clearCaches() {
   _settingsCache = null;
   _settingsCacheAt = 0;
   _excludeCache.clear();
+  _inlineCfgNormal   = null;
+  _inlineCfgExcluded = null;
 }
 
 // ── Client config ────────────────────────────────────────────────────────────
 
 function buildClientConfig(settings, excluded) {
-  return {
-    excluded,
-    enableBetweenAds:       settings.enableBetweenAds,
-    showFirstTopicAd:       settings.showFirstTopicAd,
-    placeholderIds:         settings.placeholderIds,
-    intervalPosts:          settings.intervalPosts,
-    enableCategoryAds:      settings.enableCategoryAds,
-    showFirstCategoryAd:    settings.showFirstCategoryAd,
-    categoryPlaceholderIds: settings.categoryPlaceholderIds,
-    intervalCategories:     settings.intervalCategories,
-    enableMessageAds:       settings.enableMessageAds,
-    showFirstMessageAd:     settings.showFirstMessageAd,
-    messagePlaceholderIds:  settings.messagePlaceholderIds,
-    messageIntervalPosts:   settings.messageIntervalPosts,
-  };
+  const { excludedGroups, ...rest } = settings;
+  return { excluded, ...rest };
 }
 
 function serializeInlineConfig(cfg) {
@@ -191,8 +181,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||{};'
@@ -200,14 +194,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.93",
+  "version": "1.8.95",
   "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';
@@ -177,8 +178,8 @@
     return out;
   }
 
-  const getTopics     = () => Array.from(document.querySelectorAll(SEL.topic));
-  const getCategories = () => Array.from(document.querySelectorAll(SEL.category));
+  const getTopics     = () => document.querySelectorAll(SEL.topic);
+  const getCategories = () => document.querySelectorAll(SEL.category);
 
   // ── Anchor keys & wrap registry ────────────────────────────────────────────
 
@@ -268,9 +269,8 @@
   }
 
   function addWrapTimer(id, ms, fn) {
-    const timers = S.wrapTimers.get(id) || [];
-    timers.push(setTimeout(() => { try { fn(); } catch (_) {} }, ms));
-    S.wrapTimers.set(id, timers);
+    if (!S.wrapTimers.has(id)) S.wrapTimers.set(id, []);
+    S.wrapTimers.get(id).push(setTimeout(() => { try { fn(); } catch (_) {} }, ms));
   }
 
   function scheduleUncollapseChecks(wrap, id) {
@@ -434,12 +434,13 @@
 
   // ── Injection ──────────────────────────────────────────────────────────────
 
-  function ordinal(klass, el) {
+  function ordinal(klass, el, hint) {
     const attr = KIND[klass]?.ordinalAttr;
     if (attr) {
       const v = el.getAttribute(attr);
       if (v != null && v !== '' && !isNaN(v)) return parseInt(v, 10);
     }
+    if (hint !== undefined) return hint;
     const fullSel = KIND[klass]?.sel ?? '';
     let i = 0;
     for (const s of el.parentElement?.children ?? []) {
@@ -452,10 +453,11 @@
   function injectBetween(klass, items, interval, showFirst, poolKey) {
     if (!items.length) return 0;
     let inserted = 0;
+    let pos = 0;
     for (const el of items) {
       if (inserted >= MAX_INSERTS_RUN) break;
       if (!el?.isConnected) continue;
-      const ord = ordinal(klass, el);
+      const ord = ordinal(klass, el, pos++);
       if (!(showFirst && ord === 0) && (ord + 1) % interval !== 0) continue;
       if (adjacentWrap(el)) continue;
       const key = anchorKey(klass, el);
@@ -608,7 +610,6 @@
 
   async function runCore() {
     if (isBlocked()) return 0;
-    patchShowAds();
 
     const t = now();
     if (t - _lastGc > 30_000) { _lastGc = t; gcDisconnectedWraps(); }
@@ -798,30 +799,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 +809,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 +840,6 @@
   S.pageKey = pageKey();
   ensureTcfLocator();
   protectAriaHidden();
-  warmNetwork();
   patchShowAds();
   getIO();
   ensureDomObserver();
@@ -886,20 +862,18 @@
   //    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.
-  let _retries = 0;
-  let _scriptReloaded = false;
-  let _postReloadShown = false;
+  const RETRY = { count: 0, scriptReloaded: false, postReloadShown: false };
   function retryBoot() {
-    if (_retries >= 12) return;
-    _retries++;
+    if (RETRY.count >= 12) return;
+    RETRY.count++;
     patchShowAds();
 
     const ez = window.ezstandalone;
     const status = ez?.loadingStatus;
 
     // After reload: once Ezoic reaches 'complete', re-call showAds for all mounted placeholders
-    if (_scriptReloaded && !_postReloadShown && status === 'complete') {
-      _postReloadShown = true;
+    if (RETRY.scriptReloaded && !RETRY.postReloadShown && status === 'complete') {
+      RETRY.postReloadShown = true;
       for (const id of S.mountedIds) { try { enqueueShow(id); } catch (_) {} }
       return;
     }
@@ -907,19 +881,19 @@
     // Normal exit: placeholders mounted, no reload triggered (healthy load).
     // Exception: if Ezoic status is stuck (not absent and not 'complete'), continue
     // so crash detection below can trigger the sa.min.js reload.
-    if (S.mountedIds.size > 0 && !_scriptReloaded && (!status || status === 'complete')) return;
+    if (S.mountedIds.size > 0 && !RETRY.scriptReloaded && (!status || status === 'complete')) return;
     // Exit once reload is done and re-show has been triggered
-    if (_scriptReloaded && _postReloadShown) return;
+    if (RETRY.scriptReloaded && RETRY.postReloadShown) return;
 
-    if (!_scriptReloaded) {
+    if (!RETRY.scriptReloaded) {
       // Case 1: sa.min.js never injected (Rocket Loader stripped it, etc.)
-      const neverInjected = !status && !document.querySelector('script[src*="sa.min.js"]') && _retries <= 3;
+      const neverInjected = !status && !document.querySelector('script[src*="sa.min.js"]') && RETRY.count <= 3;
       // Case 2: cold-start crash — loadingStatus stuck before 'complete' after enough wait.
       // Do NOT reload when status==='complete' (post-defineScript-failure would re-trigger).
       const anyFilled = !!document.querySelector(`.${WRAP_CLASS} ${FILL_SEL}`);
-      const crashed = _retries >= 8 && !anyFilled && status && status !== 'complete';
+      const crashed = RETRY.count >= 8 && !anyFilled && status && status !== 'complete';
       if (neverInjected || crashed) {
-        _scriptReloaded = true;
+        RETRY.scriptReloaded = true;
         try {
           if (crashed) {
             // Remove the broken script before re-adding to avoid a duplicate
@@ -942,7 +916,7 @@
       S.lastBurstTs = now() - TIMING.BURST_COOLDOWN_MS;
       requestBurst();
     }
-    setTimeout(retryBoot, _retries <= 4 ? 300 : 1000);
+    setTimeout(retryBoot, RETRY.count <= 4 ? 300 : 1000);
   }
   setTimeout(retryBoot, 250);