nodebb-plugin-ezoic-infinite 1.6.64 → 1.6.65

package/package.json

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

package/public/client.js

@@ -402,22 +402,12 @@
 
   // ─── Insertion primitives ───────────────────────────────────────────────────
 
-  /** Extract the stable DOM id (tid/pid/cid) from an anchor element. */
-  function getAnchorStableId(el) {
-    if (!el) return '';
-    return el.getAttribute('data-tid') || el.getAttribute('data-pid') ||
-           el.getAttribute('data-cid') || el.getAttribute('data-index') || '';
-  }
-
-  function buildWrap(id, kindClass, afterPos, createPlaceholder, anchorStableId) {
+  function buildWrap(id, kindClass, afterPos, createPlaceholder) {
     const wrap = document.createElement('div');
     wrap.className = WRAP_CLASS + ' ' + kindClass;
     wrap.setAttribute('data-ezoic-after',  String(afterPos));
     wrap.setAttribute('data-ezoic-wrapid', String(id));
     wrap.setAttribute('data-created',      String(now()));
-    // Store the anchor element's stable DOM id so we can re-anchor after
-    // NodeBB re-renders the list (which changes ordinal positions).
-    if (anchorStableId) wrap.setAttribute('data-ezoic-anchor', String(anchorStableId));
     if (afterPos === 1) wrap.setAttribute('data-ezoic-pin', '1');
     wrap.style.width = '100%';
     if (createPlaceholder) {
@@ -429,27 +419,14 @@
     return wrap;
   }
 
-  /**
-   * Find a wrap that is already anchored to a specific stable id (tid/pid/cid).
-   * Used to prevent double-injection when NodeBB re-renders and ordinals shift.
-   */
-  function findWrapByAnchor(kindClass, anchorStableId) {
-    if (!anchorStableId) return null;
-    return document.querySelector(
-      '.' + WRAP_CLASS + '.' + kindClass + '[data-ezoic-anchor="' + CSS.escape(String(anchorStableId)) + '"]'
-    );
-  }
-
   function insertAfter(target, id, kindClass, afterPos) {
     if (!target || !target.insertAdjacentElement) return null;
     if (findWrap(kindClass, afterPos)) return null;
-    const anchorId = getAnchorStableId(target);
-    if (anchorId && findWrapByAnchor(kindClass, anchorId)) return null; // already anchored
     if (insertingIds.has(id)) return null;
     const existingPh = document.getElementById(PLACEHOLDER_PREFIX + id);
     insertingIds.add(id);
     try {
-      const wrap = buildWrap(id, kindClass, afterPos, !existingPh, anchorId);
+      const wrap = buildWrap(id, kindClass, afterPos, !existingPh);
       target.insertAdjacentElement('afterend', wrap);
       if (existingPh) {
         existingPh.setAttribute('data-ezoic-id', String(id));
@@ -494,21 +471,12 @@
     const itemSet   = new Set(items);
     const isMessage = kindClass === 'ezoic-ad-message';
     // Between/category ads are NEVER fully released — only hidden/shown.
+    // Releasing frees IDs into the pool → re-injection at wrong positions.
     const allowRelease = isMessage;
     let removed = 0;
 
-    // Build a set of stable anchor ids currently in the DOM (tid/pid/cid).
-    const liveAnchorIds = new Set();
-    items.forEach((el) => {
-      const sid = getAnchorStableId(el);
-      if (sid) liveAnchorIds.add(sid);
-    });
-
-    const anchorIsLive = (wrap) => {
-      // Primary: check by stable id (survives NodeBB re-renders).
-      const sid = wrap.getAttribute('data-ezoic-anchor');
-      if (sid) return liveAnchorIds.has(sid);
-      // Fallback: DOM-proximity check (for wraps without stable id).
+    const hasNearbyItem = (wrap) => {
+      // If wrap is inside a li.nodebb-ezoic-host, check the HOST's siblings.
       const pivot = (wrap.parentElement && wrap.parentElement.classList &&
                      wrap.parentElement.classList.contains(HOST_CLASS))
         ? wrap.parentElement : wrap;
@@ -530,12 +498,12 @@
       const created = parseInt(wrap.getAttribute('data-created') || '0', 10);
       if (created && (now() - created) < keepEmptyWrapMs()) return;
 
-      if (anchorIsLive(wrap)) {
+      if (hasNearbyItem(wrap)) {
         try { wrap.classList.remove('ez-orphan-hidden'); wrap.style.display = ''; } catch (e) {}
         return;
       }
 
-      // Anchor not in DOM → hide.
+      // Anchor gone → hide.
       try { wrap.classList.add('ez-orphan-hidden'); wrap.style.display = 'none'; } catch (e) {}
       if (!allowRelease) return;
 
@@ -552,55 +520,6 @@
     return removed;
   }
 
-  /**
-   * Re-anchor between/category wraps after a NodeBB list re-render.
-   *
-   * When NodeBB rebuilds the topic list (infinite scroll above, sort change…),
-   * it re-inserts topic <li> elements in a new DOM order. Our wraps are still
-   * in the DOM but they may now sit between wrong topics because their ordinals
-   * changed. We use the stable anchor id (data-tid / data-pid) recorded at
-   * insertion time to find each wrap's correct anchor topic and move it there.
-   */
-  function reanchorWraps(kindClass, items) {
-    // Build tid → element map from the current live items.
-    const tidMap = new Map();
-    items.forEach((el) => {
-      const sid = getAnchorStableId(el);
-      if (sid) tidMap.set(sid, el);
-    });
-
-    document.querySelectorAll('.' + WRAP_CLASS + '.' + kindClass).forEach((wrap) => {
-      try {
-        const sid = wrap.getAttribute('data-ezoic-anchor');
-        if (!sid) return;
-        const anchor = tidMap.get(sid);
-        if (!anchor || !anchor.isConnected) return;
-
-        // Check if the wrap is already correctly positioned (immediately after anchor).
-        // Account for li.nodebb-ezoic-host wrapper.
-        const wrapOrHost = (wrap.parentElement && wrap.parentElement.classList &&
-                            wrap.parentElement.classList.contains(HOST_CLASS))
-          ? wrap.parentElement : wrap;
-
-        if (wrapOrHost.previousElementSibling === anchor) {
-          // Already in the right place — just un-hide if it was hidden.
-          try { wrap.classList.remove('ez-orphan-hidden'); wrap.style.display = ''; } catch (e) {}
-          return;
-        }
-
-        // Update data-ezoic-after to the anchor's current ordinal so findWrap still works.
-        const newOrdinal = getAnchorStableId(anchor)
-          ? (parseInt(anchor.getAttribute('data-index') || '-1', 10) + 1) || 0
-          : 0;
-        if (newOrdinal > 0) wrap.setAttribute('data-ezoic-after', String(newOrdinal));
-
-        // Move the wrap (or its host) to after the anchor.
-        anchor.insertAdjacentElement('afterend', wrapOrHost);
-        try { wrap.classList.remove('ez-orphan-hidden'); wrap.style.display = ''; } catch (e) {}
-      } catch (e) {}
-    });
-  }
-
   function decluster(kindClass) {
     const wraps = Array.from(document.querySelectorAll('.' + WRAP_CLASS + '.' + kindClass));
     if (wraps.length < 2) return 0;
@@ -990,10 +909,25 @@
     const maxInserts = MAX_INSERTS_PER_RUN + (isBoosted() ? 1 : 0);
     let inserted = 0;
 
+    // Viewport top — we never inject after an element that is fully above this.
+    // This is the definitive guard against NodeBB loading content above the fold
+    // and our scanner immediately injecting ads on those newly-loaded top items.
+    // We use a generous negative margin so items just barely scrolled above still
+    // get ads injected (they'll be visible when the user scrolls back a little).
+    const viewportSafeTop = -(window.innerHeight || 800) * 0.5;
+
     for (const afterPos of targets) {
       if (inserted >= maxInserts) break;
       const el = ordinalMap.get(afterPos);
       if (!el || !el.isConnected) continue;
+
+      // Skip elements that are well above the viewport.
+      // getBoundingClientRect is cheap on modern engines (no forced layout).
+      try {
+        const rect = el.getBoundingClientRect();
+        if (rect.bottom < viewportSafeTop) continue;
+      } catch (e) {}
+
       if (isAdjacentAd(el)) continue;
       if (findWrap(kindClass, afterPos)) continue;
 
@@ -1052,11 +986,6 @@
 
     } else if (kind === 'categoryTopics' && normalizeBool(cfg.enableBetweenAds)) {
       const items = getTopicItems();
-      // Re-anchor FIRST: move existing wraps to their correct topic after any
-      // NodeBB list re-render (ordinals may have shifted). This must happen before
-      // pruneOrphanWraps (which uses live anchor ids) and before injectBetween
-      // (which checks findWrap/findWrapByAnchor to avoid duplicates).
-      reanchorWraps('ezoic-ad-between', items);
       pruneOrphanWraps('ezoic-ad-between', items);
       if (canInject) {
         inserted += injectBetween('ezoic-ad-between', items,
@@ -1068,7 +997,6 @@
 
     } else if (kind === 'categories' && normalizeBool(cfg.enableCategoryAds)) {
       const items = getCategoryItems();
-      reanchorWraps('ezoic-ad-categories', items);
       pruneOrphanWraps('ezoic-ad-categories', items);
       if (canInject) {
         inserted += injectBetween('ezoic-ad-categories', items,