nodebb-plugin-ezoic-infinite 1.2.2 → 1.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.2.2",
+  "version": "1.2.5",
   "description": "Production-ready Ezoic infinite ads integration for NodeBB 4.x",
   "main": "library.js",
   "license": "MIT",

package/public/client.js

@@ -35,10 +35,6 @@
     seenTopicAnchors: new WeakSet(),
     seenPostAnchors: new WeakSet(),
 
-    // FIFO for recycling
-    fifoTopics: [],
-    fifoPosts: [],
-
     // showAds anti-double
     lastShowById: new Map(),
     pendingById: new Set(),
@@ -97,11 +93,57 @@
     return 'category';
   }
 
+
+  function getTopicItems() {
+    return Array.from(document.querySelectorAll(SELECTORS.topicItem));
+  }
+
+  function getPostContainers() {
+    // Harmony can include multiple [component="post"] blocks (e.g. parent previews, nested structures).
+    // We only want top-level post containers that actually contain post content.
+    const nodes = Array.from(document.querySelectorAll(SELECTORS.postItem));
+    return nodes.filter((el) => {
+      if (!el || !el.isConnected) return false;
+
+      // Must contain post content
+      if (!el.querySelector('[component="post/content"]')) return false;
+
+      // Must not be nested within another post container
+      const parentPost = el.parentElement && el.parentElement.closest('[component="post"][data-pid]');
+      if (parentPost && parentPost !== el) return false;
+
+      // Avoid "parent/quote" blocks that use component="post/parent"
+      if (el.getAttribute('component') === 'post/parent') return false;
+
+      return true;
+    });
+  }
+
   function hasAdImmediatelyAfter(el) {
     const n = el && el.nextElementSibling;
     return !!(n && n.classList && n.classList.contains(WRAP_CLASS));
   }
 
+  function enforceNoAdjacentAds() {
+    // NodeBB can virtualize (remove) topics/posts from the DOM while keeping our ad wrappers,
+    // which can temporarily make two ad wrappers adjacent. Hide the later one to avoid back-to-back ads.
+    const ads = Array.from(document.querySelectorAll(`.${WRAP_CLASS}`));
+    for (let i = 0; i < ads.length; i++) {
+      const ad = ads[i];
+      const prev = ad.previousElementSibling;
+      if (prev && prev.classList && prev.classList.contains(WRAP_CLASS)) {
+        ad.style.display = 'none';
+      } else {
+        ad.style.display = '';
+      }
+    }
+  }
+
+
+    const n = el && el.nextElementSibling;
+    return !!(n && n.classList && n.classList.contains(WRAP_CLASS));
+  }
+
   function buildWrap(id, kind, afterPos) {
     const wrap = document.createElement('div');
     wrap.className = `${WRAP_CLASS} ${kind}`;
@@ -123,12 +165,6 @@
   function safeRect(el) {
     try { return el.getBoundingClientRect(); } catch (e) { return null; }
   }
-
-  function destroyPlaceholder(id) {
-    try {
-      if (window.ezstandalone && typeof window.ezstandalone.destroyPlaceholders === 'function') {
-        window.ezstandalone.destroyPlaceholders([id]);
-      }
     } catch (e) {}
   }
 
@@ -216,41 +252,14 @@
       if (attempts < 40) setTimeout(waitForPh, 50);
     })();
   }
-
-  function recycleOne(pool, usedSet, fifo, wrapperSelector) {
-    const margin = 1600;
-    const topLimit = -margin;
-
-    for (let i = 0; i < fifo.length; i++) {
-      const old = fifo[i];
-      const w = document.querySelector(wrapperSelector(old));
-      if (!w) { fifo.splice(i, 1); i--; continue; }
-
-      const r = safeRect(w);
-      if (r && r.bottom < topLimit) {
-        fifo.splice(i, 1);
-        w.remove();
-        usedSet.delete(old.id);
-        destroyPlaceholder(old.id);
-        pool.push(old.id);
-        return true;
-      }
     }
     return false;
   }
 
   function nextId(kind) {
-    const isTopics = kind === 'between';
-    const pool = isTopics ? state.poolTopics : state.poolPosts;
-    const used = isTopics ? state.usedTopics : state.usedPosts;
-    const fifo = isTopics ? state.fifoTopics : state.fifoPosts;
-    const sel = isTopics
-      ? (old) => `.${WRAP_CLASS}.ezoic-ad-between[data-ezoic-after="${old.after}"]`
-      : (old) => `.${WRAP_CLASS}.ezoic-ad-message[data-ezoic-after="${old.after}"]`;
-
+    const pool = (kind === 'between') ? state.poolTopics : state.poolPosts;
     if (pool.length) return pool.shift();
-    if (recycleOne(pool, used, fifo, sel) && pool.length) return pool.shift();
-    return null;
+    return null; // stop injecting when pool is empty
   }
 
   async function fetchConfig() {
@@ -285,7 +294,7 @@
     const interval = Math.max(1, parseInt(cfg.intervalPosts, 10) || 6);
     const first = normalizeBool(cfg.showFirstTopicAd);
 
-    const items = Array.from(document.querySelectorAll(SELECTORS.topicItem));
+    const items = getTopicItems();
     if (!items.length) return 0;
 
     let inserted = 0;
@@ -310,7 +319,6 @@
       const wrap = insertAfter(li, id, 'ezoic-ad-between', pos);
       if (!wrap) continue;
 
-      state.fifoTopics.push({ id, after: pos });
       inserted += 1;
 
       callShowAdsWhenReady(id);
@@ -326,7 +334,7 @@
     const interval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
     const first = normalizeBool(cfg.showFirstMessageAd);
 
-    const posts = Array.from(document.querySelectorAll(SELECTORS.postItem));
+    const posts = getPostContainers();
     if (!posts.length) return 0;
 
     let inserted = 0;
@@ -350,7 +358,6 @@
       const wrap = insertAfter(post, id, 'ezoic-ad-message', no);
       if (!wrap) continue;
 
-      state.fifoPosts.push({ id, after: no });
       inserted += 1;
 
       callShowAdsWhenReady(id);
@@ -373,9 +380,6 @@
     state.seenTopicAnchors = new WeakSet();
     state.seenPostAnchors = new WeakSet();
 
-    state.fifoTopics = [];
-    state.fifoPosts = [];
-
     state.lastShowById = new Map();
     state.pendingById = new Set();
 
@@ -408,6 +412,8 @@
     if (kind === 'topic') inserted = injectPosts(cfg);
     else inserted = injectTopics(cfg);
 
+    enforceNoAdjacentAds();
+
     // If we inserted max per run, schedule another pass to gradually fill (avoids “burst”)
     if (inserted >= MAX_INSERTS_PER_RUN) {
       setTimeout(() => scheduleRun('continue-fill'), 120);