nodebb-plugin-ezoic-infinite 1.4.92 → 1.4.94

package/package.json

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

package/public/{public/client.js → client.js}

@@ -8,7 +8,6 @@
   }, WRAP_CLASS = 'ezoic-ad';
   const PLACEHOLDER_PREFIX = 'ezoic-pub-ad-placeholder-', MAX_INSERTS_PER_RUN = 3;
 
-  // Nécessaire pour savoir si on doit appeler destroyPlaceholders avant recyclage.
   const sessionDefinedIds = new Set();
 
   const insertingIds = new Set(), state = {
@@ -106,9 +105,7 @@
 
   function destroyPlaceholderIds(ids) {
   if (!ids || !ids.length) return;
-  // Only destroy ids that were actually "defined" (filled at least once) to avoid Ezoic warnings.
   const filtered = ids.filter((id) => {
-  // Utiliser sessionDefinedIds (survit aux navigations) plutôt que state.definedIds
   try { return sessionDefinedIds.has(id); } catch (e) { return true; }
   });
   if (!filtered.length) return;
@@ -119,6 +116,11 @@
   window.ezstandalone.destroyPlaceholders(filtered);
   }
   } catch (e) {}
+
+  // Recyclage: libérer IDs après 100ms
+  setTimeout(() => {
+  filtered.forEach(id => sessionDefinedIds.delete(id));
+  }, 100);
   };
   try {
   window.ezstandalone = window.ezstandalone || {};
@@ -126,10 +128,50 @@
   if (window.ezstandalone && typeof window.ezstandalone.destroyPlaceholders === 'function') call();
   else window.ezstandalone.cmd.push(call);
   } catch (e) {}
+
+  // Recyclage: libérer IDs après 100ms
+  setTimeout(() => {
+  filtered.forEach(id => sessionDefinedIds.delete(id));
+  }, 100);
   }
 
+  // Nettoyer éléments Ezoic invisibles qui créent espace vertical
+  function cleanupInvisibleEzoicElements() {
+  try {
+  document.querySelectorAll('.ezoic-ad').forEach(wrapper => {
+  const ph = wrapper.querySelector('[id^="ezoic-pub-ad-placeholder-"]');
+  if (!ph) return;
+  
+  // Supprimer TOUS les éléments après le placeholder rempli
+  // qui créent de l'espace vertical
+  let found = false;
+  Array.from(wrapper.children).forEach(child => {
+  if (child === ph || child.contains(ph)) {
+  found = true;
+  return;
+  }
+  
+  // Si élément APRÈS le placeholder
+  if (found) {
+  const rect = child.getBoundingClientRect();
+  const computed = window.getComputedStyle(child);
   
-  // Nettoyer les wrappers vides (sans pub) pour éviter espaces verticaux
+  // Supprimer si:
+  // 1. Height > 0 mais pas de texte/image visible
+  // 2. Ou opacity: 0
+  // 3. Ou visibility: hidden
+  const hasContent = child.textContent.trim().length > 0 || 
+                    child.querySelector('img, iframe, video');
+  
+  if (!hasContent || computed.opacity === '0' || computed.visibility === 'hidden') {
+  child.remove();
+  }
+  }
+  });
+  });
+  } catch (e) {}
+  }
+
   function cleanupEmptyWrappers() {
   try {
   document.querySelectorAll('.ezoic-ad').forEach(wrapper => {
@@ -140,7 +182,7 @@
   if (ph.children.length === 0) {
   wrapper.remove();
   }
-  }, 3000);
+  }, 1500);
   }
   });
   } catch (e) {}
@@ -217,10 +259,8 @@
   if (findWrap(kindClass, afterPos)) return null;
 
   // CRITICAL: Double-lock pour éviter race conditions sur les doublons
-  // 1. Vérifier qu'aucun autre thread n'est en train d'insérer cet ID
   if (insertingIds.has(id)) return null;
 
-  // 2. Vérifier qu'aucun placeholder avec cet ID n'existe déjà dans le DOM
   const existingPh = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
   if (existingPh && existingPh.isConnected) return null;
 
@@ -233,7 +273,6 @@
   attachFillObserver(wrap, id);
   return wrap;
   } finally {
-  // Libérer le lock après 100ms (le temps que le DOM soit stable)
   setTimeout(() => insertingIds.delete(id), 50);
   }
   }
@@ -244,8 +283,6 @@
   }
 
   function patchShowAds() {
-  // Minimal safety net: batch showAds can be triggered by other scripts; split into individual calls.
-  // Also ensures the patch is applied even if Ezoic loads after our script.
   const applyPatch = () => {
   try {
   window.ezstandalone = window.ezstandalone || {}, ez = window.ezstandalone;
@@ -272,7 +309,6 @@
   };
 
   applyPatch();
-  // Si Ezoic n'est pas encore chargé, appliquer le patch via sa cmd queue
   if (!window.__nodebbEzoicPatched) {
   try {
   window.ezstandalone = window.ezstandalone || {};
@@ -285,7 +321,6 @@
   function markFilled(wrap) {
   try {
   if (!wrap) return;
-  // Disconnect the fill observer first (no need to remove+re-add the attribute)
   if (wrap.__ezoicFillObs) { wrap.__ezoicFillObs.disconnect(); wrap.__ezoicFillObs = null; }
   wrap.setAttribute('data-ezoic-filled', '1');
   } catch (e) {}
@@ -301,19 +336,18 @@
   if (!ph) return;
   // Already filled?
   if (ph.childNodes && ph.childNodes.length > 0) {
-  markFilled(wrap);
-  state.definedIds && state.definedIds.add(id); sessionDefinedIds.add(id);
+  markFilled(wrap); // Afficher wrapper
+  sessionDefinedIds.add(id);
   return;
   }
   const obs = new MutationObserver(() => {
   if (ph.childNodes && ph.childNodes.length > 0) {
-  markFilled(wrap);
-  try { state.definedIds && state.definedIds.add(id); sessionDefinedIds.add(id); } catch (e) {}
+  markFilled(wrap); // CRITIQUE: Afficher wrapper maintenant
+  try { sessionDefinedIds.add(id); } catch (e) {}
   try { obs.disconnect(); } catch (e) {}
   }
   });
   obs.observe(ph, { childList: true, subtree: true });
-  // Keep a weak reference on the wrapper so we can disconnect on recycle/remove
   wrap.__ezoicFillObs = obs;
   } catch (e) {}
   }
@@ -333,15 +367,12 @@
   return filled;
   }
 
-  // Appeler showAds() en batch selon recommandations Ezoic
-  // Au lieu de showAds(id1), showAds(id2)... faire showAds(id1, id2, id3...)
   let batchShowAdsTimer = null;
   const pendingShowAdsIds = new Set();
 
   function scheduleShowAdsBatch(id) {
   if (!id) return;
 
-  // CRITIQUE: Si cet ID a déjà été défini (sessionDefinedIds), le détruire d'abord
   if (sessionDefinedIds.has(id)) {
   try {
   destroyPlaceholderIds([id]);
@@ -356,7 +387,6 @@
   // Ajouter à la batch
   pendingShowAdsIds.add(id);
 
-  // Debounce: attendre 100ms pour collecter tous les IDs
   clearTimeout(batchShowAdsTimer);
   batchShowAdsTimer = setTimeout(() => {
   if (pendingShowAdsIds.size === 0) return;
@@ -380,6 +410,11 @@
   }
   });
   } catch (e) {}
+  
+  // CRITIQUE: Nettoyer éléments invisibles APRÈS que pubs soient chargées
+  setTimeout(() => {
+  cleanupInvisibleEzoicElements();
+  }, 800); // 1.5s pour laisser Ezoic charger
   }, 100);
   }
 
@@ -406,19 +441,15 @@
   const startPageKey = state.pageKey;
   let attempts = 0;
   (function waitForPh() {
-  // Abort if the user navigated away since this showAds was scheduled
   if (state.pageKey !== startPageKey) return;
-  // Abort if another concurrent call is already handling this id
   if (state.pendingById.has(id)) return;
 
   attempts += 1;
   const el = document.getElementById(phId);
   if (el && el.isConnected) {
-  // CRITIQUE: Vérifier que le placeholder est VISIBLE
 
   // Si on arrive ici, soit visible, soit timeout
 
-  // Si doCall() réussit, Ezoic est chargé et showAds a été appelé → sortir
   if (doCall()) {
   state.pendingById.delete(id);
   return;
@@ -484,7 +515,6 @@
   const el = items[afterPos - 1];
   if (!el || !el.isConnected) continue;
 
-  // Prevent adjacent ads (DOM-based, robust against virtualization)
   if (isAdjacentAd(el) || isPrevAd(el)) {
   continue;
   }
@@ -501,17 +531,14 @@
 
   let wrap = null;
   if (pick.recycled && pick.recycled.wrap) {
-  // Only destroy if Ezoic has actually defined this placeholder before
   if (sessionDefinedIds.has(id)) {
   destroyPlaceholderIds([id]);
   }
-  // Remove the old wrapper entirely, then create a fresh wrapper at the new position (same id)
   const oldWrap = pick.recycled.wrap;
   try { if (oldWrap && oldWrap.__ezoicFillObs) { oldWrap.__ezoicFillObs.disconnect(); } } catch (e) {}
   try { oldWrap && oldWrap.remove(); } catch (e) {}
   wrap = insertAfter(el, id, kindClass, afterPos);
   if (!wrap) continue;
-  // Attendre que le wrapper soit dans le DOM puis appeler showAds
   setTimeout(() => {
   callShowAdsWhenReady(id);
   }, 50);
@@ -525,12 +552,10 @@
   }
 
   liveArr.push({ id, wrap });
-  // If adjacency ended up happening (e.g. DOM shifts), rollback this placement.
   if (wrap && (
   (wrap.previousElementSibling && wrap.previousElementSibling.classList && wrap.previousElementSibling.classList.contains(WRAP_CLASS)) || (wrap.nextElementSibling && wrap.nextElementSibling.classList && wrap.nextElementSibling.classList.contains(WRAP_CLASS))
   )) {
   try { wrap.remove(); } catch (e) {}
-  // Put id back if it was newly consumed (not recycled)
   if (!(pick.recycled && pick.recycled.wrap)) {
   try { kindPool.unshift(id); } catch (e) {}
   usedSet.delete(id);
@@ -547,7 +572,6 @@
   for (let i = 0; i < ads.length; i++) {
   const ad = ads[i], prev = ad.previousElementSibling;
   if (prev && prev.classList && prev.classList.contains(WRAP_CLASS)) {
-  // Supprimer le wrapper adjacent au lieu de le cacher
   try {
   const ph = ad.querySelector && ad.querySelector(`[id^="${PLACEHOLDER_PREFIX}"]`);
   if (ph) {
@@ -568,8 +592,6 @@
   function cleanup() {
   destroyUsedPlaceholders();
 
-  // CRITIQUE: Supprimer TOUS les wrappers .ezoic-ad du DOM
-  // Sinon ils restent et deviennent "unused" sur la nouvelle page
   document.querySelectorAll('.ezoic-ad').forEach(el => {
   try { el.remove(); } catch (e) {}
   });
@@ -585,23 +607,14 @@
   state.usedPosts.clear();
   state.usedCategories.clear();
   state.lastShowById.clear();
-  // CRITIQUE: Vider pendingById pour annuler tous les showAds en cours
-  // Sinon Ezoic essaie d'accéder aux placeholders pendant que NodeBB vide le DOM
   state.pendingById.clear();
   state.definedIds.clear();
 
-  // NE PAS supprimer les wrappers Ezoic ici - ils seront supprimés naturellement
-  // quand NodeBB vide le DOM lors de la navigation ajaxify
-  // Les supprimer manuellement cause des problèmes avec l'état interne d'Ezoic
-
-  // CRITIQUE: Annuler TOUS les timeouts en cours pour éviter que les anciens
-  // showAds() continuent à s'exécuter après la navigation
   state.activeTimeouts.forEach(id => {
   try { clearTimeout(id); } catch (e) {}
   });
   state.activeTimeouts.clear();
 
-  // Vider aussi pendingById pour annuler les showAds en attente
   state.pendingById.clear();
 
   if (state.obs) { state.obs.disconnect(); state.obs = null; }
@@ -618,7 +631,6 @@
   }
 
   async function runCore() {
-  // Attendre que canInsert soit true (protection race condition navigation)
   if (!state.canShowAds) {
   return;
   }
@@ -661,7 +673,6 @@
 
   enforceNoAdjacentAds();
 
-  // If nothing inserted and list isn't in DOM yet (first click), retry a bit
   let count = 0;
   if (kind === 'topic') count = getPostContainers().length;
   else if (kind === 'categoryTopics') count = getTopicItems().length;
@@ -673,12 +684,9 @@
   }
 
   if (inserted >= MAX_INSERTS_PER_RUN) {
-  // Plus d'insertions possibles ce cycle, continuer immédiatement
   setTimeout(arguments[0], 50);
   } else if (inserted === 0 && count > 0) {
   // Pool épuisé ou recyclage pas encore disponible.
-  // Réessayer jusqu'à 8 fois (toutes les 400ms) pour laisser aux anciens wrappers
-  // le temps de défiler hors écran et devenir recyclables.
   if (state.poolWaitAttempts < 8) {
   state.poolWaitAttempts += 1;
   setTimeout(arguments[0], 50);
@@ -712,15 +720,11 @@
   state.pageKey = getPageKey();
   ensureObserver();
 
-  // CRITIQUE: Attendre 300ms avant de permettre l'insertion de nouveaux placeholders
-  // pour laisser les anciens showAds() (en cours) se terminer ou échouer proprement
-  // Sinon race condition: NodeBB vide le DOM pendant que Ezoic essaie d'accéder aux placeholders
   state.canShowAds = true;
   });
 
   $(window).on('action:category.loaded.ezoicInfinite', () => {
   ensureObserver();
-  // category.loaded = infinite scroll, Ezoic déjà chargé normalement
   waitForContentThenRun();
   });
   $(window).on('action:topics.loaded.ezoicInfinite', () => {
@@ -750,7 +754,6 @@
   window.requestAnimationFrame(() => {
   ticking = false;
   enforceNoAdjacentAds();
-  // Debounce scheduleRun - une fois toutes les 2 secondes max au scroll
   const now = Date.now();
   if (!state.lastScrollRun || now - state.lastScrollRun > 2000) {
   state.lastScrollRun = now;
@@ -760,7 +763,6 @@
   }, { passive: true });
   }
 
-  // Fonction qui attend que la page ait assez de contenu avant d'insérer les pubs
   function waitForContentThenRun() {
   const MIN_WORDS = 250;
   let attempts = 0;
@@ -791,7 +793,6 @@
   })();
   }
 
-  // Fonction qui attend que Ezoic soit vraiment chargé
   function waitForEzoicThenRun() {
   let attempts = 0;
   const maxAttempts = 50; // 50 × 200ms = 10s max

package/public/style.css

@@ -0,0 +1,10 @@
+.ezoic-ad {
+  height: auto !important;
+  padding: 0 !important;
+  margin: 0 !important;
+}
+
+.ezoic-ad * {
+  margin: 0 !important;
+  padding: 0 !important;
+}

package/public/README.md

@@ -1,15 +0,0 @@
-# NodeBB Plugin – Ezoic Infinite (Production)
-
-This plugin injects Ezoic placeholders between topics and posts on NodeBB 4.x,
-with full support for infinite scroll.
-
-## Key guarantees
-- No duplicate ads back-to-back
-- One showAds call per placeholder
-- Fast reveal (MutationObserver on first child)
-- Safe with ajaxify navigation
-- Works with NodeBB 4.x + Harmony
-
-## Notes
-- Placeholders must exist and be selected in Ezoic
-- Use separate ID pools for topics vs messages

package/public/library.js

@@ -1,130 +0,0 @@
-'use strict';
-
-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
-
-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));
-}
-
-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,
-    });
-  }
-
-  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;

package/public/package.json

@@ -1,21 +0,0 @@
-{
-  "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.4.8",
-  "description": "Production-ready Ezoic infinite ads integration for NodeBB 4.x",
-  "main": "library.js",
-  "license": "MIT",
-  "keywords": [
-    "nodebb",
-    "nodebb-plugin",
-    "ezoic",
-    "ads",
-    "infinite-scroll"
-  ],
-  "engines": {
-    "nodebb": ">=4.0.0"
-  },
-  "nbbpm": {
-    "compatibility": "^4.0.0"
-  },
-  "private": false
-}

package/public/plugin.json

@@ -1,33 +0,0 @@
-{
-  "id": "nodebb-plugin-ezoic-infinite",
-  "name": "NodeBB Ezoic Infinite Ads",
-  "description": "Ezoic ads with infinite scroll using a pool of placeholder IDs",
-  "library": "./library.js",
-  "hooks": [
-    {
-      "hook": "static:app.load",
-      "method": "init"
-    },
-    {
-      "hook": "filter:admin.header.build",
-      "method": "addAdminNavigation"
-    },
-    {
-      "hook": "action:settings.set",
-      "method": "onSettingsSet"
-    }
-  ],
-  "staticDirs": {
-    "public": "public"
-  },
-  "acpScripts": [
-    "public/admin.js"
-  ],
-  "scripts": [
-    "public/client.js"
-  ],
-  "templates": "public/templates",
-  "css": [
-    "public/style.css"
-  ]
-}

package/public/public/style.css

@@ -1,3 +0,0 @@
-.ezoic-ad{height:auto !important; padding:0 !important; margin: 0.25rem 0;}
-.ezoic-ad .ezoic-ad-inner{padding:0;margin:0;}
-.ezoic-ad .ezoic-ad-inner > div{padding:0;margin:0;}