mioku-plugin-music 1.1.0 → 2.1.0

package/README.md

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

package/index.ts

@@ -1,8 +1,8 @@
 import { definePlugin } from "mioki";
-import type { AIService } from "../../src/services/ai/types";
-import type { ScreenshotService } from "../../src/services/screenshot/types";
-import type { ConfigService } from "../../src/services/config/tpyes";
-import type { AppleMusicServiceApi } from "../../src/services/applemusic/types";
+import type { AIService } from "mioku";
+import type { ScreenshotService } from "mioku";
+import type { ConfigService } from "mioku";
+import type { AppleMusicServiceApi } from "mioku-service-applemusic";
 import { resetMusicRuntimeState, setMusicRuntimeState } from "./runtime";
 import { MusicPluginRuntime } from "./runtime-core/service";
 import { MUSIC_DEFAULTS } from "./config";

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "mioku-plugin-music",
-  "version": "1.1.0",
+  "version": "2.1.0",
   "description": "音乐插件：点歌、搜索音乐、听歌语音发送",
   "main": "index.ts",
+  "type": "module",
   "keywords": [
     "mioku"
   ],
@@ -33,12 +34,22 @@
           "role": "member"
         },
         {
-          "cmd": "听 <关键词>",
-          "desc": "直接按关键词搜索并发送第一首歌曲语音",
-          "usage": "听晴天",
+          "cmd": "原曲 <编号>",
+          "desc": "发送上次搜索列表中的指定歌曲原曲文件",
+          "usage": "原曲1",
           "role": "member"
         }
       ]
     }
+  },
+  "peerDependencies": {
+    "mioku": "^0.8.0",
+    "mioki": "^0.16.0",
+    "mioku-service-applemusic": "^2.0.0"
+  },
+  "devDependencies": {
+    "mioku": "workspace:*",
+    "mioki": "^0.16.0",
+    "mioku-service-applemusic": "workspace:*"
   }
 }

package/providers/applemusic-provider.ts

@@ -1,4 +1,4 @@
-import type { AppleMusicServiceApi } from "../../../src/services/applemusic/types";
+import type { AppleMusicServiceApi } from "mioku-service-applemusic";
 import type {
   DownloadSongResult,
   MusicAlbumDetail,

package/providers/factory.ts

@@ -1,4 +1,4 @@
-import type { AppleMusicServiceApi } from "../../../src/services/applemusic/types";
+import type { AppleMusicServiceApi } from "mioku-service-applemusic";
 import { AppleMusicProvider } from "./applemusic-provider";
 import {
   type MusicProvider,

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/fallback.ts

@@ -1,4 +1,4 @@
-import type { AIService } from "../../../src/services/ai/types";
+import type { AIService } from "mioku";
 import { sendTextMessage } from "./message";
 
 function normalizeErrorMessage(error: unknown): string {
@@ -25,6 +25,11 @@ export async function notifyFallback(options: {
     );
   }
 
+  const text = options.ctx.text(options.event)?.trim() ?? "";
+  if (!text.startsWith("/")) {
+    return;
+  }
+
   const chatRuntime = options.aiService?.getChatRuntime();
   if (chatRuntime) {
     try {

package/runtime-core/message.ts

@@ -1,4 +1,5 @@
 import * as fs from "fs/promises";
+import * as path from "path";
 
 function normalizeFileSource(file: string): string {
   const value = String(file || "").trim();
@@ -100,6 +101,81 @@ export async function sendImageMessage(
   }
 }
 
+export async function sendFileMessage(
+  ctx: any,
+  event: any,
+  filePath: string,
+  name: string,
+): Promise<void> {
+  const ext = path.extname(filePath);
+  const fileName = ext ? `${name}${ext}` : name;
+  const { bot, groupId, userId } = getBotAndTarget(ctx, event);
+  const sendPayload = async (source: string) => {
+    const payload: any[] = [];
+    payload.push(
+      ctx?.segment?.file
+        ? ctx.segment.file(normalizeFileSource(source), { name: fileName })
+        : { type: "file", file: normalizeFileSource(source), name: fileName },
+    );
+
+    if (bot && groupId != null) {
+      await bot.sendGroupMsg(groupId, payload);
+      return;
+    }
+    if (bot && userId != null) {
+      await bot.sendPrivateMsg(userId, payload);
+      return;
+    }
+    if (typeof event?.reply === "function") {
+      await event.reply(payload);
+      return;
+    }
+    throw new Error("当前上下文不支持文件发送");
+  };
+
+  const canReadLocalFile =
+    filePath.startsWith("/") || /^[A-Za-z]:[\\/]/.test(filePath);
+
+  let fileSendError: unknown;
+  try {
+    await sendPayload(filePath);
+    return;
+  } catch (error) {
+    fileSendError = error;
+  }
+
+  if (!canReadLocalFile) {
+    throw fileSendError instanceof Error
+      ? fileSendError
+      : new Error(String(fileSendError || "文件发送失败"));
+  }
+
+  let buffer: Buffer;
+  try {
+    buffer = await fs.readFile(filePath);
+  } catch {
+    throw fileSendError instanceof Error
+      ? fileSendError
+      : new Error(String(fileSendError || "文件发送失败"));
+  }
+
+  const base64 = `base64://${buffer.toString("base64")}`;
+  try {
+    await sendPayload(base64);
+  } catch (base64Error) {
+    const message = String(base64Error || "");
+    const timeoutLike =
+      message.includes("timeout") ||
+      message.includes("超时") ||
+      message.includes("timed out") ||
+      message.includes("ETIMEDOUT");
+    if (timeoutLike) {
+      return;
+    }
+    throw new Error("文件发送失败：路径发送失败，base64 发送也失败");
+  }
+}
+
 export async function sendRecordMessage(
   ctx: any,
   event: any,

package/runtime-core/service.ts

@@ -1,6 +1,6 @@
-import type { AIService } from "../../../src/services/ai/types";
-import type { ScreenshotService } from "../../../src/services/screenshot/types";
-import type { AppleMusicServiceApi } from "../../../src/services/applemusic/types";
+import type { AIService } from "mioku";
+import type { ScreenshotService } from "mioku";
+import type { AppleMusicServiceApi } from "mioku-service-applemusic";
 import { MUSIC_DEFAULTS } from "../config";
 import {
   createMusicProvider,
@@ -14,6 +14,7 @@ import {
   sendImageMessage,
   sendRecordMessage,
   sendTextMessage,
+  sendFileMessage,
 } from "./message";
 import type {
   MusicBaseConfig,
@@ -41,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 {
@@ -123,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;
     }
 
@@ -170,7 +171,13 @@ export class MusicPluginRuntime {
     return provider.getAlbumDetail(albumId);
   }
 
-  async sendSongById(ctx: any, event: any, songId: string): Promise<void> {
+  async sendSongById(
+    ctx: any,
+    event: any,
+    songId: string,
+    fileName?: string,
+    options?: { forceFile?: boolean },
+  ): Promise<void> {
     const session = this.getOrCreateSession(event);
     const provider = this.createProvider(
       session.provider,
@@ -180,10 +187,23 @@ export class MusicPluginRuntime {
     this.deps.logger.info(
       `[music] download songId=${songId} source=${result.sourceType} file=${result.filePath}`,
     );
+    if (!result || typeof result !== "object") {
+      throw new Error(`downloadSong 返回异常: ${JSON.stringify(result)}`);
+    }
+    if ("tracks" in result && Array.isArray((result as any).tracks)) {
+      this.deps.logger.warn(`[music] downloadSong 返回了 tracks 字段`);
+    }
     if (result.sourceType !== "hls") {
       throw new Error("当前未获取到高质量 HLS 音频，请检查 media user token");
     }
-    await sendRecordMessage(ctx, event, result.filePath);
+    const isPrivate = event?.message_type !== "group";
+    const sendAsFile = isPrivate || options?.forceFile === true;
+    if (sendAsFile) {
+      const finalName = fileName || "song";
+      await sendFileMessage(ctx, event, result.filePath, finalName);
+    } else {
+      await sendRecordMessage(ctx, event, result.filePath);
+    }
   }
 
   async notifyFailure(
@@ -201,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) {
@@ -209,13 +234,13 @@ export class MusicPluginRuntime {
         ctx,
         event,
         aiService: this.deps.aiService,
-        instruction: `用户说“听${query}”，但搜索不到可播放歌曲。请简短提示换关键词。`,
+        instruction: `用户说”听${query}”，但搜索不到可播放歌曲。请简短提示换关键词。`,
         fallbackMessage: `没有找到和「${query}」相关的歌曲`,
       });
       return;
     }
 
-    await this.sendSongById(ctx, event, first.id);
+    await this.sendSongById(ctx, event, first.id, first.title, options);
   }
 
   private async searchAndSendList(
@@ -240,7 +265,7 @@ export class MusicPluginRuntime {
         await sendTextMessage(
           ctx,
           event,
-          `已找到 ${result.tracks.length} 首。发送“听1”播放第一首。`,
+          `已找到 ${result.tracks.length} 首。发送”听1”播放第一首。`,
         );
         return;
       }
@@ -255,7 +280,7 @@ export class MusicPluginRuntime {
       });
       await sendImageMessage(ctx, event, imagePath);
       this.deps.logger.info(
-        `[music] search rendered query="${keyword}" count=${result.tracks.length}`,
+        `[music] search rendered query=”${keyword}” count=${result.tracks.length}`,
       );
     } catch (error) {
       await notifyFallback({
@@ -273,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 || [];
@@ -283,39 +309,22 @@ export class MusicPluginRuntime {
         event,
         aiService: this.deps.aiService,
         instruction: `用户请求听第${index}首，但当前列表不足。请提示先点歌或检查编号。`,
-        fallbackMessage: `没有第 ${index} 首，请先“点歌 关键词”再选择`,
+        fallbackMessage: `没有第 ${index} 首，请先”点歌 关键词”再选择`,
       });
       return;
     }
 
     try {
-      await this.sendSongById(ctx, event, target.id);
-    } 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)}。请简短提示后重试。`,
-        fallbackMessage: "播放失败，请稍后重试。",
+        instruction: `用户选择听第${index}首时下载失败。错误：${String(error)}。请简短道歉并建议重试。`,
+        fallbackMessage: "播放失败，请稍后重试",
         error,
       });
     }
@@ -384,6 +393,10 @@ export class MusicPluginRuntime {
   }
 
   private async tryReactToCommandMessage(ctx: any, event: any): Promise<void> {
+    if (event?.message_type === "group") {
+      return;
+    }
+
     const messageId = Number(event?.message_id);
     if (!Number.isFinite(messageId) || messageId <= 0) {
       return;

package/runtime.ts

@@ -3,7 +3,7 @@ import {
   getPluginRuntimeState,
   resetPluginRuntimeState,
   setPluginRuntimeState,
-} from "../../src";
+} from "mioku";
 
 export interface MusicRuntimeState {
   runtime?: MusicPluginRuntime;

package/skills.ts

@@ -1,4 +1,4 @@
-import type { AISkill, AITool } from "../../src";
+import type { AISkill, AITool } from "mioku";
 import { getMusicRuntimeState } from "./runtime";
 
 const musicSkills: AISkill[] = [
@@ -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,11 +73,17 @@ const musicSkills: AISkill[] = [
               type: "string",
               description: "关键词，内部会搜索后发送第一首",
             },
+            as_file: {
+              type: "boolean",
+              description: "是否直接发送源文件",
+              default: false,
+            },
           },
           required: [],
         },
         handler: async (args: any, runtimeCtx?: any) => {
-          const runtime = getMusicRuntimeState().runtime;
+          const runtimeState = getMusicRuntimeState();
+          const runtime = runtimeState.runtime;
           const ctx = runtimeCtx?.ctx;
           const event = runtimeCtx?.event || runtimeCtx?.rawEvent;
           if (!runtime || !ctx || !event) {
@@ -85,19 +92,29 @@ 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}, 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(
               ctx,
               event,