nodebb-plugin-ezoic-infinite 0.6.7 → 0.6.9

package/package.json

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

package/public/client.js

@@ -10,19 +10,27 @@ let debounceTimer;
 let inFlight = false;
 let rerunRequested = false;
 
-// Per-page incremental state
+// Per-page state (keyed by tid/cid)
 let pageKey = null;
-let seenSlots = new Set();           // slots already processed (never cleared on eviction)
-let usedIds = new Set();             // IDs currently present in DOM
-let adsFIFO = [];                    // [{slot, id}] oldest first
 
-function resetPageState() {
-  seenSlots = new Set();
+// 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}]
+
+// Category page state: anchor to absolute topic position if available
+let seenAfterTopicPos = new Set(); // topic positions we've inserted after
+let fifoCat = [];                  // [{afterPos, id}]
+
+function resetState() {
+  seenAfterPostNo = new Set();
+  seenAfterTopicPos = new Set();
   usedIds = new Set();
-  adsFIFO = [];
+  fifo = [];
+  fifoCat = [];
 }
 
-function currentPageKey() {
+function getPageKey() {
   try {
     if (ajaxify && ajaxify.data) {
       if (ajaxify.data.tid) return 'topic:' + ajaxify.data.tid;
@@ -58,11 +66,10 @@ function isCategoryTopicListPage() {
 }
 
 function getTopicPosts() {
-  // Only real posts
   const $primary = $('[component="post"][data-pid]');
   if ($primary.length) return $primary;
 
-  // Fallback: top-level with post/content
+  // fallback: top-level with post/content
   return $('[data-pid]').filter(function () {
     const $el = $(this);
     const hasContent = $el.find('[component="post/content"]').length > 0;
@@ -94,7 +101,7 @@ function makeWrapperLike($target, classes, innerHtml, attrs) {
   return '<div class="' + classes + '"' + attrStr + '>' + innerHtml + '</div>';
 }
 
-function cleanupWrappersOnNav() {
+function cleanupOnNav() {
   $('.ezoic-ad-post, .ezoic-ad-topic, .ezoic-ad-between').remove();
 }
 
@@ -105,11 +112,26 @@ function pickNextId(pool) {
   return null;
 }
 
-function evictOldestOne() {
-  const old = adsFIFO.shift();
+function removeOldestTopicAd() {
+  fifo.sort((a, b) => a.afterPostNo - b.afterPostNo);
+  const old = fifo.shift();
   if (!old) return false;
 
-  const sel = '[data-ezoic-slot="' + old.slot + '"][data-ezoic-id="' + old.id + '"]';
+  const sel = '.ezoic-ad-post[data-ezoic-after="' + old.afterPostNo + '"][data-ezoic-id="' + old.id + '"]';
+  const $el = $(sel);
+  if ($el.length) $el.remove();
+
+  usedIds.delete(old.id);
+  // DO NOT delete seenAfterPostNo to prevent re-insertion in the top area
+  return true;
+}
+
+function removeOldestCategoryAd() {
+  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();
 
@@ -135,7 +157,6 @@ function callEzoic(ids) {
 
   window.ezstandalone.cmd.push(function () { run(); });
 
-  // Retry (Ezoic can load late)
   let tries = 0;
   const maxTries = 6;
   const timer = setInterval(function () {
@@ -144,93 +165,109 @@ function callEzoic(ids) {
   }, 800);
 }
 
-function injectBetweenIncremental($items, pool, interval, wrapperClass) {
-  const total = $items.length;
-  const maxSlot = Math.floor(total / interval);
-  if (maxSlot <= 0) return [];
+function getPostNumber($post) {
+  const di = parseInt($post.attr('data-index'), 10);
+  if (Number.isFinite(di) && di > 0) return di;
+
+  const txt = ($post.find('a.post-index').first().text() || '').trim();
+  const m = txt.match(/#\s*(\d+)/);
+  if (m) return parseInt(m[1], 10);
+
+  return NaN;
+}
+
+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;
+}
 
+function injectTopicMessageAds($posts, pool, interval) {
   const newIds = [];
 
-  for (let slot = 1; slot <= maxSlot; slot++) {
-    if (seenSlots.has(slot)) continue;
+  $posts.each(function () {
+    const $p = $(this);
+    // Never insert after the last real post: it can break NodeBB infinite scroll
+    if ($p.is($posts.last())) return;
+    const postNo = getPostNumber($p);
+    if (!Number.isFinite(postNo) || postNo <= 0) return;
 
-    const index = slot * interval - 1;
-    const $target = $items.eq(index);
-    if (!$target.length) continue;
+    if (postNo % interval !== 0) return;
+    if (seenAfterPostNo.has(postNo)) return;
 
     let id = pickNextId(pool);
     if (!id) {
-      if (!evictOldestOne()) break;
+      if (!removeOldestTopicAd()) return;
       id = pickNextId(pool);
-      if (!id) break;
+      if (!id) return;
     }
 
-    const placeholder = '<div id="ezoic-pub-ad-placeholder-' + id + '"></div>';
+    const inner = '<div class="ezoic-ad-message-inner"><div id="ezoic-pub-ad-placeholder-' + id + '"></div></div>';
     const html = makeWrapperLike(
-      $target,
-      wrapperClass + ' ezoic-ad',
-      placeholder,
-      'data-ezoic-slot="' + slot + '" data-ezoic-id="' + id + '"'
+      $p,
+      'ezoic-ad-post ezoic-ad',
+      inner,
+      'data-ezoic-after="' + postNo + '" data-ezoic-id="' + id + '"'
     );
 
-    $target.after(html);
+    $p.after(html);
 
-    seenSlots.add(slot);
+    seenAfterPostNo.add(postNo);
     usedIds.add(id);
-    adsFIFO.push({ slot: slot, id: id });
+    fifo.push({ afterPostNo: postNo, id: id });
     newIds.push(id);
-  }
+  });
 
   return newIds;
 }
 
-function injectMessageIncremental($posts, pool, interval) {
-  const total = $posts.length;
-  const maxSlot = Math.floor(total / interval);
-  if (maxSlot <= 0) return [];
-
+function injectCategoryBetweenAds($items, pool, interval) {
   const newIds = [];
 
-  for (let slot = 1; slot <= maxSlot; slot++) {
-    if (seenSlots.has(slot)) continue;
+  $items.each(function () {
+    const $it = $(this);
+    // Never insert after the last real topic item (keeps NodeBB infinite scroll working)
+    if ($it.is($items.last())) return;
+    const pos = getTopicPos($it);
+    if (!Number.isFinite(pos) || pos <= 0) return;
 
-    const index = slot * interval - 1;
-    const $target = $posts.eq(index);
-    if (!$target.length) continue;
+    if (pos % interval !== 0) return;
+    if (seenAfterTopicPos.has(pos)) return;
 
     let id = pickNextId(pool);
     if (!id) {
-      if (!evictOldestOne()) break;
+      if (!removeOldestCategoryAd()) return;
       id = pickNextId(pool);
-      if (!id) break;
+      if (!id) return;
     }
 
-    // Do NOT use class "post" nor component="post" for ads: can break NodeBB infinite scroll.
-    const inner = '<div class="ezoic-ad-message-inner"><div id="ezoic-pub-ad-placeholder-' + id + '"></div></div>';
+    const placeholder = '<div id="ezoic-pub-ad-placeholder-' + id + '"></div>';
     const html = makeWrapperLike(
-      $target,
-      'ezoic-ad-post ezoic-ad',
-      inner,
-      'data-ezoic-slot="' + slot + '" data-ezoic-id="' + id + '"'
+      $it,
+      'ezoic-ad-topic ezoic-ad',
+      placeholder,
+      'data-ezoic-after="' + pos + '" data-ezoic-id="' + id + '"'
     );
 
-    $target.after(html);
+    $it.after(html);
 
-    seenSlots.add(slot);
+    seenAfterTopicPos.add(pos);
     usedIds.add(id);
-    adsFIFO.push({ slot: slot, id: id });
+    fifoCat.push({ afterPos: pos, id: id });
     newIds.push(id);
-  }
+  });
 
   return newIds;
 }
 
 async function refreshAds() {
-  const key = currentPageKey();
+  const key = getPageKey();
   if (pageKey !== key) {
     pageKey = key;
-    resetPageState();
-    cleanupWrappersOnNav();
+    resetState();
+    cleanupOnNav();
   }
 
   if (inFlight) { rerunRequested = true; return; }
@@ -249,24 +286,21 @@ async function refreshAds() {
     const onTopic = isTopicPage();
     const onCategory = !onTopic && isCategoryTopicListPage();
 
-    const $posts = onTopic ? getTopicPosts() : $();
-    const $topicItems = onCategory ? getCategoryTopicItems() : $();
-
-    if (!$posts.length && !$topicItems.length) return;
-
     const newIds = [];
 
-    if ($topicItems.length) {
-      if (cfg.enableBetweenAds && betweenPool.length) {
-        newIds.push(...injectBetweenIncremental($topicItems, betweenPool, betweenInterval, 'ezoic-ad-topic'));
+    if (onCategory) {
+      const $items = getCategoryTopicItems();
+      if (cfg.enableBetweenAds && betweenPool.length && $items.length) {
+        newIds.push(...injectCategoryBetweenAds($items, betweenPool, betweenInterval));
       }
       callEzoic(newIds);
       return;
     }
 
-    if ($posts.length) {
-      if (cfg.enableMessageAds && messagePool.length) {
-        newIds.push(...injectMessageIncremental($posts, messagePool, messageInterval));
+    if (onTopic) {
+      const $posts = getTopicPosts();
+      if (cfg.enableMessageAds && messagePool.length && $posts.length) {
+        newIds.push(...injectTopicMessageAds($posts, messagePool, messageInterval));
       }
       callEzoic(newIds);
     }
@@ -274,16 +308,16 @@ async function refreshAds() {
     inFlight = false;
     if (rerunRequested) {
       rerunRequested = false;
-      setTimeout(refreshAds, 120);
+      setTimeout(refreshAds, 160);
     }
   }
 }
 
 function debounceRefresh() {
   clearTimeout(debounceTimer);
-  debounceTimer = setTimeout(refreshAds, 200);
+  debounceTimer = setTimeout(refreshAds, 220);
 }
 
 $(document).ready(debounceRefresh);
 $(window).on('action:ajaxify.end action:posts.loaded action:topic.loaded', debounceRefresh);
-setTimeout(debounceRefresh, 1800);
+setTimeout(debounceRefresh, 2200);