nodebb-plugin-ezoic-infinite 1.8.69 → 1.8.70

package/library.js

@@ -7,18 +7,17 @@ const db     = require.main.require('./src/database');
 const SETTINGS_KEY = 'ezoic-infinite';
 const plugin = {};
 
-// ── Helpers ──────────────────────────────────────────────────────────────────
+// ── Helpers ────────────────────────────────────────────────────────────────
 
 function normalizeExcludedGroups(value) {
   if (!value) return [];
   if (Array.isArray(value)) return value;
+  // NodeBB stocke les settings multi-valeurs comme string JSON "[\"group1\",\"group2\"]"
   const s = String(value).trim();
   if (s.startsWith('[')) {
-    try {
-      const parsed = JSON.parse(s);
-      if (Array.isArray(parsed)) return parsed.map(String).filter(Boolean);
-    } catch (_) {}
+    try { const parsed = JSON.parse(s); if (Array.isArray(parsed)) return parsed.map(String).filter(Boolean); } catch (_) {}
   }
+  // Fallback : séparation par virgule
   return s.split(',').map(v => v.trim()).filter(Boolean);
 }
 
@@ -31,29 +30,25 @@ function parseBool(v, def = false) {
 
 async function getAllGroups() {
   let names = await db.getSortedSetRange('groups:createtime', 0, -1);
-  if (!names?.length) {
+  if (!names || !names.length) {
     names = await db.getSortedSetRange('groups:visible:createtime', 0, -1);
   }
-  return (await groups.getGroupsData(
-    (names || []).filter(name => !groups.isPrivilegeGroup(name))
-  ))
-    .filter(g => g?.name)
-    .sort((a, b) => String(a.name).localeCompare(String(b.name), undefined, { sensitivity: 'base' }));
+  const filtered = names.filter(name => !groups.isPrivilegeGroup(name));
+  const data = await groups.getGroupsData(filtered);
+  const valid = data.filter(g => g && g.name);
+  valid.sort((a, b) => String(a.name).localeCompare(String(b.name), undefined, { sensitivity: 'base' }));
+  return valid;
 }
 
-// ── Settings cache ───────────────────────────────────────────────────────────
+// ── Settings cache (30s TTL) ────────────────────────────────────────────────
 
 let _settingsCache   = null;
 let _settingsCacheAt = 0;
 const SETTINGS_TTL   = 30_000;
 
-const _excludeCache = new Map();
-const EXCLUDE_TTL   = 60_000;
-
 async function getSettings() {
-  const t = Date.now();
-  if (_settingsCache && (t - _settingsCacheAt) < SETTINGS_TTL) return _settingsCache;
-
+  const now = Date.now();
+  if (_settingsCache && (now - _settingsCacheAt) < SETTINGS_TTL) return _settingsCache;
   const s = await meta.settings.get(SETTINGS_KEY);
   _settingsCacheAt = Date.now();
   _settingsCache = {
@@ -76,120 +71,52 @@ async function getSettings() {
 
 async function isUserExcluded(uid, excludedGroups) {
   if (!uid || !excludedGroups.length) return false;
-
-  const key = `${uid}|${excludedGroups.join('|')}`;
-  const t = Date.now();
-  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) {
-    _excludeCache.delete(_excludeCache.keys().next().value);
-  }
-
-  return value;
-}
-
-function clearCaches() {
-  _settingsCache = null;
-  _settingsCacheAt = 0;
-  _excludeCache.clear();
+  return (userGroups[0] || []).some(g => excludedGroups.includes(g.name));
 }
 
-// ── 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,
-  };
-}
+// ── Scripts Ezoic ──────────────────────────────────────────────────────────
 
-function serializeInlineConfig(cfg) {
-  return `<script data-cfasync="false">window.__nbbEzoicCfg=${JSON.stringify(cfg).replace(/</g, '\\u003c')};</script>`;
-}
+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 async src="//www.ezojs.com/ezoic/sa.min.js"></script>
+<script>
+window.ezstandalone = window.ezstandalone || {};
+ezstandalone.cmd = ezstandalone.cmd || [];
+</script>`;
 
-// ── Head injection ───────────────────────────────────────────────────────────
-
-const HEAD_PRECONNECTS = [
-  '<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>',
-  '<link rel="dns-prefetch" href="https://g.ezoic.net">',
-  '<link rel="dns-prefetch" href="https://securepubads.g.doubleclick.net">',
-].join('\n');
-
-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>',
-  'window.ezstandalone = window.ezstandalone || {};',
-  'ezstandalone.cmd = ezstandalone.cmd || [];',
-  '</script>',
-  '<script async src="//www.ezojs.com/ezoic/sa.min.js"></script>',
-].join('\n');
-
-// ── Hooks ────────────────────────────────────────────────────────────────────
+// ── Hooks ──────────────────────────────────────────────────────────────────
 
 plugin.onSettingsSet = function (data) {
-  if (data?.hash === SETTINGS_KEY) clearCaches();
+  if (data && data.hash === SETTINGS_KEY) _settingsCache = null;
 };
 
 plugin.addAdminNavigation = async (header) => {
   header.plugins = header.plugins || [];
-  header.plugins.push({
-    route: '/plugins/ezoic-infinite',
-    icon: 'fa-ad',
-    name: 'Ezoic Infinite Ads',
-  });
+  header.plugins.push({ route: '/plugins/ezoic-infinite', icon: 'fa-ad', name: 'Ezoic Infinite Ads' });
   return header;
 };
 
+/**
+ * Injecte les scripts Ezoic dans le <head> via templateData.customHTML.
+ *
+ * NodeBB v4 / thème Harmony : header.tpl contient {{customHTML}} dans le <head>
+ * (render.js ligne 232 : templateValues.customHTML = meta.config.customHTML).
+ * Le hook filter:middleware.renderHeader reçoit templateData = headerFooterData
+ * et est rendu via req.app.renderAsync('header', hookReturn.templateData).
+ * On préfixe customHTML pour que nos scripts passent AVANT le customHTML admin,
+ * tout en préservant ce dernier.
+ */
 plugin.injectEzoicHead = async (data) => {
   try {
     const settings = await getSettings();
     const uid      = data.req?.uid ?? 0;
     const excluded = await isUserExcluded(uid, settings.excludedGroups);
-
-    if (excluded) {
-      const cfg = buildClientConfig(settings, true);
-      // Minimal stub for excluded users — prevents ReferenceError if other
-      // scripts reference _ezaq or ezstandalone
-      const stub = '<script>'
-        + 'window.ezstandalone=window.ezstandalone||{};'
-        + 'window.ezstandalone.cmd=window.ezstandalone.cmd||[];'
-        + '</script>';
-      data.templateData.customHTML =
-        stub + '\n' +
-        serializeInlineConfig(cfg) +
-        (data.templateData.customHTML || '');
-    } else {
-      const cfg = buildClientConfig(settings, false);
-      data.templateData.customHTML =
-        HEAD_PRECONNECTS + '\n' +
-        EZOIC_SCRIPTS + '\n' +
-        serializeInlineConfig(cfg) +
-        (data.templateData.customHTML || '');
+    if (!excluded) {
+      // Préfixer : nos scripts d'abord, puis le customHTML existant de l'admin
+      data.templateData.customHTML = EZOIC_SCRIPTS + (data.templateData.customHTML || '');
     }
-  } catch (err) {
-    console.error('[ezoic-infinite] injectEzoicHead error:', err.message);
-  }
+  } catch (_) {}
   return data;
 };
 
@@ -200,8 +127,7 @@ plugin.init = async ({ router, middleware }) => {
     res.render('admin/plugins/ezoic-infinite', {
       title: 'Ezoic Infinite Ads',
       ...settings,
-      enableBetweenAds_checked:  settings.enableBetweenAds  ? 'checked' : '',
-      enableCategoryAds_checked: settings.enableCategoryAds ? 'checked' : '',
+      enableBetweenAds_checked: settings.enableBetweenAds ? 'checked' : '',
       enableMessageAds_checked:  settings.enableMessageAds  ? 'checked' : '',
       allGroups,
     });
@@ -211,14 +137,23 @@ plugin.init = async ({ router, middleware }) => {
   router.get('/api/admin/plugins/ezoic-infinite', render);
 
   router.get('/api/plugins/ezoic-infinite/config', async (req, res) => {
-    try {
-      const settings = await getSettings();
-      const excluded = await isUserExcluded(req.uid, settings.excludedGroups);
-      res.json(buildClientConfig(settings, excluded));
-    } catch (err) {
-      console.error('[ezoic-infinite] config API error:', err.message);
-      res.status(500).json({ error: 'internal' });
-    }
+    const settings = await getSettings();
+    const excluded = await isUserExcluded(req.uid, settings.excludedGroups);
+    res.json({
+      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,
+    });
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.8.69",
+  "version": "1.8.70",
   "description": "Production-ready Ezoic infinite ads integration for NodeBB 4.x",
   "main": "library.js",
   "license": "MIT",
@@ -18,4 +18,4 @@
     "compatibility": "^4.0.0"
   },
   "private": false
-}
+}