nodebb-plugin-ezoic-infinite 1.6.58 → 1.6.59

package/package.json

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

package/public/client.js

@@ -2,153 +2,86 @@
   'use strict';
 
   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 scheduleTimer = null;
   let isEzoicEnabled = false;
+  let isRefreshing = false;
 
-  // --- SÉLECTEURS COMPATIBLES HARMONY ---
-  function getTopicList() {
-    return document.querySelector('[component="topic/list"], [component="category"], [component="categories"]');
-  }
-
-  function getPostList() {
-    return document.querySelector('[component="topic"], [component="post/list"]');
-  }
-
-  // --- GESTION DU SDK EZOIC (SÉCURISÉE) ---
-  function callEzoic(idsToDefine) {
-    if (!window.ezstandalone || !idsToDefine.length) return;
+  // --- LOGIQUE SDK EZOIC ---
+  function callEzoic(newIds) {
+    if (!window.ezstandalone || !newIds.length) return;
 
     try {
-      // 1. On définit les nouveaux placeholders
-      window.ezstandalone.define(idsToDefine);
+      window.ezstandalone.define(newIds);
 
-      // 2. On gère le cycle de vie (Correction de tes erreurs de log)
+      // Si c'est le TOUT PREMIER appel sur la page
       if (!isEzoicEnabled && !window.ezstandalone.enabled) {
         window.ezstandalone.enable();
         window.ezstandalone.display();
         isEzoicEnabled = true;
-      } else {
-        // Si déjà activé, on attend un cycle CPU pour refresh proprement
+      } 
+      // Sinon, on utilise refresh MAIS avec un verrou de sécurité
+      else if (isEzoicEnabled && !isRefreshing) {
+        isRefreshing = true;
         setTimeout(() => {
-          if (window.ezstandalone.enabled) {
-            window.ezstandalone.refresh();
-          }
-        }, 200);
+          window.ezstandalone.refresh();
+          isRefreshing = false;
+        }, 500); // Délai de 500ms pour laisser le SDK respirer
       }
-    } catch (e) {
-      console.warn('[Ezoic] SDK Error:', e);
-    }
+    } catch (e) { console.warn('[Ezoic] Error:', e); }
   }
 
-  function getNextId(poolStr) {
-    if (!poolStr) return null;
-    const ids = poolStr.split(/[\s,]+/).filter(Boolean);
-    for (const id of ids) {
-      const num = id.replace(/[^\d]/g, '');
-      if (num && !usedIds.has(num)) {
-        usedIds.add(num);
-        return num;
-      }
-    }
-    return null;
-  }
-
-  // --- LOGIQUE D'INJECTION ---
+  // --- INJECTION ---
   function inject() {
     if (!config || config.excluded) return;
-    const newIds = [];
-    const ul = getTopicList();
+    const ul = document.querySelector('[component="topic/list"], [component="category"]');
+    if (!ul) return;
 
-    // A. LISTE DES SUJETS
-    if (ul && config.enableBetweenAds) {
-      // Nettoyage des blocs vides qui pourraient traîner
-      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));
+    const newIdsFound = [];
+    const interval = parseInt(config.intervalPosts, 10) || 5;
 
-      const items = Array.from(ul.children).filter(c => c.tagName === 'LI' && !c.classList.contains(WRAP_CLASS));
-      
-      // Pub n°1 (Après le premier sujet)
-      if (config.showFirstTopicAd && !ul.querySelector(`[${PINNED_ATTR}="true"]`)) {
+    items.forEach((li, idx) => {
+      const pos = idx + 1;
+      if (pos % interval === 0 && !li.nextElementSibling?.classList.contains(WRAP_CLASS)) {
         const id = getNextId(config.placeholderIds);
         if (id) {
-          insertAd(items[0], id, true);
-          newIds.push(parseInt(id, 10));
+          const wrap = document.createElement('div');
+          wrap.className = WRAP_CLASS;
+          wrap.innerHTML = `<div id="${PLACEHOLDER_PREFIX}${id}"></div>`;
+          li.after(wrap);
+          newIdsFound.push(parseInt(id, 10));
         }
       }
+    });
 
-      // Intervalles
-      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));
-            }
-          }
-        }
-      });
+    if (newIdsFound.length > 0) {
+      callEzoic(newIdsFound);
     }
+  }
 
-    // B. LISTE DES MESSAGES (Sujets ouverts)
-    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')) {
-        const id = getNextId(config.messagePlaceholderIds);
-        if (id) {
-          insertAd(posts[0], id, false, 'ezoic-msg-first');
-          newIds.push(parseInt(id, 10));
-        }
+  function getNextId(pool) {
+    const ids = pool.split(/[\s,]+/).filter(Boolean);
+    for (const id of ids) {
+      const n = id.trim();
+      if (n && !usedIds.has(n)) {
+        usedIds.add(n);
+        return n;
       }
     }
-
-    if (newIds.length > 0) {
-      callEzoic(newIds);
-    }
-  }
-
-  function insertAd(target, id, isPinned, extraClass = '') {
-    if (!target) return;
-    const wrap = document.createElement('div');
-    wrap.className = `${WRAP_CLASS} ezoic-ad-between ${extraClass}`;
-    if (isPinned) wrap.setAttribute(PINNED_ATTR, 'true');
-    wrap.innerHTML = `<div id="${PLACEHOLDER_PREFIX}${id}"></div>`;
-    target.after(wrap);
+    return null;
   }
 
-  // --- INITIALISATION ---
   async function init() {
-    try {
-      const res = await fetch('/api/plugins/ezoic-infinite/config');
-      config = await res.json();
-      
-      inject();
+    const res = await fetch('/api/plugins/ezoic-infinite/config');
+    config = await res.json();
+    inject();
 
-      // MutationObserver pour détecter le scroll infini
-      const observer = new MutationObserver((mutations) => {
-        if (mutations.some(m => m.addedNodes.length > 0)) {
-          if (scheduleTimer) clearTimeout(scheduleTimer);
-          scheduleTimer = setTimeout(inject, 300);
-        }
-      });
-      observer.observe(document.body, { childList: true, subtree: true });
-
-      if (window.jQuery) {
-        window.jQuery(window).on('action:ajaxify.end action:infiniteScroll.loaded', () => {
-          setTimeout(inject, 500);
-        });
-      }
-    } catch (e) {}
+    // Ecoute du scroll infini NodeBB
+    $(window).on('action:infiniteScroll.loaded', () => setTimeout(inject, 100));
   }
 
-  if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', init);
-  else init();
+  $(document).ready(init);
 })();