nodebb-plugin-ezoic-infinite 1.5.86 → 1.5.87

package/package.json

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

package/public/client.js

@@ -1,6 +1,30 @@
 (function () {
   'use strict';
 
+// ===== V4 stateless anti-remontée =====
+function purgeAllEzoicWraps(root) {
+  var scope = root || document;
+  try {
+    scope.querySelectorAll('.nodebb-ezoic-wrap').forEach(function (n) {
+      try { n.remove(); } catch (e) {}
+    });
+  } catch (e) {}
+}
+
+function resetEzoicState() {
+  try { if (typeof shownAdsSet !== 'undefined' && shownAdsSet && shownAdsSet.clear) shownAdsSet.clear(); } catch (e) {}
+  try { if (typeof pendingShowSet !== 'undefined' && pendingShowSet && pendingShowSet.clear) pendingShowSet.clear(); } catch (e) {}
+  try { if (typeof showQueue !== 'undefined') showQueue = []; } catch (e) {}
+}
+
+function hardResetAndReinject() {
+  purgeAllEzoicWraps(document);
+  resetEzoicState();
+  try { if (typeof scheduleInject === 'function') scheduleInject(); } catch (e) {}
+}
+// ===== /V4 =====
+
+
   // Track scroll direction to avoid aggressive recycling when the user scrolls upward.
   // Recycling while scrolling up is a common cause of ads "bunching" and a "disappearing too fast" feeling.
   let lastScrollY = 0;
@@ -486,24 +510,6 @@ function globalGapFixInit() {
     return document.querySelector(`.${WRAP_CLASS}.${kindClass}[data-ezoic-after="${afterPos}"]`);
   }
 
-  function getStableAnchorKey(el) {
-    try {
-      if (!el) return '';
-      const pid = el.getAttribute('data-pid');
-      if (pid) return 'pid:' + pid;
-      const tid = el.getAttribute('data-tid');
-      if (tid) return 'tid:' + tid;
-      const slug = el.getAttribute('data-slug');
-      if (slug) return 'slug:' + slug;
-    } catch (e) {}
-    return '';
-  }
-
-  function findWrapByAnchor(kindClass, anchorKey) {
-    if (!anchorKey) return null;
-    return document.querySelector(`.${WRAP_CLASS}.${kindClass}[data-ezoic-anchor="${anchorKey}"]`);
-  }
-
   // ---------------- placeholder pool ----------------
 
   function getPoolEl() {
@@ -654,13 +660,12 @@ function globalGapFixInit() {
 
   // ---------------- insertion primitives ----------------
 
-  function buildWrap(id, kindClass, afterPos, createPlaceholder, anchorKey) {
+  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()));
-    if (anchorKey) wrap.setAttribute('data-ezoic-anchor', String(anchorKey));
     // "Pinned" placements (after the first item) should remain stable.
     if (afterPos === 1) {
       wrap.setAttribute('data-ezoic-pin', '1');
@@ -677,16 +682,16 @@ function globalGapFixInit() {
     return wrap;
   }
 
-  function insertAfter(target, id, kindClass, afterPos, anchorKey) {
+  function insertAfter(target, id, kindClass, afterPos) {
     if (!target || !target.insertAdjacentElement) return null;
-    if (findWrap(kindClass, afterPos) || findWrapByAnchor(kindClass, anchorKey)) return null;
+    if (findWrap(kindClass, afterPos)) return null;
     if (insertingIds.has(id)) return null;
 
     const existingPh = document.getElementById(`${PLACEHOLDER_PREFIX}${id}`);
 
     insertingIds.add(id);
     try {
-      const wrap = buildWrap(id, kindClass, afterPos, !existingPh, anchorKey);
+      const wrap = buildWrap(id, kindClass, afterPos, !existingPh);
       target.insertAdjacentElement('afterend', wrap);
 
       // If placeholder exists elsewhere (including pool), move it into the wrapper.
@@ -723,143 +728,12 @@ function globalGapFixInit() {
   }
 
   function pruneOrphanWraps(kindClass, items) {
-    // Topic pages can be virtualized (posts removed from DOM as you scroll).
-    // When that happens, previously-inserted ad wraps may become "orphan" nodes with no
-    // nearby post containers, which leads to ads clustering together when scrolling back up.
-    // We prune only *true* orphans that are far offscreen to keep the UI stable.
-    if (!items || !items.length) return 0;
-    const itemSet = new Set(items);
-    const wraps = document.querySelectorAll(`.${WRAP_CLASS}.${kindClass}`);
-    let removed = 0;
-
-    const isFilled = (wrap) => {
-      return !!(wrap.querySelector('iframe, ins, img, video, [data-google-container-id]'));
-    };
-
-    const hasNearbyItem = (wrap) => {
-      // NodeBB/skins can inject separators/spacers; be tolerant.
-      let prev = wrap.previousElementSibling;
-      for (let i = 0; i < 14 && prev; i++) {
-        if (itemSet.has(prev)) return true;
-        prev = prev.previousElementSibling;
-      }
-      let next = wrap.nextElementSibling;
-      for (let i = 0; i < 14 && next; i++) {
-        if (itemSet.has(next)) return true;
-        next = next.nextElementSibling;
-      }
-      return false;
-    };
-
-    wraps.forEach((wrap) => {
-      // Never prune pinned placements.
-      try {
-        if (wrap.getAttribute('data-ezoic-pin') === '1') return;
-      } catch (e) {}
-
-      // For message/topic pages we may prune filled or empty orphans if they are far away,
-      // otherwise consecutive "stacks" can appear when posts are virtualized.
-      const isMessage = (kindClass === 'ezoic-ad-message');
-      if (!isMessage && isFilled(wrap)) return; // never prune filled ads for non-message lists
-
-      // Never prune a fresh wrap: it may fill late.
-      try {
-        const created = parseInt(wrap.getAttribute('data-created') || '0', 10);
-        if (created && (now() - created) < keepEmptyWrapMs()) return;
-      } catch (e) {}
-
-if (hasNearbyItem(wrap)) {
-  try { wrap.classList && wrap.classList.remove('ez-orphan-hidden'); wrap.style && (wrap.style.display = ''); } catch (e) {}
-  return;
-}
-
-// If the anchor item is no longer in the DOM (virtualized), hide the wrap so ads never "stack"
-// back-to-back while scrolling. We'll recycle it when its anchor comes back.
-try { wrap.classList && wrap.classList.add('ez-orphan-hidden'); wrap.style && (wrap.style.display = 'none'); } catch (e) {}
-
-// For message ads: only release if far offscreen to avoid perceived "vanishing" during fast scroll.
-if (isMessage) {
-  try {
-    const r = wrap.getBoundingClientRect();
-    const vh = Math.max(1, window.innerHeight || 1);
-    const farAbove = r.bottom < -vh * 2;
-    const farBelow = r.top > vh * 4;
-    if (!farAbove && !farBelow) return;
-  } catch (e) {
-    return;
-  }
+return;
 }
 
-withInternalDomChange(() => releaseWrapNode(wrap));
-removed++;
-    });
-
-    return removed;
-  }
-
   function decluster(kindClass) {
-    // Remove "near-consecutive" wraps (keep the first). Be tolerant of spacer nodes.
-    const wraps = Array.from(document.querySelectorAll(`.${WRAP_CLASS}.${kindClass}`));
-    if (wraps.length < 2) return 0;
-
-    const isWrap = (el) => !!(el && el.classList && el.classList.contains(WRAP_CLASS));
-
-    const isFilled = (wrap) => {
-      return !!(wrap && wrap.querySelector && wrap.querySelector('iframe, ins, img, video, [data-google-container-id]'));
-    };
-
-    const isFresh = (wrap) => {
-      try {
-        const created = parseInt(wrap.getAttribute('data-created') || '0', 10);
-        return created && (now() - created) < keepEmptyWrapMs();
-      } catch (e) {
-        return false;
-      }
-    };
-
-    let removed = 0;
-    for (const w of wraps) {
-      // Never decluster pinned placements.
-      try {
-        if (w.getAttribute && w.getAttribute('data-ezoic-pin') === '1') continue;
-      } catch (e) {}
-
-      let prev = w.previousElementSibling;
-      for (let i = 0; i < 3 && prev; i++) {
-        if (isWrap(prev)) {
-          // If the previous wrap is pinned, keep this one (spacing is intentional).
-          try {
-            if (prev.getAttribute && prev.getAttribute('data-ezoic-pin') === '1') break;
-          } catch (e) {}
-
-          // Never remove a wrap that is already filled; otherwise it looks like
-          // ads "disappear" while scrolling. Only remove the empty neighbour.
-          const prevFilled = isFilled(prev);
-          const curFilled = isFilled(w);
-
-          if (curFilled) {
-            // If the previous one is empty (and not fresh), drop the previous instead.
-            if (!prevFilled && !isFresh(prev)) {
-              withInternalDomChange(() => releaseWrapNode(prev));
-              removed++;
-            }
-            break;
-          }
-
-          // Current is empty.
-          // Don't decluster two "fresh" empty wraps — it can reduce fill on slow auctions.
-          // Only decluster when previous is filled, or when current is stale.
-          if (prevFilled || !isFresh(w)) {
-            withInternalDomChange(() => releaseWrapNode(w));
-            removed++;
-          }
-          break;
-        }
-        prev = prev.previousElementSibling;
-      }
-    }
-    return removed;
-  }
+return;
+}
 
   // ---------------- show (preload / fast fill) ----------------
 
@@ -1098,6 +972,8 @@ function buildOrdinalMap(items) {
   }
 
   function injectBetween(kindClass, items, interval, showFirst, allIds, cursorKey) {
+  try { if (containerEl) purgeAllEzoicWraps(containerEl); } catch (e) {}
+
     if (!items.length) return 0;
 
     const { map: ordinalMap, max: maxOrdinal } = buildOrdinalMap(items);
@@ -1111,16 +987,6 @@ function buildOrdinalMap(items) {
       if (!el) continue;
       if (!el || !el.isConnected) continue;
       if (isAdjacentAd(el)) continue;
-      const anchorKey = getStableAnchorKey(el);
-      const existingByAnchor = findWrapByAnchor(kindClass, anchorKey);
-      if (existingByAnchor && existingByAnchor.isConnected) {
-        const next = el.nextElementSibling;
-        if (next !== existingByAnchor) {
-          try { el.insertAdjacentElement('afterend', existingByAnchor); } catch (e) {}
-        }
-        existingByAnchor.setAttribute('data-ezoic-after', String(afterPos));
-        continue;
-      }
       if (findWrap(kindClass, afterPos)) continue;
 
       let id = pickIdFromAll(allIds, cursorKey);
@@ -1131,10 +997,9 @@ function buildOrdinalMap(items) {
       // This avoids "Placeholder Id X has already been defined" and also ensures ads keep
       // appearing on very long infinite scroll sessions.
       if (!id) {
-        // Safe mode: disable recycling for topic message ads to prevent visual "jumping"
-        // (ads seemingly moving back under the first post during virtualized scroll).
-        const allowRecycle = false; // hard-disable recycling to prevent wrappers jumping to top on virtualized/infinite scroll
-        recycledWrap = (allowRecycle && scrollDir > 0) ? pickRecyclableWrap(kindClass) : null;
+        // Only recycle while scrolling down. Recycling while scrolling up tends to
+        // cause perceived instability (ads bunching/disappearing).
+        recycledWrap = scrollDir > 0 ? pickRecyclableWrap(kindClass) : null;
         if (recycledWrap) {
           id = recycledWrap.getAttribute('data-ezoic-wrapid') || '';
         }
@@ -1144,7 +1009,7 @@ function buildOrdinalMap(items) {
 
       const wrap = recycledWrap
         ? moveWrapAfter(el, recycledWrap, kindClass, afterPos)
-        : insertAfter(el, id, kindClass, afterPos, anchorKey);
+        : insertAfter(el, id, kindClass, afterPos);
       if (!wrap) continue;
 
       // observePlaceholder is safe for existing ids (it is idempotent) and helps with "late fill"
@@ -1157,48 +1022,12 @@ function buildOrdinalMap(items) {
   }
 
   function pickRecyclableWrap(kindClass) {
-    // Only recycle wrappers that are well above the viewport to avoid visible "disappearing".
-    // With very small id pools (e.g. 6 ids), recycling is the only way to keep ads appearing
-    // on long topics without redefining placeholders.
-    const wraps = document.querySelectorAll('.' + kindClass + '[data-ezoic-wrapid]');
-    if (!wraps || !wraps.length) return null;
-
-    const vh = Math.max(300, window.innerHeight || 800);
-    // Recycle only when the wrapper is far above the viewport.
-    // This keeps ads on-screen longer (especially on mobile) and reduces "blink".
-    const threshold = -Math.min(9000, Math.round(vh * 6));
-
-    let best = null;
-    let bestBottom = Infinity;
-    for (const w of wraps) {
-      if (!w || !w.isConnected) continue;
-      if (w.getAttribute && w.getAttribute('data-ezoic-pin') === '1') continue;
-      const rect = w.getBoundingClientRect();
-      if (rect.bottom < threshold) {
-        if (rect.bottom < bestBottom) {
-          bestBottom = rect.bottom;
-          best = w;
-        }
-      }
-    }
-    return best;
-  }
+return null;
+}
 
   function moveWrapAfter(anchorEl, wrap, kindClass, afterPos) {
-    try {
-      if (!anchorEl || !wrap || !wrap.isConnected) return null;
-
-      wrap.setAttribute('data-ezoic-after', String(afterPos));
-      anchorEl.insertAdjacentElement('afterend', wrap);
-
-      // Ensure minimal layout impact.
-      try { wrap.style.contain = 'layout style paint'; } catch (e) {}
-      try { tightenStickyIn(wrap); } catch (e) {}
-      return wrap;
-    } catch (e) {
-      return null;
-    }
-  }
+return;
+}
 
   async function runCore() {
     if (isBlocked()) return 0;
@@ -1224,7 +1053,7 @@ function buildOrdinalMap(items) {
           state.allPosts,
           'curPosts'
         );
-        // decluster disabled for stability on virtualized lists
+        decluster('ezoic-ad-message');
       }
     } else if (kind === 'categoryTopics') {
       if (normalizeBool(cfg.enableBetweenAds)) {
@@ -1238,7 +1067,7 @@ function buildOrdinalMap(items) {
           state.allTopics,
           'curTopics'
         );
-        // decluster disabled for stability on virtualized lists
+        decluster('ezoic-ad-between');
       }
     } else if (kind === 'categories') {
       if (normalizeBool(cfg.enableCategoryAds)) {
@@ -1252,7 +1081,7 @@ function buildOrdinalMap(items) {
           state.allCategories,
           'curCategories'
         );
-        // decluster disabled for stability on virtualized lists
+        decluster('ezoic-ad-categories');
       }
     }
 
@@ -1537,3 +1366,19 @@ function buildOrdinalMap(items) {
   insertHeroAdEarly().catch(() => {});
   requestBurst();
 })();
+
+
+
+// V4 stateless hooks
+try {
+  if (typeof window !== 'undefined' && window.jQuery) {
+    window.jQuery(window).off('action:ajaxify.start.ezoicv4 action:infiniteScroll.start.ezoicv4 action:ajaxify.end.ezoicv4 action:infiniteScroll.loaded.ezoicv4');
+    window.jQuery(window).on('action:ajaxify.start.ezoicv4 action:infiniteScroll.start.ezoicv4', function () {
+      hardResetAndReinject();
+    });
+    window.jQuery(window).on('action:ajaxify.end.ezoicv4 action:infiniteScroll.loaded.ezoicv4', function () {
+      hardResetAndReinject();
+    });
+  }
+} catch (e) {}
+