nodebb-plugin-ezoic-infinite 1.8.13 → 1.8.15

package/library.js

@@ -1,24 +1,16 @@
 'use strict';
 
-const meta   = require.main.require('./src/meta');
+const meta = require.main.require('./src/meta');
 const groups = require.main.require('./src/groups');
-const db     = require.main.require('./src/database');
+const db = require.main.require('./src/database');
 
 const SETTINGS_KEY = 'ezoic-infinite';
 const plugin = {};
 
-// ── 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 (_) {}
-  }
-  // Fallback : séparation par virgule
-  return s.split(',').map(v => v.trim()).filter(Boolean);
+  return String(value).split(',').map(s => s.trim()).filter(Boolean);
 }
 
 function parseBool(v, def = false) {
@@ -29,22 +21,33 @@ function parseBool(v, def = false) {
 }
 
 async function getAllGroups() {
+  const now = Date.now();
+  if (_groupsCache && (now - _groupsCacheAt) < GROUPS_TTL) return _groupsCache;
+
   let names = await db.getSortedSetRange('groups:createtime', 0, -1);
   if (!names || !names.length) {
     names = await db.getSortedSetRange('groups:visible:createtime', 0, -1);
   }
   const filtered = names.filter(name => !groups.isPrivilegeGroup(name));
   const data = await groups.getGroupsData(filtered);
-  const valid = data.filter(g => g && g.name);
+  const valid = (data || []).filter(g => g && g.name);
   valid.sort((a, b) => String(a.name).localeCompare(String(b.name), undefined, { sensitivity: 'base' }));
+
+  _groupsCacheAt = now;
+  _groupsCache = valid;
   return valid;
 }
 
-// ── Settings cache (30s TTL) ────────────────────────────────────────────────
-
-let _settingsCache   = null;
+let _settingsCache = null;
 let _settingsCacheAt = 0;
-const SETTINGS_TTL   = 30_000;
+const SETTINGS_TTL = 30000; // 30s
+
+let _groupsCache = null;
+let _groupsCacheAt = 0;
+const GROUPS_TTL = 5 * 60 * 1000; // 5min
+
+const _excludedCache = new Map(); // uid -> { at, excluded }
+const EXCLUDED_TTL = 30 * 1000; // 30s
 
 async function getSettings() {
   const now = Date.now();
@@ -52,107 +55,100 @@ async function getSettings() {
   const s = await meta.settings.get(SETTINGS_KEY);
   _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),
+    // Between-post ads (simple blocks) in category topic list
+    enableBetweenAds: parseBool(s.enableBetweenAds, true),
+    showFirstTopicAd: parseBool(s.showFirstTopicAd, false),
+    placeholderIds: (s.placeholderIds || '').trim(),
+    intervalPosts: Math.max(1, parseInt(s.intervalPosts, 10) || 6),
+
+    // Home/categories list ads (between categories on / or /categories)
+    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),
+    intervalCategories: Math.max(1, parseInt(s.intervalCategories, 10) || 4),
+
+    // "Ad message" between replies (looks like a post)
+    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),
   };
   return _settingsCache;
 }
 
 async function isUserExcluded(uid, excludedGroups) {
   if (!uid || !excludedGroups.length) return false;
+
+  const now = Date.now();
+  const cached = _excludedCache.get(uid);
+  if (cached && (now - cached.at) < EXCLUDED_TTL) return cached.excluded;
+
   const userGroups = await groups.getUserGroups([uid]);
-  return (userGroups[0] || []).some(g => excludedGroups.includes(g.name));
-}
+  const excluded = (userGroups[0] || []).some(g => excludedGroups.includes(g.name));
 
-// ── Scripts Ezoic ──────────────────────────────────────────────────────────
+  _excludedCache.set(uid, { at: now, excluded });
+  // petite hygiene : éviter une map qui grossit sans limite
+  if (_excludedCache.size > 5000) _excludedCache.clear();
 
-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>`;
+  return excluded;
+}
 
-// ── Hooks ──────────────────────────────────────────────────────────────────
 
 plugin.onSettingsSet = function (data) {
-  if (data && data.hash === SETTINGS_KEY) _settingsCache = null;
+  // Invalider le cache dès que les settings de ce plugin sont sauvegardés via l'ACP
+  if (data && data.hash === SETTINGS_KEY) {
+    _settingsCache = null;
+    _excludedCache.clear();
+  }
 };
 
 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) {
-      // Préfixer : nos scripts d'abord, puis le customHTML existant de l'admin
-      data.templateData.customHTML = EZOIC_SCRIPTS + (data.templateData.customHTML || '');
-    }
-  } catch (_) {}
-  return data;
-};
-
 plugin.init = async ({ router, middleware }) => {
   async function render(req, res) {
-    const settings  = await getSettings();
+    const settings = await getSettings();
     const allGroups = await getAllGroups();
+
     res.render('admin/plugins/ezoic-infinite', {
       title: 'Ezoic Infinite Ads',
       ...settings,
       enableBetweenAds_checked: settings.enableBetweenAds ? 'checked' : '',
-      enableMessageAds_checked:  settings.enableMessageAds  ? 'checked' : '',
+      enableMessageAds_checked: settings.enableMessageAds ? 'checked' : '',
       allGroups,
     });
   }
 
-  router.get('/admin/plugins/ezoic-infinite',     middleware.admin.buildHeader, render);
+  router.get('/admin/plugins/ezoic-infinite', middleware.admin.buildHeader, render);
   router.get('/api/admin/plugins/ezoic-infinite', render);
 
   router.get('/api/plugins/ezoic-infinite/config', async (req, res) => {
     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,
+      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,
+      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.13",
+  "version": "1.8.15",
   "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
-}
+}

package/plugin.json

@@ -4,14 +4,30 @@
   "description": "Ezoic ads with infinite scroll using a pool of placeholder IDs",
   "library": "./library.js",
   "hooks": [
-    { "hook": "static:app.load",              "method": "init"                },
-    { "hook": "filter:admin.header.build",    "method": "addAdminNavigation"  },
-    { "hook": "action:settings.set",          "method": "onSettingsSet"       },
-    { "hook": "filter:middleware.renderHeader","method": "injectEzoicHead"     }
+    {
+      "hook": "static:app.load",
+      "method": "init"
+    },
+    {
+      "hook": "filter:admin.header.build",
+      "method": "addAdminNavigation"
+    },
+    {
+      "hook": "action:settings.set",
+      "method": "onSettingsSet"
+    }
   ],
-  "staticDirs": { "public": "public" },
-  "acpScripts":  [ "public/admin.js"  ],
-  "scripts":     [ "public/client.js" ],
-  "templates":   "public/templates",
-  "css":         [ "public/style.css" ]
-}
+  "staticDirs": {
+    "public": "public"
+  },
+  "acpScripts": [
+    "public/admin.js"
+  ],
+  "scripts": [
+    "public/client.js"
+  ],
+  "templates": "public/templates",
+  "css": [
+    "public/style.css"
+  ]
+}