mioku-plugin-music 2.0.0 → 2.2.0

package/README.md

@@ -4,8 +4,8 @@
 
 - 点歌搜索：`点歌 晴天`
 - 搜索结果截图列表
-- 编号听歌：`听1`
-- 关键词直听：`听晴天`
+- 编号听歌（语音）：`听1`
+- 编号听歌（原曲文件，群聊也直接发文件）：`原曲1`
 - AI skills：搜索、发送歌曲
 
 ## 已适配 Provider

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-music",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "description": "音乐插件：点歌、搜索音乐、听歌语音发送",
   "main": "index.ts",
   "type": "module",
@@ -17,6 +17,20 @@
       "ai",
       "screenshot"
     ],
+    "accessHooks": [
+      {
+        "id": "点歌",
+        "match": "/^\\/?点歌\\s+/"
+      },
+      {
+        "id": "听",
+        "match": "/^听\\d+$/"
+      },
+      {
+        "id": "原曲",
+        "match": "/^原曲\\d+$/"
+      }
+    ],
     "help": {
       "title": "音乐",
       "description": "点歌并发送语音，支持搜索结果图片列表",
@@ -34,9 +48,9 @@
           "role": "member"
         },
         {
-          "cmd": "听 <关键词>",
-          "desc": "直接按关键词搜索并发送第一首歌曲语音",
-          "usage": "听晴天",
+          "cmd": "原曲 <编号>",
+          "desc": "发送上次搜索列表中的指定歌曲原曲文件",
+          "usage": "原曲1",
           "role": "member"
         }
       ]

package/render/search-list.ts

@@ -66,7 +66,7 @@ export function renderMusicSearchListHtml(search: MusicSearchResult): string {
       <div class="grid gap-3">${items}</div>
       <div class="mt-5 flex items-center justify-between text-[16px] text-slate-600 dark:text-slate-300">
         <div>音源：${escapeHtml(providerLabel)}</div>
-        <div>发送「听1」播放第一首歌曲</div>
+        <div>发送「听1」或「原曲1」试试看吧~</div>
       </div>
     </div>
   `;

package/runtime-core/service.ts

@@ -42,25 +42,25 @@ function parseListenIndex(text: string): number | null {
   return idx;
 }
 
-function parseSearchKeyword(text: string): string | null {
-  const match = text.match(/^\/?点歌\s*(.+)$/);
+function parseOriginalIndex(text: string): number | null {
+  const match = text.match(/^\/?原曲\s*(\d{1,2})$/);
   if (!match) {
     return null;
   }
-  const value = String(match[1] || "").trim();
-  return value ? value : null;
+  const idx = Number(match[1]);
+  if (!Number.isFinite(idx) || idx <= 0) {
+    return null;
+  }
+  return idx;
 }
 
-function parseListenKeyword(text: string): string | null {
-  const match = text.match(/^\/?听\s*(.+)$/);
+function parseSearchKeyword(text: string): string | null {
+  const match = text.match(/^\/?点歌\s*(.+)$/);
   if (!match) {
     return null;
   }
   const value = String(match[1] || "").trim();
-  if (!value || /^\d+$/.test(value)) {
-    return null;
-  }
-  return value;
+  return value ? value : null;
 }
 
 export class MusicPluginRuntime {
@@ -124,14 +124,14 @@ export class MusicPluginRuntime {
     const listenIndex = parseListenIndex(text);
     if (listenIndex != null) {
       await this.tryReactToCommandMessage(ctx, event);
-      await this.sendByIndex(ctx, event, listenIndex);
+      await this.sendByIndex(ctx, event, listenIndex, false);
       return true;
     }
 
-    const listenKeyword = parseListenKeyword(text);
-    if (listenKeyword) {
+    const originalIndex = parseOriginalIndex(text);
+    if (originalIndex != null) {
       await this.tryReactToCommandMessage(ctx, event);
-      await this.sendByKeyword(ctx, event, listenKeyword);
+      await this.sendByIndex(ctx, event, originalIndex, true);
       return true;
     }
 
@@ -176,6 +176,7 @@ export class MusicPluginRuntime {
     event: any,
     songId: string,
     fileName?: string,
+    options?: { forceFile?: boolean },
   ): Promise<void> {
     const session = this.getOrCreateSession(event);
     const provider = this.createProvider(
@@ -196,7 +197,8 @@ export class MusicPluginRuntime {
       throw new Error("当前未获取到高质量 HLS 音频，请检查 media user token");
     }
     const isPrivate = event?.message_type !== "group";
-    if (isPrivate) {
+    const sendAsFile = isPrivate || options?.forceFile === true;
+    if (sendAsFile) {
       const finalName = fileName || "song";
       await sendFileMessage(ctx, event, result.filePath, finalName);
     } else {
@@ -219,7 +221,12 @@ export class MusicPluginRuntime {
     });
   }
 
-  async sendSongByQuery(ctx: any, event: any, query: string): Promise<void> {
+  async sendSongByQuery(
+    ctx: any,
+    event: any,
+    query: string,
+    options?: { forceFile?: boolean },
+  ): Promise<void> {
     const result = await this.searchSongs(event, query);
     const first = result.tracks[0];
     if (!first) {
@@ -233,7 +240,7 @@ export class MusicPluginRuntime {
       return;
     }
 
-    await this.sendSongById(ctx, event, first.id, first.title);
+    await this.sendSongById(ctx, event, first.id, first.title, options);
   }
 
   private async searchAndSendList(
@@ -291,6 +298,7 @@ export class MusicPluginRuntime {
     ctx: any,
     event: any,
     index: number,
+    forceFile: boolean,
   ): Promise<void> {
     const session = this.getOrCreateSession(event);
     const tracks = session.lastSearch?.tracks || [];
@@ -307,32 +315,15 @@ export class MusicPluginRuntime {
     }
 
     try {
-      await this.sendSongById(ctx, event, target.id, target.title);
-    } catch (error) {
-      await notifyFallback({
-        ctx,
-        event,
-        aiService: this.deps.aiService,
-        instruction: `用户选择听第${index}首时下载失败。错误：${String(error)}。请简短道歉并建议重试。`,
-        fallbackMessage: "播放失败，请稍后重试",
-        error,
+      await this.sendSongById(ctx, event, target.id, target.title, {
+        forceFile,
       });
-    }
-  }
-
-  private async sendByKeyword(
-    ctx: any,
-    event: any,
-    keyword: string,
-  ): Promise<void> {
-    try {
-      await this.sendSongByQuery(ctx, event, keyword);
     } catch (error) {
       await notifyFallback({
         ctx,
         event,
         aiService: this.deps.aiService,
-        instruction: `用户请求”听${keyword}”时失败。错误：${String(error)}。请简短提示后重试。`,
+        instruction: `用户选择听第${index}首时下载失败。错误：${String(error)}。请简短道歉并建议重试。`,
         fallbackMessage: "播放失败，请稍后重试",
         error,
       });

package/skills.ts

@@ -60,7 +60,8 @@ const musicSkills: AISkill[] = [
       } as AITool,
       {
         name: "send_music_song",
-        description: "发送歌曲语音（通过 song_id 或 query）",
+        description:
+          "发送歌曲（通过 song_id 或 query）。默认发语音；传 as_file=true 时直接发源文件",
         parameters: {
           type: "object",
           properties: {
@@ -72,6 +73,11 @@ const musicSkills: AISkill[] = [
               type: "string",
               description: "关键词，内部会搜索后发送第一首",
             },
+            as_file: {
+              type: "boolean",
+              description: "是否直接发送源文件",
+              default: false,
+            },
           },
           required: [],
         },
@@ -86,20 +92,27 @@ const musicSkills: AISkill[] = [
 
           const songId = String(args?.song_id || "").trim();
           const query = String(args?.query || "").trim();
+          const asFile = args?.as_file === true;
           if (!songId && !query) {
             return "必须提供 song_id 或 query";
           }
 
-          ctx.logger.info(`[music] send_music_song called: songId=${songId}, query=${query}`);
+          ctx.logger.info(
+            `[music] send_music_song called: songId=${songId}, query=${query}, asFile=${asFile}`,
+          );
 
           try {
             if (songId) {
-              await runtime.sendSongById(ctx, event, songId);
-              return "已发送歌曲";
+              await runtime.sendSongById(ctx, event, songId, undefined, {
+                forceFile: asFile,
+              });
+              return asFile ? "已发送歌曲源文件" : "已发送歌曲";
             }
 
-            await runtime.sendSongByQuery(ctx, event, query);
-            return "已按关键词发送歌曲";
+            await runtime.sendSongByQuery(ctx, event, query, {
+              forceFile: asFile,
+            });
+            return asFile ? "已按关键词发送歌曲源文件" : "已按关键词发送歌曲";
           } catch (error) {
             ctx.logger.error(`[music] send_music_song failed: ${error}`);
             await runtime.notifyFailure(