nodebb-plugin-ezoic-infinite 1.6.80 → 1.6.82

package/library.js

@@ -8,12 +8,12 @@ const SETTINGS_KEY = 'ezoic-infinite';
 const plugin = {};
 
 async function getSettings() {
-  return await meta.settings.get(SETTINGS_KEY);
+  const settings = await meta.settings.get(SETTINGS_KEY);
+  return settings || {};
 }
 
 async function isUserExcluded(uid, excludedGroups) {
   if (!uid || !excludedGroups) return false;
-  // Gérer le format multiple de NodeBB
   const groupsList = Array.isArray(excludedGroups) ? excludedGroups : [excludedGroups];
   if (!groupsList.length) return false;
   return await groups.isMemberOfGroups(uid, groupsList);

package/package.json

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

package/public/client.js

@@ -1,229 +1,220 @@
 (function () {
-  'use strict';
+    'use strict';
 
-  let lastScrollY = 0;
-  let scrollDir = 1; 
-  try {
-    lastScrollY = window.scrollY || 0;
+    // Singleton pour éviter les conflits lors de la navigation AJAX de NodeBB
+    if (window.ezInfiniteInjected) return;
+    window.ezInfiniteInjected = true;
+
+    const WRAP_CLASS = 'nodebb-ezoic-wrap';
+    const POOL_ID = 'nodebb-ezoic-placeholder-pool';
+    
+    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 || 0;
-      const d = y - lastScrollY;
-      if (Math.abs(d) > 4) {
-        scrollDir = d > 0 ? 1 : -1;
+        const y = window.scrollY;
+        scrollDir = y > lastScrollY ? 1 : -1;
         lastScrollY = y;
-      }
     }, { passive: true });
-  } catch (e) {}
-
-  const WRAP_CLASS = 'nodebb-ezoic-wrap';
-  const POOL_ID = 'nodebb-ezoic-placeholder-pool';
-  const MAX_INSERTS_PER_RUN = 8;
-
-  let config = null;
-  let isInternalChange = false;
-  let ezEnabled = false; // Flag pour savoir si ezstandalone.enable() a été appelé
-
-  function withInternalDomChange(fn) {
-    isInternalChange = true;
-    try { fn(); } finally { isInternalChange = false; }
-  }
-
-  function getPool() {
-    let p = document.getElementById(POOL_ID);
-    if (!p) {
-      p = document.createElement('div');
-      p.id = POOL_ID;
-      p.style.display = 'none';
-      document.body.appendChild(p);
-    }
-    return p;
-  }
-
-  function releaseWrapNode(wrap) {
-    if (!wrap) return;
-    const pool = getPool();
-    wrap.classList.remove('ez-orphan-hidden');
-    if (wrap.parentNode !== pool) {
-      pool.appendChild(wrap);
+
+    function withInternalDomChange(fn) {
+        isInternalChange = true;
+        try { fn(); } finally { isInternalChange = false; }
     }
-  }
-
-  function decluster(container) {
-    const wraps = Array.from(container.querySelectorAll(`.${WRAP_CLASS}`));
-    wraps.forEach(wrap => {
-      let next = wrap.nextElementSibling;
-      if (next && next.classList.contains(WRAP_CLASS)) {
-        withInternalDomChange(() => releaseWrapNode(next));
-      }
-    });
-  }
-
-  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 prev = wrap.previousElementSibling;
-      for (let i = 0; i < 3 && prev; i++) {
-        if (itemSet.has(prev)) { hasNeighbor = true; break; }
-        prev = prev.previousElementSibling;
-      }
-      if (!hasNeighbor) {
-        let next = wrap.nextElementSibling;
-        for (let i = 0; i < 3 && next; i++) {
-          if (itemSet.has(next)) { hasNeighbor = true; break; }
-          next = next.nextElementSibling;
-        }
-      }
 
-      if (!hasNeighbor) {
-        if (scrollDir === -1) {
-          withInternalDomChange(() => releaseWrapNode(wrap));
-        } else {
-          wrap.classList.add('ez-orphan-hidden');
+    function getPool() {
+        let p = document.getElementById(POOL_ID);
+        if (!p) {
+            p = document.createElement('div');
+            p.id = POOL_ID;
+            p.style.display = 'none';
+            document.body.appendChild(p);
         }
-      } else {
-        wrap.classList.remove('ez-orphan-hidden');
-      }
-    });
-  }
+        return p;
+    }
 
-  function callEzoic(placeholderId) {
-    if (typeof window.ezstandalone === 'undefined') return;
-    
-    const pid = parseInt(placeholderId, 10);
-    try {
-      if (!ezEnabled) {
-        window.ezstandalone.define(pid);
-        window.ezstandalone.enable();
-        window.ezstandalone.display();
-        ezEnabled = true;
-      } else {
-        window.ezstandalone.define(pid);
-        // Utiliser une petite pause pour être sûr que le DOM est prêt
-        setTimeout(() => {
-          if (document.getElementById('ezoic-pub-ad-placeholder-' + pid)) {
-            window.ezstandalone.refresh();
-          }
-        }, 100);
-      }
-    } catch (e) {
-      console.warn('[Ezoic-Infinite] Error refreshing ad:', e);
+    function releaseWrapNode(wrap) {
+        if (!wrap || !wrap.parentNode) return;
+        const pool = getPool();
+        wrap.classList.remove('ez-orphan-hidden');
+        if (wrap.parentNode !== pool) {
+            pool.appendChild(wrap);
+        }
     }
-  }
 
-  function redistribute(container) {
-    if (!container || !config || config.excluded) return;
-    
-    pruneOrphanWraps();
-    decluster(container);
-
-    const isTopicList = container.getAttribute('component') === 'category' || container.classList.contains('topic-list');
-    const isPostList = container.getAttribute('component') === 'topic' || container.querySelectorAll('[component="post"]').length > 0;
-
-    let enabled = false;
-    let interval = 10;
-    let kind = '';
-    let items = [];
-    let showFirst = false;
-
-    if (isTopicList && config.enableBetweenAds) {
-      enabled = true;
-      interval = parseInt(config.intervalPosts, 10) || 10;
-      kind = 'between';
-      items = Array.from(container.querySelectorAll('[component="category/topic"]'));
-      showFirst = config.showFirstTopicAd;
-    } else if (isPostList && config.enableMessageAds) {
-      enabled = true;
-      interval = parseInt(config.messageIntervalPosts, 10) || 10;
-      kind = 'message';
-      items = Array.from(container.querySelectorAll('[component="post"]'));
-      showFirst = config.showFirstMessageAd;
+    // 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));
+            }
+        });
     }
 
-    if (!enabled || items.length === 0) return;
+    // 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;
+                }
+            }
 
-    let inserts = 0;
-    items.forEach((item, index) => {
-      if (inserts >= MAX_INSERTS_PER_RUN) return;
-      const pos = index + 1;
-      let shouldHaveAd = (pos % interval === 0);
-      if (pos === 1 && showFirst) shouldHaveAd = true;
+            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');
+            }
+        });
+    }
 
-      const next = item.nextElementSibling;
-      const hasAdAfter = next && next.classList.contains(WRAP_CLASS);
+    // Appel à la bibliothèque Ezoic déjà initialisée
+    function callEzoicRefresh(placeholderId) {
+        if (typeof window.ezstandalone === 'undefined') return;
+        const pid = parseInt(placeholderId, 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.enable();
+                window.ezstandalone.display();
+                ezEnabledInternally = 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);
+            }
+        } catch (e) {
+            console.warn('[Ezoic-Infinite] Refresh skip:', e.message);
+        }
+    }
 
-      if (shouldHaveAd && !hasAdAfter) {
-        const pool = getPool();
-        const available = pool.querySelector(`.${WRAP_CLASS}[data-kind="${kind}"]`);
-        if (available) {
-          withInternalDomChange(() => {
-            item.parentNode.insertBefore(available, item.nextSibling);
-            callEzoic(available.getAttribute('data-placeholder-id'));
-          });
-          inserts++;
+    function redistribute(container) {
+        if (!container || !config || config.excluded) return;
+        
+        pruneOrphanWraps();
+        decluster(container);
+
+        const isTopicList = container.getAttribute('component') === 'category' || container.classList.contains('topic-list');
+        const isPostList = container.getAttribute('component') === 'topic' || container.querySelectorAll('[component="post"]').length > 0;
+
+        let interval = 10;
+        let kind = '';
+        let items = [];
+        let showFirst = false;
+
+        if (isTopicList && config.enableBetweenAds) {
+            interval = parseInt(config.intervalPosts, 10) || 10;
+            kind = 'between';
+            items = Array.from(container.querySelectorAll('[component="category/topic"]'));
+            showFirst = config.showFirstTopicAd;
+        } else if (isPostList && config.enableMessageAds) {
+            interval = parseInt(config.messageIntervalPosts, 10) || 10;
+            kind = 'message';
+            items = Array.from(container.querySelectorAll('[component="post"]'));
+            showFirst = config.showFirstMessageAd;
         }
-      }
-    });
-  }
-
-  function fetchConfig(cb) {
-    fetch('/api/plugins/ezoic-infinite/config')
-      .then(r => r.json())
-      .then(data => {
-        config = data;
-        const pool = getPool();
-        const setupPool = (idsRaw, kind) => {
-          if (!idsRaw) return;
-          const ids = idsRaw.split(/[\s,]+/).filter(Boolean);
-          ids.forEach(id => {
-            if (!document.querySelector(`[data-placeholder-id="${id}"]`)) {
-              const d = document.createElement('div');
-              d.className = WRAP_CLASS + ' nodebb-ezoic-ad-' + kind;
-              d.setAttribute('data-kind', kind);
-              d.setAttribute('data-placeholder-id', id);
-              const inner = document.createElement('div');
-              inner.id = 'ezoic-pub-ad-placeholder-' + id;
-              inner.className = 'ezoic-ad';
-              d.appendChild(inner);
-              pool.appendChild(d);
+
+        if (items.length === 0) return;
+
+        items.forEach((item, index) => {
+            const pos = index + 1;
+            let shouldHaveAd = (pos % interval === 0);
+            if (pos === 1 && showFirst) shouldHaveAd = true;
+
+            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'));
+                    });
+                }
             }
-          });
-        };
-        setupPool(config.placeholderIds, 'between');
-        setupPool(config.messagePlaceholderIds, 'message');
-        cb();
-      });
-  }
-
-  let timer = null;
-  function schedule() {
-    if (timer) clearTimeout(timer);
-    timer = setTimeout(() => {
-      const lists = document.querySelectorAll('[component="category"], .topic-list, [component="topic"], [component="category/topic/list"]');
-      lists.forEach(redistribute);
-    }, 150); // Un peu plus de délai pour NodeBB 4.x
-  }
-
-  function init() {
-    fetchConfig(() => {
-      schedule();
-      if (typeof MutationObserver !== 'undefined') {
-        const mo = new MutationObserver((muts) => {
-          if (isInternalChange) return;
-          schedule();
         });
-        mo.observe(document.body, { childList: true, subtree: true });
-      }
-    });
-  }
-
-  if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', init);
-  } else {
-    init();
-  }
+    }
+
+    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())
+            .then(data => {
+                config = data;
+                const pool = getPool();
+                const setup = (raw, kind) => {
+                    if (!raw) return;
+                    raw.split(/[\s,]+/).filter(Boolean).forEach(id => {
+                        if (!document.querySelector(`[data-placeholder-id="${id}"]`)) {
+                            const d = document.createElement('div');
+                            d.className = WRAP_CLASS;
+                            d.setAttribute('data-kind', kind);
+                            d.setAttribute('data-placeholder-id', id);
+                            d.innerHTML = `<div id="ezoic-pub-ad-placeholder-${id}" class="ezoic-ad"></div>`;
+                            pool.appendChild(d);
+                        }
+                    });
+                };
+                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 });
+                }
+            });
+    }
+
+    if (document.readyState === 'loading') {
+        document.addEventListener('DOMContentLoaded', init);
+    } else {
+        init();
+    }
 })();

package/public/style.css

@@ -1,37 +1,37 @@
+/* Container de base */
 .nodebb-ezoic-wrap {
-  display: block;
-  width: 100%;
-  margin: 20px 0 !important;
-  padding: 0 !important;
-  clear: both;
-  overflow: visible;
-  min-height: 50px; /* Aide Ezoic à détecter l'élément */
+    display: block;
+    width: 100%;
+    margin: 30px auto !important;
+    padding: 0 !important;
+    clear: both;
+    min-height: 100px; /* Important pour Ezoic */
 }
 
-/* Cache les pubs orphelines proprement */
-.nodebb-ezoic-wrap.ez-orphan-hidden {
-  display: none !important;
-  height: 0 !important;
-  min-height: 0 !important;
-  margin: 0 !important;
-  padding: 0 !important;
+/* ANTI-PILLUP RADICAL : Si deux pubs se suivent, on cache la 2ème immédiatement par CSS */
+.nodebb-ezoic-wrap + .nodebb-ezoic-wrap {
+    display: none !important;
+    height: 0 !important;
+    margin: 0 !important;
 }
 
-/* Neutralisation du style interne Ezoic pour éviter les énormes espaces blancs */
-.nodebb-ezoic-wrap .ezoic-ad {
-  margin: 0 auto !important;
-  padding: 0 !important;
-  min-height: 1px !important;
-  height: auto !important;
-  line-height: normal !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;
 }
 
-/* Enlève les marges doubles si plusieurs pubs se suivent malgré le script */
-.nodebb-ezoic-wrap + .nodebb-ezoic-wrap {
-  margin-top: 0 !important;
+/* Évite les espaces blancs inutiles à l'intérieur */
+.nodebb-ezoic-wrap .ezoic-ad {
+    margin: 0 auto !important;
+    min-height: 1px !important;
 }
 
-/* Assurer la visibilité pour l'IntersectionObserver d'Ezoic */
-.ezoic-ad iframe {
-  max-width: 100%;
+/* Harmonisation NodeBB 4.x / Harmony */
+[component="category"] .nodebb-ezoic-wrap,
+.topic-list .nodebb-ezoic-wrap {
+    border-top: 1px solid rgba(0,0,0,0.05);
+    padding-top: 10px !important;
 }