perfectionist-plugins 1.9.0 → 2.4.0

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;
 }