mioku-plugin-mc 3.0.0 → 4.0.0

package/index.ts

@@ -1,9 +1,9 @@
-import { definePlugin, type MiokiContext } from "mioki";
-import type { AIService, ConfigService } from "mioku";
+import { definePlugin, type MiokuContext } from "mioku";
+import { getService, Services } from "mioku";
 import { createConfigHandler } from "./utils/config-handler";
 import { createPlayConfigHandler } from "./play/config";
 import { createPlayManager } from "./play";
-import { setMcPlayState } from "./play/runtime";
+import { createMcSkill } from "./skills/mc";
 import { handleDebugCommand } from "./play/debug/commands";
 import { createServerManager } from "./utils/server-manager";
 import { parseMcCommand } from "./utils/command-router";
@@ -24,8 +24,8 @@ export default definePlugin({
   version: "1.0.0",
   description: "Minecraft服务器与QQ群消息互通插件",
 
-  async setup(ctx: MiokiContext) {
-    const configService = ctx.services?.config as ConfigService | undefined;
+  async setup(ctx: MiokuContext) {
+    const configService = getService(ctx, Services.Config);
 
     const configHandler = createConfigHandler(configService);
     await configHandler.register();
@@ -35,7 +35,7 @@ export default definePlugin({
     const playConfigHandler = createPlayConfigHandler(configService);
     await playConfigHandler.register();
 
-    const aiService = ctx.services?.ai as AIService | undefined;
+    const aiService = getService(ctx, Services.AI);
 
     const playManager = createPlayManager({
       ctx,
@@ -44,9 +44,12 @@ export default definePlugin({
       playConfigHandler,
       syncConfigHandler: configHandler,
     });
-    setMcPlayState({ playManager });
     ctx.logger.info("Minecraft 游玩子系统已就绪");
 
+    if (aiService) {
+      aiService.registerSkill(createMcSkill(playManager));
+    }
+
     const serverManager = createServerManager(
       (serverName, status) => {
         ctx.logger.info(`[MC] 服务器 ${serverName} 状态: ${status}`);
@@ -61,16 +64,20 @@ export default definePlugin({
 
     serverManager.startServers(config);
 
-    ctx.handle("message", async (event: any) => {
+    ctx.handle("message", async (event) => {
       const text = ctx.text(event).trim();
+      const groupId =
+        "group_id" in event && typeof event.group_id === "number"
+          ? event.group_id
+          : undefined;
 
-      if (event.group_id) {
+      if (groupId) {
         const reply = await handleDebugCommand({
           text,
           isOwner: ctx.isOwner?.(event) ?? false,
           debugEnabled: playConfigHandler.getConfig().debug.enabled,
           playManager,
-          groupId: Number(event.group_id),
+          groupId: Number(groupId),
         });
         if (reply !== null) {
           await event.reply(reply);
@@ -81,7 +88,7 @@ export default definePlugin({
       const parsed = parseMcCommand(text);
 
       if (!parsed || parsed.action === "") {
-        if (event.group_id) {
+        if (groupId) {
           playManager.onQqMessage(event);
           await forwardToMc(ctx, event, config, configHandler, serverManager);
         }
@@ -90,7 +97,9 @@ export default definePlugin({
 
       switch (parsed.action) {
         case "状态": {
-          await handleStatus(serverManager, config, (msg) => event.reply(msg));
+          await handleStatus(serverManager, config, async (msg) => {
+            await event.reply(msg);
+          });
           break;
         }
         case "开启同步": {
@@ -101,7 +110,9 @@ export default definePlugin({
             serverManager,
             configHandler,
             config,
-            (msg) => event.reply(msg),
+            async (msg) => {
+              await event.reply(msg);
+            },
           );
           break;
         }
@@ -113,13 +124,17 @@ export default definePlugin({
             serverManager,
             configHandler,
             config,
-            (msg) => event.reply(msg),
+            async (msg) => {
+              await event.reply(msg);
+            },
           );
           break;
         }
         case "重连": {
           if (ctx.isOwner?.(event)) {
-            await handleReconnect(serverManager, (msg) => event.reply(msg));
+            await handleReconnect(serverManager, async (msg) => {
+              await event.reply(msg);
+            });
           }
           break;
         }
@@ -131,13 +146,14 @@ export default definePlugin({
     return async () => {
       serverManager.stopServers();
       await playManager.dispose();
+      if (aiService) aiService.removeSkill("mc");
       ctx.logger.info("Minecraft插件已卸载");
     };
   },
 });
 
 async function handleMcEvent(
-  ctx: MiokiContext,
+  ctx: MiokuContext,
   event: McEvent,
   config: McConfig,
   configHandler: ReturnType<typeof createConfigHandler>,
@@ -158,12 +174,12 @@ async function handleMcEvent(
   const groups = groupList ? [groupList] : [];
 
   for (const botId of bots) {
-    const bot = ctx.pickBot(Number(botId));
+    const bot = ctx.pickBot(botId);
     if (!bot) continue;
 
     for (const groupId of groups) {
       try {
-        await bot.sendGroupMsg(Number(groupId), messageText);
+        await bot.sendMessage({ type: "group", group_id: groupId}, messageText);
       } catch (err) {
         ctx.logger.error(`[MC] 发送消息到群 ${groupId} 失败: ${err}`);
       }
@@ -172,7 +188,7 @@ async function handleMcEvent(
 }
 
 async function forwardToMc(
-  ctx: MiokiContext,
+  ctx: MiokuContext,
   event: any,
   config: McConfig,
   configHandler: ReturnType<typeof createConfigHandler>,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-mc",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "Minecraft与QQ群消息互通插件，支持服务器状态监控与RCON命令",
   "main": "index.ts",
   "type": "module",
@@ -71,11 +71,9 @@
     "zod": "^3.24.1"
   },
   "peerDependencies": {
-    "mioku": "^0.8.0",
-    "mioki": "^0.16.0"
+    "mioku": "^1.0.0"
   },
   "devDependencies": {
-    "mioku": "workspace:*",
-    "mioki": "^0.16.0"
+    "mioku": "workspace:*"
   }
 }

package/play/actions/registry.ts

@@ -67,7 +67,7 @@ export class ActionRegistry {
           .map(
             (issue) => `${issue.path.join(".") || "params"}: ${issue.message}`,
           )
-          .join("; "),
+          .join("); "),
         meta,
       );
     }

package/play/context.ts

@@ -1,4 +1,4 @@
-import type { MiokiContext } from "mioki";
+import type { MiokuContext } from "mioku";
 import type { AIService, AIInstance, ConfigService } from "mioku";
 import type { PlayConfig } from "./types";
 import type { ConfigHandler } from "../utils/config-handler";
@@ -6,7 +6,7 @@ import type { WorkSubroutine, WorkTerminator } from "./ai/work-subroutine";
 import type { PlaySession } from "./session";
 
 export interface PlayPluginContext {
-  ctx: MiokiContext;
+  ctx: MiokuContext;
   config: PlayConfig;
   aiService: AIService | undefined;
   configService: ConfigService | undefined;

package/play/index.ts

@@ -1,4 +1,4 @@
-import type { MiokiContext } from "mioki";
+import type { MiokuContext } from "mioku";
 import type { AIService, AIInstance, ConfigService } from "mioku";
 import type { ConfigHandler } from "../utils/config-handler";
 import type { PlayPluginContext } from "./context";
@@ -17,7 +17,7 @@ import { SelfDefenseBehavior } from "./behavior/catalog/defend";
 import type { GroupBinding, PlayServerConfig } from "./types";
 
 export interface PlayManagerOptions {
-  ctx: MiokiContext;
+  ctx: MiokuContext;
   aiService: AIService | undefined;
   configService: ConfigService | undefined;
   playConfigHandler: PlayConfigHandler;
@@ -36,7 +36,7 @@ export interface PlayExitResult {
 }
 
 export class PlayManager {
-  private readonly ctx: MiokiContext;
+  private readonly ctx: MiokuContext;
   private readonly aiService: AIService | undefined;
   private readonly configService: ConfigService | undefined;
   private readonly playConfigHandler: PlayConfigHandler;

package/play/missions/registry.ts

@@ -88,7 +88,7 @@ export class TaskRegistry {
         ok: false,
         error: `invalid_params: ${result.error.issues
           .map((i) => `${i.path.join(".") || "(root)"}: ${i.message}`)
-          .join("; ")}`,
+          .join("); ")}`,
       };
     }
     return { ok: true, params: result.data };

package/play/session.ts

@@ -242,7 +242,7 @@ export class PlaySession {
     const bot = ctx.ctx.pickBot(this.binding.botSelfId);
     if (!bot) return;
     try {
-      await bot.sendGroupMsg(this.binding.groupId, message);
+      await bot.sendMessage({ type: "group", group_id: this.binding.groupId}, message);
     } catch (err) {
       ctx.ctx.logger.error(`[MC/play] 发送 QQ 通知失败: ${err}`);
     }
@@ -264,7 +264,7 @@ export class PlaySession {
     const bot = ctx.ctx.pickBot(this.binding.botSelfId);
     if (!bot) return false;
     try {
-      await bot.sendGroupMsg(this.binding.groupId, message);
+      await bot.sendMessage({ type: "group", group_id: this.binding.groupId}, message);
       return true;
     } catch (err) {
       ctx.ctx.logger.error(`[MC/play] 发送 QQ 消息失败: ${err}`);

package/skills/mc.ts

@@ -0,0 +1,58 @@
+import type { AISkill } from "mioku";
+import type { PlayManager } from "../play";
+
+export function createMcSkill(playManager: PlayManager): AISkill {
+  return {
+    name: "mc",
+    description:
+      "让机器人进入或离开 Minecraft 服务器，让它可以与玩家一起游玩。进入后机器人将自主行动（探索、跟随、战斗、收集），直到决定离开或时间耗尽。",
+    permission: "admin",
+    tools: [
+      {
+        name: "control_bot",
+        description:
+          "进入或退出 Minecraft 服务器。action='enter' + serverId 加入服务器；action='exit' 退出。机器人进入后会自主决定行为。仅在群管理员要求或继续游戏有意义时调用。",
+        parameters: {
+          type: "object",
+          properties: {
+            action: {
+              type: "string",
+              enum: ["enter", "exit"],
+              description: "'enter' 加入服务器，'exit' 退出当前服务器",
+            },
+            serverId: {
+              type: "string",
+              description: "要进入的服务器 ID。enter 时需要，exit 时忽略。",
+            },
+          },
+          required: ["action"],
+        },
+        handler: async (args: any, runtimeCtx?: any) => {
+          const event = runtimeCtx?.event || runtimeCtx?.rawEvent;
+          const groupId = Number(event?.group_id);
+          if (!Number.isFinite(groupId) || groupId <= 0) {
+            return { error: "无法识别当前群，请在群聊中调用" };
+          }
+
+          const action = String(args?.action ?? "").toLowerCase();
+          if (action === "exit") {
+            const r = await playManager.exit(groupId);
+            return { success: r.success, message: r.message };
+          }
+
+          if (action !== "enter") {
+            return { error: `未知 action: ${action}` };
+          }
+
+          const serverId = String(args?.serverId ?? "").trim();
+          if (!serverId) return { error: "缺少 serverId" };
+
+          const r = await playManager.enter(groupId, serverId);
+          return r.success
+            ? { success: true, serverId: r.serverId, message: r.message }
+            : { error: r.message };
+        },
+      },
+    ],
+  };
+}

package/play/runtime.ts

@@ -1,14 +0,0 @@
-import { getPluginRuntimeState, setPluginRuntimeState } from "mioku";
-import type { PlayManager } from "./index";
-
-export interface McPlayRuntimeState {
-  playManager?: PlayManager;
-}
-
-export function getMcPlayState(): McPlayRuntimeState {
-  return getPluginRuntimeState("mc") as McPlayRuntimeState;
-}
-
-export function setMcPlayState(state: McPlayRuntimeState): void {
-  setPluginRuntimeState("mc", state);
-}

package/skills.ts

@@ -1,63 +0,0 @@
-import type { AISkill } from "mioku";
-import { getMcPlayState } from "./play/runtime";
-
-const skill: AISkill = {
-  name: "mc",
-  description:
-    "Let the bot enter or leave a Minecraft server so it can play alongside players. " +
-    "The bot will then act on its own (explore, follow, fight, gather) until it decides to leave or its time runs out.",
-  permission: "admin",
-  tools: [
-    {
-      name: "control_bot",
-      description:
-        "Enter or exit a Minecraft server. Use action='enter' with a serverId to join; action='exit' to leave. " +
-        "The bot autonomously decides its behavior once inside. Only call this when a group admin asks for it " +
-        "or when continuing play makes sense.",
-      parameters: {
-        type: "object",
-        properties: {
-          action: {
-            type: "string",
-            enum: ["enter", "exit"],
-            description: "'enter' to join a server, 'exit' to leave the current one.",
-          },
-          serverId: {
-            type: "string",
-            description: "The server id to enter. Required for 'enter', ignored for 'exit'.",
-          },
-        },
-        required: ["action"],
-      },
-      handler: async (args: any, event?: any) => {
-        const pm = getMcPlayState().playManager;
-        if (!pm) return { error: "mc 游玩子系统未就绪" };
-
-        const groupId = Number(event?.group_id);
-        if (!Number.isFinite(groupId) || groupId <= 0) {
-          return { error: "无法识别当前群，请在群聊中调用" };
-        }
-
-        const action = String(args?.action ?? "").toLowerCase();
-        if (action === "exit") {
-          const r = await pm.exit(groupId);
-          return { success: r.success, message: r.message };
-        }
-
-        if (action !== "enter") {
-          return { error: `未知 action: ${action}` };
-        }
-
-        const serverId = String(args?.serverId ?? "").trim();
-        if (!serverId) return { error: "缺少 serverId" };
-
-        const r = await pm.enter(groupId, serverId);
-        return r.success
-          ? { success: true, serverId: r.serverId, message: r.message }
-          : { error: r.message };
-      },
-    },
-  ],
-};
-
-export default skill;