koishi-plugin-msg-router 1.0.2 → 1.1.0

package/lib/index.js

@@ -59,6 +59,61 @@ function toOneBotId(value) {
     }
     return undefined;
 }
+function firstMessageId(value) {
+    const first = Array.isArray(value) ? value[0] : value;
+    if (first == null || first === '')
+        return Math.floor(Math.random() * 1000000);
+    if (typeof first === 'number')
+        return first;
+    const numeric = Number(first);
+    return Number.isFinite(numeric) ? numeric : String(first);
+}
+/** Extracts QQ's native Markdown payload without letting generic Satori conversion discard it. */
+function extractQQMarkdown(value) {
+    const segments = Array.isArray(value) ? value : [value];
+    let markdownSource;
+    const remaining = [];
+    for (const item of segments) {
+        if (!item || typeof item !== 'object') {
+            remaining.push(item);
+            continue;
+        }
+        const segment = item;
+        if (segment.type === 'markdown') {
+            const source = segment.data?.markdown ?? segment.data ?? {};
+            markdownSource = typeof source === 'string' ? { content: source } : source;
+        }
+        else if (!Array.isArray(value) && segment.markdown) {
+            markdownSource = typeof segment.markdown === 'string'
+                ? { content: segment.markdown }
+                : segment.markdown;
+        }
+        else {
+            remaining.push(item);
+        }
+    }
+    if (!markdownSource)
+        return;
+    const content = markdownSource.content == null ? undefined : String(markdownSource.content);
+    if (!content)
+        return;
+    const fallback = String(markdownSource.fallback_text
+        ?? markdownSource.fallback
+        ?? markdownSource.prompt
+        ?? content
+        ?? '');
+    return {
+        markdown: { content },
+        fallback,
+        remaining,
+    };
+}
+function resolveOutgoingMessage(params) {
+    if (params?.markdown) {
+        return { markdown: params.markdown };
+    }
+    return params?.message;
+}
 function toElements(value) {
     if (value == null)
         return [];
@@ -106,6 +161,18 @@ function toElements(value) {
         if (segment.type === 'reply') {
             return [(0, koishi_1.h)('quote', { id: segment.data?.id || '' })];
         }
+        if (segment.type === 'markdown') {
+            const source = segment.data?.markdown ?? segment.data ?? {};
+            const fallback = source.fallback_text ?? source.fallback ?? source.prompt ?? source.content;
+            return fallback == null ? [] : [koishi_1.h.text(String(fallback))];
+        }
+        if (segment.type === 'keyboard')
+            return [];
+        if (segment.markdown !== undefined) {
+            const source = segment.markdown ?? {};
+            const fallback = source.fallback_text ?? source.fallback ?? source.prompt ?? source.content;
+            return fallback == null ? [] : [koishi_1.h.text(String(fallback))];
+        }
         if (segment.reply !== undefined)
             return toElements(segment.reply);
         if (segment.message !== undefined)
@@ -311,6 +378,58 @@ class RouteRuntime {
         };
         push().catch(e => this.ctx.logger(exports.name).warn(e));
     }
+    async sendRoutedMessage(bot, session, targetId, isPrivate, message) {
+        const qq = extractQQMarkdown(message);
+        const isQQ = session?.platform === 'qq' || bot?.platform === 'qq';
+        const internal = bot?.internal;
+        const isQQPublicBot = typeof internal?.sendPrivateMessage === 'function';
+        const canSendNative = isQQ && typeof internal?.sendMessage === 'function'
+            && (!isPrivate || isQQPublicBot);
+        if (!qq || !canSendNative) {
+            const elements = qq
+                ? [...(qq.fallback ? [koishi_1.h.text(qq.fallback)] : []), ...toElements(qq.remaining)]
+                : toElements(message);
+            if (!elements.length)
+                return [];
+            return session
+                ? await session.send(elements)
+                : isPrivate
+                    ? await bot.sendPrivateMessage(targetId, elements)
+                    : await bot.sendMessage(targetId, elements);
+        }
+        const recentMessageId = session?.messageId
+            && (!session.timestamp || Date.now() - session.timestamp < 5 * 60 * 1000)
+            ? String(session.messageId)
+            : undefined;
+        const request = isQQPublicBot
+            ? {
+                msg_type: 2,
+                markdown: qq.markdown,
+                ...(recentMessageId ? { msg_id: recentMessageId } : {}),
+            }
+            : {
+                content: ' ',
+                markdown: qq.markdown,
+                ...(recentMessageId ? { msg_id: recentMessageId } : {}),
+            };
+        const response = isPrivate
+            ? await internal.sendPrivateMessage(targetId, request)
+            : await internal.sendMessage(targetId, request);
+        const ids = response?.id ? [response.id] : [];
+        // The Markdown segment forms one native QQ message. Preserve any other
+        // OneBot segments by sending them as a second, ordinary message.
+        const remaining = toElements(qq.remaining);
+        if (remaining.length) {
+            const extra = session
+                ? await session.send(remaining)
+                : isPrivate
+                    ? await bot.sendPrivateMessage(targetId, remaining)
+                    : await bot.sendMessage(targetId, remaining);
+            if (Array.isArray(extra))
+                ids.push(...extra);
+        }
+        return ids;
+    }
     acquireSlot() {
         if (this.inflight < this.route.maxConcurrency) {
             this.inflight += 1;
@@ -474,7 +593,7 @@ class RouteRuntime {
                 };
                 if (data.action === 'send_private_msg' || (data.action === 'send_msg' && data.params?.message_type === 'private')) {
                     const userId = data.params?.user_id;
-                    const message = data.params?.message;
+                    const message = resolveOutgoingMessage(data.params);
                     if (userId == null || message == null) {
                         return sendResponse({ status: 'failed', retcode: 100, msg: 'Missing user_id or message', data: null });
                     }
@@ -482,8 +601,8 @@ class RouteRuntime {
                     const session = this.recentPrivateSessions.get(String(userId));
                     if (session && (!data.params?.self_id || session.bot?.selfId === String(data.params?.self_id))) {
                         try {
-                            const msgIds = await session.send(toElements(message));
-                            const msgId = (Array.isArray(msgIds) && msgIds.length > 0) ? (Number(msgIds[0]) || Math.floor(Math.random() * 1000000)) : (typeof msgIds === 'string' ? msgIds : Math.floor(Math.random() * 1000000));
+                            const msgIds = await this.sendRoutedMessage(session.bot ?? bot, session, String(userId), true, message);
+                            const msgId = firstMessageId(msgIds);
                             sendResponse({ status: 'ok', retcode: 0, data: { message_id: msgId } });
                         }
                         catch (e) {
@@ -493,8 +612,8 @@ class RouteRuntime {
                     }
                     else if (bot) {
                         try {
-                            const msgIds = await bot.sendPrivateMessage(String(userId), toElements(message));
-                            const msgId = (Array.isArray(msgIds) && msgIds.length > 0) ? (Number(msgIds[0]) || Math.floor(Math.random() * 1000000)) : (typeof msgIds === 'string' ? msgIds : Math.floor(Math.random() * 1000000));
+                            const msgIds = await this.sendRoutedMessage(bot, null, String(userId), true, message);
+                            const msgId = firstMessageId(msgIds);
                             sendResponse({ status: 'ok', retcode: 0, data: { message_id: msgId } });
                         }
                         catch (e) {
@@ -509,7 +628,7 @@ class RouteRuntime {
                 }
                 if (data.action === 'send_group_msg' || (data.action === 'send_msg' && data.params?.message_type === 'group')) {
                     const groupId = data.params?.group_id;
-                    const message = data.params?.message;
+                    const message = resolveOutgoingMessage(data.params);
                     if (groupId == null || message == null) {
                         return sendResponse({ status: 'failed', retcode: 100, msg: 'Missing group_id or message', data: null });
                     }
@@ -517,8 +636,8 @@ class RouteRuntime {
                     const session = this.recentGroupSessions.get(String(groupId));
                     if (session && (!data.params?.self_id || session.bot?.selfId === String(data.params?.self_id))) {
                         try {
-                            const msgIds = await session.send(toElements(message));
-                            const msgId = (Array.isArray(msgIds) && msgIds.length > 0) ? (Number(msgIds[0]) || Math.floor(Math.random() * 1000000)) : (typeof msgIds === 'string' ? msgIds : Math.floor(Math.random() * 1000000));
+                            const msgIds = await this.sendRoutedMessage(session.bot ?? bot, session, String(groupId), false, message);
+                            const msgId = firstMessageId(msgIds);
                             sendResponse({ status: 'ok', retcode: 0, data: { message_id: msgId } });
                         }
                         catch (e) {
@@ -528,8 +647,8 @@ class RouteRuntime {
                     }
                     else if (bot) {
                         try {
-                            const msgIds = await bot.sendMessage(String(groupId), toElements(message));
-                            const msgId = (Array.isArray(msgIds) && msgIds.length > 0) ? (Number(msgIds[0]) || Math.floor(Math.random() * 1000000)) : (typeof msgIds === 'string' ? msgIds : Math.floor(Math.random() * 1000000));
+                            const msgIds = await this.sendRoutedMessage(bot, null, String(groupId), false, message);
+                            const msgId = firstMessageId(msgIds);
                             sendResponse({ status: 'ok', retcode: 0, data: { message_id: msgId } });
                         }
                         catch (e) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-msg-router",
-  "description": "OneBot v11 WebSocket 消息转发插件",
-  "version": "1.0.2",
+  "description": "Koishi 指令中转路由：仅接管指定指令，通过 OneBot v11 WebSocket 双向通信，支持 QQ Markdown",
+  "version": "1.1.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -19,6 +19,8 @@
     "plugin",
     "onebot",
     "onebot11",
+    "qq",
+    "markdown",
     "websocket",
     "router"
   ],
@@ -31,8 +33,8 @@
   },
   "koishi": {
     "description": {
-      "zh": "标准 OneBot v11 WebSocket 消息路由与通信中间件",
-      "en": "Standard OneBot v11 WebSocket message routing and communication middleware"
+      "zh": "仅接管指定指令，通过 OneBot v11 WebSocket 与外部后端双向通信，支持正反向连接和 QQ Markdown",
+      "en": "Routes selected commands to external backends over OneBot v11 WebSocket, with forward/reverse connections and QQ Markdown"
     }
   }
 }

package/readme.md

@@ -2,16 +2,19 @@
 
 [![npm](https://img.shields.io/npm/v/koishi-plugin-msg-router?style=flat-square)](https://www.npmjs.com/package/koishi-plugin-msg-router)
 
-这是一个用于 Koishi 的消息转发插件。它把你配置好的指令转发到外部 OneBot v11 WebSocket 后端，再把后端返回内容回传给用户。
+一个面向 Koishi 的 OneBot v11 指令中转路由插件。插件仅接管配置中指定的指令，将会话转换为 OneBot v11 消息事件并通过 WebSocket 交给外部后端处理；未配置的指令保持 Koishi 原有处理流程，不受影响。
+
+后端可以通过标准 OneBot API 动作向群聊或私聊回发文本、图片、语音等消息。针对 QQ 官方适配器，插件还支持原生 Markdown 文本，并在不支持 Markdown 的平台上自动降级为普通文本。
 
 ## 主要用途
 
-- 把某些 Koishi 指令交给外部后端程序处理
-- 支持正向 WS 和反向 WS 两种模式
-- 后端可通过 WebSocket 常驻连接接收请求
-- 支持令牌鉴权，`token` 可留空
-- 支持可选的 HMAC 签名
-- 支持断线重连、心跳保活、超时控制、并发控制
+- **按需接管指令**：每条路由独立配置指令列表，只转发明确指定的指令
+- **OneBot v11 兼容**：向后端推送标准消息事件，并处理常用 OneBot API 动作
+- **双向 WebSocket**：支持插件主动连接后端，也支持插件监听并等待后端连接
+- **多路由配置**：不同指令可以连接不同后端，分别设置地址、鉴权和连接参数
+- **消息类型转换**：支持文本、图片、@、回复、语音、视频和表情等常用消息段
+- **QQ Markdown**：支持 QQ 原生 Markdown 文本，其他平台自动使用普通文本降级
+- **连接管理**：提供令牌鉴权、心跳检测、断线重连、请求超时和调试日志
 
 ## 控制台配置说明
 
@@ -156,6 +159,31 @@
 
 如果 `data.text`、`data.message` 或 `data.reply` 存在，插件会直接把它返回给用户。`data.message` 支持 OneBot 风格的文本段数组。
 
+### QQ Markdown 文本
+
+后端通过 `send_group_msg`、`send_private_msg` 或 `send_msg` 回发消息时，可以使用 QQ 原生 Markdown 文本。插件在 QQ 官方适配器上会直接提交 `markdown.content`；在其他平台上会把同一内容作为普通文本降级发送。
+
+```json
+{
+  "action": "send_group_msg",
+  "params": {
+    "group_id": "群 openid",
+    "message": [
+      {
+        "type": "markdown",
+        "data": {
+          "content": "# 标题\n**加粗内容**\n[查看详情](https://example.com)",
+          "fallback_text": "标题\n加粗内容\nhttps://example.com"
+        }
+      }
+    ]
+  },
+  "echo": "request-id"
+}
+```
+
+如果后端本身直接使用 QQ 消息结构，也可以省略 `message`，直接在 `params.markdown.content` 中提供内容。`fallback_text` 可选；未提供时会直接使用 `content` 作为降级文本。
+
 ## 兼容说明
 
 - `token` 是可选项，不填时不会附加 `Authorization` 头