nodebb-plugin-ezoic-infinite 1.8.78 → 1.8.79

package/library.js

@@ -60,7 +60,7 @@ async function getSettings() {
   if (_settingsCache && (t - _settingsCacheAt) < SETTINGS_TTL) return _settingsCache;
 
   const s = await meta.settings.get(SETTINGS_KEY);
-  _settingsCacheAt = Date.now();
+  _settingsCacheAt = t;
   _settingsCache = {
     enableBetweenAds:       parseBool(s.enableBetweenAds, true),
     showFirstTopicAd:       parseBool(s.showFirstTopicAd, false),
@@ -93,10 +93,17 @@ async function isUserExcluded(uid, excludedGroups) {
 
   _excludeCache.set(key, { value, at: Date.now() });
   if (_excludeCache.size > 1000) {
+    const now = Date.now();
     let toDel = 100;
-    for (const k of _excludeCache.keys()) {
-      _excludeCache.delete(k);
-      if (--toDel <= 0) break;
+    // Supprimer en priorité les entrées expirées, puis les plus anciennes
+    for (const [k, v] of _excludeCache) {
+      if (now - v.at >= EXCLUDE_TTL) { _excludeCache.delete(k); if (--toDel <= 0) break; }
+    }
+    if (toDel > 0) {
+      for (const k of _excludeCache.keys()) {
+        _excludeCache.delete(k);
+        if (--toDel <= 0) break;
+      }
     }
   }
 

package/package.json

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

package/public/client.js

@@ -93,8 +93,7 @@
     mutGuard:     0,
     blockedUntil: 0,
     inflight:     0,
-    pending:      [],
-    pendingSet:   new Set(),
+    pending:      new Set(),
     runQueued:    false,
     burstActive:  false,
     burstDeadline: 0,
@@ -213,11 +212,11 @@
   // ── GC disconnected wraps ──────────────────────────────────────────────────
 
   function gcDisconnectedWraps() {
-    for (const [key, w] of Array.from(S.wrapByKey)) {
+    for (const [key, w] of S.wrapByKey) {
       if (!w?.isConnected) S.wrapByKey.delete(key);
     }
-    for (const [klass, set] of Array.from(S.wrapsByClass)) {
-      for (const w of Array.from(set)) {
+    for (const [klass, set] of S.wrapsByClass) {
+      for (const w of set) {
         if (w?.isConnected) continue;
         set.delete(w);
         const id = parseInt(w.getAttribute?.(ATTR.WRAPID), 10);
@@ -268,13 +267,17 @@
     return true;
   }
 
+  function addWrapTimer(id, ms, fn) {
+    const timers = S.wrapTimers.get(id) || [];
+    timers.push(setTimeout(() => { try { fn(); } catch (_) {} }, ms));
+    S.wrapTimers.set(id, timers);
+  }
+
   function scheduleUncollapseChecks(wrap, id) {
     if (!wrap || !id) return;
-    const ids = S.wrapTimers.get(id) || [];
     for (const ms of TIMING.UNCOLLAPSE_CHECK_MS) {
-      ids.push(setTimeout(() => { try { clearEmptyIfFilled(wrap); } catch (_) {} }, ms));
+      addWrapTimer(id, ms, () => clearEmptyIfFilled(wrap));
     }
-    S.wrapTimers.set(id, ids);
   }
 
   // ── Pool management ────────────────────────────────────────────────────────
@@ -401,12 +404,8 @@
       }
       const key = w.getAttribute(ATTR.ANCHOR);
       if (key && S.wrapByKey.get(key) === w) S.wrapByKey.delete(key);
-      for (const cls of w.classList) {
-        if (cls !== WRAP_CLASS && cls.startsWith('ezoic-ad-')) {
-          S.wrapsByClass.get(cls)?.delete(w);
-          break;
-        }
-      }
+      const colonIdx = key?.indexOf(':') ?? -1;
+      if (colonIdx > 0) S.wrapsByClass.get(key.slice(0, colonIdx))?.delete(w);
       w.remove();
     } catch (_) {}
   }
@@ -505,7 +504,7 @@
     if (!id || isBlocked()) return;
     if (now() - (S.lastShow.get(id) ?? 0) < TIMING.SHOW_THROTTLE_MS) return;
     if (S.inflight >= MAX_INFLIGHT) {
-      if (!S.pendingSet.has(id)) { S.pending.push(id); S.pendingSet.add(id); }
+      S.pending.add(id);
       return;
     }
     startShow(id);
@@ -513,9 +512,9 @@
 
   function drainQueue() {
     if (isBlocked()) return;
-    while (S.inflight < MAX_INFLIGHT && S.pending.length) {
-      const id = S.pending.shift();
-      S.pendingSet.delete(id);
+    while (S.inflight < MAX_INFLIGHT && S.pending.size) {
+      const id = S.pending.values().next().value;
+      S.pending.delete(id);
       startShow(id);
     }
   }
@@ -557,22 +556,18 @@
   }
 
   function scheduleEmptyCheck(id, showTs) {
-    const ids = S.wrapTimers.get(id) || [];
     for (const delay of [TIMING.EMPTY_CHECK_MS_1, TIMING.EMPTY_CHECK_MS_2]) {
-      ids.push(setTimeout(() => {
-        try {
-          const ph   = document.getElementById(`${PH_PREFIX}${id}`);
-          const wrap = ph?.closest(`.${WRAP_CLASS}`);
-          if (!wrap || !ph?.isConnected) return;
-          if (parseInt(wrap.getAttribute(ATTR.SHOWN) || '0', 10) > showTs) return;
-          if (clearEmptyIfFilled(wrap)) return;
-          if (ph.querySelector('[id^="div-gpt-ad"]')) return;
-          if (ph.offsetHeight > 10) return;
-          wrap.classList.add('is-empty');
-        } catch (_) {}
-      }, delay));
+      addWrapTimer(id, delay, () => {
+        const ph   = document.getElementById(`${PH_PREFIX}${id}`);
+        const wrap = ph?.closest(`.${WRAP_CLASS}`);
+        if (!wrap || !ph?.isConnected) return;
+        if (parseInt(wrap.getAttribute(ATTR.SHOWN) || '0', 10) > showTs) return;
+        if (clearEmptyIfFilled(wrap)) return;
+        if (ph.querySelector('[id^="div-gpt-ad"]')) return;
+        if (ph.offsetHeight > 10) return;
+        wrap.classList.add('is-empty');
+      });
     }
-    S.wrapTimers.set(id, ids);
   }
 
   // ── Patch Ezoic showAds ────────────────────────────────────────────────────
@@ -692,8 +687,7 @@
     S.wrapsByClass.clear();
     S.kind       = null;
     S.inflight   = 0;
-    S.pending    = [];
-    S.pendingSet.clear();
+    S.pending.clear();
     S.burstActive = false;
     S.runQueued   = false;
   }
@@ -797,10 +791,9 @@
 
   // ── Console muting ─────────────────────────────────────────────────────────
 
-  function muteConsole() {
-    if (window.__nbbEzMuted) return;
-    window.__nbbEzMuted = true;
-    const MUTED = [
+  const MUTED_RE = (() => {
+    const esc = s => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    return new RegExp([
       `with id ${PH_PREFIX}`,
       'adsbygoogle.push() error',
       'already been defined',
@@ -815,12 +808,17 @@
       'Error in custom getTCData',
       'no interstitial API',
       'JS-Enable should only',
-    ];
+    ].map(esc).join('|'));
+  })();
+
+  function muteConsole() {
+    if (window.__nbbEzMuted) return;
+    window.__nbbEzMuted = true;
     for (const method of ['log', 'info', 'warn', 'error']) {
       const orig = console[method];
       if (typeof orig !== 'function') continue;
       console[method] = function (...args) {
-        if (typeof args[0] === 'string') { for (const p of MUTED) if (args[0].includes(p)) return; }
+        if (typeof args[0] === 'string' && MUTED_RE.test(args[0])) return;
         return orig.apply(console, args);
       };
     }
@@ -863,10 +861,10 @@
       warmNetwork(); patchShowAds(); getIO(); ensureDomObserver();
       requestBurst();
     });
+    // action:ajaxify.contentLoaded et action:category.loaded ne passent pas par hooks → jQuery uniquement
     const burstEvts = [
-      'action:ajaxify.contentLoaded', 'action:posts.loaded',
-      'action:topics.loaded', 'action:categories.loaded',
-      'action:category.loaded', 'action:topic.loaded',
+      'action:ajaxify.contentLoaded',
+      'action:category.loaded',
     ].map(e => `${e}.nbbEzoic`).join(' ');
     $(window).on(burstEvts, () => { if (!isBlocked()) requestBurst(); });
     try {

package/CLAUDE.md

@@ -1,67 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Project Overview
-
-A NodeBB 4.x plugin that integrates Ezoic Infinite Ads with infinite scroll support. It injects Ezoic placeholder ads between topics, posts, and categories using a pool of placeholder IDs.
-
-## Development Setup
-
-This plugin has no build step, no test suite, and no dependencies beyond NodeBB's core. To test it:
-
-1. Copy/symlink the plugin directory into a NodeBB instance's `node_modules/nodebb-plugin-ezoic-infinite/`
-2. Activate the plugin in NodeBB Admin > Extend > Plugins
-3. Configure placeholder IDs at Admin > Plugins > Ezoic Infinite Ads
-
-To package for distribution:
-```bash
-zip -r nodebb-plugin-onekite-ezoic.zip . --exclude "*.zip" --exclude ".git/*" --exclude "CLAUDE.md"
-```
-
-## Architecture
-
-### Server-side (`library.js`)
-Single file exporting a `plugin` object with NodeBB hooks:
-- `filter:middleware.renderHeader` → `injectEzoicHead`: Injects Ezoic scripts + inline config into `<head>`. For excluded users, injects a stub that stubs `ezstandalone` without loading ad scripts.
-- `static:app.load` → `init`: Registers admin routes (`/admin/plugins/ezoic-infinite`) and a config API endpoint (`/api/plugins/ezoic-infinite/config`).
-- `filter:admin.header.build` → `addAdminNavigation`: Adds the plugin to the ACP nav.
-- `action:settings.set` → `onSettingsSet`: Invalidates the settings cache on save.
-
-Settings are cached for 30s. Group membership for ad exclusion is cached for 60s per uid+groups combination (up to 1000 entries).
-
-The inline config is serialized as `window.__nbbEzoicCfg` in the HTML head, so `client.js` can read it without an extra network request.
-
-### Client-side (`public/client.js`)
-Self-contained IIFE with no external dependencies beyond jQuery (available globally in NodeBB) and the Ezoic `ezstandalone` API.
-
-**Page type detection** (`detectKind`): Determines if the current page is a topic, category topic list, or categories index, then selects the corresponding ad kind (`ezoic-ad-message`, `ezoic-ad-between`, `ezoic-ad-categories`).
-
-**Ad injection flow**:
-1. `requestBurst()` → `scheduleRun()` → `runCore()` → `injectBetween()`
-2. `injectBetween` iterates DOM items, checks ordinal position against the configured interval, inserts wrapper divs after qualifying elements using `insertAfter()`
-3. Each wrapper contains an Ezoic placeholder `<div id="ezoic-pub-ad-placeholder-{id}">`
-4. `IntersectionObserver` triggers `enqueueShow(id)` → `startShow(id)` → `ezstandalone.showAds(id)` when placeholders approach the viewport
-
-**Pool/recycling**: Placeholder IDs are organized into three pools (topics, posts, categories). When all IDs in a pool are in use, `recycleWrap` finds the oldest off-screen wrap, calls `destroyPlaceholders`, and reuses it for the new position.
-
-**State resets**: On `action:ajaxify.start` (SPA navigation), `cleanup()` destroys all wraps, resets all state. On `action:ajaxify.end`, re-initializes and triggers a burst.
-
-### Admin UI
-- `public/templates/admin/plugins/ezoic-infinite.tpl`: NodeBB Benchpress template (French labels), uses `Settings.load`/`Settings.save` from NodeBB's ACP framework
-- `public/admin.js`: Minimal ACP script wiring the save button to NodeBB's `settings` module
-- `public/style.css`: Visual styles for the `.nodebb-ezoic-wrap` and `.is-empty` states
-
-### Key Constants (client.js)
-- `WRAP_CLASS = 'nodebb-ezoic-wrap'`: CSS class on all injected wrappers
-- `PH_PREFIX = 'ezoic-pub-ad-placeholder-'`: Prefix for placeholder element IDs
-- `MAX_INSERTS_RUN = 6`: Max ad insertions per `runCore()` call
-- `MAX_INFLIGHT = 4`: Max concurrent `showAds()` calls
-- Three placeholder ID pools must not overlap between ad types
-- `S.wrapTimers: Map<id, timerId[]>` tracks all pending timers per wrap — cancelled in `dropWrap()` and `cleanup()`
-- `cleanup()` disconnects `S.domObs` and `S.io` so they are re-created fresh on next SPA page
-
-### Important Constraints
-- `sa.min.js` must load **synchronously** (no `async` attribute) — loading it async causes "Timed out waiting for loadingStatus LOADING" because it may execute before the CMP is ready
-- Placeholder IDs must be distinct across the three pools (topics, posts, categories)
-- The `showAds()` function is monkey-patched to deduplicate calls and guard against disconnected placeholders