nodebb-plugin-ezoic-infinite 0.9.0 → 0.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "Ezoic ads with infinite scroll using a pool of placeholder IDs",
   "main": "library.js",
   "license": "MIT",
@@ -13,8 +13,5 @@
   ],
   "engines": {
     "node": ">=18"
-  },
-  "nbbpm": {
-    "compatibility": "^4.0.0"
   }
 }

package/plugin.json

@@ -22,8 +22,5 @@
   "scripts": [
     "public/client.js"
   ],
-  "css": [
-    "public/style.css"
-  ],
   "templates": "public/templates"
 }

package/public/client.js

@@ -1,443 +1,252 @@
 'use strict';
-/* globals ajaxify */
 
+/* globals ajaxify */
 window.ezoicInfiniteLoaded = true;
 
-let cachedConfig = null;
+let cachedConfig;
 let lastFetch = 0;
+let debounceTimer;
+
 let inFlight = false;
 let rerunRequested = false;
-let debounceTimer = null;
 
+// Incremental state (prevents ads "jumping to the top")
 let pageKey = null;
+let injectedSlots = new Set(); // slotNumber per page
+let usedIds = new Set();       // ids currently injected per page
 
-// Separate state per "mode" so category and topic don't leak ids
-let usedBetween = new Set();
-let usedMessages = new Set();
-
-let seenBetweenAfter = new Set();   // category: after absolute topic position
-let fifoBetween = [];              // [{afterPos, id}]
-let seenMsgAfter = new Set();      // topic: after absolute post number
-let fifoMsg = [];                  // [{afterPostNo, id}]
-
-// Destroy spam guard
-window.__ezoicLastDestroy = window.__ezoicLastDestroy || {};
-window.__ezoicRecycling = false;
-
-// ---------- Config ----------
-async function fetchConfig() {
-  const now = Date.now();
-  if (cachedConfig && (now - lastFetch) < 5000) return cachedConfig;
-  lastFetch = now;
+function resetPageState() {
+  injectedSlots = new Set();
+  usedIds = new Set();
+}
 
+function currentPageKey() {
+  // Stable key per ajaxified page
   try {
-    const res = await fetch('/api/admin/settings/ezoic-infinite', { credentials: 'same-origin' });
-    const data = await res.json();
-    cachedConfig = {
-      excluded: !!data.excluded,
-      enableBetweenAds: data.enableBetweenAds !== false,
-      placeholderIds: String(data.placeholderIds || '').trim(),
-      intervalPosts: parseInt(data.intervalPosts, 10) || 6,
-
-      enableMessageAds: data.enableMessageAds !== false,
-      messagePlaceholderIds: String(data.messagePlaceholderIds || '').trim(),
-      messageIntervalPosts: parseInt(data.messageIntervalPosts, 10) || 3,
-    };
-    return cachedConfig;
-  } catch (e) {
-    return cachedConfig || {
-      excluded: false,
-      enableBetweenAds: true,
-      placeholderIds: '',
-      intervalPosts: 6,
-      enableMessageAds: true,
-      messagePlaceholderIds: '',
-      messageIntervalPosts: 3,
-    };
-  }
+    if (ajaxify && ajaxify.data) {
+      if (ajaxify.data.tid) return 'topic:' + ajaxify.data.tid;
+      if (ajaxify.data.cid) return 'category:' + ajaxify.data.cid;
+      if (ajaxify.data.template) return 'tpl:' + ajaxify.data.template + ':' + (ajaxify.data.url || window.location.pathname);
+    }
+  } catch (e) {}
+  return window.location.pathname;
+}
+
+function parsePool(raw) {
+  if (!raw) return [];
+  return Array.from(new Set(
+    String(raw).split(/[\n,;\s]+/)
+      .map(x => parseInt(x, 10))
+      .filter(n => Number.isFinite(n) && n > 0)
+  ));
 }
 
-function parsePool(text) {
-  return String(text || '')
-    .split(/\r?\n|,|;/g)
-    .map(s => s.trim())
-    .filter(Boolean)
-    .map(s => parseInt(s, 10))
-    .filter(n => Number.isFinite(n) && n > 0);
+async function fetchConfig() {
+  if (cachedConfig && Date.now() - lastFetch < 10000) return cachedConfig;
+  const res = await fetch('/api/plugins/ezoic-infinite/config', { credentials: 'same-origin' });
+  cachedConfig = await res.json();
+  lastFetch = Date.now();
+  return cachedConfig;
 }
 
-// ---------- Page detection ----------
 function isTopicPage() {
-  try {
-    if (ajaxify && ajaxify.data && ajaxify.data.tid) return true;
-  } catch (e) {}
-  return /^\/topic\//.test(window.location.pathname);
+  return $('[component="post/content"]').length > 0 || $('[component="post"][data-pid]').length > 0;
 }
 
 function isCategoryTopicListPage() {
-  return document.querySelectorAll('li[component="category/topic"]').length > 0;
+  return $('li[component="category/topic"]').length > 0;
 }
 
-function getPageKey() {
-  try {
-    if (ajaxify && ajaxify.data) {
-      if (ajaxify.data.tid) return `topic:${ajaxify.data.tid}`;
-      if (ajaxify.data.cid) return `category:${ajaxify.data.cid}`;
-    }
-  } catch (e) {}
-  return `path:${window.location.pathname}`;
-}
+function getTopicPosts() {
+  const $primary = $('[component="post"][data-pid]');
+  if ($primary.length) return $primary.not('.ezoic-ad-post');
 
-function resetState() {
-  usedBetween = new Set();
-  usedMessages = new Set();
-  seenBetweenAfter = new Set();
-  seenMsgAfter = new Set();
-  fifoBetween = [];
-  fifoMsg = [];
-  window.__ezoicLastShowKey = null;
-  window.__ezoicLastShowAt = 0;
+  return $('[data-pid]').filter(function () {
+    const $el = $(this);
+    const hasContent = $el.find('[component="post/content"]').length > 0;
+    const nested = $el.parents('[data-pid]').length > 0;
+    return hasContent && !nested;
+  }).not('.ezoic-ad-post');
 }
 
-function cleanupOnNav() {
-  document.querySelectorAll('.ezoic-ad-post, .ezoic-ad-topic, .ezoic-ad').forEach(el => el.remove());
+function getCategoryTopicItems() {
+  return $('li[component="category/topic"]').not('.ezoic-ad-topic');
 }
 
-// ---------- Ezoic helpers ----------
-function destroyEzoicId(id) {
-  const now = Date.now();
-  if (window.__ezoicLastDestroy[id] && (now - window.__ezoicLastDestroy[id]) < 2000) return;
-  window.__ezoicLastDestroy[id] = now;
-
-  try {
-    window.ezstandalone = window.ezstandalone || {};
-    if (typeof window.ezstandalone.destroyPlaceholders === 'function') {
-      window.ezstandalone.destroyPlaceholders(id);
-      return;
-    }
-    window.ezstandalone.cmd = window.ezstandalone.cmd || [];
-    window.ezstandalone.cmd.push(function () {
-      try {
-        if (typeof window.ezstandalone.destroyPlaceholders === 'function') {
-          window.ezstandalone.destroyPlaceholders(id);
-        }
-      } catch (e) {}
-    });
-  } catch (e) {}
+function tagName($el) {
+  return ($el && $el.length ? (($el.prop('tagName') || '').toUpperCase()) : '');
 }
 
-// Auto-height: hide until filled
-function setupAdAutoHeight() {
-  if (window.__ezoicAutoHeightAttached) return;
-  window.__ezoicAutoHeightAttached = true;
-
-  const attach = function () {
-    document.querySelectorAll('.ezoic-ad').forEach(function (wrap) {
-      if (!wrap.classList.contains('ezoic-filled')) {
-        wrap.style.display = 'none';
-      }
-      const ph = wrap.querySelector('[id^="ezoic-pub-ad-placeholder-"]');
-      if (ph && ph.children && ph.children.length) {
-        wrap.classList.add('ezoic-filled');
-        wrap.style.display = '';
-      }
-    });
-  };
+function makeWrapperLike($target, classes, innerHtml, attrs) {
+  const t = tagName($target);
+  const attrStr = attrs ? ' ' + attrs : '';
+  if (t === 'LI') {
+    return '<li class="' + classes + ' list-unstyled"' + attrStr + '>' + innerHtml + '</li>';
+  }
+  return '<div class="' + classes + '"' + attrStr + '>' + innerHtml + '</div>';
+}
 
-  attach();
-  setTimeout(attach, 500);
-  setTimeout(attach, 1500);
-  setTimeout(attach, 3000);
-  setInterval(attach, 1000);
+function pickNextId(pool) {
+  for (const id of pool) {
+    if (!usedIds.has(id)) return id;
+  }
+  return null;
 }
 
 function callEzoic(ids) {
+  if (!ids || !ids.length) return;
+
   window.ezstandalone = window.ezstandalone || {};
   window.ezstandalone.cmd = window.ezstandalone.cmd || [];
 
-  const uniq = Array.from(new Set(ids || []));
-  if (!uniq.length) return;
-
-  // De-dupe rapid duplicates
-  const key = uniq.join(',');
-  const now = Date.now();
-  if (window.__ezoicLastShowKey === key && (now - (window.__ezoicLastShowAt || 0)) < 1200) return;
-  window.__ezoicLastShowKey = key;
-  window.__ezoicLastShowAt = now;
-
   const run = function () {
     try {
       if (typeof window.ezstandalone.showAds === 'function') {
-        window.ezstandalone.showAds.apply(window.ezstandalone, uniq);
+        window.ezstandalone.showAds.apply(window.ezstandalone, ids);
         return true;
       }
     } catch (e) {}
     return false;
   };
 
-  setupAdAutoHeight();
   window.ezstandalone.cmd.push(function () { run(); });
 
-  // Retry only if showAds isn't available yet
-  try {
-    if (typeof window.ezstandalone.showAds !== 'function') {
-      let tries = 0;
-      const retry = function () {
-        tries++;
-        if (run()) return;
-        if (tries < 6) setTimeout(retry, 800);
-      };
-      setTimeout(retry, 800);
-    }
-  } catch (e) {}
-}
-
-// ---------- Pool logic ----------
-function pickNextId(pool, usedSet) {
-  for (const id of pool) {
-    if (!usedSet.has(id)) return id;
-  }
-  return null;
+  // retry a few times (Ezoic can load late)
+  let tries = 0;
+  const maxTries = 6;
+  const timer = setInterval(function () {
+    tries++;
+    if (run() || tries >= maxTries) clearInterval(timer);
+  }, 800);
 }
 
-function recycleOldest(fifo, usedSet, selector, avoidAfterNode) {
-  if (window.__ezoicRecycling) return null;
-  window.__ezoicRecycling = true;
-  try {
-    fifo.sort((a, b) => (a.after - b.after));
-    while (fifo.length) {
-      const old = fifo.shift();
-      const el = document.querySelector(selector(old));
-      if (!el) continue;
-
-      // Don't recycle if it is right after the last real item (protect sentinel)
-      try {
-        if (avoidAfterNode && el.previousElementSibling === avoidAfterNode) {
-          fifo.push(old);
-          return null;
-        }
-      } catch (e) {}
-
-      el.remove();
-      usedSet.delete(old.id);
-      destroyEzoicId(old.id);
-      return old.id;
-    }
-    return null;
-  } finally {
-    window.__ezoicRecycling = false;
-  }
-}
-
-// ---------- Injection ----------
-function injectBetweenAds(config) {
-  if (!config.enableBetweenAds) return;
-  const pool = parsePool(config.placeholderIds);
-  if (!pool.length) return;
-
-  const interval = Math.max(1, config.intervalPosts);
-  const items = Array.from(document.querySelectorAll('li[component="category/topic"]'));
-  if (!items.length) return;
+function injectBetweenIncremental($items, pool, interval, wrapperClass) {
+  const total = $items.length;
+  const maxSlot = Math.floor(total / interval);
+  if (maxSlot <= 0) return [];
 
   const newIds = [];
-  const lastItem = items[items.length - 1];
 
-  for (let i = 0; i < items.length; i++) {
-    const pos = i + 1; // absolute position in loaded list
-    if (pos % interval !== 0) continue;
-    if (seenBetweenAfter.has(pos)) continue;
+  for (let slot = 1; slot <= maxSlot; slot++) {
+    if (injectedSlots.has(slot)) continue;
+
+    const index = slot * interval - 1;
+    const $target = $items.eq(index);
+    if (!$target.length) continue;
 
-    let id = pickNextId(pool, usedBetween);
+    const id = pickNextId(pool);
     if (!id) {
-      // recycle oldest
-      id = recycleOldest(
-        fifoBetween,
-        usedBetween,
-        (o) => `.ezoic-ad-topic[data-ezoic-after="${o.after}"][data-ezoic-id="${o.id}"]`,
-        lastItem
-      );
-      if (!id) break;
+      // pool exhausted: stop injecting further to avoid reusing ids and "jumping"
+      break;
     }
 
-    const anchor = items[i];
-    const wrap = document.createElement('li');
-    wrap.className = 'ezoic-ad ezoic-ad-topic';
-    wrap.setAttribute('data-ezoic-after', String(pos));
-    wrap.setAttribute('data-ezoic-id', String(id));
-    wrap.innerHTML = `<div id="ezoic-pub-ad-placeholder-${id}"></div>`;
+    const placeholder = '<div id="ezoic-pub-ad-placeholder-' + id + '"></div>';
+    const html = makeWrapperLike($target, wrapperClass, placeholder, 'data-ezoic-slot="' + slot + '" data-ezoic-id="' + id + '"');
 
-    anchor.insertAdjacentElement('afterend', wrap);
+    $target.after(html);
 
-    seenBetweenAfter.add(pos);
-    usedBetween.add(id);
-    fifoBetween.push({ after: pos, id });
+    injectedSlots.add(slot);
+    usedIds.add(id);
     newIds.push(id);
   }
 
-  if (newIds.length) callEzoic(newIds);
+  return newIds;
 }
 
-function getPostNumberFromPost(postEl) {
-  // Prefer post-index text (#72)
-  try {
-    const idx = postEl.querySelector('a.post-index');
-    if (idx) {
-      const n = parseInt(String(idx.textContent || '').replace('#', '').trim(), 10);
-      if (Number.isFinite(n)) return n;
-    }
-  } catch (e) {}
-
-  // Fallback: pid-based ordering not reliable, but DOM order is ok for interval within loaded window.
-  return null;
-}
-
-function injectMessageAds(config) {
-  if (!config.enableMessageAds) return;
-  const pool = parsePool(config.messagePlaceholderIds);
-  if (!pool.length) return;
-
-  const interval = Math.max(1, config.messageIntervalPosts);
-  const posts = Array.from(document.querySelectorAll('[component="post"][data-pid]'));
-  if (!posts.length) return;
+function injectMessageIncremental($posts, pool, interval) {
+  const total = $posts.length;
+  const maxSlot = Math.floor(total / interval);
+  if (maxSlot <= 0) return [];
 
   const newIds = [];
-  const lastPost = posts[posts.length - 1];
 
-  // Determine absolute post numbers if available; else use DOM position
-  let numbers = posts.map((p, i) => ({ el: p, no: getPostNumberFromPost(p) || (i + 1) }));
-  // Ensure strictly increasing by DOM
-  numbers = numbers.map((x, i) => ({ el: x.el, no: x.no || (i + 1) }));
+  for (let slot = 1; slot <= maxSlot; slot++) {
+    if (injectedSlots.has(slot)) continue;
 
-  for (const entry of numbers) {
-    const afterNo = entry.no;
-    if (afterNo % interval !== 0) continue;
-    if (seenMsgAfter.has(afterNo)) continue;
+    const index = slot * interval - 1;
+    const $target = $posts.eq(index);
+    if (!$target.length) continue;
 
-    let id = pickNextId(pool, usedMessages);
-    if (!id) {
-      id = recycleOldest(
-        fifoMsg,
-        usedMessages,
-        (o) => `.ezoic-ad-post[data-ezoic-after="${o.after}"][data-ezoic-id="${o.id}"]`,
-        lastPost
-      );
-      if (!id) break;
-    }
+    const id = pickNextId(pool);
+    if (!id) break;
 
-    const wrap = document.createElement('div');
-    wrap.className = 'ezoic-ad ezoic-ad-post';
-    wrap.setAttribute('data-ezoic-after', String(afterNo));
-    wrap.setAttribute('data-ezoic-id', String(id));
-    wrap.innerHTML = `<div class="ezoic-ad-message-inner"><div id="ezoic-pub-ad-placeholder-${id}"></div></div>`;
+    const inner = '<div class="content"><div id="ezoic-pub-ad-placeholder-' + id + '"></div></div>';
+    const html = makeWrapperLike($target, 'post ezoic-ad-post', inner, 'data-ezoic-slot="' + slot + '" data-ezoic-id="' + id + '"');
 
-    entry.el.insertAdjacentElement('afterend', wrap);
+    $target.after(html);
 
-    seenMsgAfter.add(afterNo);
-    usedMessages.add(id);
-    fifoMsg.push({ after: afterNo, id });
+    injectedSlots.add(slot);
+    usedIds.add(id);
     newIds.push(id);
   }
 
-  if (newIds.length) callEzoic(newIds);
+  return newIds;
 }
 
-// ---------- Main refresh ----------
 async function refreshAds() {
-  if (inFlight) {
-    rerunRequested = true;
-    return;
+  // reset state when navigating (ajaxify)
+  const key = currentPageKey();
+  if (pageKey !== key) {
+    pageKey = key;
+    resetPageState();
+    // also cleanup any injected wrappers that may have been left by browser bfcache
+    $('.ezoic-ad-post, .ezoic-ad-between, .ezoic-ad-topic').remove();
   }
+
+  if (inFlight) { rerunRequested = true; return; }
   inFlight = true;
-  rerunRequested = false;
 
   try {
     const cfg = await fetchConfig();
-    if (cfg.excluded) return;
+    if (!cfg || cfg.excluded) return;
 
-    const key = getPageKey();
-    if (key !== pageKey) {
-      pageKey = key;
-      resetState();
-      cleanupOnNav();
-    }
+    const betweenPool = parsePool(cfg.placeholderIds);
+    const betweenInterval = Math.max(1, parseInt(cfg.intervalPosts, 10) || 6);
+
+    const messagePool = parsePool(cfg.messagePlaceholderIds);
+    const messageInterval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
 
     const onTopic = isTopicPage();
-    const onCategory = isCategoryTopicListPage() && !onTopic;
+    const onCategory = !onTopic && isCategoryTopicListPage();
+
+    const $posts = onTopic ? getTopicPosts() : $();
+    const $topicItems = onCategory ? getCategoryTopicItems() : $();
 
-    if (onCategory) injectBetweenAds(cfg);
-    if (onTopic) injectMessageAds(cfg);
+    if (!$posts.length && !$topicItems.length) return;
+
+    const newIds = [];
+
+    // Your rule:
+    // - Category topic list: BETWEEN only
+    // - Topic page: MESSAGE only
+    if ($topicItems.length) {
+      if (cfg.enableBetweenAds && betweenPool.length) {
+        newIds.push(...injectBetweenIncremental($topicItems, betweenPool, betweenInterval, 'ezoic-ad-topic'));
+      }
+      callEzoic(newIds);
+      return;
+    }
+
+    if ($posts.length) {
+      if (cfg.enableMessageAds && messagePool.length) {
+        newIds.push(...injectMessageIncremental($posts, messagePool, messageInterval));
+      }
+      callEzoic(newIds);
+    }
   } finally {
     inFlight = false;
-    if (rerunRequested) setTimeout(refreshAds, 50);
+    if (rerunRequested) {
+      rerunRequested = false;
+      setTimeout(refreshAds, 120);
+    }
   }
 }
 
 function debounceRefresh() {
-  if (debounceTimer) clearTimeout(debounceTimer);
-  debounceTimer = setTimeout(refreshAds, 250);
+  clearTimeout(debounceTimer);
+  debounceTimer = setTimeout(refreshAds, 180);
 }
 
-// ---------- Observers / Events ----------
-(function setupTriggers() {
-  // Ajaxify navigation: only cleanup when URL changes
-  $(window).on('action:ajaxify.start', function (ev, data) {
-    try {
-      const targetUrl = (data && (data.url || data.href)) ? String(data.url || data.href) : '';
-      if (targetUrl) {
-        const a = document.createElement('a');
-        a.href = targetUrl;
-        const targetPath = a.pathname || targetUrl;
-        if (targetPath === window.location.pathname) return;
-      }
-    } catch (e) {}
-    pageKey = null;
-    resetState();
-    cleanupOnNav();
-  });
-
-  $(window).on('action:ajaxify.end action:posts.loaded action:topics.loaded action:topic.loaded action:category.loaded', debounceRefresh);
-
-  // MutationObserver (new posts/topics appended)
-  try {
-    const obs = new MutationObserver(function (mutations) {
-      for (const m of mutations) {
-        if (!m.addedNodes) continue;
-        for (const n of m.addedNodes) {
-          if (!n || n.nodeType !== 1) continue;
-          if (n.matches && (n.matches('[component="post"][data-pid]') || n.matches('li[component="category/topic"]'))) {
-            debounceRefresh();
-            return;
-          }
-          if (n.querySelector && (n.querySelector('[component="post"][data-pid]') || n.querySelector('li[component="category/topic"]'))) {
-            debounceRefresh();
-            return;
-          }
-        }
-      }
-    });
-    obs.observe(document.body, { childList: true, subtree: true });
-    window.__ezoicInfiniteObserver = obs;
-  } catch (e) {}
-
-  // Poller fallback (count changes)
-  let lastPosts = 0;
-  let lastTopics = 0;
-  setInterval(function () {
-    const p = document.querySelectorAll('[component="post"][data-pid]').length;
-    const t = document.querySelectorAll('li[component="category/topic"]').length;
-    if (p !== lastPosts || t !== lastTopics) {
-      lastPosts = p; lastTopics = t;
-      debounceRefresh();
-    }
-  }, 1500);
-
-  // First run(s) - important for hard load
-  document.addEventListener('DOMContentLoaded', function () {
-    debounceRefresh();
-    setTimeout(debounceRefresh, 1500);
-    setTimeout(debounceRefresh, 5000);
-    setTimeout(debounceRefresh, 10000);
-  });
-  // In case this script loads after DOMContentLoaded
-  setTimeout(debounceRefresh, 800);
-})();
+$(document).ready(debounceRefresh);
+$(window).on('action:ajaxify.end action:posts.loaded action:topic.loaded', debounceRefresh);
+setTimeout(debounceRefresh, 1800);

package/public/templates/admin/plugins/ezoic-infinite.tpl

@@ -1,5 +1,5 @@
 <div class="acp-page-container">
-  <h2>Ezoic Infinite Ads</h2>
+  <h2>Ezoic - Publicités Infinite Scroll Ads</h2>
 
   <form class="ezoic-infinite-settings" role="form">
     <h4 class="mt-3">Pubs entre les posts (bloc simple)</h4>

package/public/style.css

@@ -1,4 +0,0 @@
-.ezoic-ad{min-height:0 !important;height:auto !important;padding:0 !important;margin:0.5rem 0;}
-.ezoic-ad:not(.ezoic-filled){display:none !important;}
-.ezoic-ad-message-inner{padding:0;margin:0;}
-.ezoic-ad-message-inner > div{margin:0;padding:0;}