onebots 0.4.46 → 0.4.48

package/lib/adapters/qq/index.js

@@ -35,7 +35,7 @@ const qq_group_bot_1 = require("qq-group-bot");
 const path = __importStar(require("path"));
 class QQAdapter extends adapter_1.Adapter {
     constructor(app, config) {
-        super(app, 'qq', config);
+        super(app, "qq", config);
         _QQAdapter_disposes.set(this, new Map());
         this.icon = `https://qzonestyle.gtimg.cn/qzone/qzact/act/external/tiqq/logo.png`;
     }
@@ -44,7 +44,7 @@ class QQAdapter extends adapter_1.Adapter {
         const selfInfo = await oneBot.internal.getSelfInfo();
         oneBot.avatar = selfInfo.avatar;
         oneBot.nickname = selfInfo.username;
-        const pkg = require(path.resolve(path.dirname(require.resolve('qq-group-bot')), '../package.json'));
+        const pkg = require(path.resolve(path.dirname(require.resolve("qq-group-bot")), "../package.json"));
         oneBot.dependency = `qq-group-bot v${pkg.version}`;
         const disposeArr = [];
         const clean = () => {
@@ -53,12 +53,12 @@ class QQAdapter extends adapter_1.Adapter {
             }
             oneBot.internal.stop();
         };
-        const messageHandler = (event) => {
-            this.emit('message.receive', oneBot.uin, event);
+        const messageHandler = event => {
+            this.emit("message.receive", oneBot.uin, event);
         };
-        oneBot.internal.on('message', messageHandler);
+        oneBot.internal.on("message", messageHandler);
         disposeArr.push(() => {
-            oneBot.internal.off('message', messageHandler);
+            oneBot.internal.off("message", messageHandler);
         });
         return clean;
     }
@@ -77,7 +77,7 @@ class QQAdapter extends adapter_1.Adapter {
         oneBot.internal = new qq_group_bot_1.Bot({
             appid: oneBot.uin,
             logLevel: this.app.config.log_level,
-            ...protocol
+            ...protocol,
         });
         oneBot.status = onebot_1.OneBotStatus.Online;
         return oneBot;
@@ -89,9 +89,11 @@ class QQAdapter extends adapter_1.Adapter {
         if (source)
             quote = { id: source };
         const result = await bot.internal.sendGroupMessage(group_id, message.map(({ type, data }) => ({ type, ...data })), quote);
-        if (result.msg === 'success') {
+        if (result.msg === "success") {
             return {
-                message_id: version === 'V11' ? bot.V11.transformToInt('message_id', `group:${group_id}${result.msg_id}`) : `group:${group_id}${result.msg_id}`,
+                message_id: version === "V11"
+                    ? bot.V11.transformToInt("message_id", `group:${group_id}${result.msg_id}`)
+                    : `group:${group_id}${result.msg_id}`,
             };
         }
         throw new Error(result.msg);
@@ -103,9 +105,11 @@ class QQAdapter extends adapter_1.Adapter {
         if (source)
             quote = { id: source };
         const result = await bot.internal.sendPrivateMessage(user_id, message.map(({ type, data }) => ({ type, ...data })), quote);
-        if (result.msg === 'success') {
+        if (result.msg === "success") {
             return {
-                message_id: version === 'V11' ? bot.V11.transformToInt('message_id', `private:${user_id}${result.msg_id}`) : `private:${user_id}${result.msg_id}`,
+                message_id: version === "V11"
+                    ? bot.V11.transformToInt("message_id", `private:${user_id}${result.msg_id}`)
+                    : `private:${user_id}${result.msg_id}`,
             };
         }
         throw new Error(result.msg);
@@ -117,9 +121,11 @@ class QQAdapter extends adapter_1.Adapter {
         if (source)
             quote = { id: source };
         const result = await bot.internal.sendGuildMessage(channel_id, message.map(({ type, data }) => ({ type, ...data })), quote);
-        if (result.msg === 'success') {
+        if (result.msg === "success") {
             return {
-                message_id: version === 'V11' ? bot.V11.transformToInt('message_id', `guild:${channel_id}${result.msg_id}`) : `guild:${channel_id}${result.msg_id}`,
+                message_id: version === "V11"
+                    ? bot.V11.transformToInt("message_id", `guild:${channel_id}${result.msg_id}`)
+                    : `guild:${channel_id}${result.msg_id}`,
             };
         }
         throw new Error(result.msg);
@@ -131,24 +137,26 @@ class QQAdapter extends adapter_1.Adapter {
         if (source)
             quote = { id: source };
         const result = await bot.internal.sendDirectMessage(guild_id, message.map(({ type, data }) => ({ type, ...data })), quote);
-        if (result.msg === 'success') {
+        if (result.msg === "success") {
             return {
-                message_id: version === 'V11' ? bot.V11.transformToInt('message_id', `direct:${guild_id}${result.msg_id}`) : `direct:${guild_id}${result.msg_id}`,
+                message_id: version === "V11"
+                    ? bot.V11.transformToInt("message_id", `direct:${guild_id}${result.msg_id}`)
+                    : `direct:${guild_id}${result.msg_id}`,
             };
         }
         throw new Error(result.msg);
     }
     deleteMessage(uin, message_id) {
-        const [from_type, from_id, ...msg_idArr] = message_id.split(':');
+        const [from_type, from_id, ...msg_idArr] = message_id.split(":");
         const bot = this.getOneBot(uin).internal;
         switch (from_type) {
-            case 'private':
-            case 'group':
+            case "private":
+            case "group":
                 throw new Error(`暂不支持撤回${from_type}类型的消息`);
-            case 'direct':
-                return bot.recallDirectMessage(from_id, msg_idArr.join(':'));
-            case 'guild':
-                return bot.recallGuildMessage(from_id, msg_idArr.join(':'));
+            case "direct":
+                return bot.recallDirectMessage(from_id, msg_idArr.join(":"));
+            case "guild":
+                return bot.recallGuildMessage(from_id, msg_idArr.join(":"));
         }
     }
     call(uin, version, method, args) {
@@ -156,9 +164,9 @@ class QQAdapter extends adapter_1.Adapter {
         if (!oneBot) {
             throw new Error(`未找到账号${uin}`);
         }
-        if (typeof this[method] === 'function')
+        if (typeof this[method] === "function")
             return this[method](uin, version, args);
-        if (typeof oneBot.internal[method] !== 'function')
+        if (typeof oneBot.internal[method] !== "function")
             throw onebot_1.OneBot.UnsupportedMethodError;
         try {
             return oneBot.internal[method](...(args || []));
@@ -171,10 +179,10 @@ class QQAdapter extends adapter_1.Adapter {
         return [].concat(segment).map(item => {
             if (typeof item === "string")
                 return {
-                    type: 'text',
+                    type: "text",
                     data: {
-                        text: item
-                    }
+                        text: item,
+                    },
                 };
             return item;
         });
@@ -183,18 +191,18 @@ class QQAdapter extends adapter_1.Adapter {
         return [].concat(message).map(item => {
             if (!item || typeof item !== "object")
                 return {
-                    type: 'text',
+                    type: "text",
                     data: {
-                        text: item
-                    }
+                        text: item,
+                    },
                 };
             const { type, data, ...other } = item;
             return {
                 type,
                 data: {
                     ...data,
-                    ...other
-                }
+                    ...other,
+                },
             };
         });
     }
@@ -203,54 +211,61 @@ class QQAdapter extends adapter_1.Adapter {
         if (!regExpMatchArray)
             return [
                 {
-                    type: 'text',
+                    type: "text",
                     data: {
-                        text: message
-                    }
-                }
+                        text: message,
+                    },
+                },
             ];
         const result = [];
         for (const match of regExpMatchArray) {
-            const [type, ...valueArr] = match.substring(1, match.length - 1).split(',');
+            const [type, ...valueArr] = match.substring(1, match.length - 1).split(",");
             result.push({
                 type: type,
                 data: Object.fromEntries(valueArr.map(item => {
-                    const [key, value] = item.split('=');
+                    const [key, value] = item.split("=");
                     return [key, value];
-                }))
+                })),
             });
         }
         return result;
     }
     toCqcode(version, messageArr) {
-        return [].concat(messageArr).map(item => {
+        return []
+            .concat(messageArr)
+            .map(item => {
+            if (typeof item === "string")
+                return item;
+            if (item.type === "text")
+                return item.data?.text || item.text;
             const dataStr = Object.entries(item.data).map(([key, value]) => {
                 // is Buffer
                 if (value instanceof Buffer)
-                    return `${key}=${value.toString('base64')}`;
+                    return `${key}=${value.toString("base64")}`;
                 // is Object
                 if (value instanceof Object)
                     return `${key}=${JSON.stringify(value)}`;
                 // is Array
                 if (value instanceof Array)
-                    return `${key}=${value.map(v => JSON.stringify(v)).join(',')}`;
+                    return `${key}=${value.map(v => JSON.stringify(v)).join(",")}`;
                 // is String
                 return `${key}=${item[key]}`;
             });
-            return `[CQ:${item.type},${dataStr.join(',')}]`;
-        }).join('');
+            return `[CQ:${item.type},${dataStr.join(",")}]`;
+        })
+            .join("");
     }
     formatEventPayload(uin, version, event, data) {
         const result = {
             id: data.id,
-            [version === 'V12' ? 'type' : 'post_type']: event,
+            [version === "V12" ? "type" : "post_type"]: event,
             version: version,
             self: {
-                platform: 'qq',
-                user_id: data.self_id
+                platform: "qq",
+                user_id: data.self_id,
             },
             detail_type: data.message_type || data.notice_type || data.request_type,
-            platform: 'qq',
+            platform: "qq",
             time: data.timestamp,
             ...data,
         };
@@ -261,9 +276,9 @@ class QQAdapter extends adapter_1.Adapter {
         const oneBot = this.getOneBot(uin);
         switch (version) {
             case "V11":
-                oneBot.V11.transformStrToIntForObj(result, ['message_id', 'user_id', 'group_id']);
-                oneBot.V11.transformStrToIntForObj(result.sender, ['user_id ']);
-                oneBot.V11.transformStrToIntForObj(result.self, ['user_id ']);
+                oneBot.V11.transformStrToIntForObj(result, ["message_id", "user_id", "group_id"]);
+                oneBot.V11.transformStrToIntForObj(result.sender, ["user_id "]);
+                oneBot.V11.transformStrToIntForObj(result.self, ["user_id "]);
                 break;
         }
         return result;

package/lib/adapters/qq/utils.js

@@ -36,26 +36,11 @@ function findLastIndex(list, predicate) {
 exports.findLastIndex = findLastIndex;
 function trimQuote(str) {
     const quotes = [
-        [
-            '"',
-            '"',
-        ],
-        [
-            "'",
-            "'",
-        ],
-        [
-            '`',
-            '`',
-        ],
-        [
-            '“',
-            '”',
-        ],
-        [
-            '‘',
-            '’',
-        ]
+        ['"', '"'],
+        ["'", "'"],
+        ["`", "`"],
+        ["“", "”"],
+        ["‘", "’"],
     ];
     for (let i = 0; i < quotes.length; i++) {
         const [start, end] = quotes[i];

package/lib/adapters/wechat/index.d.ts

@@ -3,7 +3,7 @@ import { App } from "../../server/app";
 import { OneBot } from "../../onebot";
 import { Client, Sendable, BaseClient } from "lib-wechat";
 type WechatConfig = BaseClient.Config;
-export default class WechatAdapter extends Adapter<'wechat'> {
+export default class WechatAdapter extends Adapter<"wechat"> {
     #private;
     constructor(app: App, config: WechatAdapter.Config);
     startOneBot(oneBot: OneBot<Client>): Promise<() => void>;
@@ -25,7 +25,7 @@ export default class WechatAdapter extends Adapter<'wechat'> {
     stop(uin?: string): Promise<void>;
     getSelfInfo<V extends OneBot.Version>(uin: string, version: V): OneBot.SelfInfo<V>;
 }
-declare module '../../adapter' {
+declare module "../../adapter" {
     namespace Adapter {
         interface Configs {
             wechat: WechatAdapter.Config;
@@ -33,7 +33,7 @@ declare module '../../adapter' {
     }
 }
 export declare namespace WechatAdapter {
-    interface Config extends Adapter.Config<'wechat'> {
+    interface Config extends Adapter.Config<"wechat"> {
         protocol: WechatConfig;
     }
 }

package/lib/adapters/wechat/index.js

@@ -35,13 +35,13 @@ const lib_wechat_1 = require("lib-wechat");
 const path = __importStar(require("path"));
 class WechatAdapter extends adapter_1.Adapter {
     constructor(app, config) {
-        super(app, 'wechat', config);
+        super(app, "wechat", config);
         _WechatAdapter_disposes.set(this, new Map());
         this.icon = `https://res.wx.qq.com/a/wx_fed/assets/res/NTI4MWU5.ico`;
     }
     async startOneBot(oneBot) {
         await this.setOnline(oneBot.uin);
-        const pkg = require(path.resolve(path.dirname(require.resolve('lib-wechat')), '../package.json'));
+        const pkg = require(path.resolve(path.dirname(require.resolve("lib-wechat")), "../package.json"));
         oneBot.dependency = `lib-wechat v${pkg.version}`;
         const disposeArr = [];
         const clean = () => {
@@ -50,12 +50,12 @@ class WechatAdapter extends adapter_1.Adapter {
             }
             oneBot.internal.stop();
         };
-        const messageHandler = (event) => {
-            this.emit('message.receive', oneBot.uin, event);
+        const messageHandler = event => {
+            this.emit("message.receive", oneBot.uin, event);
         };
-        oneBot.internal.on('message', messageHandler);
+        oneBot.internal.on("message", messageHandler);
         disposeArr.push(() => {
-            oneBot.internal.off('message', messageHandler);
+            oneBot.internal.off("message", messageHandler);
         });
         return clean;
     }
@@ -63,7 +63,7 @@ class WechatAdapter extends adapter_1.Adapter {
         const oneBot = this.getOneBot(uin);
         await oneBot?.internal.start();
         const { data } = await oneBot?.internal.getAvatar(oneBot.internal.info.nickname);
-        oneBot.avatar = `data:image/png;base64,${data.toString('base64')}`;
+        oneBot.avatar = `data:image/png;base64,${data.toString("base64")}`;
         oneBot.nickname = oneBot.internal.info.nickname;
         oneBot.status = onebot_1.OneBotStatus.Good;
     }
@@ -76,7 +76,7 @@ class WechatAdapter extends adapter_1.Adapter {
         const oneBot = super.createOneBot(uin, protocol, versions);
         oneBot.internal = new lib_wechat_1.Client({
             log_level: this.app.config.log_level,
-            ...protocol
+            ...protocol,
         });
         oneBot.status = onebot_1.OneBotStatus.Online;
         return oneBot;
@@ -86,9 +86,9 @@ class WechatAdapter extends adapter_1.Adapter {
         if (!oneBot) {
             throw new Error(`未找到账号${uin}`);
         }
-        if (typeof this[method] === 'function')
+        if (typeof this[method] === "function")
             return this[method](uin, version, args);
-        if (typeof oneBot.internal[method] !== 'function')
+        if (typeof oneBot.internal[method] !== "function")
             throw onebot_1.OneBot.UnsupportedMethodError;
         try {
             return oneBot.internal[method](...(args || []));
@@ -104,13 +104,15 @@ class WechatAdapter extends adapter_1.Adapter {
             const { type, data } = item;
             return {
                 type,
-                ...data
+                ...data,
             };
         }));
         if (Array.isArray(result))
             result = JSON.stringify(result);
         return {
-            message_id: version === 'V11' ? bot.V11.transformToInt('message_id', `${user_id}:${result}`) : `${user_id}:${result}`
+            message_id: version === "V11"
+                ? bot.V11.transformToInt("message_id", `${user_id}:${result}`)
+                : `${user_id}:${result}`,
         };
     }
     async sendGroupMessage(uin, version, args) {
@@ -120,20 +122,22 @@ class WechatAdapter extends adapter_1.Adapter {
             const { type, data } = item;
             return {
                 type,
-                ...data
+                ...data,
             };
         }));
         if (Array.isArray(result))
             result = JSON.stringify(result);
         return {
-            message_id: version === 'V11' ? bot.V11.transformToInt('message_id', `${group_id}:${result}`) : `${group_id}:${result}`
+            message_id: version === "V11"
+                ? bot.V11.transformToInt("message_id", `${group_id}:${result}`)
+                : `${group_id}:${result}`,
         };
     }
     async deleteMessage(uin, version, [str]) {
-        const [username, ...message_idArr] = str.split(':');
+        const [username, ...message_idArr] = str.split(":");
         const bot = this.getOneBot(uin);
         try {
-            const message_ids = JSON.parse(message_idArr.join(':'));
+            const message_ids = JSON.parse(message_idArr.join(":"));
             if (Array.isArray(message_ids)) {
                 let success = false;
                 for (const message_id in message_ids) {
@@ -143,22 +147,22 @@ class WechatAdapter extends adapter_1.Adapter {
                 }
                 return success;
             }
-            else if (message_ids && typeof message_ids === 'string') {
+            else if (message_ids && typeof message_ids === "string") {
                 return await bot.internal.recallMsg(username, message_ids);
             }
         }
         catch {
-            return bot.internal.recallMsg(username, message_idArr.join(':'));
+            return bot.internal.recallMsg(username, message_idArr.join(":"));
         }
     }
     fromSegment(version, segment) {
         return [].concat(segment).map(item => {
             if (typeof item === "string")
                 return {
-                    type: 'text',
+                    type: "text",
                     data: {
-                        text: item
-                    }
+                        text: item,
+                    },
                 };
             return item;
         });
@@ -167,18 +171,18 @@ class WechatAdapter extends adapter_1.Adapter {
         return [].concat(message).map(item => {
             if (!item || typeof item !== "object")
                 return {
-                    type: 'text',
+                    type: "text",
                     data: {
-                        text: item
-                    }
+                        text: item,
+                    },
                 };
             const { type, data, ...other } = item;
             return {
                 type,
                 data: {
                     ...data,
-                    ...other
-                }
+                    ...other,
+                },
             };
         });
     }
@@ -187,42 +191,49 @@ class WechatAdapter extends adapter_1.Adapter {
         if (!regExpMatchArray)
             return [
                 {
-                    type: 'text',
+                    type: "text",
                     data: {
-                        text: message
-                    }
-                }
+                        text: message,
+                    },
+                },
             ];
         const result = [];
         for (const match of regExpMatchArray) {
-            const [type, ...valueArr] = match.substring(1, match.length - 1).split(',');
+            const [type, ...valueArr] = match.substring(1, match.length - 1).split(",");
             result.push({
                 type: type,
                 data: Object.fromEntries(valueArr.map(item => {
-                    const [key, value] = item.split('=');
+                    const [key, value] = item.split("=");
                     return [key, value];
-                }))
+                })),
             });
         }
         return result;
     }
     toCqcode(version, messageArr) {
-        return [].concat(messageArr).map(item => {
+        return []
+            .concat(messageArr)
+            .map(item => {
+            if (typeof item === "string")
+                return item;
+            if (item.type === "text")
+                return item.data?.text || item.text;
             const dataStr = Object.entries(item.data).map(([key, value]) => {
                 // is Buffer
                 if (value instanceof Buffer)
-                    return `${key}=${value.toString('base64')}`;
+                    return `${key}=${value.toString("base64")}`;
                 // is Object
                 if (value instanceof Object)
                     return `${key}=${JSON.stringify(value)}`;
                 // is Array
                 if (value instanceof Array)
-                    return `${key}=${value.map(v => JSON.stringify(v)).join(',')}`;
+                    return `${key}=${value.map(v => JSON.stringify(v)).join(",")}`;
                 // is String
                 return `${key}=${item[key]}`;
             });
-            return `[CQ:${item.type},${dataStr.join(',')}]`;
-        }).join('');
+            return `[CQ:${item.type},${dataStr.join(",")}]`;
+        })
+            .join("");
     }
     async getFriendList(uin, version) {
         const bot = this.getOneBot(uin);
@@ -231,7 +242,9 @@ class WechatAdapter extends adapter_1.Adapter {
             return {
                 ...friend,
                 user_name: friend.nickname,
-                user_id: version === "V11" ? bot.V11.transformToInt('friend', friend.user_id) : friend.user_id,
+                user_id: version === "V11"
+                    ? bot.V11.transformToInt("friend", friend.user_id)
+                    : friend.user_id,
             };
         });
     }
@@ -241,7 +254,9 @@ class WechatAdapter extends adapter_1.Adapter {
         return result.map(group => {
             return {
                 ...group,
-                group_id: version === "V11" ? bot.V11.transformToInt('group', group.group_id) : group.group_id,
+                group_id: version === "V11"
+                    ? bot.V11.transformToInt("group", group.group_id)
+                    : group.group_id,
             };
         });
     }
@@ -249,14 +264,14 @@ class WechatAdapter extends adapter_1.Adapter {
         const bot = this.getOneBot(uin);
         const result = {
             id: data.id,
-            [version === 'V12' ? 'type' : 'post_type']: event,
+            [version === "V12" ? "type" : "post_type"]: event,
             version: version,
             self: {
-                platform: 'wechat',
-                user_id: data.self_id
+                platform: "wechat",
+                user_id: data.self_id,
             },
             detail_type: data.message_type || data.notice_type || data.request_type,
-            platform: 'wechat',
+            platform: "wechat",
             group: data.group?.info,
             member: data.member?.info,
             friend: data.friend?.info,
@@ -266,13 +281,13 @@ class WechatAdapter extends adapter_1.Adapter {
         delete result.bot;
         delete result.c;
         delete result.parser;
-        if (version === 'V11') {
-            bot.V11.transformStrToIntForObj(result, ['user_id', 'group_id', 'message_id']);
-            bot.V11.transformStrToIntForObj(result.self, ['user_id']);
-            bot.V11.transformStrToIntForObj(result.sender, ['user_id']);
-            bot.V11.transformStrToIntForObj(result.group, ['user_id', 'group_id']);
-            bot.V11.transformStrToIntForObj(result.member, ['user_id', 'member_id']);
-            bot.V11.transformStrToIntForObj(result.friend, ['user_id']);
+        if (version === "V11") {
+            bot.V11.transformStrToIntForObj(result, ["user_id", "group_id", "message_id"]);
+            bot.V11.transformStrToIntForObj(result.self, ["user_id"]);
+            bot.V11.transformStrToIntForObj(result.sender, ["user_id"]);
+            bot.V11.transformStrToIntForObj(result.group, ["user_id", "group_id"]);
+            bot.V11.transformStrToIntForObj(result.member, ["user_id", "member_id"]);
+            bot.V11.transformStrToIntForObj(result.friend, ["user_id"]);
         }
         return result;
     }

package/lib/adapters/wechat/utils.js

@@ -36,26 +36,11 @@ function findLastIndex(list, predicate) {
 exports.findLastIndex = findLastIndex;
 function trimQuote(str) {
     const quotes = [
-        [
-            '"',
-            '"',
-        ],
-        [
-            "'",
-            "'",
-        ],
-        [
-            '`',
-            '`',
-        ],
-        [
-            '“',
-            '”',
-        ],
-        [
-            '‘',
-            '’',
-        ]
+        ['"', '"'],
+        ["'", "'"],
+        ["`", "`"],
+        ["“", "”"],
+        ["‘", "’"],
     ];
     for (let i = 0; i < quotes.length; i++) {
         const [start, end] = quotes[i];

package/lib/bin.js

@@ -10,11 +10,11 @@ const child_process_1 = require("child_process");
 const execArgv = process_1.default.argv.splice(2);
 let cp;
 if (process_1.default.env.TS_NODE_DEV) {
-    cp = (0, child_process_1.exec)('vite');
-    cp.stdout.on('data', (data) => {
+    cp = (0, child_process_1.exec)("vite");
+    cp.stdout.on("data", data => {
         console.log(data);
     });
-    cp.stderr.on('data', e => {
+    cp.stderr.on("data", e => {
         console.error(e);
     });
 }
@@ -31,10 +31,10 @@ for (let i = 0; i < execArgv.length; i += 2) {
             obj[key] = [obj[key], value];
     }
 }
-if (obj['-r']) {
-    const adapters = [].concat(obj['-r']);
+if (obj["-r"]) {
+    const adapters = [].concat(obj["-r"]);
     for (const adapter of adapters) {
         app_1.App.registerAdapter(adapter);
     }
 }
-(0, app_1.createOnebots)(obj['-c'], cp).start();
+(0, app_1.createOnebots)(obj["-c"], cp).start();