mioku-plugin-terraria 1.0.0 → 2.0.1

package/README.md

@@ -1,6 +1,6 @@
 # mioku-plugin-terraria
 
-为 Mioku 提供 Terraria（TShock）服务器与 QQ 群消息互通能力，使用 [TianSuo](https://github.com/17TheWord/QueQiao) 协议（JSON over WebSocket）。
+为 Mioku 提供 Terraria（TShock）服务器与 QQ 群消息互通能力，使用 [TianSuo](https://github.com/Jerryplusy/TianSuo) 协议（JSON over WebSocket）。
 
 ## 功能特性
 
@@ -9,13 +9,9 @@
 - **多服务器支持**：可同时连接多台 Terraria 服务器，每台独立配置
 - **自动重连**：连接断开后按指数退避自动重连，可配置最大重试次数
 
-## 服务器端要求
+## 服务端要求
 
-Terraria 服务器需安装 [TianSuo](https://github.com/17TheWord/QueQiao) TShock 插件
-
-```bash
-bun install
-```
+Terraria 服务器需安装 [TianSuo](https://github.com/Jerryplusy/TianSuo) TShock 插件
 
 ## 配置
 
@@ -32,6 +28,6 @@ bun install
 
 ## 鸣谢
 
-- [TianSuo](https://github.com/17TheWord/QueQiao)：Terraria WebSocket 桥
+- [TianSuo](https://github.com/Jerryplusy/TianSuo)：Terraria WebSocket 桥
 - [TShock](https://github.com/TShock/TShock) 与 [Pryaxis](https://github.com/Pryaxis)：Terraria 服务端框架与插件 API
 - [Re-Logic](https://www.terraria.org/)：Terraria

package/index.ts

@@ -1,8 +1,7 @@
-import { definePlugin, getService, Services, type MiokiContext } from "mioku";
+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,10 +18,8 @@ import { PROTOCOL, type TerrariaConfig, type TerrariaEvent } from "./types";
 
 export default definePlugin({
   name: "terraria",
-  version: "1.0.0",
-  description: "Terraria 服务器与 QQ 群消息互通插件，基于 TianSuo 协议",
 
-  async setup(ctx: MiokiContext) {
+  async setup(ctx: MiokuContext) {
     const configService = getService(ctx, Services.Config);
 
     const configHandler = createConfigHandler(configService);
@@ -42,65 +39,86 @@ export default definePlugin({
     serverManager.startServers(config);
     ctx.logger.info("Terraria 插件已就绪");
 
-    ctx.handle("message", async (event) => {
-      const text = ctx.text(event).trim();
+    const requireGroup = (event: any): number | undefined => {
       const groupId =
         "group_id" in event && typeof event.group_id === "number"
           ? event.group_id
           : undefined;
+      return groupId;
+    };
 
-      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;
-      }
+    ctx.command({
+      name: "/ts 状态",
+      match: /^\/ts\s*状态(?:\s|$)/,
+      prefixes: false,
+      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 开启同步",
+      match: /^\/ts\s*开启同步(?:\s|$)/,
+      prefixes: false,
+      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 关闭同步",
+      match: /^\/ts\s*关闭同步(?:\s|$)/,
+      prefixes: false,
+      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 重连",
+      match: /^\/ts\s*重连(?:\s|$)/,
+      prefixes: false,
+      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?.startsWith("/ts")) return;
       await forwardToTerraria(ctx, event, config, configHandler, serverManager);
     });
 
@@ -112,7 +130,7 @@ export default definePlugin({
 });
 
 async function handleTerrariaEvent(
-  ctx: MiokiContext,
+  ctx: MiokuContext,
   raw: { serverName: string; name: string; data: Record<string, unknown> },
   config: TerrariaConfig,
   configHandler: ReturnType<typeof createConfigHandler>,
@@ -152,11 +170,11 @@ async function handleTerrariaEvent(
   const groups = serverItem.group_list ? [serverItem.group_list] : [];
 
   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(
           `[Terraria] 发送消息到群 ${groupId} 失败: ${err}`,
@@ -167,7 +185,7 @@ async function handleTerrariaEvent(
 }
 
 async function forwardToTerraria(
-  ctx: MiokiContext,
+  ctx: MiokuContext,
   event: any,
   config: TerrariaConfig,
   configHandler: ReturnType<typeof createConfigHandler>,
@@ -195,7 +213,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,78 +1,29 @@
 {
   "name": "mioku-plugin-terraria",
-  "version": "1.0.0",
+  "version": "2.0.1",
   "description": "Terraria 服务器与 QQ 群消息互通插件，基于 TianSuo 协议",
   "main": "index.ts",
   "type": "module",
   "keywords": [
-    "mioku",
-    "terraria",
-    "tshock",
-    "tiansuo"
+    "mioku"
   ],
   "repository": {
     "type": "git",
     "url": "https://github.com/mioku-lab/mioku-plugin-terraria.git"
   },
   "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"
-        }
-      ]
-    }
+    "services": [
+      "config"
+    ]
   },
   "dependencies": {
     "ws": "^8.18.0"
   },
   "peerDependencies": {
-    "mioku": "^0.8.0",
-    "mioki": "^0.16.0"
+    "mioku": "^1.0.0"
   },
   "devDependencies": {
     "mioku": "workspace:*",
-    "mioki": "^0.16.0",
     "@types/ws": "^8.5.13"
   }
 }

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 };
-}