nodebb-plugin-ezoic-infinite 1.4.72 → 1.4.73

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

@@ -318,34 +318,33 @@
   }
   }
 
-  
-  function forcePlaceholderAutoHeight(wrap, id) {
+  function markFilled(wrap) {
   try {
-    if (!wrap || !id) return;
-    const ph = wrap.querySelector && wrap.querySelector(`#${PLACEHOLDER_PREFIX}${id}`);
-    if (!ph) return;
-    // Neutraliser les hauteurs réservées (inline ou CSS) qui créent un espace après la pub
-    ph.style.setProperty('height', 'auto', 'important');
-    ph.style.setProperty('min-height', '0px', 'important');
-    // Eviter le gap baseline sous les iframes/ins
-    wrap.querySelectorAll && wrap.querySelectorAll('iframe, ins').forEach(n => {
-      try { n.style.setProperty('display', 'block', 'important'); } catch (e) {}
-    });
-    requestAnimationFrame(() => {
-      try {
-        ph.style.setProperty('height', 'auto', 'important');
-        ph.style.setProperty('min-height', '0px', 'important');
-      } catch (e) {}
-    });
+  if (!wrap) return;
+  if (wrap.__ezoicFillObs) { wrap.__ezoicFillObs.disconnect(); wrap.__ezoicFillObs = null; }
+  wrap.setAttribute('data-ezoic-filled', '1');
   } catch (e) {}
   }
 
-function markFilled(wrap, id) {
+  function forcePlaceholderAutoHeight(wrap, id) {
   try {
-  if (!wrap) return;
-  if (wrap.__ezoicFillObs) { wrap.__ezoicFillObs.disconnect(); wrap.__ezoicFillObs = null; }
-  wrap.setAttribute('data-ezoic-filled', '1');
-  try { forcePlaceholderAutoHeight(wrap, id); } catch (e) {}
+  if (!wrap || !id) return;
+  const ph = wrap.querySelector && wrap.querySelector(`#${PLACEHOLDER_PREFIX}${id}`);
+  if (!ph) return;
+  // Override any reserved height/min-height injected by ad scripts
+  try {
+  ph.style.setProperty('height', 'auto', 'important');
+  ph.style.setProperty('min-height', '0px', 'important');
+  } catch (e) {}
+  // Some creatives adjust after a frame
+  try {
+  requestAnimationFrame(() => {
+  try {
+  ph.style.setProperty('height', 'auto', 'important');
+  ph.style.setProperty('min-height', '0px', 'important');
+  } catch (e) {}
+  });
+  } catch (e) {}
   } catch (e) {}
   }
 
@@ -359,13 +358,15 @@ function markFilled(wrap, id) {
   if (!ph) return;
   // Already filled?
   if (ph.childNodes && ph.childNodes.length > 0) {
-  markFilled(wrap, id); // Afficher wrapper
+  markFilled(wrap); // Afficher wrapper
+  forcePlaceholderAutoHeight(wrap, id);
   sessionDefinedIds.add(id);
   return;
   }
   const obs = new MutationObserver(() => {
   if (ph.childNodes && ph.childNodes.length > 0) {
-  markFilled(wrap, id); // CRITIQUE: Afficher wrapper maintenant
+  markFilled(wrap); // CRITIQUE: Afficher wrapper maintenant
+  forcePlaceholderAutoHeight(wrap, id);
   try { sessionDefinedIds.add(id); } catch (e) {}
   try { obs.disconnect(); } catch (e) {}
   }
@@ -385,7 +386,7 @@ function markFilled(wrap, id) {
   const filled = !!(ph.childNodes && ph.childNodes.length > 0);
   if (filled) {
   try { state.definedIds && state.definedIds.add(id); sessionDefinedIds.add(id); } catch (e) {}
-  try { markFilled(wrap, id); } catch (e) {}
+  try { markFilled(wrap); } catch (e) {}
   }
   return filled;
   }
@@ -414,18 +415,23 @@ function markFilled(wrap, id) {
   batchShowAdsTimer = setTimeout(() => {
   if (pendingShowAdsIds.size === 0) return;
 
-  const idsArray = Array.from(pendingShowAdsIds);
+  // Only keep IDs whose placeholders still exist at execution time
+  const idsArray = Array.from(pendingShowAdsIds).filter((id) => {
+  const el = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
+  return !!(el && el.isConnected);
+  });
   pendingShowAdsIds.clear();
 
+  if (!idsArray.length) return;
+
   // Appeler showAds avec TOUS les IDs en une fois
   try {
   window.ezstandalone = window.ezstandalone || {};
   window.ezstandalone.cmd = window.ezstandalone.cmd || [];
   window.ezstandalone.cmd.push(function() {
   if (typeof window.ezstandalone.showAds === 'function') {
-  // Appel batch: showAds(id1, id2, id3...)
-  const okIds = idsArray.filter(id => { const el = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`); return el && el.isConnected; });
-  if (okIds.length) { window.ezstandalone.showAds(...okIds); }
+  // Call as array (most compatible with ezstandalone)
+  window.ezstandalone.showAds(idsArray);
   // Tracker tous les IDs
   idsArray.forEach(id => {
   state.lastShowById.set(id, Date.now());
@@ -574,6 +580,18 @@ function markFilled(wrap, id) {
   // Appel immédiat au lieu de 10ms delay
   callShowAdsWhenReady(id);
   }
+
+  liveArr.push({ id, wrap });
+  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) {}
+  if (!(pick.recycled && pick.recycled.wrap)) {
+  try { kindPool.unshift(id); } catch (e) {}
+  usedSet.delete(id);
+  }
+  continue;
+  }
   inserted += 1;
   }
   return inserted;

package/package.json

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

package/style.css

@@ -0,0 +1,43 @@
+/*
+  NodeBB + Ezoic (standalone)
+  Goal: never reserve space until the ad is truly filled, and never keep a fixed/min height.
+*/
+
+/* Hide wrappers until we detect the placeholder has content (prevents empty gaps if CMP/ads are blocked) */
+.ezoic-ad {
+  display: none;
+  width: 100%;
+  height: auto !important;
+  min-height: 0 !important;
+  padding: 0 !important;
+  margin: 0 !important;
+}
+
+.ezoic-ad[data-ezoic-filled="1"] {
+  display: block;
+}
+
+/* The placeholder must not reserve space */
+.ezoic-ad > [id^="ezoic-pub-ad-placeholder-"] {
+  height: auto !important;
+  min-height: 0 !important;
+  margin: 0 !important;
+  padding: 0 !important;
+}
+
+/* Avoid baseline gap under iframes/ins */
+.ezoic-ad iframe,
+.ezoic-ad ins {
+  display: block !important;
+}
+
+/* Remove empty spacer divs that sometimes get injected */
+.ezoic-ad > div:empty {
+  display: none !important;
+}
+
+/* Keep internal margins/paddings from creating vertical gaps */
+.ezoic-ad * {
+  margin: 0 !important;
+  padding: 0 !important;
+}

package/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/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/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/style.css

@@ -1,31 +0,0 @@
-
-/* Wrapper: invisible tant que la pub n'est pas réellement insérée */
-.ezoic-ad{
-  display:none;
-  width:100%;
-  height:auto !important;
-  padding:0 !important;
-  margin:0 !important;
-}
-.ezoic-ad[data-ezoic-filled="1"]{
-  display:block;
-}
-
-/* Le placeholder ne doit jamais réserver une hauteur fixe */
-.ezoic-ad > [id^="ezoic-pub-ad-placeholder-"]{
-  height:auto !important;
-  min-height:0 !important;
-  margin:0 !important;
-  padding:0 !important;
-}
-
-/* Évite le gap baseline sous iframes/ins */
-.ezoic-ad iframe,
-.ezoic-ad ins{
-  display:block !important;
-}
-
-/* Supprimer les spacers vides */
-.ezoic-ad > div:empty{
-  display:none !important;
-}