koishi-plugin-noah 1.5.0 → 1.6.0

package/lib/games/sdvx/services/music-service.d.ts

@@ -4,6 +4,7 @@ import { SDVXMusic } from '../types';
 export declare class MusicService {
     private static instance;
     private sdvx_data_url;
+    private sdvx_search_url;
     private constructor();
     /**
      * 获取 MusicService 实例
@@ -18,4 +19,11 @@ export declare class MusicService {
      * @returns 音乐信息数组
      */
     getMusic(ctx: Context, musicIds: number[]): Promise<SDVXMusic[]>;
+    /**
+     * 根据曲名查询歌曲
+     * @param ctx - Koishi 上下文对象
+     * @param query - 查询字符串
+     * @returns 音乐信息数组
+     */
+    searchMusic(ctx: Context, query: string): Promise<SDVXMusic[]>;
 }

package/lib/index.cjs

@@ -4076,6 +4076,73 @@ 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;
+  sdvx_search_url;
+  constructor(config) {
+    this.sdvx_data_url = config.sdvx_data_url;
+    this.sdvx_search_url = config.sdvx_search_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;
+  }
+  /**
+   * 根据曲名查询歌曲
+   * @param ctx - Koishi 上下文对象
+   * @param query - 查询字符串
+   * @returns 音乐信息数组
+   */
+  async searchMusic(ctx, query) {
+    let musicInfo;
+    try {
+      const response = await ctx.http.get(
+        `/sdvx/get?query=${query}&isnocase=true&isfuzzy=true&isalias=true`,
+        {
+          baseURL: this.sdvx_search_url
+        }
+      );
+      const musicIds = response.map((item) => item.id).filter((n) => Number.isInteger(n));
+      const infoRes = this.getMusic(ctx, musicIds);
+      musicInfo = await infoRes;
+      return musicInfo;
+    } catch {
+      return null;
+    }
+  }
+};
+
 // src/games/sdvx/commands/chart.ts
 function mapArrangementToken(tok) {
   const t = tok.toLowerCase();
@@ -4100,16 +4167,74 @@ function isBarcode(s) {
   return /^\d+\.[A-Za-z]+$/.test(s);
 }
 __name(isBarcode, "isBarcode");
+function parseDiffAndTitle(rawTokens) {
+  let diffStr = null;
+  let diffIndex = null;
+  const titleParts = [];
+  const fullMap = {
+    novice: "novice",
+    nov: "novice",
+    advanced: "advanced",
+    adv: "advanced",
+    exhaust: "exhaust",
+    exh: "exhaust",
+    infinite: "infinite",
+    inf: "infinite",
+    gravity: "infinite",
+    grv: "infinite",
+    heavenly: "infinite",
+    hvn: "infinite",
+    vivid: "infinite",
+    vvd: "infinite",
+    exceed: "infinite",
+    xcd: "infinite",
+    maximum: "maximum",
+    mxm: "maximum"
+  };
+  for (const tok of rawTokens) {
+    const trimmed = tok.trim();
+    if (!trimmed) continue;
+    if (diffIndex === null && /^[1-5]$/.test(trimmed)) {
+      diffIndex = Number(trimmed) - 1;
+      continue;
+    }
+    const lettersOnly = trimmed.replace(/[^A-Za-z]/g, "");
+    if (lettersOnly) {
+      const byAbbr = getDiffStringFromAbbr(lettersOnly);
+      if (byAbbr) {
+        diffStr = byAbbr.diffStr;
+        continue;
+      }
+      const lower = lettersOnly.toLowerCase();
+      if (fullMap[lower]) {
+        diffStr = fullMap[lower];
+        continue;
+      }
+    }
+    titleParts.push(trimmed);
+  }
+  return {
+    diffStr,
+    diffIndex,
+    titleQuery: titleParts.join(" ").trim()
+  };
+}
+__name(parseDiffAndTitle, "parseDiffAndTitle");
+function getHighestDifstr(diffs) {
+  return diffs[diffs.length - 1].difstr;
+}
+__name(getHighestDifstr, "getHighestDifstr");
 function chart(ctx, config, logger5) {
-  ctx.command("sdvx.chart [query:text]").alias("sdvx.c").option("lossless", "-l").action(async ({ session, options }, query) => {
+  ctx.command("sdvx.chart [query:text]").alias("sdvx.c").action(async ({ session }, query) => {
     if (!query) {
       await session.send(session.text(".prompt"));
       query = await session.prompt();
       if (!query) return session.text("commands.timeout");
     }
+    const musicService = MusicService.getInstance(config);
     try {
       let arrangement_mode = "normal";
-      let laser_l_color = "GREEN";
+      let laser_l_color = "BLUE";
       let laser_r_color = "RED";
       const tokens = query.split(/\s+/).filter(Boolean);
       const remaining = [];
@@ -4140,7 +4265,7 @@ function chart(ctx, config, logger5) {
         const music_id = Number(midRaw);
         const { diffStr } = getDiffStringFromAbbr(diffAbbrRaw);
         const difstr = diffStr;
-        const output_format = options?.lossless ? "PNG" : "JPEG";
+        const output_format = "PNG";
         const payload = {
           music_id,
           difstr,
@@ -4158,7 +4283,55 @@ function chart(ctx, config, logger5) {
         });
         return import_koishi10.h.image(res, "image/png");
       } else {
-        return session.text(".error");
+        const {
+          diffStr: parsedDiff,
+          diffIndex,
+          titleQuery
+        } = parseDiffAndTitle(remaining);
+        if (!titleQuery) return session.text(".no-result");
+        const musicInfo = await musicService.searchMusic(
+          ctx,
+          titleQuery
+        );
+        if (!musicInfo || musicInfo.length === 0) return session.text(".no-result");
+        const picked = musicInfo[0];
+        const music_id = Number(picked?.id);
+        if (!Number.isFinite(music_id)) {
+          logger5.warn("search result missing id", picked);
+          return session.text(".error");
+        }
+        let difstr = null;
+        if (parsedDiff) {
+          difstr = parsedDiff;
+        } else if (diffIndex !== null && Array.isArray(picked?.difficulty) && diffIndex >= 0 && diffIndex < picked.difficulty.length) {
+          const d = picked.difficulty[diffIndex];
+          difstr = d?.difstr ?? null;
+        }
+        if (!difstr) {
+          difstr = getHighestDifstr(picked?.difficulty);
+        }
+        const output_format = "PNG";
+        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", {
+            name: picked.title_name,
+            difstr
+          })
+        );
+        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");
       }
     } catch (err) {
       logger5.warn(err);
@@ -4202,48 +4375,6 @@ 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";
@@ -5197,10 +5328,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>", 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>" } } } } };
+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>", sdvx_search_url: "<p>The URL of the SDVX search 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 {name} [{difstr}], 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>", "no-result": "<p>Aww, Noah couldn’t find that song~ try another keyword, okay?</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>", 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>" } } } } };
+var zh_CN_default4 = { _config: { $desc: "SDVX 模块设置", default_model: "<p>默认的 model 值（如 `2024110700`）</p>", sdvx_data_url: "<p>SDVX 数据服务的 URL</p>", sdvx_search_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 正在绘制 {name} [{difstr}]，请耐心等待~</p>", "no-result": "<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";
@@ -5289,7 +5420,8 @@ var generalConfig = import_koishi19.Schema.object({
 var import_koishi20 = require("koishi");
 var sdvxConfig = import_koishi20.Schema.object({
   default_model: import_koishi20.Schema.string().default("2024110700"),
-  sdvx_data_url: import_koishi20.Schema.string().required()
+  sdvx_data_url: import_koishi20.Schema.string().required(),
+  sdvx_search_url: import_koishi20.Schema.string().required()
 }).i18n({
   "en-US": en_US_default4._config,
   "zh-CN": zh_CN_default4._config

package/lib/types/config.d.ts

@@ -26,6 +26,8 @@ export interface SDVXConfig extends BaseConfig {
     default_model: string;
     /** SDVX 数据 URL */
     sdvx_data_url: string;
+    /** SDVX 搜索 URL */
+    sdvx_search_url: string;
 }
 /**
  * 戳一戳功能配置接口

package/package.json

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