onebots 0.4.21 → 0.4.23

package/lib/service/V11/index.js

@@ -1,39 +1,63 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.V11 = void 0;
-const icqq_1 = require("icqq");
-const action_1 = require("./action");
 const onebot_1 = require("../../onebot");
-const ws_1 = require("ws");
-const url_1 = require("url");
+const app_1 = require("../../server/app");
+const service_1 = require("../../service");
 const utils_1 = require("../../utils");
-const icqq_cq_enable_1 = require("icqq-cq-enable");
-const onebot_2 = require("../../onebot");
+const crypto = __importStar(require("crypto"));
+const fs_1 = require("fs");
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
-const events_1 = require("events");
-const fs_1 = require("fs");
-const db_sqlite_1 = require("./db_sqlite");
+const icqq_1 = require("icqq");
+const icqq_cq_enable_1 = require("icqq-cq-enable");
 const path_1 = require("path");
-const app_1 = require("../../server/app");
+const url_1 = require("url");
+const ws_1 = require("ws");
+const action_1 = require("./action");
 const db_entities_1 = require("./db_entities");
-class V11 extends events_1.EventEmitter {
+const db_sqlite_1 = require("./db_sqlite");
+const sendMsgTypes = ["private", "group", "discuss"];
+const sendMsgMethodRegex = new RegExp(`send_(${sendMsgTypes.join("|")})_msg`);
+class V11 extends service_1.Service {
     constructor(oneBot, client, config) {
-        super();
+        super(config);
         this.oneBot = oneBot;
         this.client = client;
-        this.config = config;
-        this.version = 'V11';
+        this.version = "V11";
         this.timestamp = Date.now();
         this._queue = [];
         this.queue_running = false;
         this.wsr = new Set();
         this.action = new action_1.Action();
         this.logger = this.oneBot.app.getLogger(this.oneBot.uin, this.version);
-        this.db = new db_sqlite_1.Database((0, path_1.join)(app_1.App.configDir, 'data', this.oneBot.uin + '.db'), this.logger);
+        this.db = new db_sqlite_1.Database((0, path_1.join)(app_1.App.configDir, "data", this.oneBot.uin + ".db"), this.logger);
     }
     start(path) {
         this.path = `/${this.oneBot.uin}`;
@@ -43,33 +67,52 @@ class V11 extends events_1.EventEmitter {
             this.startHttp();
         if (this.config.use_ws)
             this.startWs();
-        this.config.http_reverse.forEach(config => {
-            if (typeof config === 'string') {
+        this.config.http_reverse.forEach((config) => {
+            if (typeof config === "string") {
                 config = {
                     url: config,
                     access_token: this.config.access_token,
-                    secret: this.config.secret
+                    secret: this.config.secret,
                 };
             }
             else {
                 config = {
                     access_token: this.config.access_token,
                     secret: this.config.secret,
-                    ...config
+                    ...config,
                 };
             }
             this.startHttpReverse(config);
         });
-        this.config.ws_reverse.forEach(config => {
+        this.config.ws_reverse.forEach((config) => {
             this.startWsReverse(config);
         });
+        this.on("dispatch", (serialized) => {
+            for (const ws of this.wss.clients) {
+                ws.send(serialized, (err) => {
+                    if (err)
+                        this.logger.error(`正向WS(${ws.url})上报事件失败: ` + err.message);
+                    else
+                        this.logger.debug(`正向WS(${ws.url})上报事件成功: ` + serialized);
+                });
+            }
+            for (const ws of this.wsr) {
+                ws.send(serialized, (err) => {
+                    if (err) {
+                        this.logger.error(`反向WS(${ws.url})上报事件失败: ` + err.message);
+                    }
+                    else
+                        this.logger.debug(`反向WS(${ws.url})上报事件成功: ` + serialized);
+                });
+            }
+        });
         if (this.config.heartbeat) {
             this.heartbeat = setInterval(() => {
                 this.dispatch({
                     self_id: this.oneBot.uin,
                     status: {
                         online: this.client.status === icqq_1.OnlineStatus.Online,
-                        good: this.oneBot.status === onebot_1.OneBotStatus.Good
+                        good: this.oneBot.status === onebot_1.OneBotStatus.Good,
                     },
                     time: Math.floor(Date.now() / 1000),
                     post_type: "meta_event",
@@ -84,7 +127,7 @@ class V11 extends events_1.EventEmitter {
         this.logger.mark(`开启http服务器成功，监听:http://127.0.0.1:${this.oneBot.app.config.port}${this.path}`);
     }
     startHttpReverse(config) {
-        this.on('dispatch', (unserialized) => {
+        this.on("dispatch", (unserialized) => {
             const serialized = JSON.stringify(unserialized);
             const options = {
                 method: "POST",
@@ -98,16 +141,18 @@ class V11 extends events_1.EventEmitter {
             };
             if (this.config.secret) {
                 //@ts-ignore
-                options.headers["X-Signature"] = "sha1=" + crypto.createHmac("sha1", String(this.config.secret)).update(serialized).digest("hex");
+                options.headers["X-Signature"] =
+                    "sha1=" + crypto.createHmac("sha1", String(this.config.secret)).update(serialized).digest("hex");
             }
             const protocol = config.url.startsWith("https") ? https_1.default : http_1.default;
             try {
-                protocol.request(config.url, options, (res) => {
+                protocol
+                    .request(config.url, options, (res) => {
                     if (res.statusCode !== 200)
                         return this.logger.warn(`POST(${config.url})上报事件收到非200响应：` + res.statusCode);
                     let data = "";
                     res.setEncoding("utf-8");
-                    res.on("data", (chunk) => data += chunk);
+                    res.on("data", (chunk) => (data += chunk));
                     res.on("end", () => {
                         this.logger.debug(`收到HTTP响应 ${res.statusCode} ：` + data);
                         if (!data)
@@ -119,9 +164,11 @@ class V11 extends events_1.EventEmitter {
                             this.logger.error(`快速操作遇到错误：` + e.message);
                         }
                     });
-                }).on("error", (err) => {
+                })
+                    .on("error", (err) => {
                     this.logger.error(`POST(${config.url})上报事件失败：` + err.message);
-                }).end(serialized, () => {
+                })
+                    .end(serialized, () => {
                     this.logger.debug(`POST(${config.url})上报事件成功: ` + serialized);
                 });
             }
@@ -146,38 +193,18 @@ class V11 extends events_1.EventEmitter {
             });
             if (this.config.access_token) {
                 const url = new url_1.URL(req.url, "http://127.0.0.1");
-                const token = url.searchParams.get('access_token');
+                const token = url.searchParams.get("access_token");
                 if (token)
                     req.headers["authorization"] = `Bearer ${token}`;
-                if (!req.headers["authorization"] || req.headers["authorization"] !== `Bearer ${this.config.access_token}`)
+                if (!req.headers["authorization"] ||
+                    req.headers["authorization"] !== `Bearer ${this.config.access_token}`)
                     return ws.close(1002, "wrong access token");
             }
             this._webSocketHandler(ws);
         });
-        this.on('dispatch', (serialized) => {
-            for (const ws of this.wss.clients) {
-                ws.send(serialized, (err) => {
-                    if (err)
-                        this.logger.error(`正向WS(${ws.url})上报事件失败: ` + err.message);
-                    else
-                        this.logger.debug(`正向WS(${ws.url})上报事件成功: ` + serialized);
-                });
-            }
-        });
     }
     startWsReverse(url) {
         this._createWsr(url);
-        this.on('dispatch', (serialized) => {
-            for (const ws of this.wsr) {
-                ws.send(serialized, (err) => {
-                    if (err) {
-                        this.logger.error(`反向WS(${ws.url})上报事件失败: ` + err.message);
-                    }
-                    else
-                        this.logger.debug(`反向WS(${ws.url})上报事件成功: ` + serialized);
-                });
-            }
-        });
     }
     async stop(force) {
         if (this.client.status === icqq_1.OnlineStatus.Online) {
@@ -192,19 +219,20 @@ class V11 extends events_1.EventEmitter {
     }
     system_online(data) {
         this.logger.info("【好友列表】");
-        this.client.fl.forEach(item => this.logger.info(`\t${item.nickname}(${item.user_id})`));
+        this.client.fl.forEach((item) => this.logger.info(`\t${item.nickname}(${item.user_id})`));
         this.logger.info("【群列表】");
-        this.client.gl.forEach(item => this.logger.info(`\t${item.group_name}(${item.group_id})`));
-        this.logger.info('');
+        this.client.gl.forEach((item) => this.logger.info(`\t${item.group_name}(${item.group_id})`));
+        this.logger.info("");
     }
     async dispatch(data) {
-        data.post_type = data.post_type || 'system';
-        if (data.message && data.post_type === 'message') {
-            if (this.config.post_message_format === 'array') {
+        data.post_type = data.post_type || "system";
+        if (data.message && data.post_type === "message") {
+            if (this.config.post_message_format === "array") {
                 data.message = (0, icqq_cq_enable_1.toSegment)(data.message);
-                if (data.source) { // reply
+                if (data.source) {
+                    // reply
                     let msg0 = data.message[0];
-                    msg0.data['id'] = await this.getReplyMsgIdFromDB(data);
+                    msg0.data["id"] = await this.getReplyMsgIdFromDB(data);
                 }
             }
             else {
@@ -221,7 +249,7 @@ class V11 extends events_1.EventEmitter {
         if (data.message_id) {
             data.message_id = await this.addMsgToDB(data);
         }
-        if (data.post_type == 'notice' && String(data.notice_type).endsWith('_recall')) {
+        if (data.post_type == "notice" && String(data.notice_type).endsWith("_recall")) {
             this.db.markMsgAsRecalled(data.base64_id);
         }
         if (data.font) {
@@ -234,39 +262,44 @@ class V11 extends events_1.EventEmitter {
         //     if (!['user_id', 'group_id', 'discuss_id', 'member_id', 'channel_id', 'guild_id'].includes(key)) return value
         //     return value + ''
         // })
-        this.emit('dispatch', this._formatEvent(data));
+        this.emit("dispatch", this._formatEvent(data));
     }
     _formatEvent(data) {
-        if (data.post_type === 'notice') {
+        if (data.post_type === "notice") {
             // console.log(JSON.stringify(data))
             const data1 = { ...data };
-            if (data.notice_type === 'group') {
+            if (data.notice_type === "group") {
                 delete data1.group;
                 delete data1.member;
                 switch (data.sub_type) {
-                    case 'decrease':
-                        data1.sub_type = data.operator_id === data.user_id ? 'leave' : data.user_id === this.client.uin ? 'kick_me' : 'kick';
+                    case "decrease":
+                        data1.sub_type =
+                            data.operator_id === data.user_id
+                                ? "leave"
+                                : data.user_id === this.client.uin
+                                    ? "kick_me"
+                                    : "kick";
                         data1.notice_type = `${data.notice_type}_${data.sub_type}`;
                         break;
-                    case 'increase':
+                    case "increase":
                         data1.notice_type = `${data.notice_type}_${data.sub_type}`;
-                        data1.sub_type = 'approve'; // todo 尚未实现
+                        data1.sub_type = "approve"; // todo 尚未实现
                         data1.operator_id = data1.user_id; // todo 尚未实现
                         break;
-                    case 'ban':
+                    case "ban":
                         data1.notice_type = `${data.notice_type}_${data.sub_type}`;
-                        data1.subtype = data.duration ? 'ban' : 'lift_ban';
+                        data1.subtype = data.duration ? "ban" : "lift_ban";
                         break;
-                    case 'recall':
+                    case "recall":
                         data1.notice_type = `${data.notice_type}_${data.sub_type}`;
                         delete data1.sub_type;
                         break;
-                    case 'admin':
+                    case "admin":
                         data1.notice_type = `${data.notice_type}_${data.sub_type}`;
-                        data1.sub_type = data.set ? 'set' : 'unset';
+                        data1.sub_type = data.set ? "set" : "unset";
                         break;
-                    case 'poke':
-                        data1.notice_type = 'notify';
+                    case "poke":
+                        data1.notice_type = "notify";
                         data1.user_id = data.operator_id;
                         break;
                     default:
@@ -276,10 +309,10 @@ class V11 extends events_1.EventEmitter {
             else {
                 delete data1.friend;
                 switch (data.sub_type) {
-                    case 'increase':
+                    case "increase":
                         data1.notice_type = `friend_add`;
                         break;
-                    case 'recall':
+                    case "recall":
                         data1.notice_type = `friend_recall`;
                         break;
                     default:
@@ -293,7 +326,8 @@ class V11 extends events_1.EventEmitter {
         }
     }
     async addMsgToDB(data) {
-        if (!data.sender || !('user_id' in data.sender)) { // eg. notice
+        if (!data.sender || !("user_id" in data.sender)) {
+            // eg. notice
             return;
         }
         let msg = new db_entities_1.MsgEntry();
@@ -301,13 +335,13 @@ class V11 extends events_1.EventEmitter {
         msg.seq = data.seq;
         msg.user_id = data.sender.user_id;
         msg.nickname = data.sender.nickname;
-        if (data.message_type === 'group') {
+        if (data.message_type === "group") {
             msg.group_id = data.group_id;
-            msg.group_name = data["group_name"] || ''; // 可能不存在(gocq默认不发)
+            msg.group_name = data["group_name"] || ""; // 可能不存在(gocq默认不发)
         }
         else {
             msg.group_id = 0;
-            msg.group_name = '';
+            msg.group_name = "";
         }
         msg.content = data.cqCode;
         return await this.db.addOrUpdateMsg(msg);
@@ -325,23 +359,26 @@ class V11 extends events_1.EventEmitter {
         msg.base64_id = base64_id;
         msg.seq = seq;
         msg.user_id = user_id;
-        msg.nickname = '';
+        msg.nickname = "";
         msg.group_id = group_id;
-        msg.content = '';
+        msg.group_name = "";
+        msg.content = "";
         return await this.db.addOrUpdateMsg(msg);
     }
     async getReplyMsgIdFromDB(data) {
-        let group_id = (data.message_type === 'group') ? data.group_id : 0;
+        let group_id = data.message_type === "group" ? data.group_id : 0;
         let msg = await this.db.getMsgByParams(data.source.user_id, group_id, data.source.seq);
         return msg ? msg.id : 0;
     }
     async _httpRequestHandler(ctx) {
-        if (ctx.method === 'OPTIONS') {
-            return ctx.writeHead(200, {
-                'Access-Control-Allow-Origin': '*',
-                'Access-Control-Allow-Methods': 'POST, GET, OPTIONS',
-                'Access-Control-Allow-Headers': 'Content-Type, authorization'
-            }).end();
+        if (ctx.method === "OPTIONS") {
+            return ctx
+                .writeHead(200, {
+                "Access-Control-Allow-Origin": "*",
+                "Access-Control-Allow-Methods": "POST, GET, OPTIONS",
+                "Access-Control-Allow-Headers": "Content-Type, authorization",
+            })
+                .end();
         }
         const url = new url_1.URL(ctx.url, `http://127.0.0.1`);
         if (this.config.access_token) {
@@ -360,7 +397,7 @@ class V11 extends events_1.EventEmitter {
         ctx.res.setHeader("Content-Type", "application/json; charset=utf-8");
         if (this.config.enable_cors)
             ctx.res.setHeader("Access-Control-Allow-Origin", "*");
-        const action = url.pathname.replace(`${this.path}`, '').slice(1);
+        const action = url.pathname.replace(`${this.path}`, "").slice(1);
         if (ctx.method === "GET") {
             try {
                 const ret = await this.apply({ action, params: ctx.query });
@@ -372,7 +409,10 @@ class V11 extends events_1.EventEmitter {
         }
         else if (ctx.method === "POST") {
             try {
-                const params = { ...(ctx.request.query || {}), ...(ctx.request.body || {}) };
+                const params = {
+                    ...(ctx.request.query || {}),
+                    ...(ctx.request.body || {}),
+                };
                 const ret = await this.apply({ action, params });
                 ctx.res.writeHead(200).end(ret);
             }
@@ -403,7 +443,7 @@ class V11 extends events_1.EventEmitter {
                         status: "async",
                         data: null,
                         error: null,
-                        echo: data.echo
+                        echo: data.echo,
                     });
                 }
                 else {
@@ -413,7 +453,7 @@ class V11 extends events_1.EventEmitter {
             }
             catch (e) {
                 let code, message;
-                if (e instanceof onebot_2.NotFoundError) {
+                if (e instanceof onebot_1.NotFoundError) {
                     code = 1404;
                     message = "不支持的api";
                 }
@@ -426,11 +466,12 @@ class V11 extends events_1.EventEmitter {
                     status: "failed",
                     data: null,
                     error: {
-                        code, message
+                        code,
+                        message,
                     },
                     echo: data?.echo,
                     msg: e.message,
-                    action: data.action
+                    action: data.action,
                 }));
             }
         });
@@ -501,9 +542,6 @@ class V11 extends events_1.EventEmitter {
      */
     async apply(req) {
         let { action, params, echo } = req;
-        if (typeof params.message_id == 'number' || /^\d+$/.test(params.message_id)) {
-            params.message_id = (await this.db.getMsgById(params.message_id)).id; // 调用api时把本地的数字id转为base64发给icqq
-        }
         action = (0, utils_1.toLine)(action);
         let is_async = action.includes("_async");
         if (is_async)
@@ -511,10 +549,9 @@ class V11 extends events_1.EventEmitter {
         let is_queue = action.includes("_rate_limited");
         if (is_queue)
             action = action.replace("_rate_limited", "");
-        if (action === 'send_msg') {
-            if (["private", "group", "discuss"].includes(params.message_type)) {
+        if (action === "send_msg") {
+            if (sendMsgTypes.includes(params.message_type))
                 action = "send_" + params.message_type + "_msg";
-            }
             else if (params.user_id)
                 action = "send_private_msg";
             else if (params.group_id)
@@ -522,81 +559,95 @@ class V11 extends events_1.EventEmitter {
             else if (params.discuss_id)
                 action = "send_discuss_msg";
             else
-                throw new Error('required message_type or input (user_id/group_id)');
+                throw new Error("required message_type or input (user_id/group_id)");
+        }
+        else if (action === "send_like") {
+            action = "send_user_like";
         }
-        if (action === 'send_like')
-            action = 'send_user_like';
         const method = (0, utils_1.toHump)(action);
-        if (Reflect.has(this.action, method)) {
-            const ARGS = String(Reflect.get(this.action, method)).match(/\(.*\)/)?.[0]
-                .replace("(", "")
-                .replace(")", "")
-                .split(",")
-                .filter(Boolean).map(v => v.replace(/=.+/, "").trim());
-            const args = [];
-            for (let k of ARGS) {
-                if (Reflect.has(params, k)) {
-                    if (onebot_2.BOOLS.includes(k))
-                        params[k] = (0, utils_1.toBool)(params[k]);
-                    if (k === 'message') {
-                        if (typeof params[k] === 'string') {
-                            if (/[CQ:music,type=.+,id=.+]/.test(params[k])) {
-                                params[k] = params[k].replace(',type=', ',platform=');
-                            }
-                            params[k] = (0, icqq_cq_enable_1.fromCqcode)(params[k]);
-                        }
-                        else {
-                            if (params[k][0].type == 'music' && params[k][0]?.data?.type) {
-                                params[k][0].data.platform = params[k][0].data.type;
-                                delete params[k][0].data.type;
-                            }
-                            params[k] = (0, icqq_cq_enable_1.fromSegment)(params[k]);
-                        }
-                        params['message_id'] = params[k].find(e => e.type === 'reply')?.message_id;
-                    }
-                    args.push(params[k]);
-                }
+        if (!Reflect.has(this.action, method))
+            throw new onebot_1.NotFoundError();
+        const processOBMessage = (message) => {
+            if (typeof message === "string")
+                message = (0, icqq_cq_enable_1.fromCqcode)(message);
+            const [firstSeg] = message;
+            if (firstSeg.type == "music" && firstSeg?.data?.type) {
+                firstSeg.data.platform = firstSeg.data.type;
+                delete firstSeg.data.type;
             }
-            let ret, result;
-            if (is_queue) {
-                this._queue.push({ method, args });
-                this._runQueue();
-                result = V11.ok(null, 0, true);
+            return (0, icqq_cq_enable_1.fromSegment)(message);
+        };
+        for (const key of Object.keys(params)) {
+            if (onebot_1.BOOLS.includes(key))
+                params[key] = (0, utils_1.toBool)(params[key]);
+            else if (key === "message") {
+                const message = processOBMessage(params[key]);
+                const replyFilter = (e) => e.type === "reply";
+                const replyElem = message.find(replyFilter);
+                const messageId = replyElem?.id ?? replyElem?.message_id;
+                if (messageId)
+                    params.message_id = messageId;
+                params.message = message.filter((e) => !replyFilter(e));
             }
-            else {
-                try {
-                    ret = await this.action[method].apply(this, args);
-                }
-                catch (e) {
-                    return JSON.stringify(V11.error(e.message));
-                }
-                if (ret instanceof Promise) {
-                    if (is_async) {
-                        result = V11.ok(null, 0, true);
-                    }
-                    else {
-                        result = V11.ok(await ret, 0, false);
-                    }
+        }
+        if (action === "get_msg")
+            params.onebot_id = params.message_id;
+        if (typeof params.message_id === "number" || /^\d+$/.test(params.message_id)) {
+            params.message_id = (await this.db.getMsgById(params.message_id)).base64_id; // 调用api时把本地的数字id转为base64发给icqq
+        }
+        // this.logger.info(`处理过后的请求 params: `, params)
+        const orgArgNameList = String(Reflect.get(this.action, method))
+            .match(/\(.*\)/)?.[0]
+            .replace("(", "")
+            .replace(")", "")
+            .split(",")
+            .filter(Boolean)
+            .map((v) => v.replace(/=.+/, "").trim());
+        const args = orgArgNameList.map((k) => params[k]);
+        // this.logger.info(`Action 原参数名列表: `, orgArgNameList)
+        // this.logger.info(`处理后的 Action 参数列表: `, args)
+        let ret, result;
+        if (is_queue) {
+            this._queue.push({ method, args });
+            this._runQueue();
+            result = V11.ok(null, 0, true);
+        }
+        else {
+            try {
+                ret = await this.action[method].apply(this, args);
+            }
+            catch (e) {
+                this.logger.error(e);
+                const err = V11.error(e.message);
+                if (echo)
+                    err.echo = echo;
+                return JSON.stringify(err);
+            }
+            if (ret instanceof Promise) {
+                if (is_async) {
+                    result = V11.ok(null, 0, true);
                 }
                 else {
                     result = V11.ok(await ret, 0, false);
                 }
             }
-            if (result.data instanceof Map)
-                result.data = [...result.data.values()];
-            if (result.data?.message)
-                result.data.message = (0, icqq_cq_enable_1.toSegment)(result.data.message);
-            // send_msg_xxx 时提前把数据写入数据库(也有可能来的比message慢，后来的话会被数据库忽略)
-            if (result.status === 'ok' && params.user_id && result.data?.message_id && result.data?.seq) {
-                result.data.message_id = await this.addMsgToDBFromSendMsgResult(params.user_id, params.group_id || 0, result.data.seq, result.data.message_id);
-            }
-            if (echo) {
-                result.echo = echo;
+            else {
+                result = V11.ok(await ret, 0, false);
             }
-            return JSON.stringify(result);
         }
-        else
-            throw new onebot_2.NotFoundError();
+        if (result.data instanceof Map)
+            result.data = [...result.data.values()];
+        if (result.data?.message)
+            result.data.message = (0, icqq_cq_enable_1.toSegment)(result.data.message);
+        // send_msg_xxx 时提前把数据写入数据库(也有可能来的比message慢，后来的话会被数据库忽略)
+        if (result.status === "ok" && action.match(sendMsgMethodRegex) && result.data?.message_id && result.data?.seq) {
+            result.data.message_id = await this.addMsgToDBFromSendMsgResult(this.client.uin, // msg send resp uin is always bot uin
+            params.group_id || 0, result.data.seq, result.data.message_id);
+        }
+        if (echo) {
+            result.echo = echo;
+        }
+        return JSON.stringify(result);
     }
     /**
      * 限速队列调用
@@ -621,35 +672,35 @@ exports.V11 = V11;
     function ok(data, retcode = 0, pending) {
         return {
             retcode,
-            status: pending ? 'async' : 'ok',
+            status: pending ? "async" : "ok",
             data,
-            error: null
+            error: null,
         };
     }
     V11.ok = ok;
     function error(error, retcode = 1) {
         return {
             retcode,
-            status: 'error',
+            status: "error",
             data: null,
-            error
+            error,
         };
     }
     V11.error = error;
     V11.defaultConfig = {
         heartbeat: 3,
-        access_token: '',
+        access_token: "",
         post_timeout: 15,
-        secret: '',
+        secret: "",
         rate_limit_interval: 4,
-        post_message_format: 'string',
+        post_message_format: "string",
         reconnect_interval: 3,
         use_http: true,
         enable_cors: true,
         enable_reissue: false,
         use_ws: true,
         http_reverse: [],
-        ws_reverse: []
+        ws_reverse: [],
     };
     function genMetaEvent(uin, type) {
         return {