mioku-plugin-music 3.0.1 → 3.0.3

package/README.md

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

package/index.ts

@@ -13,8 +13,6 @@ function cloneConfig<T>(value: T): T {
 
 export default definePlugin({
   name: "music",
-  version: "1.0.0",
-  description: "点歌与听歌插件",
   async setup(ctx) {
     const configService = getService(ctx, Services.Config);
     const aiService = getService(ctx, Services.AI);
@@ -56,8 +54,40 @@ export default definePlugin({
       );
     }
 
-    ctx.handle("message", async (event) => {
-      await runtime.handleMessage(ctx, event);
+    const react = (event: any) => runtime.tryReactToCommandMessage(ctx, event);
+
+    ctx.command({
+      prefixes: false,
+      name: "点歌",
+      match: /^点歌\s*(.+)$/,
+      description: "搜索歌曲/歌手/专辑，返回最多 15 条结果图片列表",
+      usage: ".点歌 晴天",
+      handler: async ({ event, match }) => {
+        await react(event);
+        await runtime.searchAndSendList(ctx, event, match![1].trim());
+      },
+    });
+    ctx.command({
+      prefixes: false,
+      name: "听",
+      match: /^听\s*(\d{1,2})$/,
+      description: "发送上次搜索列表中的指定歌曲语音",
+      usage: ".听1",
+      handler: async ({ event, match }) => {
+        await react(event);
+        await runtime.sendByIndex(ctx, event, Number(match![1]), false);
+      },
+    });
+    ctx.command({
+      prefixes: false,
+      name: "原曲",
+      match: /^原曲\s*(\d{1,2})$/,
+      description: "发送上次搜索列表中的指定歌曲原曲文件",
+      usage: ".原曲1",
+      handler: async ({ event, match }) => {
+        await react(event);
+        await runtime.sendByIndex(ctx, event, Number(match![1]), true);
+      },
     });
 
     return () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-music",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "音乐插件：点歌、搜索音乐、听歌语音发送",
   "main": "index.ts",
   "type": "module",
@@ -16,45 +16,7 @@
       "config",
       "ai",
       "screenshot"
-    ],
-    "accessHooks": [
-      {
-        "id": "点歌",
-        "match": "/^\\/?点歌\\s+/"
-      },
-      {
-        "id": "听",
-        "match": "/^听\\d+$/"
-      },
-      {
-        "id": "原曲",
-        "match": "/^原曲\\d+$/"
-      }
-    ],
-    "help": {
-      "title": "音乐",
-      "description": "点歌并发送语音，支持搜索结果图片列表",
-      "commands": [
-        {
-          "cmd": "点歌 <歌曲名>",
-          "desc": "搜索歌曲/歌手/专辑，返回最多 15 条结果图片列表",
-          "usage": "/点歌 晴天",
-          "role": "member"
-        },
-        {
-          "cmd": "听 <编号>",
-          "desc": "发送上次搜索列表中的指定歌曲语音",
-          "usage": "听1",
-          "role": "member"
-        },
-        {
-          "cmd": "原曲 <编号>",
-          "desc": "发送上次搜索列表中的指定歌曲原曲文件",
-          "usage": "原曲1",
-          "role": "member"
-        }
-      ]
-    }
+    ]
   },
   "peerDependencies": {
     "mioku": "^1.0.0",

package/runtime-core/fallback.ts

@@ -26,7 +26,8 @@ export async function notifyFallback(options: {
   }
 
   const text = options.ctx.text(options.event)?.trim() ?? "";
-  if (!text.startsWith("/")) {
+  // 只有像命令的消息才触发 AI 兜底提示(命令支持裸写与 . 前缀)
+  if (!/^[./]/.test(text)) {
     return;
   }
 

package/runtime-core/message.ts

@@ -22,15 +22,17 @@ function normalizeFileSource(file: string): string {
 
 function getBotAndTarget(ctx: any, event: any): {
   bot: any;
-  groupId?: number;
-  userId?: number;
+  groupId?: string;
+  userId?: string;
 } {
   const bot = event?.bot;
+  const groupId = String(event?.group_id ?? "").trim();
+  const userId = String(event?.user_id ?? "").trim();
 
   return {
     bot,
-    groupId: event?.message_type === "group" ? event.group_id : undefined,
-    userId: event?.message_type !== "group" ? event?.user_id : undefined,
+    groupId: event?.message_type === "group" ? groupId : undefined,
+    userId: event?.message_type !== "group" ? userId : undefined,
   };
 }
 
@@ -44,11 +46,11 @@ export async function sendTextMessage(
 
   payload.push(ctx.segment.text(text));
 
-  if (bot && groupId != null) {
+  if (bot && groupId != null && groupId !== "") {
     await bot.sendGroupMsg(groupId, payload);
     return;
   }
-  if (bot && userId != null) {
+  if (bot && userId != null && userId !== "") {
     await bot.sendPrivateMsg(userId, payload);
     return;
   }
@@ -69,11 +71,11 @@ export async function sendImageMessage(
     const payload: any[] = [];
     payload.push(ctx.segment.image(normalizeFileSource(source)));
 
-    if (bot && groupId != null) {
+    if (bot && groupId != null && groupId !== "") {
       await bot.sendGroupMsg(groupId, payload);
       return;
     }
-    if (bot && userId != null) {
+    if (bot && userId != null && userId !== "") {
       await bot.sendPrivateMsg(userId, payload);
       return;
     }
@@ -106,11 +108,11 @@ export async function sendFileMessage(
     const payload: any[] = [];
     payload.push(ctx.segment.file(normalizeFileSource(source), { name: fileName }));
 
-    if (bot && groupId != null) {
+    if (bot && groupId != null && groupId !== "") {
       await bot.sendGroupMsg(groupId, payload);
       return;
     }
-    if (bot && userId != null) {
+    if (bot && userId != null && userId !== "") {
       await bot.sendPrivateMsg(userId, payload);
       return;
     }
@@ -174,11 +176,11 @@ export async function sendRecordMessage(
     const payload: any[] = [];
     payload.push(ctx.segment.record(normalizeFileSource(source)));
 
-    if (bot && groupId != null) {
+    if (bot && groupId != null && groupId !== "") {
       await bot.sendGroupMsg(groupId, payload);
       return;
     }
-    if (bot && userId != null) {
+    if (bot && userId != null && userId !== "") {
       await bot.sendPrivateMsg(userId, payload);
       return;
     }

package/runtime-core/service.ts

@@ -32,39 +32,6 @@ interface MusicPluginRuntimeDeps {
   neteaseService?: NeteaseServiceApi;
 }
 
-function parseListenIndex(text: string): number | null {
-  const match = text.match(/^\/?听\s*(\d{1,2})$/);
-  if (!match) {
-    return null;
-  }
-  const idx = Number(match[1]);
-  if (!Number.isFinite(idx) || idx <= 0) {
-    return null;
-  }
-  return idx;
-}
-
-function parseOriginalIndex(text: string): number | null {
-  const match = text.match(/^\/?原曲\s*(\d{1,2})$/);
-  if (!match) {
-    return null;
-  }
-  const idx = Number(match[1]);
-  if (!Number.isFinite(idx) || idx <= 0) {
-    return null;
-  }
-  return idx;
-}
-
-function parseSearchKeyword(text: string): string | null {
-  const match = text.match(/^\/?点歌\s*(.+)$/);
-  if (!match) {
-    return null;
-  }
-  const value = String(match[1] || "").trim();
-  return value ? value : null;
-}
-
 export class MusicPluginRuntime {
   private readonly deps: MusicPluginRuntimeDeps;
   private readonly sessions = new MusicSessionStore();
@@ -110,36 +77,6 @@ export class MusicPluginRuntime {
     return this.sessions.get(event);
   }
 
-  async handleMessage(ctx: any, event: any): Promise<boolean> {
-    const text = String(ctx.text(event) || "").trim();
-    if (!text) {
-      return false;
-    }
-
-    const searchKeyword = parseSearchKeyword(text);
-    if (searchKeyword) {
-      await this.tryReactToCommandMessage(ctx, event);
-      await this.searchAndSendList(ctx, event, searchKeyword);
-      return true;
-    }
-
-    const listenIndex = parseListenIndex(text);
-    if (listenIndex != null) {
-      await this.tryReactToCommandMessage(ctx, event);
-      await this.sendByIndex(ctx, event, listenIndex, false);
-      return true;
-    }
-
-    const originalIndex = parseOriginalIndex(text);
-    if (originalIndex != null) {
-      await this.tryReactToCommandMessage(ctx, event);
-      await this.sendByIndex(ctx, event, originalIndex, true);
-      return true;
-    }
-
-    return false;
-  }
-
   async searchSongs(event: any, query: string): Promise<MusicSearchResult> {
     const session = this.getOrCreateSession(event);
     const provider = await this.createProvider(
@@ -245,7 +182,7 @@ export class MusicPluginRuntime {
     await this.sendSongById(ctx, event, first.id, first.title, options);
   }
 
-  private async searchAndSendList(
+  async searchAndSendList(
     ctx: any,
     event: any,
     keyword: string,
@@ -296,7 +233,7 @@ export class MusicPluginRuntime {
     }
   }
 
-  private async sendByIndex(
+  async sendByIndex(
     ctx: any,
     event: any,
     index: number,
@@ -404,13 +341,13 @@ export class MusicPluginRuntime {
     };
   }
 
-  private async tryReactToCommandMessage(ctx: any, event: any): Promise<void> {
+  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) {
+    const messageId = String(event?.message_id ?? "").trim();
+    if (!messageId) {
       return;
     }