nodebb-plugin-ezoic-infinite 1.6.91 → 1.6.92

package/package.json

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

package/public/client.js

@@ -9,8 +9,9 @@
   
   let config = null;
   let isInternalChange = false;
+  let activeIdsOnPage = new Set();
   let pendingIds = new Set();
-  let refreshTimer = null;
+  let triggerTimer = null;
 
   function getPool() {
     let p = document.getElementById(POOL_ID);
@@ -30,16 +31,21 @@
       const idsToProcess = Array.from(pendingIds);
       pendingIds.clear();
 
-      // On enregistre les IDs
+      // 1. Définir les IDs (requis par Ezoic avant l'affichage)
       window.ezstandalone.define(idsToProcess);
 
-      // On appelle UNIQUEMENT refresh. 
-      // Si Ezoic n'est pas "enabled", il ignorera l'appel sans erreur bloquante.
-      try {
-          window.ezstandalone.refresh();
-      } catch (e) {
-          console.debug('[Ezoic] Refresh deferred');
+      if (!window.ezstandalone.enabled) {
+        // PREMIER CHARGEMENT
+        window.ezstandalone.enable();
+        window.ezstandalone.showAds(); // Appelle tout ce qui est présent
+      } else {
+        // NOUVEAU CONTENU (INFINITE SCROLL)
+        // La doc dit : ezstandalone.showAds(104, 105);
+        window.ezstandalone.showAds.apply(null, idsToProcess);
       }
+      
+      // On garde trace pour le nettoyage futur
+      idsToProcess.forEach(id => activeIdsOnPage.add(id));
     });
   }
 
@@ -47,29 +53,42 @@
     const pid = parseInt(id, 10);
     if (isNaN(pid)) return;
     pendingIds.add(pid);
+    
+    // On attend un peu pour grouper si plusieurs pubs arrivent en même temps
+    clearTimeout(triggerTimer);
+    triggerTimer = setTimeout(triggerEzoic, 200);
+  }
 
-    clearTimeout(refreshTimer);
-    refreshTimer = setTimeout(triggerEzoic, 300);
+  // "Changing Pages" : Nettoyage complet lors de la navigation NodeBB
+  function onPageChangeStart() {
+    if (typeof window.ezstandalone !== 'undefined') {
+      window.ezstandalone.cmd.push(function() {
+        // On nettoie tout avant de charger la nouvelle page
+        if (typeof window.ezstandalone.destroyAll === 'function') {
+          window.ezstandalone.destroyAll();
+        }
+        activeIdsOnPage.clear();
+      });
+    }
   }
 
   function redistribute() {
     if (!config || config.excluded) return;
 
-    // 1. Accueil (Catégories)
-    const categoryItems = document.querySelectorAll('.category-item, [component="categories/category"]');
-    // 2. Liste Topics
-    const topicItems = document.querySelectorAll('li[component="category/topic"]');
-    // 3. Messages
-    const postItems = document.querySelectorAll('[component="post"]');
+    const selectors = {
+      'home': '.category-item, [component="categories/category"]',
+      'topic-list': 'li[component="category/topic"]',
+      'message': '[component="post"]'
+    };
 
-    if (categoryItems.length > 0 && config.enableCategoryAds) {
-      process(Array.from(categoryItems), 'home', config.intervalCategories, config.showFirstCategoryAd);
+    if (config.enableCategoryAds) {
+      process(Array.from(document.querySelectorAll(selectors.home)), 'home', config.intervalCategories, config.showFirstCategoryAd);
     }
-    if (topicItems.length > 0 && config.enableBetweenAds) {
-      process(Array.from(topicItems), 'topic-list', config.intervalPosts, config.showFirstTopicAd);
+    if (config.enableBetweenAds) {
+      process(Array.from(document.querySelectorAll(selectors['topic-list'])), 'topic-list', config.intervalPosts, config.showFirstTopicAd);
     }
-    if (postItems.length > 0 && config.enableMessageAds) {
-      process(Array.from(postItems), 'message', config.messageIntervalPosts, config.showFirstMessageAd);
+    if (config.enableMessageAds) {
+      process(Array.from(document.querySelectorAll(selectors.message)), 'message', config.messageIntervalPosts, config.showFirstMessageAd);
     }
   }
 
@@ -79,14 +98,16 @@
       const pos = index + 1;
       const shouldHaveAd = (pos === 1 && showFirst) || (pos % int === 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) {
           isInternalChange = true;
           item.parentNode.insertBefore(available, item.nextSibling);
           callEzoic(available.getAttribute('data-placeholder-id'));
-          setTimeout(() => { isInternalChange = false; }, 100);
+          setTimeout(() => { isInternalChange = false; }, 50);
         }
       }
     });
@@ -101,17 +122,20 @@
         const setup = (raw, kind) => {
           if (!raw) return;
           raw.split(/[\s,]+/).filter(Boolean).forEach(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}"></div>`;
-            pool.appendChild(d);
+            if (!pool.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}"></div>`;
+              pool.appendChild(d);
+            }
           });
         };
         setup(config.categoryPlaceholderIds, 'home');
         setup(config.placeholderIds, 'topic-list');
         setup(config.messagePlaceholderIds, 'message');
+        
         redistribute();
 
         const observer = new MutationObserver(() => {
@@ -121,7 +145,11 @@
       });
   }
 
-  window.addEventListener('action:ajaxify.end', () => setTimeout(redistribute, 500));
+  // Événements NodeBB
+  window.addEventListener('action:ajaxify.start', onPageChangeStart);
+  window.addEventListener('action:ajaxify.end', () => {
+    setTimeout(redistribute, 500);
+  });
 
   if (document.readyState === 'loading') {
     document.addEventListener('DOMContentLoaded', init);