koishi-plugin-starfx-bot 0.19.0 → 0.19.1

package/lib/index.js

@@ -405,12 +405,54 @@ __name(drawBanGDream, "drawBanGDream");
 async function intervalGetExchangeRate(ctx, cfg, session, searchString, exchangeRatePath) {
 }
 __name(intervalGetExchangeRate, "intervalGetExchangeRate");
-async function getExchangeRate(ctx, cfg, session, searchString) {
+async function parseNaturalCurrency(searchString) {
+  const index = await getCurrencyCodesMap();
+  const s = searchString.replace(/\s+/g, "");
+  const match = s.match(/(.+?)(兑|对)(.+)/);
+  if (match) {
+    const from = index[match[1]];
+    const to = index[match[3]];
+    if (from && to) {
+      return from + to;
+    }
+  }
+  if (index[s]) {
+    return index[s];
+  }
+  return null;
+}
+__name(parseNaturalCurrency, "parseNaturalCurrency");
+async function getExchangeRate(ctx, cfg, session, searchString, raw, retryTimes = 1) {
+  const apiKey = retryTimes ? await getMvpAPIKey() : await updateMvpAPIKey();
   try {
-    const apiKey = await getMvpAPIKey();
-    const guids = await getExchangeGuids(searchString, apiKey);
+    let guids = [];
+    if (searchString) {
+      const parsed = await parseNaturalCurrency(searchString);
+      if (parsed) {
+        searchString = parsed;
+      }
+    }
+    if (raw && /^([a-z0-9]{6})([,\s]([a-z0-9]{6}))*$/.test(raw)) {
+      guids = raw.split(",");
+    } else if (/^([a-zA-Z]{3}|[a-zA-Z]{6})([,\s]([a-zA-Z]{3}|[a-zA-Z]{6}))*$/.test(searchString)) {
+      const currencies = await getCurrencyCodes();
+      const codes = searchString.split(/[,\s]+/);
+      const invalidCodes = [];
+      let search6Strings = [];
+      codes.forEach((code) => {
+        const first = code.slice(0, 3).toUpperCase();
+        const second = code.length === 3 ? "CNY" : code.slice(3, 6).toUpperCase();
+        search6Strings.push(code.length === 3 ? first + second : code);
+        if (!currencies.some((c) => c.code === first)) invalidCodes.push(first);
+        if (code.length === 6 && !currencies.some((c) => c.code === second)) invalidCodes.push(second);
+      });
+      if (invalidCodes.length > 0) {
+        throw new Error(`输入的货币代码不合法: ${invalidCodes.join(", ")}`);
+      }
+      guids = await getExchangeGuids(search6Strings.join(","), apiKey);
+    }
     if (!guids.length || guids.every((g) => !g)) {
-      throw new Error("Invalid symbols");
+      throw new Error(`输入无效: ${searchString}`);
     }
     const result = [];
     for (const guid of guids) {
@@ -422,28 +464,35 @@ async function getExchangeRate(ctx, cfg, session, searchString) {
       if (!nowPrice || !oneMonthPrice) {
         throw new Error("Failed to fetch price");
       }
-      const chartBuffer = await drawOneMonthChartSkia(oneMonthPrice.prices, oneMonthPrice.timeStamps);
+      const chartBuffer = await drawOneMonthChartSkia(oneMonthPrice.prices, oneMonthPrice.timeStamps, `1 ${nowPrice.fromCurrency} to 1 ${nowPrice.currency}`);
       const imgSrc = "data:image/png;base64," + chartBuffer.toString("base64");
       result.push({
         name: nowPrice.symbolName,
+        fromCurrency: nowPrice.fromCurrency,
+        currency: nowPrice.currency,
         nowPrice: nowPrice.price,
         oneMonthChart: import_koishi.h.image(imgSrc)
       });
     }
     for (const item of result) {
       await session.send([
-        import_koishi.h.text((/* @__PURE__ */ new Date()).toLocaleString()),
         import_koishi.h.text(`
+${(/* @__PURE__ */ new Date()).toLocaleString()}
 ${item.name}
-当前价格: `),
-        import_koishi.h.text(`${item.nowPrice}
-近30天价格走势: `),
+(${item.fromCurrency}/${item.currency})
+当前价格: ${item.nowPrice}
+近30天价格走势:
+`),
         item.oneMonthChart
       ]);
     }
   } catch (err) {
-    const message = err instanceof Error ? err.message : typeof err === "string" ? err : JSON.stringify(err);
-    await session.send(`查询失败：${message}`);
+    if (retryTimes === 0) {
+      const message = err instanceof Error ? err.message : typeof err === "string" ? err : JSON.stringify(err);
+      await session.send(`查询失败：${message}`);
+    } else {
+      await getExchangeRate(ctx, cfg, session, searchString, raw, retryTimes - 1);
+    }
   }
 }
 __name(getExchangeRate, "getExchangeRate");
@@ -696,8 +745,9 @@ async function updateMvpAPIKey() {
     const apiResp = await fetch(apiUrl);
     if (!apiResp.ok) throw new Error(`Failed to fetch config API: ${apiResp.status}`);
     const json = await apiResp.json();
-    const mvpAPIkey = json?.configs?.["shared/msn-ns/CommonAutoSuggest/default"]?.properties?.["mvpAPIkey"] ?? null;
-    return mvpAPIkey;
+    const newMvpAPIKey = json?.configs?.["shared/msn-ns/CommonAutoSuggest/default"]?.properties?.["mvpAPIkey"] ?? null;
+    mvpAPIKey = newMvpAPIKey;
+    return newMvpAPIKey;
   } catch (err) {
     console.error(err);
     return null;
@@ -714,7 +764,8 @@ async function getExchangeGuids(symbols, apikey) {
     const url = `https://assets.msn.cn/service/Finance/IdMap?apikey=${apikey}&MStarIds=${encodeURIComponent(symbols)}`;
     const resp = await fetch(url);
     if (!resp.ok) throw new Error(`请求失败: ${resp.status}`);
-    const data = await resp.json();
+    let data = await resp.json();
+    data = data.filter((d) => d.status === 200);
     const inputSymbols = symbols.split(",");
     const guidMap = new Map(data.map((item) => [item.mStarId, item.guid]));
     return inputSymbols.map((sym) => guidMap.get(sym) || "");
@@ -744,11 +795,13 @@ async function getQuotes(ids, apiKey) {
         q.instrumentId,
         {
           price: q.price,
-          symbolName: q.localizedAttributes?.["zh-cn"]?.symbolName || q.symbol
+          symbolName: q.localizedAttributes?.["zh-cn"]?.symbolName || q.localizedAttributes?.["zh-cn"]?.displayName || q.symbol,
+          fromCurrency: q.fromCurrency || q.displayName,
+          currency: q.currency
         }
       ])
     );
-    return inputIds.map((id) => quoteMap.get(id) ?? { price: 0, symbolName: "" });
+    return inputIds.map((id) => quoteMap.get(id) ?? { price: 0, symbolName: "", fromCurrency: "", currency: "" });
   } catch (err) {
     console.error(err);
     return [];
@@ -775,7 +828,7 @@ async function getMonthMSNClosePrices(ids, apiKey) {
   });
 }
 __name(getMonthMSNClosePrices, "getMonthMSNClosePrices");
-async function drawOneMonthChartSkia(prices, timeStamps, width = 1200, height = 600) {
+async function drawOneMonthChartSkia(prices, timeStamps, title = "兑换汇率", width = 1200, height = 600) {
   if (!prices.length || !timeStamps.length || prices.length !== timeStamps.length) return;
   const dataPoints = timeStamps.map((t, i) => ({ x: new Date(t), y: prices[i] }));
   const canvas = new import_skia_canvas.Canvas(width, height);
@@ -793,7 +846,7 @@ async function drawOneMonthChartSkia(prices, timeStamps, width = 1200, height =
     type: "line",
     data: {
       datasets: [{
-        label: "兑换汇率",
+        label: title,
         data: dataPoints,
         showLine: true,
         // ⭐ 不连线，只画点
@@ -802,9 +855,17 @@ async function drawOneMonthChartSkia(prices, timeStamps, width = 1200, height =
         pointBorderWidth: 0,
         // ⭐ 去掉外边框 → 变成实心点
         borderWidth: 2,
-        borderColor: "blue",
+        borderColor: "red",
         backgroundColor: "rgba(0,0,255,0.1)",
-        tension: 0.2
+        tension: 0,
+        segment: {
+          borderDash: /* @__PURE__ */ __name((ctx) => {
+            const p0 = ctx.p0.parsed.x;
+            const p1 = ctx.p1.parsed.x;
+            const diffHours = (p1 - p0) / (1e3 * 60 * 60);
+            return diffHours > 2 ? [6, 4] : [];
+          }, "borderDash")
+        }
       }]
     },
     options: {
@@ -836,6 +897,32 @@ async function drawOneMonthChartSkia(prices, timeStamps, width = 1200, height =
   return await canvas.toBuffer("png");
 }
 __name(drawOneMonthChartSkia, "drawOneMonthChartSkia");
+var currencyCodes = [];
+async function getCurrencyCodes() {
+  if (currencyCodes?.length) return currencyCodes;
+  currencyCodes = require(import_node_path.default.resolve(__dirname, "./currency.json"));
+  return currencyCodes;
+}
+__name(getCurrencyCodes, "getCurrencyCodes");
+var currencyCodesMap = {};
+async function getCurrencyCodesMap() {
+  if (Object.keys(currencyCodesMap)?.length) return currencyCodesMap;
+  currencyCodesMap = await buildCurrencyIndex();
+  return currencyCodesMap;
+}
+__name(getCurrencyCodesMap, "getCurrencyCodesMap");
+async function buildCurrencyIndex() {
+  const map = {};
+  (await getCurrencyCodes()).forEach((c) => {
+    map[c.country] = c.code;
+    map[c.currencyCn] = c.code;
+  });
+  map["日元"] = "JPY";
+  map["人民币"] = "CNY";
+  map["港币"] = "HKD";
+  return map;
+}
+__name(buildCurrencyIndex, "buildCurrencyIndex");
 
 // src/index.ts
 var import_node_path2 = __toESM(require("node:path"));
@@ -848,7 +935,7 @@ var package_default = {
   contributors: [
     "StarFreedomX <starfreedomx@outlook.com>"
   ],
-  version: "0.19.0",
+  version: "0.19.1",
   main: "lib/index.js",
   typings: "lib/index.d.ts",
   files: [
@@ -1074,7 +1161,7 @@ function apply(ctx, cfg) {
   }
   if (cfg.roomNumber) {
     const roomNumMap = /* @__PURE__ */ new Map();
-    ctx.command("room-number [param: string]").action(async ({ session }, param) => {
+    ctx.command("room-number [param: string]").usage("记录房间号").action(async ({ session }, param) => {
       const nowRoomNumMap = cfg.saveRoomAsFile ? readMap(cfg.saveRoomAsFile) : roomNumMap;
       const room = nowRoomNumMap.get(session.gid);
       if (!param) {
@@ -1098,7 +1185,7 @@ function apply(ctx, cfg) {
   }
   if (cfg.ready) {
     const readyMap = /* @__PURE__ */ new Map();
-    ctx.command("waiting-play [param:text]", { strictOptions: true }).action(async ({ session }, param) => {
+    ctx.command("waiting-play [param:text]", { strictOptions: true }).usage("待机").action(async ({ session }, param) => {
       return ready(session, cfg, param, readyMap);
     });
   }
@@ -1108,13 +1195,13 @@ function apply(ctx, cfg) {
     });
   }
   if (cfg.undo) {
-    ctx.command("undo").alias("撤回").action(async ({ session }) => {
+    ctx.command("undo").alias("撤回").usage("撤回消息").action(async ({ session }) => {
       if (detectControl(controlJson, session.guildId, "undo"))
         await undo(cfg, session);
     });
   }
   if (cfg.forward) {
-    ctx.command("forward").option("group", "-g <group:string>").option("platform", "-p <platform:string>").action(async ({ session, options }) => {
+    ctx.command("forward").option("group", "-g <group:string>").option("platform", "-p <platform:string>").usage("转发消息").action(async ({ session, options }) => {
       if (detectControl(controlJson, session.guildId, "forward")) {
         const mapPath = import_node_path2.default.join(assetsDir, "forward.json");
         const groupMap = readMap(mapPath);
@@ -1140,7 +1227,7 @@ function apply(ctx, cfg) {
     });
   }
   if (cfg.originImg) {
-    ctx.command("获取X原图 <urls>").alias("推特原图").action(async ({ session }, urls) => {
+    ctx.command("获取X原图 <urls>").alias("推特原图").usage("获取推特原图").action(async ({ session }, urls) => {
       if (detectControl(controlJson, session.guildId, "originImg")) {
         let [xUrls, xIndex] = await Promise.all([
           getXUrl(session?.quote?.content),
@@ -1154,9 +1241,9 @@ function apply(ctx, cfg) {
     });
   }
   if (cfg.searchExchangeRate) {
-    ctx.command("查汇率 [exchangeParam:string]").action(async ({ session }, exchangeParam) => {
+    ctx.command("查汇率 <exchangeParam:text>").usage("查询当前汇率").example("查汇率 JPY : 查询日元兑换人民币的汇率(3位字母)").example("查汇率 JPYCNY : 查询日元兑换人民币的汇率(6位字母)").example("查汇率 -r avdzk2 : 查询日元兑换人民币的汇率(msn代码avdzk2)").example("查汇率 -r auvwoc : 查询黄金的价格(msn代码auvwoc, 很怪吧我也不知道为什么是这个)").option("raw", "-r <raw:string>").action(async ({ session, options }, exchangeParam) => {
       if (detectControl(controlJson, session.guildId, "exchangeRate")) {
-        return await getExchangeRate(ctx, cfg, session, exchangeParam);
+        return await getExchangeRate(ctx, cfg, session, exchangeParam, options?.raw);
       }
     });
   }

package/lib/utils.d.ts

@@ -130,7 +130,7 @@ export declare function drawBanGDream(avatar: string, inputOptions?: {
     border: string;
 }): Promise<string>;
 export declare function intervalGetExchangeRate(ctx: Context, cfg: Config, session: Session, searchString: string, exchangeRatePath: string): Promise<void>;
-export declare function getExchangeRate(ctx: Context, cfg: Config, session: Session, searchString: string): Promise<void>;
+export declare function getExchangeRate(ctx: Context, cfg: Config, session: Session, searchString?: string, raw?: string, retryTimes?: number): Promise<void>;
 export declare function parseJsonControl(text: string): FeatureControl | null;
 export declare function detectControl(controlJson: FeatureControl, guildId: string, funName: string): boolean;
 export declare function handleRoll(session: Session): string;
@@ -154,9 +154,17 @@ export declare function ready(session: Session, cfg: Config, param: string, read
  * 绘制近一个月收盘价走势图
  * @param prices 收盘价数组
  * @param timeStamps ISO 时间戳数组
+ * @param title 图表标题
  * @param width 图表宽度
  * @param height 图表高度
  * @returns buffer
  */
-export declare function drawOneMonthChartSkia(prices: number[], timeStamps: string[], width?: number, height?: number): Promise<Buffer>;
+export declare function drawOneMonthChartSkia(prices: number[], timeStamps: string[], title?: string, width?: number, height?: number): Promise<Buffer>;
+interface CurrencyCode {
+    "country": string;
+    "currencyCn": string;
+    "code": string;
+}
+export declare function getCurrencyCodes(): Promise<CurrencyCode[]>;
+export declare function getCurrencyCodesMap(): Promise<Record<string, string>>;
 export {};

package/package.json

@@ -4,7 +4,7 @@
   "contributors": [
     "StarFreedomX <starfreedomx@outlook.com>"
   ],
-  "version": "0.19.0",
+  "version": "0.19.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -55,6 +55,8 @@ StarFreedomX机器人的小功能，自用
 | `sold`           | 闲鱼“卖掉了”功能（对应`openSold`）               |
 | `repeat`         | 群复读功能（对应`openRepeat`）                 |
 | `record`         | 群语录功能（对应`投稿、语录`）                      |
+| `record-push`    | 群语录功能（对应`投稿`）                         |
+| `record-get`     | 群语录功能（对应`语录`）                         |
 | `atNotSay`       | “艾特我/他又不说话”系列功能                       |
 | `replyBot`       | “我才不是机器人！”系列功能                        |
 | `iLoveYou`       | “我也喜欢你”系列功能                           |
@@ -116,3 +118,4 @@ StarFreedomX机器人的小功能，自用
 | `0.18.1` | 修复艾特不说话功能                     |
 | `0.18.2` | 不直接操作插件目录，防止更新问题              |
 | `0.19.0` | 新增查汇率功能                       |
+| `0.19.0` | 查汇率适配更多语法                     |