mioku-plugin-terraria 2.0.0 → 2.0.2

package/core/command.ts

@@ -14,7 +14,7 @@ export function isCommandAllowed(
   text: string,
   serverItem: TerrariaServerConfig,
   isMaster: boolean,
-  userId: number | string | undefined,
+  userId: string | undefined,
 ): boolean {
   if (isMaster) return true;
 

package/index.ts

@@ -2,7 +2,6 @@ import { definePlugin, getService, Services, type MiokuContext } from "mioku";
 import { handleStatus } from "./handlers/status";
 import { handleSync } from "./handlers/sync";
 import { handleReconnect } from "./handlers/reconnect";
-import { parseTsCommand } from "./utils/command-router";
 import { createConfigHandler } from "./utils/config-handler";
 import {
   formatQqToTerraria,
@@ -19,8 +18,6 @@ import { PROTOCOL, type TerrariaConfig, type TerrariaEvent } from "./types";
 
 export default definePlugin({
   name: "terraria",
-  version: "1.0.0",
-  description: "Terraria 服务器与 QQ 群消息互通插件，基于 TianSuo 协议",
 
   async setup(ctx: MiokuContext) {
     const configService = getService(ctx, Services.Config);
@@ -42,65 +39,81 @@ export default definePlugin({
     serverManager.startServers(config);
     ctx.logger.info("Terraria 插件已就绪");
 
-    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;
-
-      const parsed = parseTsCommand(text);
-      if (parsed) {
-        if (!groupId) return;
-
-        switch (parsed.action) {
-          case "状态": {
-            await handleStatus(serverManager, config, async (msg) => {
-              await event.reply(msg);
-            });
-            return;
-          }
-          case "开启同步": {
-            const serverName = parsed.args[0];
-            await handleSync(
-              serverName,
-              true,
-              configHandler,
-              config,
-              async (msg) => {
-                await event.reply(msg);
-              },
-            );
-            return;
-          }
-          case "关闭同步": {
-            const serverName = parsed.args[0];
-            await handleSync(
-              serverName,
-              false,
-              configHandler,
-              config,
-              async (msg) => {
-                await event.reply(msg);
-              },
-            );
-            return;
-          }
-          case "重连": {
-            if (ctx.isOwner?.(event)) {
-              await handleReconnect(serverManager, async (msg) => {
-                await event.reply(msg);
-              });
-            }
-            return;
-          }
-          case "":
-            return;
-        }
-        return;
-      }
+    const requireGroup = (event: any): string | undefined =>
+      String(event?.group_id ?? "").trim() || undefined;
+
+    ctx.command({
+      name: "ts 状态",
+      prefixes: ["/", "."],
+      match: /^ts\s*状态(?:\s|$)/,
+      permission: "master",
+      description: "查看所有已配置服务器的 WebSocket 连接状态",
+      handler: async ({ event }) => {
+        if (!requireGroup(event)) return;
+        await handleStatus(serverManager, config, async (msg) => {
+          await event.reply(msg);
+        });
+      },
+    });
+    ctx.command({
+      name: "ts 开启同步",
+      prefixes: ["/", "."],
+      match: /^ts\s*开启同步(?:\s|$)/,
+      permission: "master",
+      description: "开启指定服务器的群聊消息同步功能",
+      usage: ".ts 开启同步 <服务器名称>",
+      handler: async ({ event, args }) => {
+        if (!requireGroup(event)) return;
+        await handleSync(
+          args[0],
+          true,
+          configHandler,
+          config,
+          async (msg) => {
+            await event.reply(msg);
+          },
+        );
+      },
+    });
+    ctx.command({
+      name: "ts 关闭同步",
+      prefixes: ["/", "."],
+      match: /^ts\s*关闭同步(?:\s|$)/,
+      permission: "master",
+      description: "关闭指定服务器的群聊消息同步功能",
+      usage: ".ts 关闭同步 <服务器名称>",
+      handler: async ({ event, args }) => {
+        if (!requireGroup(event)) return;
+        await handleSync(
+          args[0],
+          false,
+          configHandler,
+          config,
+          async (msg) => {
+            await event.reply(msg);
+          },
+        );
+      },
+    });
+    ctx.command({
+      name: "ts 重连",
+      prefixes: ["/", "."],
+      match: /^ts\s*重连(?:\s|$)/,
+      permission: "master",
+      description: "断开并重新建立所有服务器的 WebSocket 连接",
+      handler: async ({ event }) => {
+        if (!requireGroup(event)) return;
+        await handleReconnect(serverManager, async (msg) => {
+          await event.reply(msg);
+        });
+      },
+    });
 
+    ctx.handle("message", async (event) => {
+      const groupId = requireGroup(event);
       if (!groupId) return;
+      const text = ctx.text(event)?.trim();
+      if (text && /^[./]ts\b/.test(text)) return;
       await forwardToTerraria(ctx, event, config, configHandler, serverManager);
     });
 
@@ -178,9 +191,10 @@ async function forwardToTerraria(
     `[Terraria] 收到群消息 group=${event.group_id} text=${text}`,
   );
 
-  if (!event.group_id) return;
+  const groupId = String(event.group_id ?? "").trim();
+  if (!groupId) return;
 
-  const servers = configHandler.getServersForGroup(event.group_id);
+  const servers = configHandler.getServersForGroup(groupId);
   if (servers.length === 0) return;
 
   const msgList: QqMessagePart[] = Array.isArray(event.message)
@@ -195,7 +209,7 @@ async function forwardToTerraria(
       const isAllowed = isCommandAllowed(
         commandText,
         server,
-        ctx.isOwner?.(event) ?? false,
+        ctx.isMaster?.(event) ?? false,
         event.user_id,
       );
       if (!isAllowed) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-terraria",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Terraria 服务器与 QQ 群消息互通插件，基于 TianSuo 协议",
   "main": "index.ts",
   "type": "module",
@@ -14,53 +14,7 @@
   "mioku": {
     "services": [
       "config"
-    ],
-    "accessHooks": [
-      {
-        "id": "/ts 状态",
-        "match": "/^\\/ts\\s*状态/"
-      },
-      {
-        "id": "/ts 开启同步",
-        "match": "/^\\/ts\\s*开启同步/"
-      },
-      {
-        "id": "/ts 关闭同步",
-        "match": "/^\\/ts\\s*关闭同步/"
-      },
-      {
-        "id": "/ts 重连",
-        "match": "/^\\/ts\\s*重连/"
-      }
-    ],
-    "help": {
-      "title": "Terraria",
-      "description": "Terraria 服务器与 QQ 群消息互通插件，基于 TianSuo 协议",
-      "commands": [
-        {
-          "cmd": "/ts 状态",
-          "desc": "查看所有已配置服务器的 WebSocket 连接状态",
-          "role": "master"
-        },
-        {
-          "cmd": "/ts 开启同步 <服务器名称>",
-          "desc": "开启指定服务器的群聊消息同步功能",
-          "usage": "/ts 开启同步 <服务器名称>",
-          "role": "master"
-        },
-        {
-          "cmd": "/ts 关闭同步 <服务器名称>",
-          "desc": "关闭指定服务器的群聊消息同步功能",
-          "usage": "/ts 关闭同步 <服务器名称>",
-          "role": "master"
-        },
-        {
-          "cmd": "/ts 重连",
-          "desc": "断开并重新建立所有服务器的 WebSocket 连接",
-          "role": "master"
-        }
-      ]
-    }
+    ]
   },
   "dependencies": {
     "ws": "^8.18.0"

package/utils/command-router.ts

@@ -1,21 +0,0 @@
-export interface ParsedCommand {
-  action: string;
-  args: string[];
-  raw: string;
-}
-
-export function parseTsCommand(text: string): ParsedCommand | null {
-  const trimmed = text.trim();
-  if (!trimmed.startsWith("/ts")) return null;
-
-  const remainder = trimmed.slice(3).trim();
-  if (!remainder) {
-    return { action: "", args: [], raw: "" };
-  }
-
-  const parts = remainder.split(/\s+/);
-  const action = parts[0] || "";
-  const args = parts.slice(1);
-
-  return { action, args, raw: remainder };
-}