koishi-plugin-noah 1.4.2 → 1.5.0

package/lib/index.cjs

@@ -3332,26 +3332,13 @@ async function readCode128(ctx, barcodeApiUrl, imageUrl) {
 }
 __name(readCode128, "readCode128");
 
-// src/games/general/utils/textParser.ts
-function parseOptionsFromText(textElements) {
-  const allText = textElements.map((el) => el.attrs?.content || "").join(" ");
-  const optionRegex = /(-{1,2}[a-zA-Z][a-zA-Z0-9-]*(?:\s+[^\s-][^\s]*)?)/g;
-  const options = [];
-  let match;
-  while ((match = optionRegex.exec(allText)) !== null) {
-    options.push(match[1].trim());
-  }
-  return options.join(" ");
-}
-__name(parseOptionsFromText, "parseOptionsFromText");
-
 // src/games/general/events/quote.ts
 function quote(ctx, config) {
   ctx.on("message", async (session) => {
     if (session.quote && session.quote.user.id === session.selfId) {
       const images = await import_koishi7.h.select(session.quote.elements, "img");
       const textElements = await import_koishi7.h.select(session.elements, "text");
-      const options = parseOptionsFromText(textElements);
+      const allText = textElements.map((el) => el.attrs?.content || "").join(" ");
       if (images.length === 1) {
         const imageUrl = images[0].attrs.src;
         const code = await readCode128(ctx, config.barcode_api_url, imageUrl);
@@ -3365,7 +3352,7 @@ function quote(ctx, config) {
           } else {
             return;
           }
-          const command = `${module2}.chart ${options} -b ${music_id}.${music_diff}`;
+          const command = `${module2}.chart ${music_id}.${music_diff} ${allText}`;
           await session.execute(command);
         }
       }
@@ -4089,72 +4076,94 @@ function getDiffStringFromAbbr(diffAbbr) {
 }
 __name(getDiffStringFromAbbr, "getDiffStringFromAbbr");
 
-// src/games/sdvx/services/music-service.ts
-var MusicService = class _MusicService {
-  static {
-    __name(this, "MusicService");
-  }
-  static instance;
-  sdvx_data_url;
-  constructor(config) {
-    this.sdvx_data_url = config.sdvx_data_url;
-  }
-  /**
-   * 获取 MusicService 实例
-   * @param config - SDVX 配置对象
-   * @returns MusicService 实例
-   */
-  static getInstance(config) {
-    if (!_MusicService.instance) {
-      _MusicService.instance = new _MusicService(config);
-    }
-    return _MusicService.instance;
-  }
-  /**
-   * 获取音乐信息
-   * @param ctx - Koishi 上下文对象
-   * @param musicIds - 音乐 ID 数组
-   * @returns 音乐信息数组
-   */
-  async getMusic(ctx, musicIds) {
-    const response = await ctx.http.post(
-      `/music`,
-      {
-        ids: musicIds
-      },
-      {
-        baseURL: this.sdvx_data_url
-      }
-    );
-    const musicInfo = await response;
-    return musicInfo;
-  }
-};
-
 // src/games/sdvx/commands/chart.ts
+function mapArrangementToken(tok) {
+  const t = tok.toLowerCase();
+  if (t === "ran" || t === "random") return "random";
+  if (t === "m" || t === "mirror" || t === "mir") return "mirror";
+  if (t === "sran" || t === "srandom") return "s-random";
+  if (t === "fran" || t === "wtf") return "f-random";
+  return null;
+}
+__name(mapArrangementToken, "mapArrangementToken");
+function mapLeftColorToken(tok) {
+  const m = /^l(blue|red|yellow|green)$/i.exec(tok);
+  return m ? m[1].toUpperCase() : null;
+}
+__name(mapLeftColorToken, "mapLeftColorToken");
+function mapRightColorToken(tok) {
+  const m = /^r(blue|red|yellow|green)$/i.exec(tok);
+  return m ? m[1].toUpperCase() : null;
+}
+__name(mapRightColorToken, "mapRightColorToken");
+function isBarcode(s) {
+  return /^\d+\.[A-Za-z]+$/.test(s);
+}
+__name(isBarcode, "isBarcode");
 function chart(ctx, config, logger5) {
-  ctx.command("sdvx.chart [query:text]").alias("sdvx.c").option("lossless", "-l").option("barcode", "-b <code:text>").option("mirror", "-m").action(async ({ session, options }, query) => {
-    const musicService = MusicService.getInstance(config);
-    if (options.barcode) {
-      const [mid, diff] = options.barcode.split(".");
-      const diffStr = getDiffStringFromAbbr(diff).diffStr;
-      const [music] = await musicService.getMusic(ctx, [parseInt(mid)]);
-      if (music) {
-        const chart2 = music.difficulty.find((d) => d.difstr === diffStr);
-        if (chart2) {
-          const url = options.mirror ? `${config.sdvx_data_url}${chart2.mirror_chart_url}`.replace(
-            ".webp",
-            ".png"
-          ) : `${config.sdvx_data_url}${chart2.chart_url}`.replace(".webp", ".png");
-          return import_koishi10.h.image(url);
-        }
-      }
-    }
+  ctx.command("sdvx.chart [query:text]").alias("sdvx.c").option("lossless", "-l").action(async ({ session, options }, query) => {
     if (!query) {
       await session.send(session.text(".prompt"));
       query = await session.prompt();
       if (!query) return session.text("commands.timeout");
     }
+    try {
+      let arrangement_mode = "normal";
+      let laser_l_color = "GREEN";
+      let laser_r_color = "RED";
+      const tokens = query.split(/\s+/).filter(Boolean);
+      const remaining = [];
+      for (const tok of tokens) {
+        const arr = mapArrangementToken(tok);
+        if (arr) {
+          arrangement_mode = arr;
+          continue;
+        }
+        const lc = mapLeftColorToken(tok);
+        if (lc) {
+          laser_l_color = lc;
+          continue;
+        }
+        const rc = mapRightColorToken(tok);
+        if (rc) {
+          laser_r_color = rc;
+          continue;
+        }
+        remaining.push(tok);
+      }
+      const rest = remaining.join(" ").trim();
+      if (!rest) {
+        return;
+      }
+      if (isBarcode(rest)) {
+        const [midRaw, diffAbbrRaw] = rest.split(".");
+        const music_id = Number(midRaw);
+        const { diffStr } = getDiffStringFromAbbr(diffAbbrRaw);
+        const difstr = diffStr;
+        const output_format = options?.lossless ? "PNG" : "JPEG";
+        const payload = {
+          music_id,
+          difstr,
+          arrangement_mode,
+          rng_seed: null,
+          output_format,
+          laser_l_color,
+          laser_r_color,
+          px_per_second: 600,
+          column_height: 2800
+        };
+        session.send(session.text(".drawing"));
+        const res = await ctx.http.post(`${config.sdvx_data_url}/chart`, payload, {
+          headers: { "Content-Type": "application/json" }
+        });
+        return import_koishi10.h.image(res, "image/png");
+      } else {
+        return session.text(".error");
+      }
+    } catch (err) {
+      logger5.warn(err);
+      return session.text(".error");
+    }
   });
 }
 __name(chart, "chart");
@@ -4193,6 +4202,48 @@ var IIDXService = class _IIDXService {
   }
 };
 
+// src/games/sdvx/services/music-service.ts
+var MusicService = class _MusicService {
+  static {
+    __name(this, "MusicService");
+  }
+  static instance;
+  sdvx_data_url;
+  constructor(config) {
+    this.sdvx_data_url = config.sdvx_data_url;
+  }
+  /**
+   * 获取 MusicService 实例
+   * @param config - SDVX 配置对象
+   * @returns MusicService 实例
+   */
+  static getInstance(config) {
+    if (!_MusicService.instance) {
+      _MusicService.instance = new _MusicService(config);
+    }
+    return _MusicService.instance;
+  }
+  /**
+   * 获取音乐信息
+   * @param ctx - Koishi 上下文对象
+   * @param musicIds - 音乐 ID 数组
+   * @returns 音乐信息数组
+   */
+  async getMusic(ctx, musicIds) {
+    const response = await ctx.http.post(
+      `/music`,
+      {
+        ids: musicIds
+      },
+      {
+        baseURL: this.sdvx_data_url
+      }
+    );
+    const musicInfo = await response;
+    return musicInfo;
+  }
+};
+
 // src/servers/utils/grade.ts
 function getSDVXGrade(score) {
   if (score >= 99e5) return "S";
@@ -5146,10 +5197,10 @@ function apply12(ctx) {
 __name(apply12, "apply");
 
 // src/games/sdvx/locales/en-US.yml
-var en_US_default4 = { _config: { $desc: "SDVX Module Settings", default_model: "<p>Default model value (e.g. `2024110700`)</p>", sdvx_data_url: "<p>The URL of the SDVX data service</p>" }, commands: { vf: { description: "Show Noah help information", messages: { "card-not-found": "<p>You haven't bound a card yet, go bind a card first~</p>", "server-not-found": "<p>No available servers, add one yourself~</p>", "no-scores-found": "<p>No scores found, please check your data.</p>", error: "<p>An error occurred(っ °Д °;)っ</p>", drawing: "<p>Noah is drawing, please wait patiently~</p>", "menu-select": "<p>Please select the card you want to use:</p>\n{card_list}\n<p>q. Exit</p>", "invalid-select": "<p>No such option!</p>", quit: "<p>Exited~</p>" } }, sdvx: { recent: { description: "Show recent scores", messages: { "card-not-found": "<p>You haven't bound a card yet, go bind a card first~</p>", "server-not-found": "<p>No available servers, add one yourself~</p>", "no-scores-found": "<p>No scores found, please check your data.</p>", error: "<p>An error occurred(っ °Д °;)っ</p>", drawing: "<p>Noah is drawing, please wait patiently~</p>" } }, chart: { description: "Show SDVX chart", messages: { prompt: "<p>Which song's chart would you like to view?</p>" } }, calculate: { description: "Calculate volforce value or score", messages: { "invalid-query": "<p>Invalid query parameters, please check your input~</p>", "no-results": "<p>No results found~</p>", "too-many-results": "<p>Too many results! Found {0} results, please narrow down your query (current limit: 500 results)</p>", drawing: "<p>Noah is drawing, please wait patiently~</p>", error: "<p>An error occurred(っ °Д °;)っ</p>" } } } } };
+var en_US_default4 = { _config: { $desc: "SDVX Module Settings", default_model: "<p>Default model value (e.g. `2024110700`)</p>", sdvx_data_url: "<p>The URL of the SDVX data service</p>" }, commands: { vf: { description: "Show Noah help information", messages: { "card-not-found": "<p>You haven't bound a card yet, go bind a card first~</p>", "server-not-found": "<p>No available servers, add one yourself~</p>", "no-scores-found": "<p>No scores found, please check your data.</p>", error: "<p>An error occurred(っ °Д °;)っ</p>", drawing: "<p>Noah is drawing, please wait patiently~</p>", "menu-select": "<p>Please select the card you want to use:</p>\n{card_list}\n<p>q. Exit</p>", "invalid-select": "<p>No such option!</p>", quit: "<p>Exited~</p>" } }, sdvx: { recent: { description: "Show recent scores", messages: { "card-not-found": "<p>You haven't bound a card yet, go bind a card first~</p>", "server-not-found": "<p>No available servers, add one yourself~</p>", "no-scores-found": "<p>No scores found, please check your data.</p>", error: "<p>An error occurred(っ °Д °;)っ</p>", drawing: "<p>Noah is drawing, please wait patiently~</p>" } }, chart: { description: "Show SDVX chart", messages: { prompt: "<p>Which song's chart would you like to view?</p>", error: "<p>An error occurred(っ °Д °;)っ</p>", drawing: "<p>Noah is drawing, please wait patiently~</p>" } }, calculate: { description: "Calculate volforce value or score", messages: { "invalid-query": "<p>Invalid query parameters, please check your input~</p>", "no-results": "<p>No results found~</p>", "too-many-results": "<p>Too many results! Found {0} results, please narrow down your query (current limit: 500 results)</p>", drawing: "<p>Noah is drawing, please wait patiently~</p>", error: "<p>An error occurred(っ °Д °;)っ</p>" } } } } };
 
 // src/games/sdvx/locales/zh-CN.yml
-var zh_CN_default4 = { _config: { $desc: "SDVX 模块设置", default_model: "<p>默认的 model 值（如 `2024110700`）</p>", sdvx_data_url: "<p>SDVX 数据服务的 URL</p>" }, commands: { vf: { description: "查询 SDVX VOLFORCE", messages: { "card-not-found": "<p>你还没绑卡，去绑个卡再来吧~</p>", "server-not-found": "<p>没有可用的服务器哦，自己添加一个吧~</p>", "no-scores-found": "<p>没有找到你的分数数据哦~</p>", error: "<p>Noah 遇到了错误(っ °Д °;)っ</p>", drawing: "<p>Noah 正在画啦，请耐心等待~</p>", "menu-select": "<p>请选择你要使用的卡片：</p>\n{card_list}\n<p>q. 退出</p>", "invalid-select": "<p>没有该选项！</p>", quit: "<p>已退出~</p>" } }, sdvx: { recent: { description: "查询最近分数", messages: { "card-not-found": "<p>你还没绑卡，去绑个卡再来吧~</p>", "server-not-found": "<p>没有可用的服务器哦，自己添加一个吧~</p>", "no-scores-found": "<p>没有找到你的分数数据哦~</p>", error: "<p>Noah 遇到了错误(っ °Д °;)っ</p>", drawing: "<p>Noah 正在画啦，请耐心等待~</p>" } }, chart: { description: "查询 SDVX 谱面", messages: { prompt: "<p>要查哪首歌的铺面呢？</p>" } }, calculate: { description: "计算 volforce 值或分数", messages: { "invalid-query": "<p>查询参数无效，请检查你的输入~</p>", "no-results": "<p>没有找到符合条件的结果~</p>", "too-many-results": "<p>结果太多啦！共找到 {0} 条结果，请缩小查询范围（当前限制：500 条）</p>", drawing: "<p>Noah 正在画啦，请耐心等待~</p>", error: "<p>Noah 遇到了错误(っ °Д °;)っ</p>" } } } } };
+var zh_CN_default4 = { _config: { $desc: "SDVX 模块设置", default_model: "<p>默认的 model 值（如 `2024110700`）</p>", sdvx_data_url: "<p>SDVX 数据服务的 URL</p>" }, commands: { vf: { description: "查询 SDVX VOLFORCE", messages: { "card-not-found": "<p>你还没绑卡，去绑个卡再来吧~</p>", "server-not-found": "<p>没有可用的服务器哦，自己添加一个吧~</p>", "no-scores-found": "<p>没有找到你的分数数据哦~</p>", error: "<p>Noah 遇到了错误(っ °Д °;)っ</p>", drawing: "<p>Noah 正在画啦，请耐心等待~</p>", "menu-select": "<p>请选择你要使用的卡片：</p>\n{card_list}\n<p>q. 退出</p>", "invalid-select": "<p>没有该选项！</p>", quit: "<p>已退出~</p>" } }, sdvx: { recent: { description: "查询最近分数", messages: { "card-not-found": "<p>你还没绑卡，去绑个卡再来吧~</p>", "server-not-found": "<p>没有可用的服务器哦，自己添加一个吧~</p>", "no-scores-found": "<p>没有找到你的分数数据哦~</p>", error: "<p>Noah 遇到了错误(っ °Д °;)っ</p>", drawing: "<p>Noah 正在画啦，请耐心等待~</p>" } }, chart: { description: "查询 SDVX 谱面", messages: { prompt: "<p>要查哪首歌的铺面呢？</p>", error: "<p>Noah 遇到了错误(っ °Д °;)っ</p>", drawing: "<p>Noah 正在画啦，请耐心等待~</p>" } }, calculate: { description: "计算 volforce 值或分数", messages: { "invalid-query": "<p>查询参数无效，请检查你的输入~</p>", "no-results": "<p>没有找到符合条件的结果~</p>", "too-many-results": "<p>结果太多啦！共找到 {0} 条结果，请缩小查询范围（当前限制：500 条）</p>", drawing: "<p>Noah 正在画啦，请耐心等待~</p>", error: "<p>Noah 遇到了错误(っ °Д °;)っ</p>" } } } } };
 
 // src/games/sdvx/index.ts
 var name13 = "Noah-SDVX";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koishi-plugin-noah",
-    "version": "1.4.2",
+    "version": "1.5.0",
     "contributors": [
         "Logthm <logthm@outlook.com>"
     ],