nodebb-plugin-ezoic-infinite 0.7.7 → 0.8.0

package/package.json

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

package/public/client.js

@@ -140,34 +140,64 @@ function removeOldestCategoryAd() {
 }
 
 function callEzoic(ids) {
-  if (!ids || !ids.length) return;
-
+  // ids optional; if omitted, we will scan DOM for unrendered placeholders
   window.ezstandalone = window.ezstandalone || {};
   window.ezstandalone.cmd = window.ezstandalone.cmd || [];
 
+  const collect = function () {
+    const list = [];
+    document.querySelectorAll('.ezoic-ad [id^="ezoic-pub-ad-placeholder-"]').forEach(function (ph) {
+      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');
+    });
+    // de-dupe
+    return Array.from(new Set(list));
+  };
+
+  const toShow = (ids && ids.length) ? Array.from(new Set(ids)) : collect();
+  if (!toShow.length) return;
+
   const run = function () {
-    try {
-      if (typeof window.ezstandalone.destroyPlaceholders === 'function') {
-        window.ezstandalone.destroyPlaceholders.apply(window.ezstandalone, ids);
-      }
-    } catch (e) {}
     try {
       if (typeof window.ezstandalone.showAds === 'function') {
-        window.ezstandalone.showAds.apply(window.ezstandalone, ids);
+        window.ezstandalone.showAds.apply(window.ezstandalone, toShow);
         return true;
       }
     } catch (e) {}
     return false;
   };
 
+  setupAdAutoHeight();
   window.ezstandalone.cmd.push(function () { run(); });
 
+  // Retry only if showAds isn't available yet
   let tries = 0;
   const maxTries = 6;
-  const timer = setInterval(function () {
+  const retry = function () {
     tries++;
-    if (run() || tries >= maxTries) clearInterval(timer);
-  }, 800);
+    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') {
+      setTimeout(retry, 800);
+    }
+  } catch (e) {
+    setTimeout(retry, 800);
+  }
 }
 
 function getPostNumber($post) {
@@ -291,6 +321,7 @@ async function refreshAds() {
         newIds.push(...injectCategoryBetweenAds($items, betweenPool, betweenInterval));
       }
       callEzoic(newIds);
+      callEzoic();
       return;
     }
 
@@ -300,6 +331,7 @@ async function refreshAds() {
         newIds.push(...injectTopicMessageAds($posts, messagePool, messageInterval));
       }
       callEzoic(newIds);
+      callEzoic();
     }
   } finally {
     inFlight = false;
@@ -324,20 +356,19 @@ setTimeout(debounceRefresh, 2200);
 (function setupEzoicObserver() {
   if (window.__ezoicInfiniteObserver) return;
   try {
-    const trigger = function () { debounceRefresh(); };
-
-    // MutationObserver: trigger when new posts/topics are added anywhere in the page
     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"]'))) {
-            trigger();
+            debounceRefresh();
             return;
           }
+          // descendant match
           if (n.querySelector && (n.querySelector('[component="post"][data-pid]') || n.querySelector('li[component="category/topic"]'))) {
-            trigger();
+            debounceRefresh();
             return;
           }
         }
@@ -345,20 +376,5 @@ setTimeout(debounceRefresh, 2200);
     });
     obs.observe(document.body, { childList: true, subtree: true });
     window.__ezoicInfiniteObserver = obs;
-
-    // Poller fallback: if some renders bypass observers/events, detect count changes
-    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) {}
 })();