nodebb-plugin-ezoic-infinite 0.8.0 → 0.8.1

package/package.json

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

package/plugin.json

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

package/public/client.js

@@ -1,6 +1,6 @@
 'use strict';
-
 /* globals ajaxify */
+
 window.ezoicInfiniteLoaded = true;
 
 let cachedConfig;
@@ -10,17 +10,17 @@ let debounceTimer;
 let inFlight = false;
 let rerunRequested = false;
 
-// Per-page state (keyed by tid/cid)
+// Per-page state
 let pageKey = null;
 
-// Topic page state: anchor ads to absolute post number (not DOM index)
-let seenAfterPostNo = new Set();   // post numbers we've already inserted an ad after
-let usedIds = new Set();           // ids currently in DOM
-let fifo = [];                     // [{afterPostNo, id}]
+// 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}]
 
-// Category page state: anchor to absolute topic position if available
-let seenAfterTopicPos = new Set(); // topic positions we've inserted after
-let fifoCat = [];                  // [{afterPos, id}]
+// Category topic list page: anchor ads to absolute position
+let seenAfterTopicPos = new Set();
+let fifoCat = [];                // [{afterPos, id}]
 
 function resetState() {
   seenAfterPostNo = new Set();
@@ -50,7 +50,7 @@ function parsePool(raw) {
 }
 
 async function fetchConfig() {
-  if (cachedConfig && Date.now() - lastFetch < 10000) return cachedConfig;
+  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();
@@ -58,7 +58,10 @@ async function fetchConfig() {
 }
 
 function isTopicPage() {
-  return $('[component="post/content"]').length > 0 || $('[component="post"][data-pid]').length > 0;
+  try {
+    if (ajaxify && ajaxify.data && ajaxify.data.tid) return true;
+  } catch (e) {}
+  return /^\/topic\//.test(window.location.pathname);
 }
 
 function isCategoryTopicListPage() {
@@ -69,7 +72,7 @@ function getTopicPosts() {
   const $primary = $('[component="post"][data-pid]');
   if ($primary.length) return $primary;
 
-  // fallback: top-level with post/content
+  // 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;
@@ -82,7 +85,7 @@ function getCategoryTopicItems() {
   return $('li[component="category/topic"]');
 }
 
-// If target's parent is UL/OL, wrapper MUST be LI (otherwise browser may move it to top)
+// 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();
@@ -102,7 +105,7 @@ function makeWrapperLike($target, classes, innerHtml, attrs) {
 }
 
 function cleanupOnNav() {
-  $('.ezoic-ad-post, .ezoic-ad-topic, .ezoic-ad-between').remove();
+  $('.ezoic-ad-post, .ezoic-ad-topic').remove();
 }
 
 function pickNextId(pool) {
@@ -112,53 +115,119 @@ function pickNextId(pool) {
   return null;
 }
 
-function removeOldestTopicAd() {
+function destroyEzoicId(id) {
+  try {
+    window.ezstandalone = window.ezstandalone || {};
+    window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+    const fn = 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 (!fifo.length) return null;
   fifo.sort((a, b) => a.afterPostNo - b.afterPostNo);
-  const old = fifo.shift();
-  if (!old) return false;
 
-  const sel = '.ezoic-ad-post[data-ezoic-after="' + old.afterPostNo + '"][data-ezoic-id="' + old.id + '"]';
-  const $el = $(sel);
-  if ($el.length) $el.remove();
+  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) {}
 
-  usedIds.delete(old.id);
-  // DO NOT delete seenAfterPostNo to prevent re-insertion in the top area
-  return true;
+    $el.remove();
+    usedIds.delete(old.id);
+    destroyEzoicId(old.id);
+    return old.id;
+  }
+  return null;
 }
 
-function removeOldestCategoryAd() {
+function recycleOldestCategoryId($items) {
+  if (!fifoCat.length) return null;
   fifoCat.sort((a, b) => a.afterPos - b.afterPos);
-  const old = fifoCat.shift();
-  if (!old) return false;
 
-  const sel = '.ezoic-ad-topic[data-ezoic-after="' + old.afterPos + '"][data-ezoic-id="' + old.id + '"]';
-  const $el = $(sel);
-  if ($el.length) $el.remove();
+  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();
+    usedIds.delete(old.id);
+    destroyEzoicId(old.id);
+    return old.id;
+  }
+  return null;
+}
+
+function setupAdAutoHeight() {
+  if (window.__ezoicAutoHeightAttached) return;
+  window.__ezoicAutoHeightAttached = true;
+
+  try {
+    const ro = new ResizeObserver(function () {
+      document.querySelectorAll('.ezoic-ad').forEach(function (wrap) {
+        wrap.style.minHeight = '0px';
+        wrap.style.height = 'auto';
+      });
+    });
+
+    function attach() {
+      document.querySelectorAll('.ezoic-ad').forEach(function (wrap) {
+        if (wrap.__ezoicRO) return;
+        wrap.__ezoicRO = true;
+        ro.observe(wrap);
+      });
+    }
 
-  usedIds.delete(old.id);
-  return true;
+    attach();
+    setTimeout(attach, 600);
+    setTimeout(attach, 1600);
+  } catch (e) {}
 }
 
 function callEzoic(ids) {
-  // ids optional; if omitted, we will scan DOM for unrendered placeholders
   window.ezstandalone = window.ezstandalone || {};
   window.ezstandalone.cmd = window.ezstandalone.cmd || [];
 
+  // Collect unrendered wrappers (prevents duplicates even if events fire multiple times)
   const collect = function () {
     const list = [];
-    document.querySelectorAll('.ezoic-ad [id^="ezoic-pub-ad-placeholder-"]').forEach(function (ph) {
+    document.querySelectorAll('.ezoic-ad').forEach(function (wrap) {
+      if (wrap.getAttribute('data-ezoic-rendered') === '1') return;
+      const ph = wrap.querySelector('[id^="ezoic-pub-ad-placeholder-"]');
+      if (!ph) return;
       const idStr = ph.id.replace('ezoic-pub-ad-placeholder-', '');
       const id = parseInt(idStr, 10);
       if (!Number.isFinite(id) || id <= 0) return;
 
-      const wrap = ph.closest('.ezoic-ad');
-      if (!wrap) return;
-      if (wrap.getAttribute('data-ezoic-rendered') === '1') return;
-
-      list.push(id);
       wrap.setAttribute('data-ezoic-rendered', '1');
+      list.push(id);
     });
-    // de-dupe
     return Array.from(new Set(list));
   };
 
@@ -178,16 +247,13 @@ function callEzoic(ids) {
   setupAdAutoHeight();
   window.ezstandalone.cmd.push(function () { run(); });
 
-  // Retry only if showAds isn't available yet
+  // Retry if Ezoic loads late
   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);
   };
 
@@ -201,13 +267,15 @@ function callEzoic(ids) {
 }
 
 function getPostNumber($post) {
-  const di = parseInt($post.attr('data-index'), 10);
-  if (Number.isFinite(di) && di > 0) return di;
-
+  // 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);
 
+  // fallback data-index (often 0/1 based)
+  const di = parseInt($post.attr('data-index'), 10);
+  if (Number.isFinite(di) && di >= 0) return di + 1;
+
   return NaN;
 }
 
@@ -224,8 +292,9 @@ function injectTopicMessageAds($posts, pool, interval) {
 
   $posts.each(function () {
     const $p = $(this);
-    // Never insert after the last real post: it can break NodeBB infinite scroll
+    // Never insert after the last post (sentinel)
     if ($p.is($posts.last())) return;
+
     const postNo = getPostNumber($p);
     if (!Number.isFinite(postNo) || postNo <= 0) return;
 
@@ -233,7 +302,10 @@ function injectTopicMessageAds($posts, pool, interval) {
     if (seenAfterPostNo.has(postNo)) return;
 
     let id = pickNextId(pool);
-    if (!id) { return; }
+    if (!id) {
+      id = recycleOldestTopicId($posts);
+      if (!id) return;
+    }
 
     const inner = '<div class="ezoic-ad-message-inner"><div id="ezoic-pub-ad-placeholder-' + id + '"></div></div>';
     const html = makeWrapperLike(
@@ -259,8 +331,9 @@ function injectCategoryBetweenAds($items, pool, interval) {
 
   $items.each(function () {
     const $it = $(this);
-    // Never insert after the last real topic item (keeps NodeBB infinite scroll working)
+    // Never insert after the last topic item (sentinel)
     if ($it.is($items.last())) return;
+
     const pos = getTopicPos($it);
     if (!Number.isFinite(pos) || pos <= 0) return;
 
@@ -268,7 +341,10 @@ function injectCategoryBetweenAds($items, pool, interval) {
     if (seenAfterTopicPos.has(pos)) return;
 
     let id = pickNextId(pool);
-    if (!id) { return; }
+    if (!id) {
+      id = recycleOldestCategoryId($items);
+      if (!id) return;
+    }
 
     const placeholder = '<div id="ezoic-pub-ad-placeholder-' + id + '"></div>';
     const html = makeWrapperLike(
@@ -310,17 +386,20 @@ async function refreshAds() {
     const messagePool = parsePool(cfg.messagePlaceholderIds);
     const messageInterval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
 
+    const hasTopicList = isCategoryTopicListPage();
     const onTopic = isTopicPage();
-    const onCategory = !onTopic && isCategoryTopicListPage();
+    const onCategory = hasTopicList && !onTopic;
 
     const newIds = [];
 
+    // 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;
     }
@@ -347,28 +426,29 @@ function debounceRefresh() {
   debounceTimer = setTimeout(refreshAds, 220);
 }
 
-$(document).ready(debounceRefresh);
+$(document).ready(function () { setupAdAutoHeight(); debounceRefresh(); });
+
 $(window).on('action:ajaxify.end action:posts.loaded action:topic.loaded action:topics.loaded action:category.loaded', debounceRefresh);
-setTimeout(debounceRefresh, 2200);
 
-// Fallback: some themes/devices don't emit the expected events for infinite scroll.
-// Observe DOM additions and trigger a refresh when new posts/topics are appended/prepended.
+setTimeout(function () { setupAdAutoHeight(); debounceRefresh(); }, 2200);
+
+// Observer + poller: ensure we rerun when NodeBB injects new items
 (function setupEzoicObserver() {
   if (window.__ezoicInfiniteObserver) return;
   try {
+    const trigger = function () { debounceRefresh(); };
+
     const obs = new MutationObserver(function (mutations) {
       for (const m of mutations) {
         if (!m.addedNodes || !m.addedNodes.length) continue;
         for (const n of m.addedNodes) {
           if (!n || n.nodeType !== 1) continue;
-          // direct match
           if (n.matches && (n.matches('[component="post"][data-pid]') || n.matches('li[component="category/topic"]'))) {
-            debounceRefresh();
+            trigger();
             return;
           }
-          // descendant match
           if (n.querySelector && (n.querySelector('[component="post"][data-pid]') || n.querySelector('li[component="category/topic"]'))) {
-            debounceRefresh();
+            trigger();
             return;
           }
         }
@@ -376,5 +456,19 @@ setTimeout(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) {}
 })();

package/public/style.css

@@ -1,2 +1,3 @@
-.ezoic-ad-post{margin:0.75rem 0;}
-.ezoic-ad-message-inner{padding:0.75rem 0;}
+.ezoic-ad{min-height:0!important;height:auto!important;padding:0!important;}
+.ezoic-ad-post,.ezoic-ad-topic{margin:0.5rem 0;}
+.ezoic-ad-message-inner{padding:0;margin:0;}