nodebb-plugin-ezoic-infinite 1.0.10 → 1.0.13

package/package.json

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

package/public/client.js

@@ -2,6 +2,7 @@
 
 /* globals ajaxify */
 (function () {
+  try {
   if (window.ezoicInfiniteLoaded) return;
   window.ezoicInfiniteLoaded = true;
 
@@ -23,16 +24,20 @@
 
   function getPageKey() {
     try {
-      if (ajaxify && ajaxify.data) {
-        if (ajaxify.data.tid) return 'topic:' + ajaxify.data.tid;
-        if (ajaxify.data.cid) return 'cid:' + ajaxify.data.cid + ':' + window.location.pathname;
+      const ax = window.ajaxify;
+      if (ax && ax.data) {
+        if (ax.data.tid) return 'topic:' + ax.data.tid;
+        if (ax.data.cid) return 'cid:' + ax.data.cid + ':' + window.location.pathname;
       }
     } catch (e) {}
     return window.location.pathname;
   }
 
   function isTopicPage() {
-    try { return !!(ajaxify && ajaxify.data && ajaxify.data.tid); } catch (e) {}
+    try {
+      const ax = window.ajaxify;
+      return !!(ax && ax.data && ax.data.tid);
+    } catch (e) {}
     return /^\/topic\//.test(window.location.pathname);
   }
 
@@ -121,18 +126,38 @@
   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;
+    const last = window.__ezoicLastSingle[key] || 0;
     if (now - last < 4000) return;
-    window.__ezoicLastSingle[id] = now;
+
+    // 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;
         }
@@ -140,12 +165,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);
     })();
   }
@@ -266,7 +296,7 @@
           injectBetweenTopics(cfg);
         } else {
           window.__ezoicCatRetry = window.__ezoicCatRetry || 0;
-          if (window.__ezoicCatRetry < 10) {
+          if (window.__ezoicCatRetry < 20) {
             window.__ezoicCatRetry++;
             setTimeout(run, 250);
           }
@@ -293,7 +323,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);
@@ -323,4 +353,8 @@ function bindNodeBBEvents() {
       setTimeout(run, 1200);
     });
   }
+;
+  } catch (e) {
+    // fail silently to avoid breaking NodeBB
+  }
 })();