nodebb-plugin-ezoic-infinite 0.6.0 → 0.6.2

package/package.json

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

package/public/client.js

@@ -1,24 +1,17 @@
-/* globals ajaxify */
 'use strict';
 
+/* globals ajaxify */
 window.ezoicInfiniteLoaded = true;
 
 let cachedConfig;
 let lastFetch = 0;
-let debounceTimer;
 
+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' });
-  cachedConfig = await res.json();
-  lastFetch = Date.now();
-  return cachedConfig;
-}
-
 function parsePool(raw) {
   if (!raw) return [];
   return Array.from(new Set(
@@ -28,18 +21,28 @@ function parsePool(raw) {
   ));
 }
 
-function isTopicTemplate() {
-  return !!(ajaxify && ajaxify.data && (ajaxify.data.template === 'topic' || ajaxify.data.template === 'topicEvents'));
+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;
+}
+
+// Robust DOM-based detection (no dependency on ajaxify template timing)
+function isTopicPage() {
+  return $('[component="post/content"]').length > 0 || $('[component="post"][data-pid]').length > 0;
 }
 
-function isCategoryTemplate() {
-  return !!(ajaxify && ajaxify.data && ajaxify.data.template === 'category');
+function isCategoryTopicListPage() {
+  return $('li[component="category/topic"]').length > 0;
 }
 
 function getTopicPosts() {
-  if (!isTopicTemplate()) return $();
   const $primary = $('[component="post"][data-pid]');
   if ($primary.length) return $primary.not('.ezoic-ad-post');
+
+  // Fallback: top-level data-pid containing post/content
   return $('[data-pid]').filter(function () {
     const $el = $(this);
     const hasContent = $el.find('[component="post/content"]').length > 0;
@@ -49,7 +52,6 @@ function getTopicPosts() {
 }
 
 function getCategoryTopicItems() {
-  if (!isCategoryTemplate()) return $();
   return $('li[component="category/topic"]').not('.ezoic-ad-topic');
 }
 
@@ -57,11 +59,12 @@ function tagName($el) {
   return ($el && $el.length ? (($el.prop('tagName') || '').toUpperCase()) : '');
 }
 
-function removeExistingEzoicNodes() {
-  // Remove only the wrappers we created. Their inner placeholder divs go away with them.
-  $('.ezoic-ad-post').remove();
-  $('.ezoic-ad-between').remove();
-  $('.ezoic-ad-topic').remove();
+function makeWrapperLike($target, classes, innerHtml) {
+  const t = tagName($target);
+  if (t === 'LI') {
+    return '<li class="' + classes + ' list-unstyled" data-ezoic-ad="1">' + innerHtml + '</li>';
+  }
+  return '<div class="' + classes + '" data-ezoic-ad="1">' + innerHtml + '</div>';
 }
 
 function computeWindowSlots(totalItems, interval, poolSize) {
@@ -73,15 +76,13 @@ function computeWindowSlots(totalItems, interval, poolSize) {
   return out;
 }
 
-function makeWrapperLike($target, classes, innerHtml) {
-  const t = tagName($target);
-  if (t === 'LI') {
-    return '<li class="' + classes + ' list-unstyled" data-ezoic-ad="1">' + innerHtml + '</li>';
-  }
-  return '<div class="' + classes + '" data-ezoic-ad="1">' + innerHtml + '</div>';
+function removeOurWrappers() {
+  $('.ezoic-ad-post').remove();
+  $('.ezoic-ad-between').remove();
+  $('.ezoic-ad-topic').remove();
 }
 
-function insertBetweenGeneric($items, ids, interval, wrapperClass) {
+function insertBetween($items, ids, interval, wrapperClass) {
   const total = $items.length;
   const slotsToRender = computeWindowSlots(total, interval, ids.length);
   if (!slotsToRender.length) return [];
@@ -101,7 +102,7 @@ function insertBetweenGeneric($items, ids, interval, wrapperClass) {
   return activeIds;
 }
 
-function insertAdMessagesBetweenReplies($posts, ids, interval) {
+function insertMessageAds($posts, ids, interval) {
   const total = $posts.length;
   const slotsToRender = computeWindowSlots(total, interval, ids.length);
   if (!slotsToRender.length) return [];
@@ -122,31 +123,45 @@ function insertAdMessagesBetweenReplies($posts, ids, interval) {
   return activeIds;
 }
 
-function ezoicShow(ids) {
+function signatureFor($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';
+}
+
+// Call Ezoic when ready (retry a few times, non-destructive)
+function callEzoic(ids) {
   if (!ids || !ids.length) return;
 
-  // Ezoic supports showAds(101,102,103) and recommends a single call with all ids.
   window.ezstandalone = window.ezstandalone || {};
   window.ezstandalone.cmd = window.ezstandalone.cmd || [];
-  window.ezstandalone.cmd.push(function () {
+
+  const run = function () {
     try {
       if (typeof window.ezstandalone.showAds === 'function') {
         window.ezstandalone.showAds.apply(window.ezstandalone, ids);
+        return true;
       }
     } catch (e) {}
-  });
-}
+    return false;
+  };
 
-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';
+  // Use cmd queue first (best if Ezoic loads later)
+  window.ezstandalone.cmd.push(function () { run(); });
+
+  // Also retry a few times in case cmd isn't flushed promptly
+  let tries = 0;
+  const maxTries = 6;
+  const timer = setInterval(function () {
+    tries++;
+    if (run() || tries >= maxTries) clearInterval(timer);
+  }, 800);
 }
 
 async function refreshAds() {
@@ -163,34 +178,38 @@ async function refreshAds() {
     const messagePool = parsePool(cfg.messagePlaceholderIds);
     const messageInterval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
 
-    const $posts = getTopicPosts();
-    const $topicItems = getCategoryTopicItems();
+    const onTopic = isTopicPage();
+    const onCategory = !onTopic && isCategoryTopicListPage();
+
+    const $posts = onTopic ? getTopicPosts() : $();
+    const $topicItems = onCategory ? getCategoryTopicItems() : $();
 
     if (!$posts.length && !$topicItems.length) return;
 
-    const signature = computeSignature($posts, $topicItems);
-    if (signature === lastSignature) return;
-    lastSignature = signature;
+    const sig = signatureFor($posts, $topicItems);
+    if (sig === lastSignature) return;
+    lastSignature = sig;
 
-    removeExistingEzoicNodes();
+    removeOurWrappers();
 
     const activeIds = [];
 
-    // Category pages: BETWEEN only (between topics)
+    // Your rule:
+    // - Category topic list: BETWEEN only
+    // - Topic page: MESSAGE only
     if ($topicItems.length) {
       if (cfg.enableBetweenAds && betweenPool.length) {
-        activeIds.push(...insertBetweenGeneric($topicItems, betweenPool, betweenInterval, 'ezoic-ad-topic'));
+        activeIds.push(...insertBetween($topicItems, betweenPool, betweenInterval, 'ezoic-ad-topic'));
       }
-      ezoicShow(activeIds);
+      callEzoic(activeIds);
       return;
     }
 
-    // Topic pages: MESSAGE only (between replies)
     if ($posts.length) {
       if (cfg.enableMessageAds && messagePool.length) {
-        activeIds.push(...insertAdMessagesBetweenReplies($posts, messagePool, messageInterval));
+        activeIds.push(...insertMessageAds($posts, messagePool, messageInterval));
       }
-      ezoicShow(activeIds);
+      callEzoic(activeIds);
     }
   } finally {
     inFlight = false;
@@ -203,9 +222,9 @@ async function refreshAds() {
 
 function debounceRefresh() {
   clearTimeout(debounceTimer);
-  debounceTimer = setTimeout(refreshAds, 220);
+  debounceTimer = setTimeout(refreshAds, 200);
 }
 
 $(document).ready(debounceRefresh);
 $(window).on('action:ajaxify.end action:posts.loaded action:topic.loaded', debounceRefresh);
-setTimeout(debounceRefresh, 2200);
+setTimeout(debounceRefresh, 2000);