nodebb-plugin-ezoic-infinite 0.5.7 → 0.5.9

package/package.json

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

package/public/client.js

@@ -7,6 +7,10 @@ let cachedConfig;
 let lastFetch = 0;
 let debounceTimer;
 
+let lastSignature = null;
+let inFlight = false;
+let rerunRequested = false;
+
 async function fetchConfig() {
   if (cachedConfig && Date.now() - lastFetch < 10000) return cachedConfig;
   const res = await fetch('/api/plugins/ezoic-infinite/config', { credentials: 'same-origin' });
@@ -24,7 +28,16 @@ function parsePool(raw) {
   ));
 }
 
+function isTopicTemplate() {
+  return !!(ajaxify && ajaxify.data && (ajaxify.data.template === 'topic' || ajaxify.data.template === 'topicEvents'));
+}
+
+function isCategoryTemplate() {
+  return !!(ajaxify && ajaxify.data && ajaxify.data.template === 'category');
+}
+
 function getTopicPosts() {
+  if (!isTopicTemplate()) return $();
   const $primary = $('[component="post"][data-pid]');
   if ($primary.length) return $primary.not('.ezoic-ad-post');
 
@@ -40,6 +53,7 @@ function getTopicPosts() {
 }
 
 function getCategoryTopicItems() {
+  if (!isCategoryTemplate()) return $();
   return $('li[component="category/topic"]').not('.ezoic-ad-topic');
 }
 
@@ -47,14 +61,11 @@ function tagName($el) {
   return ($el && $el.length ? (($el.prop('tagName') || '').toUpperCase()) : '');
 }
 
-function removePlaceholdersByPool(pool) {
-  pool.forEach(id => $('[id="ezoic-pub-ad-placeholder-' + id + '"]').remove());
-}
-
-function removeAdWrappers() {
+function removeExistingEzoicNodes() {
   $('.ezoic-ad-post').remove();
   $('.ezoic-ad-between').remove();
   $('.ezoic-ad-topic').remove();
+  $('[id^="ezoic-pub-ad-placeholder-"]').remove();
 }
 
 function computeWindowSlots(totalItems, interval, poolSize) {
@@ -130,14 +141,11 @@ function uniqueConcat(a, b) {
 function ezoicCall(ids) {
   if (!ids || !ids.length) return;
 
-  // Queue calls until Ezoic is ready (recommended pattern)
   window.ezstandalone = window.ezstandalone || {};
   window.ezstandalone.cmd = window.ezstandalone.cmd || [];
 
   window.ezstandalone.cmd.push(function () {
     try {
-      // IMPORTANT: destroy only the placeholders we are about to reuse,
-      // NOT all placeholders. Destroying too early/all can make ads disappear.
       if (typeof window.ezstandalone.destroyPlaceholders === 'function') {
         window.ezstandalone.destroyPlaceholders.apply(window.ezstandalone, ids);
       }
@@ -151,62 +159,78 @@ function ezoicCall(ids) {
   });
 }
 
-async function refreshAds() {
-  let cfg;
-  try { cfg = await fetchConfig(); } catch (e) { return; }
-  if (!cfg || cfg.excluded) return;
+function computeSignature($posts, $topicItems) {
+  if ($posts.length) {
+    const lastPid = $posts.last().attr('data-pid') || '';
+    return 'topic:' + $posts.length + ':' + lastPid;
+  }
+  if ($topicItems.length) {
+    const lastTid = $topicItems.last().attr('data-tid') || '';
+    return 'category:' + $topicItems.length + ':' + lastTid;
+  }
+  return 'none';
+}
 
-  const betweenPool = parsePool(cfg.placeholderIds);
-  const betweenInterval = Math.max(1, parseInt(cfg.intervalPosts, 10) || 6);
+async function refreshAds() {
+  if (inFlight) { rerunRequested = true; return; }
+  inFlight = true;
 
-  const messagePool = parsePool(cfg.messagePlaceholderIds);
-  const messageInterval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
+  try {
+    const cfg = await fetchConfig();
+    if (!cfg || cfg.excluded) return;
 
-  const $posts = getTopicPosts();
-  const $topicItems = getCategoryTopicItems();
+    const betweenPool = parsePool(cfg.placeholderIds);
+    const betweenInterval = Math.max(1, parseInt(cfg.intervalPosts, 10) || 6);
 
-  if (!$posts.length && !$topicItems.length) return;
+    const messagePool = parsePool(cfg.messagePlaceholderIds);
+    const messageInterval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
 
-  removeAdWrappers();
-  removePlaceholdersByPool(uniqueConcat(betweenPool, messagePool));
+    const $posts = getTopicPosts();
+    const $topicItems = getCategoryTopicItems();
 
-  const combinedUnique = uniqueConcat(betweenPool, messagePool);
+    if (!$posts.length && !$topicItems.length) return;
 
-  const activeIds = [];
+    const signature = computeSignature($posts, $topicItems);
+    if (signature === lastSignature) return;
+    lastSignature = signature;
 
-  // Category topic list page
-  if (!$posts.length && $topicItems.length) {
-    if (cfg.enableBetweenAds && betweenPool.length) {
-      activeIds.push(...insertBetweenGeneric($topicItems, combinedUnique.slice(0, betweenPool.length), betweenInterval, 'ezoic-ad-topic'));
-    }
-  }
+    removeExistingEzoicNodes();
 
-  // Topic page
-  if ($posts.length) {
-    let cursor = 0;
+    const combinedUnique = uniqueConcat(betweenPool, messagePool);
+    const activeIds = [];
 
-    if (cfg.enableBetweenAds && betweenPool.length) {
-      const idsForBetween = combinedUnique.slice(cursor, cursor + betweenPool.length);
-      cursor += idsForBetween.length;
-      activeIds.push(...insertBetweenGeneric($posts, idsForBetween, betweenInterval, 'ezoic-ad-between'));
+    // Category topic list page: use BETWEEN only
+    if ($topicItems.length) {
+      if (cfg.enableBetweenAds && betweenPool.length) {
+        activeIds.push(...insertBetweenGeneric($topicItems, combinedUnique.slice(0, betweenPool.length), betweenInterval, 'ezoic-ad-topic'));
+      }
+      ezoicCall(activeIds);
+      return;
     }
 
-    if (cfg.enableMessageAds && messagePool.length) {
-      const idsForMessage = combinedUnique.slice(cursor, cursor + messagePool.length);
-      cursor += idsForMessage.length;
-      activeIds.push(...insertAdMessagesBetweenReplies($posts, idsForMessage, messageInterval));
+    // Topic page: ONLY message ads (as requested)
+    if ($posts.length) {
+      if (cfg.enableMessageAds && messagePool.length) {
+        // Use messagePool slice from the combined unique set, but keep it stable
+        const idsForMessage = combinedUnique.slice(0, messagePool.length);
+        activeIds.push(...insertAdMessagesBetweenReplies($posts, idsForMessage, messageInterval));
+      }
+      ezoicCall(activeIds);
+    }
+  } finally {
+    inFlight = false;
+    if (rerunRequested) {
+      rerunRequested = false;
+      setTimeout(refreshAds, 50);
     }
   }
-
-  // Ask Ezoic to (re)fill ONLY the placeholders we inserted.
-  ezoicCall(activeIds);
 }
 
 function debounceRefresh() {
   clearTimeout(debounceTimer);
-  debounceTimer = setTimeout(refreshAds, 180);
+  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);