nodebb-plugin-ezoic-infinite 1.6.82 → 1.6.83

package/library.js

@@ -2,65 +2,58 @@
 
 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 = {};
 
 async function getSettings() {
-  const settings = await meta.settings.get(SETTINGS_KEY);
-  return settings || {};
-}
-
-async function isUserExcluded(uid, excludedGroups) {
-  if (!uid || !excludedGroups) return false;
-  const groupsList = Array.isArray(excludedGroups) ? excludedGroups : [excludedGroups];
-  if (!groupsList.length) return false;
-  return await groups.isMemberOfGroups(uid, groupsList);
+    return await meta.settings.get(SETTINGS_KEY) || {};
 }
 
 plugin.init = async ({ router, middleware }) => {
-  const renderAdmin = async (req, res) => {
-    const settings = await getSettings();
-    const names = await db.getSortedSetRange('groups:createtime', 0, -1);
-    const groupsData = await groups.getGroupsData(names);
-    const allGroups = groupsData.filter(g => g && g.name).map(g => ({ name: g.name }));
-
-    res.render('admin/plugins/ezoic-infinite', {
-      ...settings,
-      allGroups,
-      enableBetweenAds_checked: settings.enableBetweenAds === 'on' ? 'checked' : '',
-      enableMessageAds_checked: settings.enableMessageAds === 'on' ? 'checked' : ''
-    });
-  };
-
-  router.get('/admin/plugins/ezoic-infinite', middleware.admin.buildHeader, renderAdmin);
-  router.get('/api/admin/plugins/ezoic-infinite', renderAdmin);
-
-  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 === 'on',
-      showFirstTopicAd: settings.showFirstTopicAd === 'on',
-      placeholderIds: settings.placeholderIds || '',
-      intervalPosts: settings.intervalPosts || 10,
-      enableMessageAds: settings.enableMessageAds === 'on',
-      showFirstMessageAd: settings.showFirstMessageAd === 'on',
-      messagePlaceholderIds: settings.messagePlaceholderIds || '',
-      messageIntervalPosts: settings.messageIntervalPosts || 10,
+    const renderAdmin = async (req, res) => {
+        const settings = await getSettings();
+        const db = require.main.require('./src/database');
+        const names = await db.getSortedSetRange('groups:createtime', 0, -1);
+        const groupsData = await groups.getGroupsData(names);
+        const allGroups = groupsData.filter(g => g && g.name).map(g => ({ name: g.name }));
+
+        res.render('admin/plugins/ezoic-infinite', {
+            ...settings,
+            allGroups,
+            enableBetweenAds_checked: settings.enableBetweenAds === 'on' ? 'checked' : '',
+            enableMessageAds_checked: settings.enableMessageAds === 'on' ? 'checked' : ''
+        });
+    };
+
+    router.get('/admin/plugins/ezoic-infinite', middleware.admin.buildHeader, renderAdmin);
+    router.get('/api/admin/plugins/ezoic-infinite', renderAdmin);
+
+    router.get('/api/plugins/ezoic-infinite/config', async (req, res) => {
+        const settings = await getSettings();
+        let excluded = false;
+        if (req.uid && settings.excludedGroups) {
+            const groupsList = Array.isArray(settings.excludedGroups) ? settings.excludedGroups : [settings.excludedGroups];
+            excluded = await groups.isMemberOfGroups(req.uid, groupsList);
+        }
+
+        res.json({
+            excluded,
+            enableBetweenAds: settings.enableBetweenAds === 'on',
+            showFirstTopicAd: settings.showFirstTopicAd === 'on',
+            placeholderIds: settings.placeholderIds || '',
+            intervalPosts: settings.intervalPosts || 10,
+            enableMessageAds: settings.enableMessageAds === 'on',
+            showFirstMessageAd: settings.showFirstMessageAd === 'on',
+            messagePlaceholderIds: settings.messagePlaceholderIds || '',
+            messageIntervalPosts: settings.messageIntervalPosts || 10,
+        });
     });
-  });
 };
 
 plugin.addAdminNavigation = async (header) => {
-  header.plugins.push({
-    route: '/plugins/ezoic-infinite',
-    icon: 'fa-ad',
-    name: 'Ezoic Infinite'
-  });
-  return header;
+    header.plugins.push({ route: '/plugins/ezoic-infinite', icon: 'fa-ad', name: 'Ezoic Infinite' });
+    return header;
 };
 
 module.exports = plugin;

package/package.json

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

package/public/client.js

@@ -1,7 +1,6 @@
 (function () {
     'use strict';
 
-    // Singleton pour éviter les conflits lors de la navigation AJAX de NodeBB
     if (window.ezInfiniteInjected) return;
     window.ezInfiniteInjected = true;
 
@@ -10,21 +9,7 @@
     
     let config = null;
     let isInternalChange = false;
-    let ezEnabledInternally = false;
-
-    // Détection du sens du scroll pour le nettoyage (Pillup prevention)
-    let lastScrollY = window.scrollY;
-    let scrollDir = 1; 
-    window.addEventListener('scroll', () => {
-        const y = window.scrollY;
-        scrollDir = y > lastScrollY ? 1 : -1;
-        lastScrollY = y;
-    }, { passive: true });
-
-    function withInternalDomChange(fn) {
-        isInternalChange = true;
-        try { fn(); } finally { isInternalChange = false; }
-    }
+    let ezEnabled = false;
 
     function getPool() {
         let p = document.getElementById(POOL_ID);
@@ -37,115 +22,40 @@
         return p;
     }
 
-    function releaseWrapNode(wrap) {
-        if (!wrap || !wrap.parentNode) return;
-        const pool = getPool();
-        wrap.classList.remove('ez-orphan-hidden');
-        if (wrap.parentNode !== pool) {
-            pool.appendChild(wrap);
-        }
-    }
-
-    // ANTI-PILLUP : Supprime les pubs si elles se touchent
-    function decluster(container) {
-        const wraps = Array.from(container.querySelectorAll(`.${WRAP_CLASS}`));
-        wraps.forEach(wrap => {
-            let next = wrap.nextElementSibling;
-            // Si l'élément suivant est une autre pub, on la remet au pool
-            if (next && next.classList.contains(WRAP_CLASS)) {
-                withInternalDomChange(() => releaseWrapNode(next));
-            }
-        });
-    }
-
-    // Nettoyage des orphelins (Virtualisation NodeBB)
-    function pruneOrphanWraps() {
-        const wraps = document.querySelectorAll(`.${WRAP_CLASS}`);
-        const items = document.querySelectorAll('[component="category/topic"], [component="post"]');
-        const itemSet = new Set(items);
-
-        wraps.forEach(wrap => {
-            if (wrap.parentElement && wrap.parentElement.id === POOL_ID) return;
-            
-            let hasNeighbor = false;
-            let p = wrap.previousElementSibling;
-            // On vérifie sur 2 voisins pour être sûr
-            for (let i = 0; i < 2 && p; i++) {
-                if (itemSet.has(p)) { hasNeighbor = true; break; }
-                p = p.previousElementSibling;
-            }
-            if (!hasNeighbor) {
-                let n = wrap.nextElementSibling;
-                for (let i = 0; i < 2 && n; i++) {
-                    if (itemSet.has(n)) { hasNeighbor = true; break; }
-                    n = n.nextElementSibling;
-                }
-            }
-
-            if (!hasNeighbor) {
-                // En remontée (Up), on recycle immédiatement pour éviter l'empilement
-                if (scrollDir === -1) {
-                    withInternalDomChange(() => releaseWrapNode(wrap));
-                } else {
-                    wrap.classList.add('ez-orphan-hidden');
-                }
-            } else {
-                wrap.classList.remove('ez-orphan-hidden');
-            }
-        });
-    }
-
-    // Appel à la bibliothèque Ezoic déjà initialisée
-    function callEzoicRefresh(placeholderId) {
+    function callEzoic(pid) {
         if (typeof window.ezstandalone === 'undefined') return;
-        const pid = parseInt(placeholderId, 10);
-        
+        const id = parseInt(pid, 10);
         try {
-            // On définit l'ID
-            window.ezstandalone.define(pid);
-            
-            // Si c'est le tout premier, on tente un display
-            if (!ezEnabledInternally) {
+            window.ezstandalone.define(id);
+            if (!ezEnabled) {
                 window.ezstandalone.enable();
                 window.ezstandalone.display();
-                ezEnabledInternally = true;
+                ezEnabled = true;
             } else {
-                // Sinon on rafraîchit (avec un petit délai pour le rendu DOM)
-                setTimeout(() => {
-                    const el = document.getElementById('ezoic-pub-ad-placeholder-' + pid);
-                    if (el && el.offsetParent !== null) {
-                        window.ezstandalone.refresh();
-                    }
-                }, 250);
+                // Délai pour s'assurer que le div est bien rendu par le navigateur
+                setTimeout(() => { window.ezstandalone.refresh(); }, 200);
             }
-        } catch (e) {
-            console.warn('[Ezoic-Infinite] Refresh skip:', e.message);
-        }
+        } catch (e) { console.warn('[Ezoic] Error:', e); }
     }
 
-    function redistribute(container) {
-        if (!container || !config || config.excluded) return;
-        
-        pruneOrphanWraps();
-        decluster(container);
+    function redistribute() {
+        if (!config || config.excluded) return;
 
-        const isTopicList = container.getAttribute('component') === 'category' || container.classList.contains('topic-list');
-        const isPostList = container.getAttribute('component') === 'topic' || container.querySelectorAll('[component="post"]').length > 0;
+        // Sélecteurs spécifiques à NodeBB 4.x / Harmony
+        const topicItems = document.querySelectorAll('[component="category/topic"]');
+        const postItems = document.querySelectorAll('[component="post"]');
 
-        let interval = 10;
-        let kind = '';
-        let items = [];
-        let showFirst = false;
+        let items = [], kind = '', interval = 10, showFirst = false;
 
-        if (isTopicList && config.enableBetweenAds) {
-            interval = parseInt(config.intervalPosts, 10) || 10;
+        if (topicItems.length > 0 && config.enableBetweenAds) {
+            items = Array.from(topicItems);
             kind = 'between';
-            items = Array.from(container.querySelectorAll('[component="category/topic"]'));
+            interval = parseInt(config.intervalPosts, 10);
             showFirst = config.showFirstTopicAd;
-        } else if (isPostList && config.enableMessageAds) {
-            interval = parseInt(config.messageIntervalPosts, 10) || 10;
+        } else if (postItems.length > 0 && config.enableMessageAds) {
+            items = Array.from(postItems);
             kind = 'message';
-            items = Array.from(container.querySelectorAll('[component="post"]'));
+            interval = parseInt(config.messageIntervalPosts, 10);
             showFirst = config.showFirstMessageAd;
         }
 
@@ -153,32 +63,22 @@
 
         items.forEach((item, index) => {
             const pos = index + 1;
-            let shouldHaveAd = (pos % interval === 0);
-            if (pos === 1 && showFirst) shouldHaveAd = true;
-
+            const shouldHaveAd = (pos === 1 && showFirst) || (pos % interval === 0);
+            
             const next = item.nextElementSibling;
             if (shouldHaveAd && !(next && next.classList.contains(WRAP_CLASS))) {
                 const pool = getPool();
                 const available = pool.querySelector(`.${WRAP_CLASS}[data-kind="${kind}"]`);
                 if (available) {
-                    withInternalDomChange(() => {
-                        item.parentNode.insertBefore(available, item.nextSibling);
-                        callEzoicRefresh(available.getAttribute('data-placeholder-id'));
-                    });
+                    isInternalChange = true;
+                    item.parentNode.insertBefore(available, item.nextSibling);
+                    callEzoic(available.getAttribute('data-placeholder-id'));
+                    setTimeout(() => { isInternalChange = false; }, 100);
                 }
             }
         });
     }
 
-    let timer = null;
-    function schedule() {
-        if (timer) clearTimeout(timer);
-        timer = setTimeout(() => {
-            const targets = document.querySelectorAll('[component="category"], .topic-list, [component="topic"], [component="category/topic/list"]');
-            targets.forEach(redistribute);
-        }, 300);
-    }
-
     function init() {
         fetch('/api/plugins/ezoic-infinite/config')
             .then(r => r.json())
@@ -201,14 +101,13 @@
                 setup(config.placeholderIds, 'between');
                 setup(config.messagePlaceholderIds, 'message');
                 
-                schedule();
-                
-                if (typeof MutationObserver !== 'undefined') {
-                    const mo = new MutationObserver(() => {
-                        if (!isInternalChange) schedule();
-                    });
-                    mo.observe(document.body, { childList: true, subtree: true });
-                }
+                redistribute();
+
+                // On surveille les changements de page et l'infinite scroll
+                const observer = new MutationObserver(() => {
+                    if (!isInternalChange) redistribute();
+                });
+                observer.observe(document.body, { childList: true, subtree: true });
             });
     }
 

package/public/style.css

@@ -1,37 +1,20 @@
-/* Container de base */
+/* Style du container injecté */
 .nodebb-ezoic-wrap {
-    display: block;
-    width: 100%;
-    margin: 30px auto !important;
-    padding: 0 !important;
+    display: block !important;
+    width: 100% !important;
+    margin: 30px 0 !important;
+    min-height: 100px; /* Force un espace pour qu'Ezoic puisse injecter */
     clear: both;
-    min-height: 100px; /* Important pour Ezoic */
 }
 
-/* ANTI-PILLUP RADICAL : Si deux pubs se suivent, on cache la 2ème immédiatement par CSS */
+/* ANTI-PILLUP : Interdit deux pubs consécutives */
 .nodebb-ezoic-wrap + .nodebb-ezoic-wrap {
     display: none !important;
-    height: 0 !important;
-    margin: 0 !important;
 }
 
-/* Cache les blocs orphelins (ceux qui ont perdu leurs posts voisins au scroll up) */
-.nodebb-ezoic-wrap.ez-orphan-hidden {
-    display: none !important;
-    height: 0 !important;
-    margin: 0 !important;
-    padding: 0 !important;
-}
-
-/* Évite les espaces blancs inutiles à l'intérieur */
-.nodebb-ezoic-wrap .ezoic-ad {
-    margin: 0 auto !important;
-    min-height: 1px !important;
-}
-
-/* Harmonisation NodeBB 4.x / Harmony */
-[component="category"] .nodebb-ezoic-wrap,
-.topic-list .nodebb-ezoic-wrap {
+/* Alignement Harmony */
+[component="category/topic"] + .nodebb-ezoic-wrap,
+[component="post"] + .nodebb-ezoic-wrap {
     border-top: 1px solid rgba(0,0,0,0.05);
-    padding-top: 10px !important;
+    padding: 15px 0;
 }

package/public/test.txt

@@ -1 +0,0 @@
-hi