perfectionist-plugins 2.0.0 → 2.4.1

package/package.json

@@ -1,37 +1,36 @@
-{
-  "name": "perfectionist-plugins",
-  "version": "2.0.0",
-  "description": "Small plugins that fix the annoying parts of League of Legends champ select. Built for Pengu Loader.",
-  "type": "module",
-  "main": "perfectionist-utils.js",
-  "exports": {
-    ".": "./perfectionist-utils.js",
-    "./perfectionist-utils.js": "./perfectionist-utils.js",
-    "./ban-blocker.js": "./ban-blocker.js",
-    "./hide-unowned-skins.js": "./hide-unowned-skins.js",
-    "./unlock-profile-skins.js": "./unlock-profile-skins.js",
-    "./auto-claimer.js": "./auto-claimer.js",
-    "./auto-read.js": "./auto-read.js",
-    "./better-client.js": "./better-client.js"
-  },
-  "files": [
-    "perfectionist-utils.js",
-    "ban-blocker.js",
-    "hide-unowned-skins.js",
-    "unlock-profile-skins.js",
-    "auto-claimer.js",
-    "auto-read.js",
-    "better-client.js",
-    "tools/betterclient-monitor.js"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/SrKing-9812/Perfectionist-Plugins.git"
-  },
-  "keywords": [
-    "pengu-loader",
-    "league-of-legends",
-    "plugin"
-  ],
-  "author": "Sr. King"
-}
+{
+  "name": "perfectionist-plugins",
+  "version": "2.4.1",
+  "description": "Small plugins that fix the annoying parts of League of Legends champ select. Built for Pengu Loader.",
+  "type": "module",
+  "main": "perfectionist-utils.js",
+  "exports": {
+    ".": "./perfectionist-utils.js",
+    "./perfectionist-utils.js": "./perfectionist-utils.js",
+    "./ban-blocker.js": "./ban-blocker.js",
+    "./hide-unowned-skins.js": "./hide-unowned-skins.js",
+    "./unlock-profile-skins.js": "./unlock-profile-skins.js",
+    "./auto-claimer.js": "./auto-claimer.js",
+    "./auto-read.js": "./auto-read.js",
+    "./better-client.js": "./better-client.js"
+  },
+  "files": [
+    "perfectionist-utils.js",
+    "ban-blocker.js",
+    "hide-unowned-skins.js",
+    "unlock-profile-skins.js",
+    "auto-claimer.js",
+    "auto-read.js",
+    "better-client.js"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/SrKing-9812/Perfectionist-Plugins.git"
+  },
+  "keywords": [
+    "pengu-loader",
+    "league-of-legends",
+    "plugin"
+  ],
+  "author": "Sr. King"
+}

package/perfectionist-utils.js

@@ -1,22 +1,19 @@
 const READY_EVENT = "perfectionist:utils-ready";
 const STATE_KEY = "perfectionist-plugins:state";
-const CACHE_KEY = "perfectionist-plugins:cache";
 const NAV_ID = "perfectionist-plugins-nav";
 const PANEL_ID = "perfectionist-plugins-panel";
 const STYLE_ID = "perfectionist-plugins-style";
 const TAB_TITLE = "Perfectionism";
 
-export const version = "2.0.0";
+export const version = "2.4.0";
 
 const PKG = "perfectionist-plugins";
 const CDN = "https://cdn.jsdelivr.net/npm";
-const REGISTRY_URL = `https://registry.npmjs.org/${PKG}/latest`;
-const CORE_FILE = "perfectionist-utils.js";
 
 const BUNDLED_MODULES = [
   {
     id: "perfectionist-utils",
-    file: CORE_FILE,
+    file: "perfectionist-utils.js",
     name: "Perfectionism Core",
     version,
     description: "Shared core for the Perfectionism plugins.",
@@ -26,7 +23,7 @@ const BUNDLED_MODULES = [
     id: "better-client",
     file: "better-client.js",
     name: "BetterClient",
-    version: "1.2.0",
+    version: "1.7.0",
     description: "Debloats the client: blocks telemetry, merges duplicate requests, caches immutable data, decodes images asynchronously and fixes several bugs.",
   },
   {
@@ -40,14 +37,14 @@ const BUNDLED_MODULES = [
     id: "unlock-profile-skins",
     file: "unlock-profile-skins.js",
     name: "Unlock Profile Skins",
-    version: "1.2.1",
+    version: "1.2.4",
     description: "Unlocks every skin in the Set profile background window.",
   },
   {
     id: "hide-unowned-skins",
     file: "hide-unowned-skins.js",
     name: "Hide Unowned Skins",
-    version: "2.4.0",
+    version: "2.5.1",
     description: "In champion select, only shows the skins you own for the picked champion.",
   },
   {
@@ -127,7 +124,6 @@ const STYLE_CSS = `
 #${PANEL_ID} .perf-chip:hover { color: #f0e6d2; border-color: #c89b3c; }
 #${PANEL_ID} .perf-chip--on { color: #010a13; background: #c89b3c; border-color: #c89b3c; }
 #${PANEL_ID} .perf-chip--on:hover { background: #f0e6d2; }
-
 #${PANEL_ID} .perf-tools { display: flex; align-items: center; gap: 10px; flex: 0 0 auto; margin-bottom: 14px; }
 #${PANEL_ID} .perf-search { flex: 1 1 auto; min-width: 0; box-sizing: border-box;
   font-family: "LoL Body", Arial, "Helvetica Neue", Helvetica, sans-serif; font-size: 12px; letter-spacing: 0.3px;
@@ -142,18 +138,6 @@ const STYLE_CSS = `
 #${PANEL_ID} .perf-chip:disabled { opacity: 0.45; cursor: default; }
 #${PANEL_ID} .perf-chip:disabled:hover { color: #a09b8c; border-color: #785a28; background: #0a1428; }
 #${PANEL_ID} .perf-chip--on:disabled:hover { color: #010a13; border-color: #c89b3c; background: #c89b3c; }
-
-.perf-update { position: fixed; inset: 0; z-index: 100000; display: flex; align-items: center;
-  justify-content: center; background: rgba(1, 10, 19, 0.72); }
-.perf-update-box { width: 430px; box-sizing: border-box; padding: 22px 26px;
-  background: #010a13; border: 1px solid #785a28; box-shadow: 0 0 32px rgba(0, 0, 0, 0.8); }
-.perf-update-title { font-family: "LoL Display", "Times New Roman", Times, Baskerville, Georgia, serif;
-  font-size: 15px; font-weight: 700; letter-spacing: 1.05px; text-transform: uppercase; color: #f0e6d2; }
-.perf-update-status { font-family: "LoL Body", Arial, sans-serif; font-size: 12px; letter-spacing: 0.3px;
-  color: #a09b8c; margin-top: 12px; line-height: 1.5; }
-.perf-update-track { height: 6px; margin-top: 16px; background: #0a1428; border: 1px solid #785a28; }
-.perf-update-fill { height: 100%; width: 0; background: #c89b3c; transition: width 0.25s; }
-.perf-update-close { margin-top: 18px; }
 `;
 
 const registry = new Map();
@@ -167,8 +151,10 @@ let coords = null;
 const resolved = new Map();
 let availableModules = BUNDLED_MODULES;
 let pendingReload = false;
+let modulesLoaded = false;
 let searchQuery = "";
 let runningVersion = version;
+let coreStarted = false;
 
 let state = { installed: {}, enabled: {}, options: {}, masterLocked: false };
 
@@ -319,20 +305,6 @@ function isInstalled(mod) {
   return installed === undefined ? registry.has(mod.id) : Boolean(installed);
 }
 
-function newerVersion(a, b) {
-  const pa = String(a ?? "0")
-    .split(".")
-    .map(Number);
-  const pb = String(b ?? "0")
-    .split(".")
-    .map(Number);
-  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
-    const diff = (pa[i] || 0) - (pb[i] || 0);
-    if (diff !== 0) return diff > 0;
-  }
-  return false;
-}
-
 function moduleUrl(file) {
   return `${CDN}/${PKG}@${runningVersion}/${file}`;
 }
@@ -357,105 +329,14 @@ async function uninstallModule(mod) {
   refreshPanel();
 }
 
-const SAFE_PHASES = new Set(["None", "Lobby", "EndOfGame"]);
-
 function reloadClientNow() {
   if (typeof window.reloadClient === "function") window.reloadClient();
   else window.location.reload();
 }
 
-async function reloadWhenSafe() {
-  for (;;) {
-    let phase = null;
-    try {
-      phase = await apiGet("/lol-gameflow/v1/gameflow-phase");
-    } catch {
-      phase = null;
-    }
-    if (phase == null || SAFE_PHASES.has(phase)) break;
-    await new Promise((resolve) => setTimeout(resolve, 5000));
-  }
-  reloadClientNow();
-}
-
-function apiGet(path) {
-  return fetch(path, { headers: { Accept: "application/json" } }).then((response) => {
-    if (!response.ok) throw new Error(`${path} responded ${response.status}`);
-    return response.status === 204 ? null : response.json();
-  });
-}
-
-function buildUpdateWindow() {
-  const root = el("div", "perf-update");
-  const box = el("div", "perf-update-box");
-  box.append(el("div", "perf-update-title", "Installing Update"));
-  const status = el("div", "perf-update-status", "Downloading...");
-  const track = el("div", "perf-update-track");
-  const fill = el("div", "perf-update-fill");
-  track.append(fill);
-  box.append(status, track);
-  root.append(box);
-  return {
-    root,
-    setStatus: (text) => {
-      status.textContent = text;
-    },
-    setProgress: (fraction) => {
-      fill.style.width = `${Math.round(Math.max(0, Math.min(1, fraction)) * 100)}%`;
-    },
-    fail: (text) => {
-      status.textContent = text;
-      const close = el("button", "perf-btn perf-update-close", "Close");
-      close.addEventListener("click", () => root.remove());
-      box.append(close);
-    },
-  };
-}
-
-async function runUpdate(target) {
-  const win = buildUpdateWindow();
-  (document.body ?? document.documentElement).append(win.root);
-  const files = [{ name: "Perfectionism Core", file: CORE_FILE }, ...BUNDLED_MODULES.filter((m) => !m.core)];
-  const sources = {};
-  for (let i = 0; i < files.length; i++) {
-    win.setStatus(`Downloading ${files[i].name}...`);
-    win.setProgress(i / files.length);
-    try {
-      const response = await fetch(`${CDN}/${PKG}@${target}/${files[i].file}`);
-      if (response.status === 404 && files[i].id) continue;
-      if (!response.ok) throw new Error(`download failed (${response.status})`);
-      const text = await response.text();
-      if (!text || !/export/.test(text)) throw new Error("the downloaded file looks invalid");
-      if (files[i].id) sources[files[i].id] = text;
-    } catch (error) {
-      logError(`could not update to ${target}.`, error);
-      win.fail(`Could not update to ${target}. It will be retried on the next client start.`);
-      return;
-    }
-  }
-  try {
-    localStorage.setItem(CACHE_KEY, JSON.stringify({ version: target, files: sources }));
-  } catch {}
-  win.setProgress(1);
-  runningVersion = target;
-  saveState();
-  win.setStatus("Update installed. Restarting the client...");
-  reloadWhenSafe();
-}
-
-async function checkForUpdates() {
-  if (!/^\d+\.\d+\.\d+$/.test(runningVersion)) return;
-  let target = null;
-  try {
-    const response = await fetch(REGISTRY_URL, { headers: { Accept: "application/json" }, cache: "no-store" });
-    if (response.ok) target = (await response.json())?.version ?? null;
-  } catch {
-    return;
-  }
-  if (target && newerVersion(target, runningVersion)) runUpdate(target);
-}
-
 async function loadModules() {
+  if (modulesLoaded) return;
+  modulesLoaded = true;
   for (const mod of BUNDLED_MODULES) {
     if (mod.core || resolved.has(mod.id) || registry.has(mod.id) || !isInstalled(mod)) continue;
     try {
@@ -1020,7 +901,6 @@ const utils = {
   getAvailableModules,
   installModule,
   uninstallModule,
-  checkForUpdates,
   watch,
   waitFor,
   addStyle,
@@ -1030,7 +910,8 @@ const utils = {
 };
 
 export async function init(context, coordsProvided) {
-  if (window.PerfectionistUtils) return;
+  if (coreStarted || window.PerfectionistUtils) return;
+  coreStarted = true;
   coords = coordsProvided ?? null;
   runningVersion = coords?.version || version;
 
@@ -1044,7 +925,6 @@ export async function init(context, coordsProvided) {
 
   try {
     await loadModules();
-    checkForUpdates();
   } catch (error) {
     logError("startup failed.", error);
   }

package/unlock-profile-skins.js

@@ -1,4 +1,4 @@
-export const version = "1.2.1";
+export const version = "1.2.4";
 
 const PLUGIN_ID = "unlock-profile-skins";
 const PICKER_BUTTON_SELECTOR = ".style-profile-skin-picker-button";
@@ -6,12 +6,14 @@ const CURRENT_SUMMONER_URI = "/lol-summoner/v1/current-summoner";
 const INVENTORY_PATH = /^\/lol-champions\/v1\/inventories\/(\d+)\/champions$/;
 const AUGMENT_INVENTORY_PATH = /^\/lol-inventory\/v2\/inventory\/SKIN_AUGMENT$/i;
 const SUMMONER_TTL = 10 * 60 * 1000;
+const SUMMONER_WAIT_MS = 1200;
 const STATE_KEY = "perfectionist-plugins:state";
 const FAKE_PURCHASE_DATE = 1577836800000;
 const FAKE_RENTAL_END = 4102444800000;
 const TIER_LABEL = "tier";
 const GROUPING_OPTIONS = "lol-uikit-dropdown-option";
 const HARVEST_WAIT_MS = 2000;
+const INVENTORY_TEXT_CACHE_LIMIT = 2;
 
 let filterActive = true;
 let api = null;
@@ -22,6 +24,7 @@ let harvestPromise = null;
 const augmentIds = new Set();
 const pendingTargetLoads = new Set();
 const variantIdRemap = new Map();
+const inventoryTextCache = new Map();
 
 function readDefaultEnabled() {
   try {
@@ -196,17 +199,24 @@ function unlockDeep(node) {
       }
     }
   }
-  if (node.ownership && typeof node.ownership === "object") {
-    changed = unlockOwnership(node.ownership) || changed;
-  } else if (typeof node.contentId === "string" && Array.isArray(node.overlays)) {
-    node.ownership = synthesizedOwnership();
-    changed = true;
-  }
-  if (node.owned === false) {
-    node.owned = true;
-    changed = true;
+  const championNode = Array.isArray(node.skins);
+  if (!championNode) {
+    if (node.ownership && typeof node.ownership === "object") {
+      changed = unlockOwnership(node.ownership) || changed;
+    } else if (typeof node.contentId === "string" && Array.isArray(node.overlays)) {
+      node.ownership = synthesizedOwnership();
+      changed = true;
+    }
+    if (node.owned === false) {
+      node.owned = true;
+      changed = true;
+    }
   }
-  const values = Array.isArray(node) ? node : Object.values(node);
+  const values = Array.isArray(node)
+    ? node
+    : Object.keys(node)
+        .filter((key) => key !== "ownership")
+        .map((key) => node[key]);
   for (const value of values) {
     if (value && typeof value === "object") changed = unlockDeep(value) || changed;
   }
@@ -279,6 +289,7 @@ function ensureAugmentIds() {
 let tierObserver = null;
 let tierAppliedForOpen = false;
 let tierDropdown = null;
+let tierArmListener = null;
 
 function findGroupingDropdown() {
   for (const dd of document.querySelectorAll("lol-uikit-framed-dropdown")) {
@@ -312,6 +323,10 @@ function applyTierGrouping() {
 function startTierGrouping() {
   if (tierObserver) return;
   tierObserver = new MutationObserver(() => {
+    if (!isPickerOpen()) {
+      stopTierGrouping();
+      return;
+    }
     try {
       applyTierGrouping();
     } catch (error) {
@@ -334,12 +349,34 @@ function maybeRefreshSummoner() {
   ensureSummonerId();
 }
 
+function whenSummonerKnown(timeout) {
+  if (summonerId !== null) return Promise.resolve(true);
+  ensureSummonerId();
+  const deadline = Date.now() + timeout;
+  return new Promise((resolve) => {
+    const step = () => {
+      if (summonerId !== null) return resolve(true);
+      if (Date.now() >= deadline) return resolve(false);
+      setTimeout(step, 40);
+    };
+    setTimeout(step, 0);
+  });
+}
+
 function ensureSummonerId() {
   if (summonerId !== null || summonerPending) return;
-  const get = api?.lcu?.get;
-  if (!get) return;
   summonerPending = true;
-  get(CURRENT_SUMMONER_URI, { ttl: SUMMONER_TTL })
+  let request;
+  try {
+    const get = api?.lcu?.get;
+    request = get
+      ? get(CURRENT_SUMMONER_URI, { ttl: SUMMONER_TTL })
+      : (rawFetch || window.fetch)(CURRENT_SUMMONER_URI).then((response) => response.json());
+  } catch {
+    summonerPending = false;
+    return;
+  }
+  Promise.resolve(request)
     .then((summoner) => {
       summonerId = typeof summoner?.summonerId === "number" ? summoner.summonerId : null;
     })
@@ -348,13 +385,31 @@ function ensureSummonerId() {
       summonerPending = false;
     });
 }
+function rewriteInventoryText(raw) {
+  if (typeof raw !== "string") return raw;
+  if (inventoryTextCache.has(raw)) {
+    const cached = inventoryTextCache.get(raw);
+    inventoryTextCache.delete(raw);
+    inventoryTextCache.set(raw, cached);
+    return cached;
+  }
+  let rewritten = raw;
+  try {
+    const json = JSON.parse(raw);
+    if (unlockDeep(json)) rewritten = JSON.stringify(json);
+  } catch {}
+  inventoryTextCache.set(raw, rewritten);
+  while (inventoryTextCache.size > INVENTORY_TEXT_CACHE_LIMIT) {
+    inventoryTextCache.delete(inventoryTextCache.keys().next().value);
+  }
+  return rewritten;
+}
 
 function rewriteWebSocketFrame(text) {
   if (!filterActive || typeof text !== "string") return null;
   const targetFrame = text.indexOf("lol-champions/v1/inventories") !== -1;
   const augmentFrame = text.indexOf("SKIN_AUGMENT") !== -1;
   if (!targetFrame && !augmentFrame) return null;
-  if (!isPickerOpen()) return null;
   let frame;
   try {
     frame = JSON.parse(text);
@@ -454,53 +509,72 @@ function installFetchFilter() {
 
   const wrapped = function (input, init) {
     const url = typeof input === "string" ? input : (input && input.url) || "";
-    const target = isTargetUrl(url);
-    const augment = !target && isAugmentUrl(url);
-    if (filterActive && pathIdOf(url) !== null) maybeRefreshSummoner();
-    if (filterActive && init && typeof init.body === "string") {
-      const mapped = remapVariantIds(init.body);
-      if (mapped !== init.body) init = { ...init, body: mapped };
+    const inventory = pathIdOf(url) !== null;
+    const augmentRequest = isAugmentUrl(url);
+    let options = init;
+    if (filterActive && options && typeof options.body === "string") {
+      const mapped = remapVariantIds(options.body);
+      if (mapped !== options.body) options = { ...options, body: mapped };
     }
-    const promise = original.call(this, input, init);
-    if (filterActive && target && augmentIds.size === 0) {
-      const latch = (async () => {
-        try {
-          const response = await promise;
-          if (response && response.ok && augmentIds.size === 0) {
-            const json = await response.clone().json().catch(() => null);
-            if (json) harvestFromPayload(json);
+    const promise = original.call(this, input, options);
+    if (!filterActive || (!inventory && !augmentRequest)) return promise;
+    if (inventory) maybeRefreshSummoner();
+
+    return whenSummonerKnown(SUMMONER_WAIT_MS).then(() => {
+      const target = isTargetUrl(url);
+      if (!augmentRequest && !target) return promise;
+      if (target && augmentIds.size === 0) {
+        const latch = (async () => {
+          try {
+            const response = await promise;
+            if (response && response.ok && augmentIds.size === 0) {
+              const json = await response.clone().json().catch(() => null);
+              if (json) harvestFromPayload(json);
+            }
+          } catch {}
+          pendingTargetLoads.delete(latch);
+        })();
+        pendingTargetLoads.add(latch);
+      }
+      const ready = augmentRequest && augmentIds.size === 0 ? ensureAugmentIds() : Promise.resolve();
+      return ready
+        .then(() => promise)
+        .then((response) => {
+          if (!response || !response.ok) return response;
+          if (augmentRequest) {
+            return response
+              .clone()
+              .json()
+              .catch(() => null)
+              .then((json) => {
+                if (!json || !unlockAugmentInventory(json)) return response;
+                return new Response(JSON.stringify(json), {
+                  status: response.status,
+                  statusText: response.statusText,
+                  headers: response.headers,
+                });
+              });
           }
-        } catch {}
-        pendingTargetLoads.delete(latch);
-      })();
-      pendingTargetLoads.add(latch);
-    }
-    if (!filterActive || (!target && !augment) || !isPickerOpen()) return promise;
-    const ready = augment && augmentIds.size === 0 ? ensureAugmentIds() : Promise.resolve();
-    return ready
-      .then(() => promise)
-      .then((response) => {
-        if (!response || !response.ok) return response;
-        return response
-          .clone()
-          .json()
-          .catch(() => null)
-          .then((json) => {
-            if (!json) return response;
-            const changed = augment ? unlockAugmentInventory(json) : unlockDeep(json);
-            if (!changed) return response;
-            return new Response(JSON.stringify(json), {
-              status: response.status,
-              statusText: response.statusText,
-              headers: response.headers,
+          return response
+            .clone()
+            .text()
+            .catch(() => null)
+            .then((text) => {
+              if (text === null) return response;
+              const rewritten = rewriteInventoryText(text);
+              if (rewritten === text) return response;
+              return new Response(rewritten, {
+                status: response.status,
+                statusText: response.statusText,
+                headers: response.headers,
+              });
             });
-          });
-      });
+        });
+    });
   };
   wrapped.__perfProfileFilter = true;
   window.fetch = wrapped;
 }
-
 function installXhrFilter() {
   const proto = window.XMLHttpRequest && window.XMLHttpRequest.prototype;
   if (!proto || proto.open.__perfProfileFilter) return;
@@ -543,23 +617,24 @@ function installXhrFilter() {
       });
       pendingTargetLoads.add(latch);
     }
-    if (textDescriptor && textDescriptor.get && (target || augment)) {
+    if (textDescriptor && textDescriptor.get && (pathIdOf(url) !== null || augment)) {
       const cache = { raw: null, gate: null, filtered: null };
-      const gateOpen = () => filterActive && isPickerOpen();
+      const gateOpen = () => filterActive && (augment || isTargetUrl(url));
       const rewriteBody = (json) => (augment ? unlockAugmentInventory(json) : unlockDeep(json));
       const filteredText = () => {
-        const raw = textDescriptor.get.call(xhr);
         const gate = gateOpen();
-        if (cache.filtered === null || cache.raw !== raw || cache.gate !== gate) {
-          cache.raw = raw;
-          cache.gate = gate;
-          cache.filtered = raw;
-          if (gate) {
+        if (cache.filtered !== null && cache.gate === gate) return cache.filtered;
+        const raw = textDescriptor.get.call(xhr);
+        cache.gate = gate;
+        cache.filtered = raw;
+        if (gate) {
+          if (augment) {
             try {
               const json = JSON.parse(raw);
-              const rewritten = rewriteBody(json) ? JSON.stringify(json) : null;
-              if (rewritten !== null) cache.filtered = rewritten;
+              if (rewriteBody(json)) cache.filtered = JSON.stringify(json);
             } catch {}
+          } else {
+            cache.filtered = rewriteInventoryText(raw);
           }
         }
         return cache.filtered;
@@ -578,7 +653,7 @@ function installXhrFilter() {
         });
       }
     }
-    if (augment && filterActive && isPickerOpen() && augmentIds.size === 0) {
+    if (augment && filterActive && augmentIds.size === 0) {
       const sendArgs = args;
       ensureAugmentIds().finally(() => {
         try {
@@ -597,6 +672,7 @@ function installSourceFilter() {
     installWebSocketFilter();
     installFetchFilter();
     installXhrFilter();
+    ensureSummonerId();
   } catch (error) {
     logError("could not install the source filter.", error);
   }
@@ -617,11 +693,21 @@ function onEnable(utils) {
   filterActive = true;
   ensureSourceFilter();
   ensureSummonerId();
-  startTierGrouping();
+  tierArmListener = () => {
+    if (tierObserver) return;
+    setTimeout(() => {
+      if (tierArmListener && isPickerOpen()) startTierGrouping();
+    }, 0);
+  };
+  document.addEventListener("click", tierArmListener, true);
+  if (isPickerOpen()) startTierGrouping();
 }
 
 function onDisable() {
   filterActive = false;
+  inventoryTextCache.clear();
+  if (tierArmListener) document.removeEventListener("click", tierArmListener, true);
+  tierArmListener = null;
   stopTierGrouping();
   api = null;
 }