mioku-plugin-music 2.4.3 → 3.0.0

package/index.ts

@@ -1,13 +1,11 @@
-import { definePlugin } from "mioki";
-import type { AIService } from "mioku";
-import type { ScreenshotService } from "mioku";
-import type { ConfigService } from "mioku";
-import type { AppleMusicServiceApi } from "mioku-service-applemusic";
-import type { NeteaseServiceApi } from "mioku-service-netease";
-import { resetMusicRuntimeState, setMusicRuntimeState } from "./runtime";
+import { definePlugin } from "mioku";
+import { AppleMusicService } from "mioku-service-applemusic";
+import { NeteaseService } from "mioku-service-netease";
+import { getService, Services } from "mioku";
 import { MusicPluginRuntime } from "./runtime-core/service";
 import { MUSIC_DEFAULTS } from "./config";
 import type { MusicBaseConfig } from "./types";
+import { createMusicSkills } from "./skills/music";
 
 function cloneConfig<T>(value: T): T {
   return JSON.parse(JSON.stringify(value)) as T;
@@ -18,17 +16,11 @@ export default definePlugin({
   version: "1.0.0",
   description: "点歌与听歌插件",
   async setup(ctx) {
-    const configService = ctx.services?.config as ConfigService | undefined;
-    const aiService = ctx.services?.ai as AIService | undefined;
-    const screenshotService = ctx.services?.screenshot as
-      | ScreenshotService
-      | undefined;
-    const applemusicService = ctx.services?.applemusic as
-      | AppleMusicServiceApi
-      | undefined;
-    const neteaseService = ctx.services?.netease as
-      | NeteaseServiceApi
-      | undefined;
+    const configService = getService(ctx, Services.Config);
+    const aiService = getService(ctx, Services.AI);
+    const screenshotService = getService(ctx, Services.Screenshot);
+    const applemusicService = getService(ctx, AppleMusicService);
+    const neteaseService = getService(ctx, NeteaseService);
     let baseConfig = cloneConfig(MUSIC_DEFAULTS);
 
     if (configService) {
@@ -50,7 +42,9 @@ export default definePlugin({
     });
     runtime.updateConfig(baseConfig);
 
-    setMusicRuntimeState({ runtime });
+    if (aiService) {
+      for (const skill of createMusicSkills(runtime)) aiService.registerSkill(skill);
+    }
 
     const disposers: Array<() => void> = [];
     if (configService) {
@@ -62,15 +56,13 @@ export default definePlugin({
       );
     }
 
-    ctx.handle("message", async (event: any) => {
+    ctx.handle("message", async (event) => {
       await runtime.handleMessage(ctx, event);
     });
 
     return () => {
-      for (const dispose of disposers) {
-        dispose();
-      }
-      resetMusicRuntimeState();
+      for (const dispose of disposers) dispose();
+      if (aiService) aiService.removeSkill("music");
     };
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-music",
-  "version": "2.4.3",
+  "version": "3.0.0",
   "description": "音乐插件：点歌、搜索音乐、听歌语音发送",
   "main": "index.ts",
   "type": "module",
@@ -57,14 +57,12 @@
     }
   },
   "peerDependencies": {
-    "mioku": "^0.8.0",
-    "mioki": "^0.16.0",
-    "mioku-service-applemusic": "^2.0.0",
-    "mioku-service-netease": "^1.0.0"
+    "mioku": "^1.0.0",
+    "mioku-service-applemusic": "^3.0.0",
+    "mioku-service-netease": "^2.0.0"
   },
   "devDependencies": {
     "mioku": "workspace:*",
-    "mioki": "^0.16.0",
     "mioku-service-applemusic": "workspace:*",
     "mioku-service-netease": "workspace:*"
   }

package/render/search-list.ts

@@ -4,11 +4,11 @@ import { getMusicProviderLabel } from "../providers/provider-labels";
 function escapeHtml(value: string): string {
   const source = String(value || "");
   return source
-    .replace(/&/g, "&")
-    .replace(/</g, "&lt;")
-    .replace(/>/g, "&gt;")
-    .replace(/"/g, "&quot;")
-    .replace(/'/g, "&#039;");
+    .replace(/&/g, "&amp);")
+    .replace(/</g, "&lt);")
+    .replace(/>/g, "&gt);")
+    .replace(/"/g, "&quot);")
+    .replace(/'/g, "&#039);");
 }
 
 export function renderMusicSearchListHtml(search: MusicSearchResult): string {

package/runtime-core/message.ts

@@ -25,16 +25,12 @@ function getBotAndTarget(ctx: any, event: any): {
   groupId?: number;
   userId?: number;
 } {
-  const selfId = event?.self_id != null ? Number(event.self_id) : undefined;
-  const bot =
-    selfId != null && typeof ctx?.pickBot === "function"
-      ? ctx.pickBot(selfId)
-      : undefined;
+  const bot = event?.bot;
 
   return {
     bot,
-    groupId: event?.message_type === "group" ? Number(event.group_id) : undefined,
-    userId: event?.message_type !== "group" ? Number(event?.user_id) : undefined,
+    groupId: event?.message_type === "group" ? event.group_id : undefined,
+    userId: event?.message_type !== "group" ? event?.user_id : undefined,
   };
 }
 
@@ -46,7 +42,7 @@ export async function sendTextMessage(
   const { bot, groupId, userId } = getBotAndTarget(ctx, event);
   const payload: any[] = [];
 
-  payload.push(ctx?.segment?.text ? ctx.segment.text(text) : { type: "text", text });
+  payload.push(ctx.segment.text(text));
 
   if (bot && groupId != null) {
     await bot.sendGroupMsg(groupId, payload);
@@ -71,11 +67,7 @@ export async function sendImageMessage(
   const { bot, groupId, userId } = getBotAndTarget(ctx, event);
   const sendPayload = async (source: string) => {
     const payload: any[] = [];
-    payload.push(
-      ctx?.segment?.image
-        ? ctx.segment.image(normalizeFileSource(source))
-        : { type: "image", file: normalizeFileSource(source) },
-    );
+    payload.push(ctx.segment.image(normalizeFileSource(source)));
 
     if (bot && groupId != null) {
       await bot.sendGroupMsg(groupId, payload);
@@ -112,11 +104,7 @@ export async function sendFileMessage(
   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 },
-    );
+    payload.push(ctx.segment.file(normalizeFileSource(source), { name: fileName }));
 
     if (bot && groupId != null) {
       await bot.sendGroupMsg(groupId, payload);
@@ -184,11 +172,7 @@ export async function sendRecordMessage(
   const { bot, groupId, userId } = getBotAndTarget(ctx, event);
   const sendPayload = async (source: string) => {
     const payload: any[] = [];
-    payload.push(
-      ctx?.segment?.record
-        ? ctx.segment.record(normalizeFileSource(source))
-        : { type: "record", file: normalizeFileSource(source) },
-    );
+    payload.push(ctx.segment.record(normalizeFileSource(source)));
 
     if (bot && groupId != null) {
       await bot.sendGroupMsg(groupId, payload);

package/runtime-core/service.ts

@@ -414,19 +414,13 @@ export class MusicPluginRuntime {
       return;
     }
 
-    const selfId = Number(event?.self_id || ctx?.self_id);
-    if (!Number.isFinite(selfId) || selfId <= 0) {
-      return;
-    }
-
-    const bot =
-      typeof ctx?.pickBot === "function" ? ctx.pickBot(selfId) : undefined;
-    if (!bot || typeof bot.api !== "function") {
-      return;
+    const bot = event?.bot;
+    if (!bot || bot.adapter !== "onebotv11") {
+      return; // set_msg_emoji_like 是 onebot 专属特殊 API，icqq 不支持
     }
 
     try {
-      await bot.api("set_msg_emoji_like", {
+      await bot.sendApi("set_msg_emoji_like", {
         message_id: messageId,
         emoji_id: MusicPluginRuntime.COMMAND_REACTION_FACE_ID,
         set: true,

package/skills/music.ts

@@ -0,0 +1,129 @@
+import type { AISkill, AITool } from "mioku";
+import type { MusicPluginRuntime } from "../runtime-core/service";
+
+export function createMusicSkills(runtime: MusicPluginRuntime): AISkill[] {
+  return [
+    {
+      name: "music",
+      description:
+        "搜索音乐/歌曲/专辑/歌手，并可发送歌曲，注意，当用户想让你唱歌时，通常使用该技能而不是发送语音",
+      permission: "member",
+      tools: [
+        {
+          name: "search_music",
+          description: "按关键词搜索歌曲",
+          parameters: {
+            type: "object",
+            properties: {
+              query: {
+                type: "string",
+                description: "搜索关键词，可是歌曲名、歌手或专辑名",
+              },
+            },
+            required: ["query"],
+          },
+          handler: async (args: any, runtimeCtx?: any) => {
+            const ctx = runtimeCtx?.ctx;
+            const event = runtimeCtx?.event || runtimeCtx?.rawEvent;
+            if (!event) {
+              return "music 插件尚未初始化";
+            }
+            const query = String(args?.query || "").trim();
+            if (!query) {
+              return "query 不能为空";
+            }
+            try {
+              const result = await runtime.searchSongs(event, query);
+              if (!result.tracks.length) {
+                return `没有找到「${query}」的歌曲`;
+              }
+              const list = result.tracks
+                .slice(0, 10)
+                .map(
+                  (item, index) =>
+                    `${index + 1}. ${item.title} - ${item.artist} (${item.album}) [${item.id}]`,
+                )
+                .join("\n");
+              return `已找到 ${result.tracks.length} 首：\n${list}`;
+            } catch (error) {
+              if (ctx) {
+                await runtime.notifyFailure(
+                  ctx,
+                  event,
+                  `AI 发起音乐搜索失败。错误：${String(error)}。请简短告知稍后再试。`,
+                  `搜索失败：${String(error)}`,
+                );
+              }
+              return `搜索失败：${String(error)}`;
+            }
+          },
+        } as AITool,
+        {
+          name: "send_music_song",
+          description:
+            "发送歌曲（通过 song_id 或 query）。默认发语音；传 as_file=true 时直接发源文件",
+          parameters: {
+            type: "object",
+            properties: {
+              song_id: {
+                type: "string",
+                description: "歌曲 ID，优先使用",
+              },
+              query: {
+                type: "string",
+                description: "关键词，内部会搜索后发送第一首",
+              },
+              as_file: {
+                type: "boolean",
+                description: "是否直接发送源文件",
+                default: false,
+              },
+            },
+            required: [],
+          },
+          handler: async (args: any, runtimeCtx?: any) => {
+            const ctx = runtimeCtx?.ctx;
+            const event = runtimeCtx?.event || runtimeCtx?.rawEvent;
+            if (!ctx || !event) {
+              return "当前上下文不支持发送歌曲";
+            }
+
+            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, undefined, {
+                  forceFile: asFile,
+                });
+                return asFile ? "已发送歌曲源文件" : "已发送歌曲";
+              }
+
+              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,
+                `AI 发送歌曲失败。错误：${String(error)}。请简短提示稍后重试。`,
+                `发送失败：${String(error)}`,
+              );
+              return `发送失败：${String(error)}`;
+            }
+          },
+        } as AITool,
+      ],
+    },
+  ];
+}

package/runtime.ts

@@ -1,24 +0,0 @@
-import type { MusicPluginRuntime } from "./runtime-core/service";
-import {
-  getPluginRuntimeState,
-  resetPluginRuntimeState,
-  setPluginRuntimeState,
-} from "mioku";
-
-export interface MusicRuntimeState {
-  runtime?: MusicPluginRuntime;
-}
-
-const MUSIC_PLUGIN_NAME = "music";
-
-export function getMusicRuntimeState(): MusicRuntimeState {
-  return getPluginRuntimeState(MUSIC_PLUGIN_NAME) as MusicRuntimeState;
-}
-
-export function setMusicRuntimeState(nextState: MusicRuntimeState): MusicRuntimeState {
-  return setPluginRuntimeState(MUSIC_PLUGIN_NAME, nextState) as MusicRuntimeState;
-}
-
-export function resetMusicRuntimeState(): void {
-  resetPluginRuntimeState(MUSIC_PLUGIN_NAME);
-}

package/skills.ts

@@ -1,132 +0,0 @@
-import type { AISkill, AITool } from "mioku";
-import { getMusicRuntimeState } from "./runtime";
-
-const musicSkills: AISkill[] = [
-  {
-    name: "music",
-    description:
-      "搜索音乐/歌曲/专辑/歌手，并可发送歌曲，注意，当用户想让你唱歌时，通常使用该技能而不是发送语音",
-    permission: "member",
-    tools: [
-      {
-        name: "search_music",
-        description: "按关键词搜索歌曲",
-        parameters: {
-          type: "object",
-          properties: {
-            query: {
-              type: "string",
-              description: "搜索关键词，可是歌曲名、歌手或专辑名",
-            },
-          },
-          required: ["query"],
-        },
-        handler: async (args: any, runtimeCtx?: any) => {
-          const runtime = getMusicRuntimeState().runtime;
-          const ctx = runtimeCtx?.ctx;
-          const event = runtimeCtx?.event || runtimeCtx?.rawEvent;
-          if (!runtime || !event) {
-            return "music 插件尚未初始化";
-          }
-          const query = String(args?.query || "").trim();
-          if (!query) {
-            return "query 不能为空";
-          }
-          try {
-            const result = await runtime.searchSongs(event, query);
-            if (!result.tracks.length) {
-              return `没有找到「${query}」的歌曲`;
-            }
-            const list = result.tracks
-              .slice(0, 10)
-              .map(
-                (item, index) =>
-                  `${index + 1}. ${item.title} - ${item.artist} (${item.album}) [${item.id}]`,
-              )
-              .join("\n");
-            return `已找到 ${result.tracks.length} 首：\n${list}`;
-          } catch (error) {
-            if (ctx) {
-              await runtime.notifyFailure(
-                ctx,
-                event,
-                `AI 发起音乐搜索失败。错误：${String(error)}。请简短告知稍后再试。`,
-                `搜索失败：${String(error)}`,
-              );
-            }
-            return `搜索失败：${String(error)}`;
-          }
-        },
-      } as AITool,
-      {
-        name: "send_music_song",
-        description:
-          "发送歌曲（通过 song_id 或 query）。默认发语音；传 as_file=true 时直接发源文件",
-        parameters: {
-          type: "object",
-          properties: {
-            song_id: {
-              type: "string",
-              description: "歌曲 ID，优先使用",
-            },
-            query: {
-              type: "string",
-              description: "关键词，内部会搜索后发送第一首",
-            },
-            as_file: {
-              type: "boolean",
-              description: "是否直接发送源文件",
-              default: false,
-            },
-          },
-          required: [],
-        },
-        handler: async (args: any, runtimeCtx?: any) => {
-          const runtimeState = getMusicRuntimeState();
-          const runtime = runtimeState.runtime;
-          const ctx = runtimeCtx?.ctx;
-          const event = runtimeCtx?.event || runtimeCtx?.rawEvent;
-          if (!runtime || !ctx || !event) {
-            return "当前上下文不支持发送歌曲";
-          }
-
-          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, undefined, {
-                forceFile: asFile,
-              });
-              return asFile ? "已发送歌曲源文件" : "已发送歌曲";
-            }
-
-            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,
-              `AI 发送歌曲失败。错误：${String(error)}。请简短提示稍后重试。`,
-              `发送失败：${String(error)}`,
-            );
-            return `发送失败：${String(error)}`;
-          }
-        },
-      } as AITool,
-    ],
-  },
-];
-
-export default musicSkills;