nodebb-plugin-ezoic-infinite 1.6.55 → 1.6.57

package/library.js

@@ -4,127 +4,50 @@ const meta = require.main.require('./src/meta');
 const groups = require.main.require('./src/groups');
 const db = require.main.require('./src/database');
 
-const SETTINGS_KEY = 'ezoic-infinite';
 const plugin = {};
 
-function normalizeExcludedGroups(value) {
-  if (!value) return [];
-  if (Array.isArray(value)) return value;
-  return String(value).split(',').map(s => s.trim()).filter(Boolean);
-}
-
-function parseBool(v, def = false) {
-  if (v === undefined || v === null || v === '') return def;
-  if (typeof v === 'boolean') return v;
-  const s = String(v).toLowerCase();
-  return s === '1' || s === 'true' || s === 'on' || s === 'yes';
-}
-
-async function getAllGroups() {
-  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);
-  // Filter out nulls (groups deleted between the sorted-set read and getGroupsData)
-  const valid = data.filter(g => g && g.name);
-  valid.sort((a, b) => String(a.name).localeCompare(String(b.name), undefined, { sensitivity: 'base' }));
-  return valid;
-}
-let _settingsCache = null;
-let _settingsCacheAt = 0;
-const SETTINGS_TTL = 30000; // 30s
-
+// Helper pour garantir des valeurs par défaut
 async function getSettings() {
-  const now = Date.now();
-  if (_settingsCache && (now - _settingsCacheAt) < SETTINGS_TTL) return _settingsCache;
-  const s = await meta.settings.get(SETTINGS_KEY);
-  _settingsCacheAt = Date.now();
-  _settingsCache = {
-    // 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),
-
-    // "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 userGroups = await groups.getUserGroups([uid]);
-  return (userGroups[0] || []).some(g => excludedGroups.includes(g.name));
+    const settings = await meta.settings.get('ezoic-infinite');
+    return {
+        enableBetweenAds: settings.enableBetweenAds === 'on',
+        showFirstTopicAd: settings.showFirstTopicAd === 'on',
+        placeholderIds: settings.placeholderIds || '',
+        intervalPosts: parseInt(settings.intervalPosts, 10) || 5,
+        enableMessageAds: settings.enableMessageAds === 'on',
+        showFirstMessageAd: settings.showFirstMessageAd === 'on',
+        messagePlaceholderIds: settings.messagePlaceholderIds || '',
+        messageIntervalPosts: parseInt(settings.messageIntervalPosts, 10) || 5,
+        excludedGroups: settings.excludedGroups || [],
+    };
 }
 
-plugin.onSettingsSet = function (data) {
-  // 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;
-  }
-};
-
-plugin.addAdminNavigation = async (header) => {
-  header.plugins = header.plugins || [];
-  header.plugins.push({
-    route: '/plugins/ezoic-infinite',
-    icon: 'fa-ad',
-    name: 'Ezoic Infinite Ads'
-  });
-  return header;
-};
-
 plugin.init = async ({ router, middleware }) => {
-  async function render(req, res) {
-    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' : '',
-      allGroups,
+    const render = async (req, res) => {
+        const settings = await getSettings();
+        const allGroups = await getAllGroups(); // Utilise votre fonction existante
+        res.render('admin/plugins/ezoic-infinite', { ...settings, allGroups });
+    };
+
+    router.get('/admin/plugins/ezoic-infinite', middleware.admin.buildHeader, render);
+    router.get('/api/admin/plugins/ezoic-infinite', render);
+
+    // L'API que le client.js appelle
+    router.get('/api/plugins/ezoic-infinite/config', async (req, res) => {
+        const settings = await getSettings();
+        let excluded = false;
+
+        if (req.uid && settings.excludedGroups.length) {
+            excluded = await groups.isMemberOfAny(req.uid, settings.excludedGroups);
+        }
+
+        res.json({
+            ...settings,
+            excluded
+        });
     });
-  }
-
-  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,
-      categoryPlaceholderIds: settings.categoryPlaceholderIds,
-      intervalCategories: settings.intervalCategories,
-      enableMessageAds: settings.enableMessageAds,
-      showFirstMessageAd: settings.showFirstMessageAd,
-      messagePlaceholderIds: settings.messagePlaceholderIds,
-      messageIntervalPosts: settings.messageIntervalPosts,
-    });
-  });
 };
 
-module.exports = plugin;
+// ... gardez vos fonctions getAllGroups et addAdminNavigation ...
+
+module.exports = plugin;

package/package.json

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

package/public/client.js

@@ -1,25 +1,50 @@
 (function () {
   'use strict';
 
-  // --- 1. VARIABLES ET CONFIG ---
   const WRAP_CLASS = 'nodebb-ezoic-wrap';
   const PINNED_ATTR = 'data-ezoic-pinned';
   const PLACEHOLDER_PREFIX = 'ezoic-pub-ad-placeholder-';
   
   let config = null;
   let usedIds = new Set();
+  let isEzoicEnabled = false; // Flag crucial pour corriger vos logs d'erreur
   let scheduleTimer = null;
 
-  // --- 2. SÉLECTEURS DE THÈMES ---
+  // --- SÉLECTEURS ---
   function getTopicList() {
-    return document.querySelector('.category [component="category"], .categories [component="categories"], [component="topic/list"], .topic-list');
+    return document.querySelector('[component="topic/list"], [component="category"], [component="categories"]');
   }
 
   function getPostList() {
     return document.querySelector('[component="topic"], [component="post/list"]');
   }
 
-  // --- 3. LOGIQUE DES POOLS D'ID ---
+  // --- LOGIQUE EZOIC ---
+  function callEzoic(idsToDefine) {
+    if (!window.ezstandalone || !idsToDefine.length) return;
+
+    try {
+      // 1. Définir les placeholders
+      window.ezstandalone.define(idsToDefine);
+
+      // 2. Logique Enable vs Refresh (Correction de vos erreurs log)
+      if (!isEzoicEnabled && !window.ezstandalone.enabled) {
+        window.ezstandalone.enable();
+        window.ezstandalone.display();
+        isEzoicEnabled = true; 
+        console.log('[Ezoic] First Enable & Display');
+      } else {
+        // On attend un cycle pour s'assurer qu'Ezoic est prêt pour le refresh
+        setTimeout(() => {
+          window.ezstandalone.refresh();
+          console.log('[Ezoic] Refreshing existing instance');
+        }, 100);
+      }
+    } catch (e) {
+      console.warn('[Ezoic] SDK Error:', e);
+    }
+  }
+
   function getNextId(poolStr) {
     if (!poolStr) return null;
     const ids = poolStr.split(/[\s,]+/).filter(Boolean);
@@ -33,131 +58,93 @@
     return null;
   }
 
-  // --- 4. APPEL EZOIC (REFRESH & SHOW) ---
-  function callEzoic(id) {
-    if (window.ezstandalone) {
-      try {
-        const nid = parseInt(id, 10);
-        window.ezstandalone.define(nid);
-        if (!window.ezstandalone.enabled) {
-          window.ezstandalone.enable();
-          window.ezstandalone.display();
-        } else {
-          window.ezstandalone.refresh();
-        }
-      } catch (e) { console.warn('[ezoic] refresh error', id, e); }
-    }
-  }
-
-  // --- 5. INJECTION SÉCURISÉE (ANTI-PILEUP) ---
+  // --- INJECTION ---
   function inject() {
     if (!config || config.excluded) return;
+    const newIds = [];
 
-    // A. LISTE DES SUJETS (Topics)
+    // A. Topics / Categories
     const ul = getTopicList();
     if (ul && config.enableBetweenAds) {
-      // Nettoyage des pubs orphelines (celles qui n'ont plus de LI au dessus à cause du scroll up)
-      const wraps = ul.querySelectorAll('.' + WRAP_CLASS);
-      wraps.forEach(w => {
+      // Nettoyage anti-pileup (remontée)
+      ul.querySelectorAll('.' + WRAP_CLASS).forEach(w => {
         if (!w.previousElementSibling || w.previousElementSibling.tagName !== 'LI') w.remove();
       });
 
       const items = Array.from(ul.children).filter(c => c.tagName === 'LI' && !c.classList.contains(WRAP_CLASS));
-      if (items.length > 0) {
-        // Pub n°1 (Pinned)
-        if (config.showFirstTopicAd && !ul.querySelector(`[${PINNED_ATTR}="true"]`)) {
-          insertAd(items[0], getNextId(config.placeholderIds), true);
+      
+      // First Ad
+      if (config.showFirstTopicAd && !ul.querySelector(`[${PINNED_ATTR}="true"]`)) {
+        const id = getNextId(config.placeholderIds);
+        if (id) {
+          insertAd(items[0], id, true);
+          newIds.push(parseInt(id, 10));
         }
+      }
 
-        // Pubs d'intervalles
-        const interval = parseInt(config.intervalPosts, 10) || 5;
-        items.forEach((li, idx) => {
-          const pos = idx + 1;
-          if (pos > 1 && pos % interval === 0) {
-            // Vérifie si ce LI a déjà une pub juste après lui pour éviter les doublons
-            const next = li.nextElementSibling;
-            if (!next || !next.classList.contains(WRAP_CLASS)) {
-              insertAd(li, getNextId(config.placeholderIds), false);
+      // Intervals
+      const interval = parseInt(config.intervalPosts, 10) || 5;
+      items.forEach((li, idx) => {
+        if ((idx + 1) % interval === 0 && idx > 0) {
+          if (!li.nextElementSibling || !li.nextElementSibling.classList.contains(WRAP_CLASS)) {
+            const id = getNextId(config.placeholderIds);
+            if (id) {
+              insertAd(li, id, false);
+              newIds.push(parseInt(id, 10));
             }
           }
-        });
-      }
+        }
+      });
     }
 
-    // B. LISTE DES MESSAGES (Posts)
+    // B. Messages (Posts)
     const postList = getPostList();
     if (postList && config.enableMessageAds) {
       const posts = Array.from(postList.querySelectorAll('[component="post"]'));
       if (config.showFirstMessageAd && posts.length > 0 && !postList.querySelector('.ezoic-msg-first')) {
-          insertAd(posts[0], getNextId(config.messagePlaceholderIds), false, 'ezoic-msg-first');
-      }
-      
-      const msgInterval = parseInt(config.messageIntervalPosts, 10) || 5;
-      if (msgInterval > 0) {
-          posts.forEach((post, idx) => {
-              const pPos = idx + 1;
-              if (pPos > 1 && pPos % msgInterval === 0) {
-                  if (!post.nextElementSibling || !post.nextElementSibling.classList.contains(WRAP_CLASS)) {
-                      insertAd(post, getNextId(config.messagePlaceholderIds), false);
-                  }
-              }
-          });
+        const id = getNextId(config.messagePlaceholderIds);
+        if (id) {
+          insertAd(posts[0], id, false, 'ezoic-msg-first');
+          newIds.push(parseInt(id, 10));
+        }
       }
     }
+
+    if (newIds.length > 0) {
+      callEzoic(newIds);
+    }
   }
 
   function insertAd(target, id, isPinned, extraClass = '') {
-    if (!target || !id) return;
     const wrap = document.createElement('div');
     wrap.className = `${WRAP_CLASS} ezoic-ad-between ${extraClass}`;
     if (isPinned) wrap.setAttribute(PINNED_ATTR, 'true');
-
-    const placeholder = document.createElement('div');
-    placeholder.id = PLACEHOLDER_PREFIX + id;
-    wrap.appendChild(placeholder);
-
+    wrap.innerHTML = `<div id="${PLACEHOLDER_PREFIX}${id}"></div>`;
     target.after(wrap);
-    
-    // On laisse le DOM respirer 50ms avant d'appeler Ezoic
-    setTimeout(() => callEzoic(id), 50);
   }
 
-  // --- 6. INITIALISATION ET HOOKS ---
-  async function fetchConfig() {
+  // --- INIT ---
+  async function init() {
     try {
       const res = await fetch('/api/plugins/ezoic-infinite/config');
       config = await res.json();
-    } catch (e) { console.error('[ezoic] config fetch failed'); }
-  }
-
-  function schedule() {
-    if (scheduleTimer) clearTimeout(scheduleTimer);
-    scheduleTimer = setTimeout(inject, 250);
-  }
+      
+      inject();
 
-  function init() {
-    fetchConfig().then(() => {
-      schedule();
-
-      // MutationObserver pour le scroll infini
-      const body = document.body;
-      const mo = new MutationObserver((mutations) => {
-        for (let m of mutations) {
-          if (m.addedNodes.length > 0) {
-            schedule();
-            break;
-          }
+      const observer = new MutationObserver((mutations) => {
+        if (mutations.some(m => m.addedNodes.length > 0)) {
+          if (scheduleTimer) clearTimeout(scheduleTimer);
+          scheduleTimer = setTimeout(inject, 300);
         }
       });
-      mo.observe(body, { childList: true, subtree: true });
-    });
+      observer.observe(document.body, { childList: true, subtree: true });
 
-    // Compatibilité jQuery/NodeBB Events
-    if (window.jQuery) {
-      window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', () => {
-        setTimeout(schedule, 500);
-      });
-    }
+      if (window.jQuery) {
+        window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', () => {
+          setTimeout(inject, 500);
+        });
+      }
+    } catch (e) {}
   }
 
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);

package/public/style.css

@@ -1,100 +1,80 @@
-/*
-  Keep our NodeBB-inserted wrappers CLS-safe.
-  NOTE: must not rely on `.ezoic-ad` because Ezoic uses that class internally.
-*/
+/* --- Conteneur principal inséré entre les sujets/messages --- */
 .nodebb-ezoic-wrap {
-  display: block;
-  width: 100%;
-  margin: 0 !important;
-  padding: 0 !important;
-  overflow: hidden;
+    display: block !important;
+    width: 100% !important;
+    clear: both !important;
+    margin: 20px 0 !important;
+    padding: 0 !important;
+    /* Important : Empêche les éléments de déborder lors du recyclage du DOM */
+    overflow: hidden; 
+    /* Améliore les performances de rendu sur NodeBB 4.x */
+    contain: layout style;
+    /* Assure une visibilité minimale pour que le SDK Ezoic puisse mesurer l'emplacement */
+    min-height: 50px;
 }
 
-.nodebb-ezoic-wrap > [id^="ezoic-pub-ad-placeholder-"] {
-  margin: 0 !important;
-  padding: 0 !important;
-  /* Keep the placeholder measurable (IO) but visually negligible */
-  min-height: 1px;
+/* --- Protection spécifique pour la 1ère publicité (Pinned) --- */
+.nodebb-ezoic-wrap[data-ezoic-pinned="true"] {
+    /* Réserve une hauteur pour éviter le "Layout Shift" (saut d'écran) au scroll up */
+    min-height: 150px;
+    border-bottom: 1px solid rgba(0,0,0,0.05);
+    margin-top: 5px !important;
 }
 
-/* If Ezoic wraps inside our wrapper, keep it tight */
-.nodebb-ezoic-wrap span.ezoic-ad,
-.nodebb-ezoic-wrap .ezoic-ad {
-  margin: 0 !important;
-  padding: 0 !important;
+/* --- Le placeholder Ezoic interne --- */
+[id^="ezoic-pub-ad-placeholder-"] {
+    margin: 0 auto !important;
+    padding: 0 !important;
+    text-align: center;
+    min-height: 1px;
+    line-height: 0;
 }
 
-/* Remove the classic "gap under iframe" (baseline/inline-block) */
-.nodebb-ezoic-wrap,
-.nodebb-ezoic-wrap * {
-  line-height: 0 !important;
-  font-size: 0 !important;
+/* --- Forcer le centrage et la réactivité des pubs Ezoic --- */
+.nodebb-ezoic-wrap span.ezoic-ad,
+.nodebb-ezoic-wrap .ezoic-ad,
+.nodebb-ezoic-wrap iframe {
+    display: block !important;
+    margin: 0 auto !important;
+    max-width: 100% !important;
 }
 
-.nodebb-ezoic-wrap iframe,
-.nodebb-ezoic-wrap div[id$="__container__"] iframe {
-  display: block !important;
-  vertical-align: top !important;
+/* --- Gestion des blocs vides (Anti-Trous blancs) --- */
+/* Si Ezoic ne remplit pas l'emplacement ou si le script le vide, 
+   on réduit l'espace pour ne pas casser le design du forum */
+.nodebb-ezoic-wrap:empty {
+    height: 0 !important;
+    min-height: 0 !important;
+    margin: 0 !important;
+    border: none !important;
 }
 
-.nodebb-ezoic-wrap div[id$="__container__"] {
-  display: block !important;
-  line-height: 0 !important;
+/* --- Adaptation pour les messages (Topic View) --- */
+.ezoic-msg-first {
+    margin-bottom: 35px !important;
+    padding-bottom: 15px !important;
+    border-bottom: 1px solid var(--border-color, #eee);
 }
 
-
-/* Collapse empty ad blocks (prevents "holes" when an ad doesn't fill or gets destroyed) */
-.nodebb-ezoic-wrap.is-empty {
-  display: block !important;
-  margin: 0 !important;
-  padding: 0 !important;
-  /* Don't fully collapse (can prevent fill / triggers "unused"), keep it at 1px */
-  height: 1px !important;
-  min-height: 1px !important;
-  overflow: hidden !important;
+/* --- Correction pour le mode sombre (NodeBB 4 Harmony) --- */
+[data-theme="dark"] .nodebb-ezoic-wrap[data-ezoic-pinned="true"] {
+    border-bottom-color: rgba(255,255,255,0.1);
 }
 
-/*
-  Optional: also neutralize spacing on native Ezoic `.ezoic-ad` blocks.
-  (Keeps your previous "CSS very good" behavior.)
-*/
-.ezoic-ad {
-  margin: 0 !important;
-  padding: 0 !important;
-}
-/* Remove Ezoic's large reserved min-height inside our wrappers (topics/messages) */
-.nodebb-ezoic-wrap .ezoic-ad,
-.nodebb-ezoic-wrap span.ezoic-ad {
-  min-height: 1px !important; /* kill 400px gaps */
-  height: auto !important;
+/* --- Neutralisation des marges Ezoic sur mobile --- */
+@media (max-width: 767px) {
+    .nodebb-ezoic-wrap {
+        margin: 10px 0 !important;
+        min-height: 30px;
+    }
+    .nodebb-ezoic-wrap[data-ezoic-pinned="true"] {
+        min-height: 100px;
+    }
 }
 
-/* Ensure Ezoic reportline doesn't affect layout */
-.nodebb-ezoic-wrap .reportline{position:absolute!important;}
-
-/* Ezoic sometimes injects `position: sticky` inside placements. In long NodeBB topics,
-   this can create "gliding" and sudden disappear/reappear effects while scrolling.
-   We neutralize sticky positioning *inside our injected wrappers* only. */
+/* --- Sécurité Anti-Sticky --- 
+   Ezoic injecte parfois du 'position: sticky' qui fait "flotter" les pubs 
+   de manière erratique lors du scroll infini. On le neutralise ici. */
 .nodebb-ezoic-wrap .ezads-sticky-intradiv {
-  position: static !important;
-  top: auto !important;
-}
-
-
-/* ===== V17 host styling ===== */
-li.nodebb-ezoic-host { list-style: none; width: 100%; display: block; }
-li.nodebb-ezoic-host > .nodebb-ezoic-wrap.ezoic-ad-between { width: 100%; display: block; }
-/* ===== /V17 ===== */
-
-.nodebb-ezoic-wrap {
-  display: block;
-  width: 100%;
-  clear: both;
-  margin: 20px 0 !important; /* Ajoute un peu d'espace pour le visuel */
-  min-height: 50px; /* Évite que le bloc ne soit écrasé à 0px */
-}
-
-/* Si la pub est vide, on garde un petit espace pour éviter le saut au scroll up */
-.nodebb-ezoic-wrap:empty {
-  min-height: 1px;
+    position: static !important;
 }