nodebb-plugin-ezoic-infinite 0.8.7 → 0.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "0.8.7",
+  "version": "0.9.0",
   "description": "Ezoic ads with infinite scroll using a pool of placeholder IDs",
   "main": "library.js",
   "license": "MIT",

package/plugin.json

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

package/public/client.js

@@ -3,61 +3,70 @@
 
 window.ezoicInfiniteLoaded = true;
 
-let cachedConfig;
+let cachedConfig = null;
 let lastFetch = 0;
-let debounceTimer;
-
 let inFlight = false;
 let rerunRequested = false;
+let debounceTimer = null;
 
-// Per-page state
 let pageKey = null;
 
-// Topic page: anchor ads to absolute post number
-let seenAfterPostNo = new Set(); // post numbers we've inserted after
-let usedIds = new Set();         // ids currently present in DOM
-let fifo = [];                   // [{afterPostNo, id}]
+// Separate state per "mode" so category and topic don't leak ids
+let usedBetween = new Set();
+let usedMessages = new Set();
 
-// Category topic list page: anchor ads to absolute position
-let seenAfterTopicPos = new Set();
-let fifoCat = [];                // [{afterPos, id}]
+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}]
 
-function resetState() {
-  seenAfterPostNo = new Set();
-  seenAfterTopicPos = new Set();
-  usedIdsMsg = new Set();
-  usedIdsBetween = new Set();
-  fifo = [];
-  fifoCat = [];
-}
+// Destroy spam guard
+window.__ezoicLastDestroy = window.__ezoicLastDestroy || {};
+window.__ezoicRecycling = false;
 
-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 window.location.pathname;
-}
+// ---------- Config ----------
+async function fetchConfig() {
+  const now = Date.now();
+  if (cachedConfig && (now - lastFetch) < 5000) return cachedConfig;
+  lastFetch = now;
 
-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)
-  ));
+  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,
+    };
+  }
 }
 
-async function fetchConfig() {
-  if (cachedConfig && Date.now() - lastFetch < 8000) return cachedConfig;
-  const res = await fetch('/api/plugins/ezoic-infinite/config', { credentials: 'same-origin' });
-  cachedConfig = await res.json();
-  lastFetch = Date.now();
-  return cachedConfig;
+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);
 }
 
+// ---------- Page detection ----------
 function isTopicPage() {
   try {
     if (ajaxify && ajaxify.data && ajaxify.data.tid) return true;
@@ -66,246 +75,100 @@ function isTopicPage() {
 }
 
 function isCategoryTopicListPage() {
-  return $('li[component="category/topic"]').length > 0;
-}
-
-function getTopicPosts() {
-  const $primary = $('[component="post"][data-pid]');
-  if ($primary.length) return $primary;
-
-  // Fallback: top-level nodes with post/content (avoid nested)
-  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;
-  });
-}
-
-function getCategoryTopicItems() {
-  return $('li[component="category/topic"]');
+  return document.querySelectorAll('li[component="category/topic"]').length > 0;
 }
 
-// If target's parent is UL/OL, wrapper must be LI
-function wrapperTagFor($target) {
-  if (!$target || !$target.length) return 'div';
-  const parentTag = ($target.parent().prop('tagName') || '').toUpperCase();
-  if (parentTag === 'UL' || parentTag === 'OL') return 'li';
-  const selfTag = ($target.prop('tagName') || '').toUpperCase();
-  if (selfTag === 'LI') return 'li';
-  return 'div';
+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 makeWrapperLike($target, classes, innerHtml, attrs) {
-  const tag = wrapperTagFor($target);
-  const attrStr = attrs ? ' ' + attrs : '';
-  if (tag === 'li') {
-    return '<li class="' + classes + ' list-unstyled"' + attrStr + '>' + innerHtml + '</li>';
-  }
-  return '<div class="' + classes + '"' + attrStr + '>' + innerHtml + '</div>';
+function resetState() {
+  usedBetween = new Set();
+  usedMessages = new Set();
+  seenBetweenAfter = new Set();
+  seenMsgAfter = new Set();
+  fifoBetween = [];
+  fifoMsg = [];
+  window.__ezoicLastShowKey = null;
+  window.__ezoicLastShowAt = 0;
 }
 
 function cleanupOnNav() {
-  $('.ezoic-ad-post, .ezoic-ad-topic').remove();
-}
-
-function pickNextId(pool, usedSet) {
-  for (const id of pool) {
-    if (!usedSet.has(id)) return id;
-  }
-  return null;
-  } finally {
-    window.__ezoicRecycling = false;
-  }
+  document.querySelectorAll('.ezoic-ad-post, .ezoic-ad-topic, .ezoic-ad').forEach(el => el.remove());
 }
 
+// ---------- Ezoic helpers ----------
 function destroyEzoicId(id) {
-  window.__ezoicLastDestroy = window.__ezoicLastDestroy || {};
   const now = Date.now();
-  if (window.__ezoicLastDestroy[id] && now - window.__ezoicLastDestroy[id] < 2000) {
-    return;
-  }
+  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 || [];
-    const fn = function () {
+    window.ezstandalone.cmd.push(function () {
       try {
         if (typeof window.ezstandalone.destroyPlaceholders === 'function') {
           window.ezstandalone.destroyPlaceholders(id);
         }
       } catch (e) {}
-    };
-    if (typeof window.ezstandalone.destroyPlaceholders === 'function') fn();
-    else window.ezstandalone.cmd.push(fn);
+    });
   } catch (e) {}
 }
 
-function recycleOldestTopicId($posts) {
-  if (window.__ezoicRecycling) return null;
-  window.__ezoicRecycling = true;
-  try {
-  if (!fifo.length) return null;
-  fifo.sort((a, b) => a.afterPostNo - b.afterPostNo);
-
-  while (fifo.length) {
-    const old = fifo.shift();
-    const sel = '.ezoic-ad-post[data-ezoic-after="' + old.afterPostNo + '"][data-ezoic-id="' + old.id + '"]';
-    const $el = $(sel);
-    if (!$el.length) continue;
-
-    // Never recycle the ad that is right after the last real post (sentinel)
-    try {
-      const $last = $posts.last();
-      if ($last.length && $el.prev().is($last)) {
-        fifo.push(old);
-        return null;
-      }
-    } catch (e) {}
-
-    $el.remove();
-    usedIdsMsg.delete(old.id);
-    destroyEzoicId(old.id);
-    return old.id;
-  }
-  return null;
-  } finally {
-    window.__ezoicRecycling = false;
-  }
-}
-
-function recycleOldestCategoryId($items) {
-  if (window.__ezoicRecycling) return null;
-  window.__ezoicRecycling = true;
-  try {
-  if (!fifoCat.length) return null;
-  fifoCat.sort((a, b) => a.afterPos - b.afterPos);
-
-  while (fifoCat.length) {
-    const old = fifoCat.shift();
-    const sel = '.ezoic-ad-topic[data-ezoic-after="' + old.afterPos + '"][data-ezoic-id="' + old.id + '"]';
-    const $el = $(sel);
-    if (!$el.length) continue;
-
-    try {
-      const $last = $items.last();
-      if ($last.length && $el.prev().is($last)) {
-        fifoCat.push(old);
-        return null;
-      }
-    } catch (e) {}
-
-    $el.remove();
-    usedIdsBetween.delete(old.id);
-    destroyEzoicId(old.id);
-    return old.id;
-  }
-  return null;
-}
-
+// Auto-height: hide until filled
 function setupAdAutoHeight() {
   if (window.__ezoicAutoHeightAttached) return;
   window.__ezoicAutoHeightAttached = true;
 
-  try {
-    const ro = new ResizeObserver(function () {
-      document.querySelectorAll('.ezoic-ad').forEach(function (wrap) {
-        // Collapse until content is injected
-        if (!wrap.classList.contains('ezoic-filled')) {
-          wrap.style.display = 'none';
-        }
-        wrap.style.minHeight = '0px';
-        wrap.style.height = 'auto';
-      });
+  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 attach() {
-      document.querySelectorAll('.ezoic-ad').forEach(function (wrap) {
-        // Collapse until content is injected
-        if (!wrap.classList.contains('ezoic-filled')) {
-          wrap.style.display = 'none';
-        }
-        if (wrap.__ezoicRO) return;
-        wrap.__ezoicRO = true;
-        ro.observe(wrap);
-      });
-    }
-
-    attach();
-    setTimeout(attach, 600);
-    setTimeout(attach, 1600);
-  } catch (e) {}
+  attach();
+  setTimeout(attach, 500);
+  setTimeout(attach, 1500);
+  setTimeout(attach, 3000);
+  setInterval(attach, 1000);
 }
 
 function callEzoic(ids) {
   window.ezstandalone = window.ezstandalone || {};
   window.ezstandalone.cmd = window.ezstandalone.cmd || [];
 
-  const markAndFilterByIds = function (list) {
-    const out = [];
-    list.forEach(function (id) {
-      const sel = '.ezoic-ad[data-ezoic-id="' + id + '"]';
-      const wraps = document.querySelectorAll(sel);
-      let anyUnrendered = false;
-      wraps.forEach(function (w) {
-        if (w.getAttribute('data-ezoic-rendered') !== '1') {
-          anyUnrendered = true;
-        }
-      });
-      if (!wraps.length) {
-        // fallback: if wrapper is missing, allow showAds (Ezoic might still handle placeholder)
-        out.push(id);
-        return;
-      }
-      if (anyUnrendered) {
-        wraps.forEach(function (w) { w.setAttribute('data-ezoic-rendered', '1'); });
-        out.push(id);
-      }
-    });
-    return out;
-  };
-
-  const collect = function () {
-    const list = [];
-    document.querySelectorAll('.ezoic-ad').forEach(function (wrap) {
-        // Collapse until content is injected
-        if (!wrap.classList.contains('ezoic-filled')) {
-          wrap.style.display = 'none';
-        }
-      if (wrap.getAttribute('data-ezoic-rendered') === '1') return;
-      const ph = wrap.querySelector('[id^="ezoic-pub-ad-placeholder-"]');
-        if (ph && ph.children && ph.children.length) {
-          // Content injected
-          wrap.classList.add('ezoic-filled');
-          wrap.style.display = '';
-        }
-      if (!ph) return;
-      const idStr = ph.id.replace('ezoic-pub-ad-placeholder-', '');
-      const id = parseInt(idStr, 10);
-      if (!Number.isFinite(id) || id <= 0) return;
-      wrap.setAttribute('data-ezoic-rendered', '1');
-      list.push(id);
-    });
-    return Array.from(new Set(list));
-  };
-
-  const input = (ids && ids.length) ? Array.from(new Set(ids)) : null;
-  const toShow = input ? markAndFilterByIds(input) : collect();
-  if (!toShow.length) return;
+  const uniq = Array.from(new Set(ids || []));
+  if (!uniq.length) return;
 
-  // De-dupe rapid duplicate calls (observer/poller can fire twice)
-  const key = toShow.join(',');
+  // De-dupe rapid duplicates
+  const key = uniq.join(',');
   const now = Date.now();
-  if (window.__ezoicLastShowKey === key && (now - (window.__ezoicLastShowAt || 0)) < 1200) {
-    return;
-  }
+  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, toShow);
+        window.ezstandalone.showAds.apply(window.ezstandalone, uniq);
         return true;
       }
     } catch (e) {}
@@ -316,230 +179,237 @@ function callEzoic(ids) {
   window.ezstandalone.cmd.push(function () { run(); });
 
   // Retry only if showAds isn't available yet
-  let tries = 0;
-  const maxTries = 6;
-  const retry = function () {
-    tries++;
-    const ok = run();
-    if (ok) return;
-    try {
-      if (typeof window.ezstandalone.showAds === 'function') return;
-    } catch (e) {}
-    if (tries < maxTries) setTimeout(retry, 800);
-  };
-
   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) {
-    setTimeout(retry, 800);
-  }
+  } catch (e) {}
 }
 
-function getPostNumber($post) {
-  // Harmony: <a class="post-index">#72</a>
-  const txt = ($post.find('a.post-index').first().text() || '').trim();
-  const m = txt.match(/#\s*(\d+)/);
-  if (m) return parseInt(m[1], 10);
+// ---------- Pool logic ----------
+function pickNextId(pool, usedSet) {
+  for (const id of pool) {
+    if (!usedSet.has(id)) return id;
+  }
+  return null;
+}
 
-  // fallback data-index (often 0/1 based)
-  const di = parseInt($post.attr('data-index'), 10);
-  if (Number.isFinite(di) && di >= 0) return di + 1;
+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;
 
-  return NaN;
-}
+      // 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) {}
 
-function getTopicPos($item) {
-  const pos = parseInt($item.attr('data-index'), 10);
-  if (Number.isFinite(pos) && pos >= 0) return pos + 1;
-  const schemaPos = parseInt($item.find('meta[itemprop="position"]').attr('content'), 10);
-  if (Number.isFinite(schemaPos) && schemaPos > 0) return schemaPos;
-  return NaN;
+      el.remove();
+      usedSet.delete(old.id);
+      destroyEzoicId(old.id);
+      return old.id;
+    }
+    return null;
+  } finally {
+    window.__ezoicRecycling = false;
+  }
 }
 
-function injectTopicMessageAds($posts, pool, interval) {
-  const newIds = [];
+// ---------- Injection ----------
+function injectBetweenAds(config) {
+  if (!config.enableBetweenAds) return;
+  const pool = parsePool(config.placeholderIds);
+  if (!pool.length) return;
 
-  $posts.each(function () {
-    const $p = $(this);
-    // Never insert after the last post (sentinel)
-    if ($p.is($posts.last())) return;
+  const interval = Math.max(1, config.intervalPosts);
+  const items = Array.from(document.querySelectorAll('li[component="category/topic"]'));
+  if (!items.length) return;
 
-    const postNo = getPostNumber($p);
-    if (!Number.isFinite(postNo) || postNo <= 0) return;
+  const newIds = [];
+  const lastItem = items[items.length - 1];
 
-    if (postNo % interval !== 0) return;
-    if (seenAfterPostNo.has(postNo)) return;
+  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;
 
-    let id = pickNextId(pool, usedIdsMsg);
+    let id = pickNextId(pool, usedBetween);
     if (!id) {
-      id = recycleOldestTopicId($posts);
-      if (!id) return;
+      // recycle oldest
+      id = recycleOldest(
+        fifoBetween,
+        usedBetween,
+        (o) => `.ezoic-ad-topic[data-ezoic-after="${o.after}"][data-ezoic-id="${o.id}"]`,
+        lastItem
+      );
+      if (!id) break;
     }
 
-    const inner = '<div class="ezoic-ad-message-inner"><div id="ezoic-pub-ad-placeholder-' + id + '"></div></div>';
-    const html = makeWrapperLike(
-      $p,
-      'ezoic-ad-post ezoic-ad',
-      inner,
-      'data-ezoic-after="' + postNo + '" data-ezoic-id="' + id + '"'
-    );
+    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>`;
 
-    $p.after(html);
+    anchor.insertAdjacentElement('afterend', wrap);
 
-    seenAfterPostNo.add(postNo);
-    usedIdsMsg.add(id);
-    fifo.push({ afterPostNo: postNo, id: id });
+    seenBetweenAfter.add(pos);
+    usedBetween.add(id);
+    fifoBetween.push({ after: pos, id });
     newIds.push(id);
-  });
+  }
 
-  return newIds;
+  if (newIds.length) callEzoic(newIds);
 }
 
-function injectCategoryBetweenAds($items, pool, interval) {
-  const 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) {}
 
-  $items.each(function () {
-    const $it = $(this);
-    // Never insert after the last topic item (sentinel)
-    if ($it.is($items.last())) return;
+  // Fallback: pid-based ordering not reliable, but DOM order is ok for interval within loaded window.
+  return null;
+}
 
-    const pos = getTopicPos($it);
-    if (!Number.isFinite(pos) || pos <= 0) return;
+function injectMessageAds(config) {
+  if (!config.enableMessageAds) return;
+  const pool = parsePool(config.messagePlaceholderIds);
+  if (!pool.length) return;
 
-    if (pos % interval !== 0) return;
-    if (seenAfterTopicPos.has(pos)) return;
+  const interval = Math.max(1, config.messageIntervalPosts);
+  const posts = Array.from(document.querySelectorAll('[component="post"][data-pid]'));
+  if (!posts.length) return;
 
-    let id = pickNextId(pool, usedIdsBetween);
+  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 (const entry of numbers) {
+    const afterNo = entry.no;
+    if (afterNo % interval !== 0) continue;
+    if (seenMsgAfter.has(afterNo)) continue;
+
+    let id = pickNextId(pool, usedMessages);
     if (!id) {
-      id = recycleOldestCategoryId($items);
-      if (!id) return;
+      id = recycleOldest(
+        fifoMsg,
+        usedMessages,
+        (o) => `.ezoic-ad-post[data-ezoic-after="${o.after}"][data-ezoic-id="${o.id}"]`,
+        lastPost
+      );
+      if (!id) break;
     }
 
-    const placeholder = '<div id="ezoic-pub-ad-placeholder-' + id + '"></div>';
-    const html = makeWrapperLike(
-      $it,
-      'ezoic-ad-topic ezoic-ad',
-      placeholder,
-      'data-ezoic-after="' + pos + '" data-ezoic-id="' + id + '"'
-    );
+    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>`;
 
-    $it.after(html);
+    entry.el.insertAdjacentElement('afterend', wrap);
 
-    seenAfterTopicPos.add(pos);
-    usedIdsBetween.add(id);
-    fifoCat.push({ afterPos: pos, id: id });
+    seenMsgAfter.add(afterNo);
+    usedMessages.add(id);
+    fifoMsg.push({ after: afterNo, id });
     newIds.push(id);
-  });
+  }
 
-  return newIds;
+  if (newIds.length) callEzoic(newIds);
 }
 
+// ---------- Main refresh ----------
 async function refreshAds() {
-  const now = Date.now();
-  if (window.__ezoicRefreshThrottle && now - window.__ezoicRefreshThrottle < 250) return;
-  window.__ezoicRefreshThrottle = now;
-  const key = getPageKey();
-  if (pageKey !== key) {
-    pageKey = key;
-    resetState();
-    cleanupOnNav();
+  if (inFlight) {
+    rerunRequested = true;
+    return;
   }
-
-  if (inFlight) { rerunRequested = true; return; }
   inFlight = true;
+  rerunRequested = false;
 
   try {
     const cfg = await fetchConfig();
-    if (!cfg || cfg.excluded) return;
-
-    const betweenPool = parsePool(cfg.placeholderIds);
-    const betweenInterval = Math.max(1, parseInt(cfg.intervalPosts, 10) || 6);
+    if (cfg.excluded) return;
 
-    const messagePool = parsePool(cfg.messagePlaceholderIds);
-    const messageInterval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
+    const key = getPageKey();
+    if (key !== pageKey) {
+      pageKey = key;
+      resetState();
+      cleanupOnNav();
+    }
 
-    const hasTopicList = isCategoryTopicListPage();
     const onTopic = isTopicPage();
-    const onCategory = hasTopicList && !onTopic;
-
-    const newIds = [];
+    const onCategory = isCategoryTopicListPage() && !onTopic;
 
-    // Rule: topic list => between only ; topic page => message only
-    if (onCategory) {
-      const $items = getCategoryTopicItems();
-      if (cfg.enableBetweenAds && betweenPool.length && $items.length) {
-        newIds.push(...injectCategoryBetweenAds($items, betweenPool, betweenInterval));
-      }
-      callEzoic(newIds);
-      // also ensure any unrendered placeholders are rendered
-      callEzoic();
-      return;
-    }
-
-    if (onTopic) {
-      const $posts = getTopicPosts();
-      if (cfg.enableMessageAds && messagePool.length && $posts.length) {
-        newIds.push(...injectTopicMessageAds($posts, messagePool, messageInterval));
-      }
-      callEzoic(newIds);
-    }
+    if (onCategory) injectBetweenAds(cfg);
+    if (onTopic) injectMessageAds(cfg);
   } finally {
     inFlight = false;
-    if (rerunRequested) {
-      rerunRequested = false;
-      setTimeout(refreshAds, 160);
-    }
+    if (rerunRequested) setTimeout(refreshAds, 50);
   }
 }
 
 function debounceRefresh() {
-  clearTimeout(debounceTimer);
-  debounceTimer = setTimeout(refreshAds, 220);
+  if (debounceTimer) clearTimeout(debounceTimer);
+  debounceTimer = setTimeout(refreshAds, 250);
 }
 
-$(document).ready(function () { setupAdAutoHeight(); debounceRefresh(); });
-
-$(window).on('action:ajaxify.start', function (ev, data) {
-  // IMPORTANT: do not cleanup on infinite scroll loads; only when navigating to a different page.
-  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 we're staying on the same logical page (same path), don't wipe ads/state
-      if (targetPath === window.location.pathname) {
-        return;
+// ---------- 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:topic.loaded action:topics.loaded action:category.loaded', debounceRefresh);
+    } catch (e) {}
+    pageKey = null;
+    resetState();
+    cleanupOnNav();
+  });
 
-setTimeout(function () { setupAdAutoHeight(); debounceRefresh(); }, 2200);
+  $(window).on('action:ajaxify.end action:posts.loaded action:topics.loaded action:topic.loaded action:category.loaded', debounceRefresh);
 
-// Observer + poller: ensure we rerun when NodeBB injects new items
-(function setupEzoicObserver() {
-  if (window.__ezoicInfiniteObserver) return;
+  // MutationObserver (new posts/topics appended)
   try {
-    const trigger = function () { debounceRefresh(); };
-
     const obs = new MutationObserver(function (mutations) {
       for (const m of mutations) {
-        if (!m.addedNodes || !m.addedNodes.length) continue;
+        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"]'))) {
-            trigger();
+            debounceRefresh();
             return;
           }
           if (n.querySelector && (n.querySelector('[component="post"][data-pid]') || n.querySelector('li[component="category/topic"]'))) {
-            trigger();
+            debounceRefresh();
             return;
           }
         }
@@ -547,19 +417,27 @@ setTimeout(function () { setupAdAutoHeight(); debounceRefresh(); }, 2200);
     });
     obs.observe(document.body, { childList: true, subtree: true });
     window.__ezoicInfiniteObserver = obs;
-
-    let lastPostCount = 0;
-    let lastTopicCount = 0;
-    setInterval(function () {
-      try {
-        const posts = document.querySelectorAll('[component="post"][data-pid]').length;
-        const topics = document.querySelectorAll('li[component="category/topic"]').length;
-        if (posts !== lastPostCount || topics !== lastTopicCount) {
-          lastPostCount = posts;
-          lastTopicCount = topics;
-          trigger();
-        }
-      } catch (e) {}
-    }, 1500);
   } 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);
 })();