koishi-plugin-warframe 1.16.1 → 1.16.3

package/lib/index.js

@@ -1542,15 +1542,6 @@ function levenshtein(a, b) {
   return dp[a.length][b.length];
 }
 __name(levenshtein, "levenshtein");
-function tokenSimilarity(a, b) {
-  const tokenize = /* @__PURE__ */ __name((s) => s.replace(/[^\w\u4E00-\u9FA5]+/g, " ").split(/\s+/).filter(Boolean), "tokenize");
-  const A = new Set(tokenize(a));
-  const B = new Set(tokenize(b));
-  const intersection = [...A].filter((x) => B.has(x)).length;
-  const union = (/* @__PURE__ */ new Set([...A, ...B])).size;
-  return intersection / union;
-}
-__name(tokenSimilarity, "tokenSimilarity");
 
 // src/warframe/utils/time.ts
 function toTimeStamp(timeStr) {
@@ -1619,7 +1610,7 @@ async function getHotRivenWeapons2() {
 __name(getHotRivenWeapons2, "getHotRivenWeapons");
 
 // src/warframe/services/wf-service/wf-service.alert.ts
-var import_warframe_public_export_plus5 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus6 = require("warframe-public-export-plus");
 
 // src/warframe/assets/index.ts
 var {
@@ -2098,6 +2089,9 @@ async function globalWorldStateFactory(json) {
 __name(globalWorldStateFactory, "globalWorldStateFactory");
 var globalWorldState = createAsyncCache(globalWorldStateFactory, -1);
 
+// src/warframe/infrastructure/wf/alert-adapter.ts
+var import_warframe_public_export_plus5 = require("warframe-public-export-plus");
+
 // src/warframe/infrastructure/wf/bounty-adapter.ts
 var import_warframe_public_export_plus4 = require("warframe-public-export-plus");
 var bountyLocationTag = {
@@ -2506,6 +2500,56 @@ function adaptOracleBountyBoard(location, cycle) {
 }
 __name(adaptOracleBountyBoard, "adaptOracleBountyBoard");
 
+// src/warframe/infrastructure/wf/alert-adapter.ts
+var alertTranslations = createAsyncCache(async () => {
+  const { default: worldstateData } = await import("warframe-worldstate-data");
+  const { languageString } = await import("warframe-worldstate-data/utilities");
+  const entries = Object.entries({ ...dictZhExtra, ...import_warframe_public_export_plus5.dict_zh });
+  const byKey = new Map(entries.map(([key, value]) => [key.toLowerCase(), value]));
+  const byEnglish = /* @__PURE__ */ new Map();
+  for (const [key, english] of Object.entries({ ...dictEnExtra, ...import_warframe_public_export_plus5.dict_en })) {
+    const chinese = byKey.get(key.toLowerCase());
+    if (chinese) {
+      byEnglish.set(english.toLowerCase(), chinese);
+    }
+  }
+  for (const [key, entry] of Object.entries(worldstateData.languages)) {
+    const chinese = byKey.get(key.toLowerCase()) ?? worldstateData.zh?.languages[key]?.value;
+    if (chinese && chinese !== entry.value) {
+      byEnglish.set(entry.value.toLowerCase(), chinese);
+    }
+  }
+  const aliases2 = /* @__PURE__ */ new Map();
+  for (const [key, chinese] of entries) {
+    if (!/\/Alerts\/|\/[^/]*Alert(?:Title|Desc)$/i.test(key)) {
+      continue;
+    }
+    const english = languageString(key, "en").toLowerCase();
+    aliases2.set(english, aliases2.has(english) && aliases2.get(english) !== chinese ? void 0 : chinese);
+  }
+  for (const [english, chinese] of aliases2) {
+    if (chinese && !byEnglish.has(english)) {
+      byEnglish.set(english, chinese);
+    }
+  }
+  return { byKey, byEnglish };
+}, -1);
+async function translateAlertText(source) {
+  const { byKey, byEnglish } = await alertTranslations.get();
+  const translated = byKey.get(source.toLowerCase()) ?? byEnglish.get(source.toLowerCase());
+  if (translated) {
+    return translated;
+  }
+  if (source.startsWith("/Lotus/")) {
+    const itemName = resolveExportItemNameZh(source);
+    if (itemName !== source.split("/").pop() && !itemName.startsWith("/Lotus/")) {
+      return itemName;
+    }
+  }
+  return source;
+}
+__name(translateAlertText, "translateAlertText");
+
 // src/warframe/services/wf-service/wf-service.alert.ts
 var ALERT_TITLE_KEY = "/Lotus/Language/Menu/AlertPopup_Alert";
 var ALERT_NIGHTMARE_KEY = "/Lotus/Language/Menu/NightmareModeName";
@@ -2517,13 +2561,14 @@ async function adaptAlerts(alerts = [], now = Date.now()) {
       continue;
     }
     const mission = raw.mission ?? {};
-    const typeKey = mission.typeKey ?? "";
+    const typeKey = mission.typeKey || mission.type || "";
     const receivedType = await getMissionTypeKey(typeKey);
-    const nodeKey = mission.nodeKey ?? "";
+    const missionType = import_warframe_public_export_plus6.ExportMissionTypes[typeKey] ?? import_warframe_public_export_plus6.ExportMissionTypes[receivedType];
+    const nodeKey = mission.nodeKey || mission.node || "";
     const solNodeKey = await getSolNodeKey(nodeKey);
-    const region = solNodeKey ? import_warframe_public_export_plus5.ExportRegions[solNodeKey] : void 0;
-    const short = region ? regionToShort(region, import_warframe_public_export_plus5.dict_zh) : {
-      name: nodeKey,
+    const region = import_warframe_public_export_plus6.ExportRegions[nodeKey] ?? import_warframe_public_export_plus6.ExportRegions[solNodeKey];
+    const short = region ? regionToShort(region, import_warframe_public_export_plus6.dict_zh) : {
+      name: await translateAlertText(nodeKey),
       system: "",
       type: "",
       faction: "",
@@ -2532,19 +2577,26 @@ async function adaptAlerts(alerts = [], now = Date.now()) {
     };
     const reward = mission.reward;
     const rewards = [];
+    const mirroredItems = (reward?.countedItems ?? []).filter((item) => item.uniqueName && item.count === 1).map((item) => [item.uniqueName, item.key, item.type]);
     for (const item of reward?.items ?? []) {
+      const mirrored = mirroredItems.findIndex((names) => names.includes(item));
+      if (mirrored >= 0) {
+        mirroredItems.splice(mirrored, 1);
+        continue;
+      }
       rewards.push({
-        name: item.startsWith("/Lotus") ? resolveExportItemNameZh(item) : item,
+        name: await translateAlertText(item),
         count: 1
       });
     }
     for (const item of reward?.countedItems ?? []) {
-      const source = item.key ?? item.type ?? "";
+      const source = item.uniqueName || item.key || item.type || "";
       if (!source) {
         continue;
       }
+      const name2 = await translateAlertText(source);
       rewards.push({
-        name: source.startsWith("/Lotus") ? resolveExportItemNameZh(source) : source,
+        name: name2 === source ? await translateAlertText(item.key || item.type || source) : name2,
         count: item.count ?? 1
       });
     }
@@ -2554,9 +2606,10 @@ async function adaptAlerts(alerts = [], now = Date.now()) {
         count: 1
       });
     }
-    const nightmare = mission.nightmare ? import_warframe_public_export_plus5.dict_zh[ALERT_NIGHTMARE_KEY] ?? dictZhExtra[ALERT_NIGHTMARE_KEY] : void 0;
+    const nightmare = mission.nightmare ? import_warframe_public_export_plus6.dict_zh[ALERT_NIGHTMARE_KEY] ?? dictZhExtra[ALERT_NIGHTMARE_KEY] : void 0;
     adapted.push({
-      type: import_warframe_public_export_plus5.dict_zh[import_warframe_public_export_plus5.ExportMissionTypes[receivedType]?.name ?? ""] ?? typeKey,
+      description: await translateAlertText(raw.description || mission.description || ""),
+      type: import_warframe_public_export_plus6.dict_zh[missionType?.name ?? ""] ?? await translateAlertText(typeKey),
       node: {
         ...short,
         minLevel: mission.minEnemyLevel ?? 0,
@@ -2569,7 +2622,7 @@ async function adaptAlerts(alerts = [], now = Date.now()) {
     });
   }
   return {
-    title: import_warframe_public_export_plus5.dict_zh[ALERT_TITLE_KEY] ?? dictZhExtra[ALERT_TITLE_KEY] ?? ALERT_TITLE_KEY,
+    title: import_warframe_public_export_plus6.dict_zh[ALERT_TITLE_KEY] ?? dictZhExtra[ALERT_TITLE_KEY] ?? ALERT_TITLE_KEY,
     alerts: adapted
   };
 }
@@ -2592,7 +2645,7 @@ async function getAlerts() {
 __name(getAlerts, "getAlerts");
 
 // src/warframe/services/wf-service/wf-service.arbitration.ts
-var import_warframe_public_export_plus6 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus7 = require("warframe-public-export-plus");
 
 // src/warframe/data/wf/arbitrationSchedule.ts
 var arbitrationSchedule = arbitrationScheduleText.split("\n").map((line) => line.split(",")).filter((arr) => arr.length === 2).map((arr) => {
@@ -2620,7 +2673,7 @@ function getArbitrations(day = 3) {
   return {
     ok: true,
     data: weekArbys.filter((a) => arbyRewards[a.node]).map((a) => {
-      const obj = regionToShort(import_warframe_public_export_plus6.ExportRegions[a.node], import_warframe_public_export_plus6.dict_zh);
+      const obj = regionToShort(import_warframe_public_export_plus7.ExportRegions[a.node], import_warframe_public_export_plus7.dict_zh);
       return {
         ...obj,
         time: new Date(a.time * 1e3).toLocaleString("zh-cn", {
@@ -2685,7 +2738,7 @@ async function getBounty(location) {
 __name(getBounty, "getBounty");
 
 // src/warframe/infrastructure/wf/calendar-adapter.ts
-var import_warframe_public_export_plus7 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus8 = require("warframe-public-export-plus");
 var CALENDAR_SEASON_HEADER_KEY = "/Lotus/Language/1999/CalendarSeasonHeader";
 var CALENDAR_HEADER_KEY = "/Lotus/Language/1999/CalendarHeader";
 var SEASON_KEYS = {
@@ -2722,7 +2775,7 @@ function calendarTimestampMs(value) {
 }
 __name(calendarTimestampMs, "calendarTimestampMs");
 function translate(key, fallback = key) {
-  return stripLotusMarkup(import_warframe_public_export_plus7.dict_zh[key] ?? dictZhExtra[key] ?? fallback);
+  return stripLotusMarkup(import_warframe_public_export_plus8.dict_zh[key] ?? dictZhExtra[key] ?? fallback);
 }
 __name(translate, "translate");
 function seasonLabel(season) {
@@ -2756,7 +2809,7 @@ function stripLotusMarkup(text) {
 }
 __name(stripLotusMarkup, "stripLotusMarkup");
 function adaptChallenge(path) {
-  const exported = import_warframe_public_export_plus7.ExportChallenges[path];
+  const exported = import_warframe_public_export_plus8.ExportChallenges[path];
   if (!exported?.name) {
     return { name: pathLeaf(path) };
   }
@@ -2800,7 +2853,7 @@ function plotCharacterName(id) {
   }
   for (const keyId of keyIds) {
     const key = `/Lotus/Language/1999/Messenger${keyId}Name`;
-    const text = import_warframe_public_export_plus7.dict_zh[key] ?? dictZhExtra[key];
+    const text = import_warframe_public_export_plus8.dict_zh[key] ?? dictZhExtra[key];
     if (text) {
       return stripLotusMarkup(text);
     }
@@ -2890,14 +2943,14 @@ async function getCalendar() {
 __name(getCalendar, "getCalendar");
 
 // src/warframe/services/wf-service/wf-service.circuit.ts
-var import_warframe_public_export_plus8 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus9 = require("warframe-public-export-plus");
 function getCircuitWeek() {
   const EPOCH = 1734307200 * 1e3;
   const week = Math.trunc((Date.now() - EPOCH) / 6048e5);
   const index1 = (week + 1) % incarnons.length;
   const index2 = (week + 8) % warframes.length;
-  const incarnons2 = incarnons.map((v) => v.map((i) => import_warframe_public_export_plus8.dict_zh[i]));
-  const warframes2 = warframes.map((v) => v.map((i) => import_warframe_public_export_plus8.dict_zh[i]));
+  const incarnons2 = incarnons.map((v) => v.map((i) => import_warframe_public_export_plus9.dict_zh[i]));
+  const warframes2 = warframes.map((v) => v.map((i) => import_warframe_public_export_plus9.dict_zh[i]));
   return {
     currentIncarnons: index1,
     currentWarframes: index2,
@@ -2940,10 +2993,10 @@ ${zariman}`;
 __name(getEnvironment, "getEnvironment");
 
 // src/warframe/services/wf-service/wf-service.event.ts
-var import_warframe_public_export_plus9 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus10 = require("warframe-public-export-plus");
 var EVENT_TITLE_KEY = "/Lotus/Language/Menu/WorldStatePanel_Event";
 function translate2(key, fallback = key) {
-  return stripLotusMarkup(import_warframe_public_export_plus9.dict_zh[key] ?? dictZhExtra[key] ?? fallback);
+  return stripLotusMarkup(import_warframe_public_export_plus10.dict_zh[key] ?? dictZhExtra[key] ?? fallback);
 }
 __name(translate2, "translate");
 function mongoDateMs2(value) {
@@ -3023,7 +3076,7 @@ function adaptEvents(rawEvents = [], now = Date.now()) {
     const maximumScore = raw.Goal ?? 0;
     const currentScore = raw.Count ?? 0;
     const progress = maximumScore > 0 ? Math.min(1, Math.max(0, currentScore / maximumScore)) : typeof raw.HealthPct === "number" ? Math.min(1, Math.max(0, raw.HealthPct)) : void 0;
-    const region = raw.Node && import_warframe_public_export_plus9.ExportRegions[raw.Node] ? regionToShort(import_warframe_public_export_plus9.ExportRegions[raw.Node], import_warframe_public_export_plus9.dict_zh) : void 0;
+    const region = raw.Node && import_warframe_public_export_plus10.ExportRegions[raw.Node] ? regionToShort(import_warframe_public_export_plus10.ExportRegions[raw.Node], import_warframe_public_export_plus10.dict_zh) : void 0;
     adapted.push({
       id: raw._id?.$oid ?? raw._id?.$id ?? raw.Tag ?? name2,
       name: name2,
@@ -3091,7 +3144,7 @@ async function getRailjackFissures() {
 __name(getRailjackFissures, "getRailjackFissures");
 
 // src/warframe/services/wf-service/wf-service.invasion.ts
-var import_warframe_public_export_plus10 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus11 = require("warframe-public-export-plus");
 var INVASION_TITLE_KEY = "/Lotus/Language/Menu/WorldStatePanel_Invasions";
 var INFESTED_INVASION_BOSS_TAG = "/Lotus/Language/Menu/InfestedInvasionBoss";
 function invasionProgress(count, goal, vsInfested) {
@@ -3121,9 +3174,9 @@ function invasionSide(faction, reward) {
     })),
     ...reward.credits && reward.credits > 0 ? [{ name: resolveExportItemNameZh(`/${reward.credits}Credits`), count: 1 }] : []
   ];
-  const nameKey = faction ? import_warframe_public_export_plus10.ExportFactions[faction]?.name ?? faction : void 0;
+  const nameKey = faction ? import_warframe_public_export_plus11.ExportFactions[faction]?.name ?? faction : void 0;
   return {
-    faction: nameKey ? import_warframe_public_export_plus10.dict_zh[nameKey] ?? dictZhExtra[nameKey] ?? "" : "",
+    faction: nameKey ? import_warframe_public_export_plus11.dict_zh[nameKey] ?? dictZhExtra[nameKey] ?? "" : "",
     tone: invasionTone(faction),
     rewards
   };
@@ -3144,9 +3197,9 @@ async function adaptInvasions(rawInvasions) {
       raw.DefenderMissionInfo?.faction
     ].some((faction) => /infest/i.test(faction ?? ""));
     const nodeId = raw.Node;
-    const solNodeKey = import_warframe_public_export_plus10.ExportRegions[nodeId] ? nodeId : await getSolNodeKey(nodeId);
-    const region = solNodeKey ? import_warframe_public_export_plus10.ExportRegions[solNodeKey] : void 0;
-    const short = region ? regionToShort(region, import_warframe_public_export_plus10.dict_zh) : void 0;
+    const solNodeKey = import_warframe_public_export_plus11.ExportRegions[nodeId] ? nodeId : await getSolNodeKey(nodeId);
+    const region = solNodeKey ? import_warframe_public_export_plus11.ExportRegions[solNodeKey] : void 0;
+    const short = region ? regionToShort(region, import_warframe_public_export_plus11.dict_zh) : void 0;
     const locTag = raw.LocTag ?? "";
     drafts.push({
       id: raw._id?.$oid ?? raw._id?.$id ?? raw.Node,
@@ -3154,7 +3207,7 @@ async function adaptInvasions(rawInvasions) {
       node: short?.name ?? "",
       systemIndex: region?.systemIndex ?? Number.MAX_SAFE_INTEGER,
       locTag,
-      campaign: locTag ? import_warframe_public_export_plus10.dict_zh[locTag] ?? dictZhExtra[locTag] ?? await translateLanguageString(locTag) : "",
+      campaign: locTag ? import_warframe_public_export_plus11.dict_zh[locTag] ?? dictZhExtra[locTag] ?? await translateLanguageString(locTag) : "",
       count,
       goal,
       attacker: invasionSide(raw.DefenderMissionInfo?.faction ?? raw.Faction, raw.AttackerReward),
@@ -3169,7 +3222,7 @@ async function adaptInvasions(rawInvasions) {
     groups.set(key, [...groups.get(key) ?? [], draft]);
   }
   return {
-    title: import_warframe_public_export_plus10.dict_zh[INVASION_TITLE_KEY] ?? dictZhExtra[INVASION_TITLE_KEY] ?? INVASION_TITLE_KEY,
+    title: import_warframe_public_export_plus11.dict_zh[INVASION_TITLE_KEY] ?? dictZhExtra[INVASION_TITLE_KEY] ?? INVASION_TITLE_KEY,
     planets: [...groups.values()].sort((a, b) => a[0].systemIndex - b[0].systemIndex).map((list) => {
       const boss = list.filter((draft) => draft.locTag === INFESTED_INVASION_BOSS_TAG);
       const ordered = [...boss, ...list.filter((draft) => draft.locTag !== INFESTED_INVASION_BOSS_TAG)];
@@ -3224,7 +3277,7 @@ async function getInvasions() {
 __name(getInvasions, "getInvasions");
 
 // src/warframe/infrastructure/wf/nightwave-adapter.ts
-var import_warframe_public_export_plus11 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus12 = require("warframe-public-export-plus");
 var RADIO_LEGION_TITLE_KEY = "/Lotus/Language/Syndicates/RadioLegionTitle";
 function timestampMs(value) {
   const raw = value?.$date?.$numberLong;
@@ -3240,11 +3293,11 @@ function remainingLabel(expiry, now) {
 }
 __name(remainingLabel, "remainingLabel");
 function translate3(key) {
-  return import_warframe_public_export_plus11.dict_zh[key] ?? dictZhExtra[key] ?? key;
+  return import_warframe_public_export_plus12.dict_zh[key] ?? dictZhExtra[key] ?? key;
 }
 __name(translate3, "translate");
 function seasonTitle(affiliationTag) {
-  const syndicate = import_warframe_public_export_plus11.ExportSyndicates[affiliationTag];
+  const syndicate = import_warframe_public_export_plus12.ExportSyndicates[affiliationTag];
   if (syndicate?.name) {
     return translate3(syndicate.name);
   }
@@ -3279,7 +3332,7 @@ function adaptChallenge2(raw, now) {
   }
   const kind = classifyChallenge(path, raw);
   const remaining = remainingLabel(expiry, now);
-  const exported = import_warframe_public_export_plus11.ExportNightwave.challenges[path];
+  const exported = import_warframe_public_export_plus12.ExportNightwave.challenges[path];
   if (!exported) {
     return {
       name: challengeFallbackName(path),
@@ -3337,12 +3390,12 @@ async function getNightwave() {
 __name(getNightwave, "getNightwave");
 
 // src/warframe/data/wf/relics.ts
-var import_warframe_public_export_plus12 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus13 = require("warframe-public-export-plus");
 var relics = (() => {
   const result = {};
-  for (const key in import_warframe_public_export_plus12.ExportRelics) {
-    const exportRelic = import_warframe_public_export_plus12.ExportRelics[key];
-    const exportRewards = import_warframe_public_export_plus12.ExportRewards[exportRelic.rewardManifest];
+  for (const key in import_warframe_public_export_plus13.ExportRelics) {
+    const exportRelic = import_warframe_public_export_plus13.ExportRelics[key];
+    const exportRewards = import_warframe_public_export_plus13.ExportRewards[exportRelic.rewardManifest];
     const era = `/Lotus/Language/Relics/Era_${exportRelic.era.toUpperCase()}`;
     const relicKey = normalizeName(exportRelic.era + exportRelic.category);
     const rewards = (exportRewards[0] ?? []).map((r) => {
@@ -3410,7 +3463,7 @@ async function getRelic(input) {
 __name(getRelic, "getRelic");
 
 // src/warframe/infrastructure/wf/riven-export-adapter.ts
-var import_warframe_public_export_plus13 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus14 = require("warframe-public-export-plus");
 var rivenDefinitionTypes = {
   LotusRifleRandomModRare: "Rifle",
   LotusShotgunRandomModRare: "Shotgun",
@@ -3504,7 +3557,7 @@ function adaptRivenDefinitions(definitions) {
       const englishName = tag === "WeaponMeleeDamageMod" ? "Damage" : tag === "WeaponFireRateMod" ? "Fire Rate / Attack Speed" : templateName;
       const name2 = splicedNames[tag] ?? traditionalNames[tag] ?? englishName;
       const unit = tag.includes("FactionDamage") ? "multiply" : raw.locTag.includes("%") ? "percent" : /\|s\b/.test(raw.locTag) ? "seconds" : "";
-      const metadata = import_warframe_public_export_plus13.ExportUpgrades[definition.uniqueName]?.upgradeEntries?.find((x) => x.tag === tag);
+      const metadata = import_warframe_public_export_plus14.ExportUpgrades[definition.uniqueName]?.upgradeEntries?.find((x) => x.tag === tag);
       const baseValue = raw.value * 90 * (unit === "percent" ? 100 : 1) * (raw.reverseValueSymbol ? -1 : 1);
       result[type].push({
         gameRef: tag,
@@ -3537,9 +3590,9 @@ var rivenAttrValueDict = Object.fromEntries(
 );
 
 // src/warframe/data/wf/rivenDisposition.ts
-var import_warframe_public_export_plus14 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus15 = require("warframe-public-export-plus");
 var weaponTypes = {};
-for (const [path, definition] of Object.entries(import_warframe_public_export_plus14.ExportUpgrades)) {
+for (const [path, definition] of Object.entries(import_warframe_public_export_plus15.ExportUpgrades)) {
   const type = rivenDefinitionTypes[path.split("/").pop()];
   if (!type)
     continue;
@@ -3577,7 +3630,7 @@ __name(buildWeaponRivenDispositionDict, "buildWeaponRivenDispositionDict");
 for (const weapon of rivenPublicExport.weapons) {
   if (weaponTypes[weapon.uniqueName])
     continue;
-  const metadata = import_warframe_public_export_plus14.ExportWeapons[weapon.uniqueName];
+  const metadata = import_warframe_public_export_plus15.ExportWeapons[weapon.uniqueName];
   const category = weapon.productCategory;
   const type = category === "Melee" ? "Melee" : category === "SpaceGuns" ? "Archgun" : category === "Pistols" ? "Pistol" : category === "LongGuns" && metadata?.holsterCategory ? metadata.holsterCategory === "SHOTGUN" ? "Shotgun" : "Rifle" : void 0;
   if (type)
@@ -3744,8 +3797,8 @@ async function getTextFromTencentOCR(image, secret) {
   const OcrClient = tencentcloud.ocr.v20181119.Client;
   const clientConfig = {
     credential: {
-      secretId: secret.id,
-      secretKey: secret.key
+      secretId: secret.id.trim(),
+      secretKey: secret.key.trim()
     },
     region: "",
     profile: {
@@ -3758,10 +3811,17 @@ async function getTextFromTencentOCR(image, secret) {
   const { TextDetections } = await client.GeneralAccurateOCR({
     ImageBase64: image
   });
-  const result = TextDetections?.map((t2) => t2.DetectedText).filter(
-    Boolean
-  );
-  return result;
+  return (TextDetections ?? []).flatMap((t2) => {
+    const text = t2.DetectedText;
+    if (!text?.trim())
+      return [];
+    const box = t2.ItemPolygon;
+    return [{
+      text,
+      confidence: t2.Confidence,
+      box: box ? { x: box.X, y: box.Y, width: box.Width, height: box.Height } : void 0
+    }];
+  });
 }
 __name(getTextFromTencentOCR, "getTextFromTencentOCR");
 async function extractTextFromImage(image, secret) {
@@ -3778,6 +3838,172 @@ async function extractTextFromImage(image, secret) {
 }
 __name(extractTextFromImage, "extractTextFromImage");
 
+// src/warframe/services/riven/ocr.ts
+function cleanText(text) {
+  return fullWidthToHalfWidth(text).trim().replace(/−/g, "-").replace(/×/g, "x");
+}
+__name(cleanText, "cleanText");
+function validBox(box) {
+  return !!box && Object.values(box).every(Number.isFinite) && box.width > 0 && box.height > 0;
+}
+__name(validBox, "validBox");
+function restoreRows(input) {
+  const blocks = input.map((b) => typeof b === "string" ? { text: b } : b).map((b) => ({ ...b, text: cleanText(b.text) })).filter((b) => b.text);
+  const positioned = blocks.filter((b) => validBox(b.box)).length;
+  if (positioned > 0 && positioned !== blocks.length)
+    return void 0;
+  if (!positioned)
+    return blocks.map((b) => ({ text: b.text, fragmented: false }));
+  const rows = [];
+  for (const block of [...blocks].sort((a, b) => a.box.y + a.box.height / 2 - b.box.y - b.box.height / 2)) {
+    const box = block.box;
+    const row = rows.find((r) => {
+      const anchor = r[0].box;
+      return Math.abs(box.y + box.height / 2 - anchor.y - anchor.height / 2) <= Math.min(box.height, anchor.height) * 0.6 || /^\d+%$/.test(block.text) && box.height < anchor.height * 0.65 && box.y >= anchor.y && box.y + box.height <= anchor.y + anchor.height;
+    });
+    if (row)
+      row.push(block);
+    else
+      rows.push([block]);
+  }
+  const result = [];
+  for (const row of rows) {
+    const parts = row.sort((a, b) => a.box.x - b.box.x);
+    const first = parts[0];
+    const last = parts.at(-1);
+    const fragmented = parts.length > 1 && /^[+\-x]?\d+(?:\.\d+)?%?$/i.test(first.text) && /\p{L}/u.test(last.text);
+    const kept = parts.filter((b, i) => !(fragmented && i > 0 && i < parts.length - 1 && /^\d+%$/.test(b.text) && b.box.height < Math.min(first.box.height, last.box.height) * 0.65));
+    if (fragmented && kept.slice(1).some((b) => /^[+\-x]?\d/i.test(b.text)))
+      return void 0;
+    for (let i = 1; i < kept.length; i++) {
+      const left = kept[i - 1].box;
+      const right = kept[i].box;
+      if (!isMetadata(first.text) && right.x - left.x - left.width > Math.max(left.height, right.height) * 4)
+        return void 0;
+    }
+    result.push({ text: kept.map((b) => b.text).join(" "), fragmented });
+  }
+  return result;
+}
+__name(restoreRows, "restoreRows");
+var weaponNames = [...new Map(Object.values(weaponRivenDispositionDict).flatMap(
+  (weapon) => [weapon.name.zh, weapon.name.en].map((display) => {
+    const name2 = display.replace(/\s*\((?:Primary|Secondary)\)|（[主副]武器）/g, "");
+    return [normalizeName(name2), { name: name2, type: weapon.calc.riventype }];
+  })
+)).entries()].sort((a, b) => b[0].length - a[0].length);
+var rivenNameParts = [...new Set(rivenPublicExport.upgrades.flatMap((d) => d.upgradeEntries.flatMap((e) => [e.prefixTag, e.suffixTag]).filter((s) => !!s && /^[a-z]+$/.test(s))))];
+var rivenNamePattern = new RegExp(`^(?:${rivenNameParts.join("|")}){1,3}$`, "i");
+function isRivenName(text) {
+  return rivenNamePattern.test(normalizeName(text));
+}
+__name(isRivenName, "isRivenName");
+function findWeapon(text) {
+  const normalized = normalizeName(text);
+  for (const [key, weapon] of weaponNames) {
+    if (normalized === key)
+      return weapon;
+    const remainder = normalized.slice(key.length);
+    if (normalized.startsWith(key) && isRivenName(remainder) && !weaponNames.some(([name2]) => name2 === remainder))
+      return weapon;
+  }
+}
+__name(findWeapon, "findWeapon");
+function normalizeStat(text) {
+  return normalizeName(text).replace(/的/g, "").replace(/暴击率/g, "暴击几率").replace(/弹药最大值/g, "弹药上限").replace(/触发时间/g, "触发持续时间").replace(/触发伤害/g, "异常状态伤害").replace(/orokin/g, "奥罗金").replace(/techrot/g, "科腐者").replace(/scaldra/g, "炽蛇军");
+}
+__name(normalizeStat, "normalizeStat");
+var elemental = /Weapon(?:Electricity|Fire|Freeze|Toxin|Impact|ArmorPiercing|Slash|Blast|Corrosive|Gas|Magnetic|Radiation|Viral)DamageMod/;
+function aliases(stat) {
+  const names = stat.aliases.flatMap((name2) => name2.split("/"));
+  if (elemental.test(stat.gameRef))
+    names.push(`${stat.name}伤害`);
+  if (stat.gameRef === "WeaponDamageAmountMod" || stat.gameRef === "WeaponMeleeDamageMod")
+    names.push("伤害");
+  return [...new Set(names.map(normalizeStat))];
+}
+__name(aliases, "aliases");
+function matchStat(label, stats, fragmented) {
+  const input = normalizeStat(label);
+  const candidates = stats.map((stat) => ({ stat, names: aliases(stat) }));
+  const exact = candidates.filter((c) => c.names.includes(input));
+  if (exact.length)
+    return exact.length === 1 ? exact[0].stat : void 0;
+  const icon = candidates.filter((c) => elemental.test(c.stat.gameRef) && /^[入人]/.test(input) && c.names.includes(input.slice(1)));
+  if (icon.length === 1)
+    return icon[0].stat;
+  if (fragmented && /^[\u4E00-\u9FFF]{3,}$/.test(input)) {
+    const suffix = candidates.filter((c) => c.names.some((name2) => name2.endsWith(input) && name2.length - input.length <= 3));
+    if (suffix.length)
+      return suffix.length === 1 ? suffix[0].stat : void 0;
+  }
+  const ranked = candidates.map((c) => ({ stat: c.stat, score: Math.max(...c.names.map((name2) => normalSimilarity(name2, input))) })).sort((a, b) => b.score - a.score);
+  if (candidates.some((c) => c.names.some((name2) => name2.length >= 3 && input !== name2 && (input.endsWith(name2) || name2.endsWith(input)))))
+    return void 0;
+  return ranked[0]?.score >= 0.8 && ranked[0].score - (ranked[1]?.score ?? 0) >= 0.15 ? ranked[0].stat : void 0;
+}
+__name(matchStat, "matchStat");
+function isRank(text) {
+  return /^(?:段位|等级|循环)\s*\d|^\d+\s*(?:段位|等级|次|循环)/.test(text);
+}
+__name(isRank, "isRank");
+function isMetadata(text) {
+  return isRank(text) || /^\d[\d\s~\-]*$/.test(text);
+}
+__name(isMetadata, "isMetadata");
+function parseRivenOcr(input) {
+  const rows = restoreRows(input);
+  if (!rows?.length)
+    return void 0;
+  const titles = rows.map((r, index) => ({ weapon: findWeapon(r.text), index })).filter((t2) => t2.weapon);
+  if (titles.length !== 1)
+    return void 0;
+  const title = titles[0];
+  if (rows.slice(0, title.index).some((r) => /^6?[+\-x]\d|^\d+(?:\.\d+)?%/i.test(r.text)))
+    return void 0;
+  const weapon = title.weapon;
+  const stats = rivenStatsByType[weapon.type];
+  if (!stats)
+    return void 0;
+  const attributes = [];
+  let footer = false;
+  for (let i = title.index + 1; i < rows.length; i++) {
+    const row = rows[i];
+    let text = row.text.replace(/\s/g, "");
+    if (isRank(text)) {
+      footer = true;
+      continue;
+    }
+    if (footer && /^\d+$/.test(text))
+      continue;
+    if (!attributes.length && isRivenName(text))
+      continue;
+    text = text.replace(/^[6🔒]([+\-])/u, "$1");
+    if (text.includes("(") && !text.includes(")") && rows[i + 1] && !/^[+\-x\d]/i.test(rows[i + 1].text)) {
+      text += rows[++i].text.replace(/\s/g, "");
+    }
+    text = text.replace(/\((?:弓类武器效果加倍|重击时x2|x2forBows|x2forHeavyAttacks)\)/gi, "");
+    const match = text.match(/^([+\-x]?)(\d+(?:\.\d+)?)(%|s)?([\p{L}/]+)$/iu);
+    if (!match)
+      return void 0;
+    const [, symbol, number, unit, label] = match;
+    if (!symbol && input.some((b) => typeof b !== "string"))
+      return void 0;
+    const attr = matchStat(label, stats, row.fragmented);
+    if (!attr || attributes.some((a) => a.attr.gameRef === attr.gameRef))
+      return void 0;
+    const prefix = symbol.toLowerCase();
+    if (prefix === "x" !== (attr.unit === "multiply") || unit === "%" && attr.unit !== "percent" || unit === "s" && attr.unit !== "seconds")
+      return void 0;
+    const value = Number(number) * (prefix === "-" ? -1 : 1);
+    if (!Number.isFinite(value) || value === 0)
+      return void 0;
+    attributes.push({ attr, value, prefix });
+  }
+  return attributes.length >= 2 && attributes.length <= 4 ? { name: weapon.name, attributes } : void 0;
+}
+__name(parseRivenOcr, "parseRivenOcr");
+
 // src/warframe/services/wf-service/wf-service.riven.ts
 async function getAnalyzedRiven(secret, url, variant) {
   const img = await fetchAsyncImage(url);
@@ -3912,138 +4138,7 @@ function getWeaponRivenDisposition(name2) {
 }
 __name(getWeaponRivenDisposition, "getWeaponRivenDisposition");
 async function parseOCRResult(ocrResult) {
-  const globalRivenCalculationAttributeList = rivenAttributes;
-  const list = ocrResult;
-  if (!list.length) {
-    return;
-  }
-  function normalizeStatName(text) {
-    return normalizeName(text).replace(/的/g, "").replace(/暴击率/g, "暴击几率").replace(/弹药最大值/g, "弹药上限").replace(/^伤害$/, "基础伤害").replace(/触发伤害/g, "异常状态伤害").replace(/orokin/g, "奥罗金").replace(/techrot/g, "科腐者").replace(/scaldra/g, "炽蛇军");
-  }
-  __name(normalizeStatName, "normalizeStatName");
-  function similarity(standard, input) {
-    standard = normalizeStatName(standard);
-    input = normalizeStatName(input);
-    if (!standard || !input)
-      return 0;
-    if (standard === input)
-      return 2;
-    if (input.startsWith(standard))
-      return 1 + standard.length / input.length * 0.5;
-    if (standard.split("/").includes(input))
-      return 1.8;
-    if (standard.split("/").some((x) => input.startsWith(x)))
-      return 1.2;
-    return Math.max(tokenSimilarity(standard, input), normalSimilarity(standard, input));
-  }
-  __name(similarity, "similarity");
-  const texts = list;
-  const attributes = [];
-  const statLines = [];
-  for (const t2 of texts) {
-    if (!t2 || !/^[x×+−-]|^\d/i.test(t2)) {
-      continue;
-    }
-    if (/^(?:\d+\s*(?:段位|等级|次|循环)|(?:段位|等级|循环)\s*\d+)$/.test(t2.trim()))
-      continue;
-    const prefix = /^[x×+−-]/i.test(t2) ? t2[0] : "";
-    const attrNamePart = removeSpace(t2).replace(/^[xX×+−-]?\d+(?:\.\d+)?[%s]?/, "");
-    if (!attrNamePart || !/[A-Z\u4E00-\u9FA5]/i.test(attrNamePart))
-      continue;
-    if (!prefix && /^[a-z]{1,2}$/i.test(attrNamePart))
-      continue;
-    const matches = globalRivenCalculationAttributeList.map((attr2) => ({
-      attr: attr2,
-      score: Math.max(...attr2.aliases.map((name2) => similarity(name2, attrNamePart)))
-    })).sort((a, b) => b.score - a.score);
-    const best = matches[0];
-    if (!best || best.score < 0.8)
-      return void 0;
-    const attr = best.attr;
-    statLines.push(t2);
-    const value = (/* @__PURE__ */ __name((function extractStatValue(text) {
-      const t3 = text.replace(/\s+/g, "").replace(/×/g, "x").replace(/−/g, "-");
-      const multMatch = t3.match(/^x(\d+(?:\.\d+)?)/i);
-      if (multMatch) {
-        return {
-          value: Number.parseFloat(multMatch[1]),
-          type: "multiply"
-        };
-      }
-      const percentMatch = t3.match(/^([+-]?\d+(?:\.\d+)?)%/);
-      if (percentMatch) {
-        return {
-          value: Number.parseFloat(percentMatch[1]),
-          type: "percent"
-        };
-      }
-      const numMatch = t3.match(/^([+-]?\d+(?:\.\d+)?)/);
-      if (numMatch) {
-        return {
-          value: Number.parseFloat(numMatch[1]),
-          type: "number"
-        };
-      }
-      return void 0;
-    }), "extractStatValue"))(t2);
-    if (!value) {
-      return void 0;
-    }
-    attributes.push({ attr, value: value.value, prefix });
-  }
-  const weaponName = (/* @__PURE__ */ __name((function extractWeaponName(ocrData) {
-    const rejectPatterns = [
-      /%/,
-      /x\d/i,
-      /\d/,
-      // numbers, %, multipliers
-      /伤害/,
-      /暴击/,
-      /射速/,
-      /攻击/,
-      /后坐力/,
-      /段位/,
-      /加倍/,
-      /效/,
-      /武器/,
-      /果/,
-      /\)/,
-      /\(/
-      // junk OCR fragments
-    ];
-    const exact = ocrData.find(
-      (text) => getWeaponRivenDisposition(text.trim()) || getWeaponRivenDisposition(`${text.trim()} (Primary)`) || getWeaponRivenDisposition(`${text.trim()} (Secondary)`) || getWeaponRivenDisposition(`${text.trim()}（主武器）`) || getWeaponRivenDisposition(`${text.trim()}（副武器）`)
-    );
-    if (exact)
-      return exact.trim();
-    const candidates = ocrData.filter((str) => {
-      const s = str.trim();
-      if (/^\d+$/.test(s))
-        return false;
-      if (/[+%]/.test(s))
-        return false;
-      if (!/[A-Z\u4E00-\u9FA5]/i.test(s))
-        return false;
-      if (rejectPatterns.some((p) => p.test(s)))
-        return false;
-      return true;
-    });
-    const merged = candidates.join("");
-    function removeRivenSuffix(name2) {
-      const s = name2.replace(/\s+/g, "");
-      const rivenPattern = /(?:[A-Z]+-[A-Z]+|[A-Z]{2,})$/i;
-      return s.replace(rivenPattern, "");
-    }
-    __name(removeRivenSuffix, "removeRivenSuffix");
-    return merged ? removeRivenSuffix(merged) : null;
-  }), "extractWeaponName"))(texts.filter((t2) => !statLines.includes(t2)));
-  if (!weaponName || !attributes.length) {
-    return void 0;
-  }
-  return {
-    name: weaponName,
-    attributes
-  };
+  return parseRivenOcr(ocrResult);
 }
 __name(parseOCRResult, "parseOCRResult");
 function analyzeRivenStat(parseResult, variant) {
@@ -4065,6 +4160,7 @@ function analyzeRivenStat(parseResult, variant) {
     return failure("riven.statTypeError");
   }
   const entries = [];
+  const notes = [];
   for (const entry of parseResult.attributes) {
     const stat = stats.find((s) => s.gameRef === entry.attr.gameRef) ?? stats.find((s) => s.key === normalizeName(entry.attr.i18n?.en?.name ?? ""));
     if (!stat || !Number.isFinite(entry.value) || !stat.baseValue)
@@ -4073,8 +4169,11 @@ function analyzeRivenStat(parseResult, variant) {
       return failure("riven.unverifiedStat", false, { stat: stat.name });
     const value = stat.unit === "multiply" ? entry.value - 1 : entry.value;
     const positive = value / stat.baseValue > 0;
-    if (value === 0 || (positive ? !stat.canBeBuff : !stat.canBeCurse))
+    const observedShotgunZoom = weaponRiven.calc.riventype === "Shotgun" && stat.gameRef === "WeaponZoomFovMod" && !positive;
+    if (value === 0 || (positive ? !stat.canBeBuff : !stat.canBeCurse && !observedShotgunZoom))
       return failure("riven.statTypeError");
+    if (observedShotgunZoom)
+      notes.push("霰弹枪负变焦按现有卡片兼容解析，范围使用导出基础值作参考；不代表当前可洗出该词条。");
     if (entries.some((e) => e.stat.gameRef === stat.gameRef))
       return failure("riven.statTypeError");
     entries.push({ stat, value, displayedValue: entry.value, positive });
@@ -4097,21 +4196,23 @@ function analyzeRivenStat(parseResult, variant) {
       max: Math.max(standard * 0.9, standard * 1.1) + offset
     };
   }, "analyze");
+  if (entries.some((e) => e.stat.spliced))
+    notes.push("融合词条为参考范围；实际融合数值的继承方式尚未验证。");
   return { ok: true, data: {
     name: weaponRiven.name.zh,
     disposition,
     buffs: buffs.map(analyze),
     curses: curses.map(analyze),
-    notes: entries.some((e) => e.stat.spliced) ? ["融合词条为参考范围；实际融合数值的继承方式尚未验证。"] : void 0
+    notes: notes.length ? notes : void 0
   } };
 }
 __name(analyzeRivenStat, "analyzeRivenStat");
 
 // src/warframe/services/wf-service/wf-service.sortie.ts
-var import_warframe_public_export_plus16 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus17 = require("warframe-public-export-plus");
 
 // src/warframe/data/wf/sortie.ts
-var import_warframe_public_export_plus15 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus16 = require("warframe-public-export-plus");
 var MODE_NAME_KEY = "/Lotus/Language/Menu/SortieMissionName";
 var SORTIE_ENEMY_LEVELS = [
   { minLevel: 50, maxLevel: 60 },
@@ -4119,7 +4220,7 @@ var SORTIE_ENEMY_LEVELS = [
   { minLevel: 80, maxLevel: 100 }
 ];
 function getSortieModeName() {
-  return import_warframe_public_export_plus15.dict_zh[MODE_NAME_KEY] ?? dictZhExtra[MODE_NAME_KEY] ?? MODE_NAME_KEY;
+  return import_warframe_public_export_plus16.dict_zh[MODE_NAME_KEY] ?? dictZhExtra[MODE_NAME_KEY] ?? MODE_NAME_KEY;
 }
 __name(getSortieModeName, "getSortieModeName");
 function getSortieEnemyLevels(index) {
@@ -4143,13 +4244,13 @@ async function adaptSortie(source, dates) {
     (source.Variants ?? []).map(async (variant, index) => {
       const missionType = variant.missionType ?? "";
       const receivedType = await getMissionTypeKey(missionType) || missionType;
-      const type = import_warframe_public_export_plus16.dict_zh[import_warframe_public_export_plus16.ExportMissionTypes[receivedType]?.name ?? ""] ?? missionType;
+      const type = import_warframe_public_export_plus17.dict_zh[import_warframe_public_export_plus17.ExportMissionTypes[receivedType]?.name ?? ""] ?? missionType;
       const nodeId = variant.node ?? "";
       const solNodeKey = await getSolNodeKey(nodeId) || nodeId;
-      const region = solNodeKey ? import_warframe_public_export_plus16.ExportRegions[solNodeKey] : void 0;
+      const region = solNodeKey ? import_warframe_public_export_plus17.ExportRegions[solNodeKey] : void 0;
       const levels = getSortieEnemyLevels(index);
       const node = region ? {
-        ...regionToShort(region, import_warframe_public_export_plus16.dict_zh),
+        ...regionToShort(region, import_warframe_public_export_plus17.dict_zh),
         minLevel: levels.minLevel,
         maxLevel: levels.maxLevel
       } : {
@@ -4210,7 +4311,7 @@ async function getSortie() {
 __name(getSortie, "getSortie");
 
 // src/warframe/services/wf-service/wf-service.steel-essence.ts
-var import_warframe_public_export_plus17 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus18 = require("warframe-public-export-plus");
 var STEEL_ESSENCE_TESHIN_KEY = "/Lotus/Language/Bosses/Teshin";
 var STEEL_ESSENCE_KEY = "/Lotus/Language/Resources/SteelEssence";
 var STEEL_ESSENCE_EPOCH_MS = Date.parse("2020-11-16T00:00:00.000Z");
@@ -4257,8 +4358,8 @@ async function adaptSteelEssence(raw = {}, now = Date.now()) {
   };
   const upcoming = rotationZh.length > 1 ? rotationZh.map((_, offset) => rotationZh[(index + offset + 1) % rotationZh.length]).filter((item) => item !== void 0).slice(0, rotationZh.length - 1) : [];
   const expiry = raw.expiry?.getTime() ?? steelEssenceWeekExpiryUtc(now);
-  const teshin = import_warframe_public_export_plus17.dict_zh[STEEL_ESSENCE_TESHIN_KEY] ?? dictZhExtra[STEEL_ESSENCE_TESHIN_KEY] ?? STEEL_ESSENCE_TESHIN_KEY;
-  const essence = import_warframe_public_export_plus17.dict_zh[STEEL_ESSENCE_KEY] ?? dictZhExtra[STEEL_ESSENCE_KEY] ?? STEEL_ESSENCE_KEY;
+  const teshin = import_warframe_public_export_plus18.dict_zh[STEEL_ESSENCE_TESHIN_KEY] ?? dictZhExtra[STEEL_ESSENCE_TESHIN_KEY] ?? STEEL_ESSENCE_TESHIN_KEY;
+  const essence = import_warframe_public_export_plus18.dict_zh[STEEL_ESSENCE_KEY] ?? dictZhExtra[STEEL_ESSENCE_KEY] ?? STEEL_ESSENCE_KEY;
   return {
     title: `${teshin} · ${essence}商店`,
     costLabel: essence,
@@ -4311,10 +4412,10 @@ async function getVoidTrader() {
 __name(getVoidTrader, "getVoidTrader");
 
 // src/warframe/services/wf-service/wf-service.weekly.ts
-var import_warframe_public_export_plus19 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus20 = require("warframe-public-export-plus");
 
 // src/warframe/data/wf/archonHunt.ts
-var import_warframe_public_export_plus18 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus19 = require("warframe-public-export-plus");
 var MODE_NAME_KEY2 = "/Lotus/Language/WorldStateWindow/LiteSortieMissionName";
 var HUNT_ENEMY_LEVELS = [
   { minLevel: 130, maxLevel: 135 },
@@ -4322,7 +4423,7 @@ var HUNT_ENEMY_LEVELS = [
   { minLevel: 145, maxLevel: 150 }
 ];
 function getArchonHuntModeName() {
-  return import_warframe_public_export_plus18.dict_zh[MODE_NAME_KEY2] ?? dictZhExtra[MODE_NAME_KEY2] ?? MODE_NAME_KEY2;
+  return import_warframe_public_export_plus19.dict_zh[MODE_NAME_KEY2] ?? dictZhExtra[MODE_NAME_KEY2] ?? MODE_NAME_KEY2;
 }
 __name(getArchonHuntModeName, "getArchonHuntModeName");
 function getArchonHuntEnemyLevels(index) {
@@ -4332,15 +4433,15 @@ __name(getArchonHuntEnemyLevels, "getArchonHuntEnemyLevels");
 
 // src/warframe/services/wf-service/wf-service.weekly.ts
 async function adaptArchonHunt(source) {
-  const name2 = import_warframe_public_export_plus19.dict_zh[`/Lotus/Language/Narmer/${removeSpace(source.boss)}`] ?? source.boss;
+  const name2 = import_warframe_public_export_plus20.dict_zh[`/Lotus/Language/Narmer/${removeSpace(source.boss)}`] ?? source.boss;
   const missions = await Promise.all(
     (source.missions ?? []).map(async (mission, index) => {
       const receivedType = await getMissionTypeKey(mission.type);
-      const type = import_warframe_public_export_plus19.dict_zh[import_warframe_public_export_plus19.ExportMissionTypes[receivedType]?.name ?? ""] ?? mission.type;
+      const type = import_warframe_public_export_plus20.dict_zh[import_warframe_public_export_plus20.ExportMissionTypes[receivedType]?.name ?? ""] ?? mission.type;
       const solNodeKey = await getSolNodeKey(mission.nodeKey);
-      const region = solNodeKey ? import_warframe_public_export_plus19.ExportRegions[solNodeKey] : void 0;
+      const region = solNodeKey ? import_warframe_public_export_plus20.ExportRegions[solNodeKey] : void 0;
       const levels = getArchonHuntEnemyLevels(index);
-      const node = region ? regionToShort(region, import_warframe_public_export_plus19.dict_zh) : {
+      const node = region ? regionToShort(region, import_warframe_public_export_plus20.dict_zh) : {
         name: mission.node ?? mission.nodeKey,
         system: "",
         type: "",
@@ -4393,7 +4494,7 @@ async function getWeekly() {
   const deepArchimMissions = await Promise.all(
     deepArchim.missions.map(async (m) => {
       const receivedType = await getMissionTypeKey(m.missionType);
-      const type = import_warframe_public_export_plus19.dict_zh[import_warframe_public_export_plus19.ExportMissionTypes[receivedType]?.name ?? ""] ?? m.missionType;
+      const type = import_warframe_public_export_plus20.dict_zh[import_warframe_public_export_plus20.ExportMissionTypes[receivedType]?.name ?? ""] ?? m.missionType;
       const deviation = stringToDebuff(
         m.deviation.key,
         m.deviation.name,
@@ -4421,7 +4522,7 @@ async function getWeekly() {
   const temporalArchimMissions = await Promise.all(
     temporalArchim.missions.map(async (m) => {
       const receivedType = await getMissionTypeKey(m.missionType);
-      const type = import_warframe_public_export_plus19.dict_zh[import_warframe_public_export_plus19.ExportMissionTypes[receivedType]?.name ?? ""] ?? receivedType;
+      const type = import_warframe_public_export_plus20.dict_zh[import_warframe_public_export_plus20.ExportMissionTypes[receivedType]?.name ?? ""] ?? receivedType;
       const deviation = stringToDebuff(
         m.deviation.key,
         m.deviation.name,
@@ -4457,7 +4558,7 @@ async function getWeekly() {
 __name(getWeekly, "getWeekly");
 
 // src/warframe/services/wfm-service/index.ts
-var import_warframe_public_export_plus20 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus21 = require("warframe-public-export-plus");
 
 // src/warframe/data/wfm/globalDucatnator.ts
 async function globalDucatnatorIDDictFactory(data) {
@@ -4664,10 +4765,10 @@ var wfmItemMatcher = (() => {
   const headSuffixLookup = [neuropticsSuffix, cerebrumSuffix];
   const warframeAliasDict = ((aliasObject) => {
     const transformedObject = {};
-    for (const [key, aliases] of Object.entries(aliasObject)) {
+    for (const [key, aliases2] of Object.entries(aliasObject)) {
       const normalizedKey = normalizeName(key);
       transformedObject[normalizedKey] = normalizedKey;
-      for (const alias of aliases) {
+      for (const alias of aliases2) {
         if (typeof alias !== "string" || alias.length === 0) {
           continue;
         }
@@ -5310,7 +5411,7 @@ async function getRivenOrders(input) {
 }
 __name(getRivenOrders, "getRivenOrders");
 async function applyRelicData(relic) {
-  const tier = import_warframe_public_export_plus20.dict_zh[relic.tierKey] ?? relic.tier;
+  const tier = import_warframe_public_export_plus21.dict_zh[relic.tierKey] ?? relic.tier;
   const { globalItemGameRefDict } = await globalItemData.get();
   const wfmDict = await globalDucatnatorIDDict.get();
   const loadedItems = relic.items.map((element) => {
@@ -5399,7 +5500,7 @@ var primedModHistory = createAsyncCache(async () => {
 }, 432e5);
 
 // src/warframe/services/world-state-refresh.ts
-var import_warframe_public_export_plus21 = require("warframe-public-export-plus");
+var import_warframe_public_export_plus22 = require("warframe-public-export-plus");
 var ALLOWED_FISSURE_MISSION_TYPES = /* @__PURE__ */ new Set(["MT_EXTERMINATION", "MT_DEFENSE", "MT_ARTIFACT"]);
 function time(value) {
   return value?.getTime() ?? 0;
@@ -5418,7 +5519,7 @@ function fissureId(value) {
 __name(fissureId, "fissureId");
 async function fissureMissionType(fissure) {
   const nodeKey = await getSolNodeKey(fissure.nodeKey);
-  return import_warframe_public_export_plus21.ExportRegions[nodeKey]?.missionType;
+  return import_warframe_public_export_plus22.ExportRegions[nodeKey]?.missionType;
 }
 __name(fissureMissionType, "fissureMissionType");
 function dailyDealId(value) {
@@ -5446,21 +5547,6 @@ function traderId(value) {
   ].join(":");
 }
 __name(traderId, "traderId");
-function alertReward(alert) {
-  const reward = alert.mission?.reward;
-  if (!reward) {
-    return "";
-  }
-  const values = [
-    ...reward.items,
-    ...reward.countedItems.map((item) => `${item.key} x${item.count}`)
-  ];
-  if (reward.credits) {
-    values.push(`${reward.credits} 现金`);
-  }
-  return values.join("、");
-}
-__name(alertReward, "alertReward");
 async function diffWorldStates(previous, current) {
   const notifications = [];
   const previousFissures = new Set(previous.raw.fissures.map(fissureId));
@@ -5518,13 +5604,17 @@ async function diffWorldStates(previous, current) {
   for (const alert of current.raw.alerts) {
     const id = alertId(alert);
     if (!previousAlerts.has(id)) {
+      const { alerts: [mapped] } = await adaptAlerts([alert], currentTimestamp);
+      if (!mapped) {
+        continue;
+      }
       notifications.push({
         type: "alert",
         id,
-        description: alert.description,
-        node: alert.mission?.node ?? "",
-        missionType: alert.mission?.type ?? "",
-        reward: alertReward(alert),
+        description: mapped.description ?? "",
+        node: mapped.node.system ? `${mapped.node.name} (${mapped.node.system})` : mapped.node.name,
+        missionType: mapped.type,
+        reward: mapped.rewards.map((item) => item.count > 1 ? `${item.name} x${item.count}` : item.name).join("、"),
         expiry: time(alert.expiry)
       });
     }
@@ -7443,6 +7533,7 @@ function AlertComponent(board) {
           const timeLeft = entry.expiry - Date.now();
           const timeColor = timeLeft > 36e5 ? "var(--wf-success)" : timeLeft > 6e5 ? "var(--wf-info)" : "var(--wf-danger)";
           return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { style: missionCardStyle, children: [
+            entry.description ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { style: "font-size:14px;font-weight:600;margin-bottom:4px;color:var(--wf-text-primary);", children: entry.description }) : null,
             /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { style: "font-size:13px;font-weight:600;margin-bottom:4px;color:var(--wf-text-body);", children: [
               entry.type,
               entry.nightmare ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { style: "margin-left:8px;font-size:12px;color:var(--wf-accent);", children: entry.nightmare }) : null