nodebb-plugin-ezoic-infinite 1.0.8 → 1.0.11

package/package.json

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

package/public/client.js

@@ -111,21 +111,48 @@
     destroyPlaceholder(id);
   }
 
+  function showAdsOnceForElement(wrapperEl, id) {
+    if (!wrapperEl || !id) return;
+    if (wrapperEl.getAttribute('data-ezoic-shown') === '1') return;
+    wrapperEl.setAttribute('data-ezoic-shown', '1');
+    callShowAdsSingle(id);
+  }
+
   function callShowAdsSingle(id) {
     if (!id) return;
 
+    // Normalize id key
+    const key = String(id);
+
+    // Ensure we never call showAds twice for the same id within a short window
     const now = Date.now();
     window.__ezoicLastSingle = window.__ezoicLastSingle || {};
-    const last = window.__ezoicLastSingle[id] || 0;
-    if (now - last < 1200) return;
-    window.__ezoicLastSingle[id] = now;
+    const last = window.__ezoicLastSingle[key] || 0;
+    if (now - last < 4000) return;
+
+    // If showAds is ready now, call once and exit (no cmd + no retry)
+    try {
+      window.ezstandalone = window.ezstandalone || {};
+      if (typeof window.ezstandalone.showAds === 'function') {
+        window.__ezoicLastSingle[key] = now;
+        window.ezstandalone.showAds(id);
+        return;
+      }
+    } catch (e) {}
+
+    // Otherwise: schedule a single pending call via cmd + retries until it succeeds
+    window.__ezoicPending = window.__ezoicPending || {};
+    if (window.__ezoicPending[key]) return;
+    window.__ezoicPending[key] = true;
 
     window.ezstandalone = window.ezstandalone || {};
     window.ezstandalone.cmd = window.ezstandalone.cmd || [];
 
-    const run = function () {
+    const tryRun = function () {
       try {
         if (typeof window.ezstandalone.showAds === 'function') {
+          window.__ezoicLastSingle[key] = Date.now();
+          delete window.__ezoicPending[key];
           window.ezstandalone.showAds(id);
           return true;
         }
@@ -133,12 +160,17 @@
       return false;
     };
 
-    window.ezstandalone.cmd.push(function () { run(); });
+    // When Ezoic finishes loading, it will drain cmd; run once there
+    window.ezstandalone.cmd.push(function () { tryRun(); });
 
+    // Retry a few times in case cmd doesn't fire (race conditions)
     let tries = 0;
     (function tick() {
       tries++;
-      if (run() || tries >= 8) return;
+      if (tryRun() || tries >= 8) {
+        if (tries >= 8) delete window.__ezoicPending[key];
+        return;
+      }
       setTimeout(tick, 800);
     })();
   }
@@ -170,6 +202,7 @@
     wrap.setAttribute('data-ezoic-after', String(afterVal));
     wrap.innerHTML = '<div class="ezoic-ad-inner"><div id="ezoic-pub-ad-placeholder-' + id + '"></div></div>';
     targetEl.insertAdjacentElement('afterend', wrap);
+    return wrap;
   }
 
   function injectBetweenTopics(cfg) {
@@ -198,8 +231,8 @@
       usedBetween.add(id);
       fifoBetween.push({ id, after: pos });
 
-      insertAfter(li, id, 'ezoic-ad-between', pos);
-      callShowAdsSingle(id);
+      const wrap = insertAfter(li, id, 'ezoic-ad-between', pos);
+      showAdsOnceForElement(wrap, id);
     });
   }
 
@@ -229,8 +262,8 @@
       usedMessage.add(id);
       fifoMessage.push({ id, after: no });
 
-      insertAfter(post, id, 'ezoic-ad-message', no);
-      callShowAdsSingle(id);
+      const wrap = insertAfter(post, id, 'ezoic-ad-message', no);
+      showAdsOnceForElement(wrap, id);
     });
   }
 
@@ -243,13 +276,27 @@
       if (pageKey !== key) {
         pageKey = key;
         cleanupForNewPage();
+        window.__ezoicCatRetry = 0;
       }
 
       const cfg = await fetchConfig();
       if (!cfg || cfg.excluded) return;
 
-      if (isTopicPage()) injectBetweenMessages(cfg);
-      else if (isCategoryTopicList()) injectBetweenTopics(cfg);
+      if (isTopicPage()) {
+        injectBetweenMessages(cfg);
+      } else {
+        // category/topic list pages may render after ajaxify end; retry a few times
+        const hasList = document.querySelectorAll('li[component="category/topic"]').length > 0;
+        if (hasList) {
+          injectBetweenTopics(cfg);
+        } else {
+          window.__ezoicCatRetry = window.__ezoicCatRetry || 0;
+          if (window.__ezoicCatRetry < 20) {
+            window.__ezoicCatRetry++;
+            setTimeout(run, 250);
+          }
+        }
+      }
     } catch (e) {
       // silent
     } finally {
@@ -271,7 +318,7 @@ function bindNodeBBEvents() {
     if (window.jQuery) {
       const $w = window.jQuery(window);
       $w.off('.ezoicInfinite');
-      $w.on('action:ajaxify.end.ezoicInfinite', scheduleRun);
+      $w.on('action:ajaxify.end.ezoicInfinite', function(){ scheduleRun(); setTimeout(scheduleRun, 600); });
       $w.on('action:posts.loaded.ezoicInfinite', scheduleRun);
       $w.on('action:topic.loaded.ezoicInfinite', scheduleRun);
       $w.on('action:topics.loaded.ezoicInfinite', scheduleRun);
@@ -279,6 +326,7 @@ function bindNodeBBEvents() {
       $w.on('action:ajaxify.start.ezoicInfinite', function () {
         pageKey = null;
         cleanupForNewPage();
+        window.__ezoicCatRetry = 0;
       });
     }
   }
@@ -287,7 +335,10 @@ function bindNodeBBEvents() {
 
   // Run immediately, so it works on first ajaxify navigation too
   run();
-  setTimeout(run, 1200);
+  setTimeout(function(){
+    // only retry if nothing was injected yet
+    if (!document.querySelector('.ezoic-ad')) run();
+  }, 1400);
 
   // Also run on hard-refresh initial load
   if (document.readyState === 'loading') {