onebots 0.4.47 → 0.4.49

package/lib/adapters/icqq/index.js

@@ -53,50 +53,57 @@ async function processMessages(uin, target_id, target_type, list) {
     for (const item of list) {
         const { type, data, ...other } = item;
         switch (type) {
-            case 'node': {
+            case "node": {
                 result.push({
                     type,
                     ...data,
-                    message: await processMessages.call(this, uin, data.user_id, 'private', data.content || [])
+                    message: await processMessages.call(this, uin, data.user_id, "private", data.content || []),
                 });
                 break;
             }
-            case 'music': {
-                if (String(item.data.platform) === 'custom') {
-                    item.data.platform = item.data['subtype']; // gocq 的平台数据存储在 subtype 内，兼容 icqq 时要求前端必须发送 id 字段
+            case "music": {
+                if (String(item.data.platform) === "custom") {
+                    item.data.platform = item.data["subtype"]; // gocq 的平台数据存储在 subtype 内，兼容 icqq 时要求前端必须发送 id 字段
                 }
                 const { type, data } = item;
-                await shareMusicCustom_1.shareMusic.call(this[target_type === 'private' ? 'pickFriend' : 'pickGroup'](target_id), {
+                await shareMusicCustom_1.shareMusic.call(this[target_type === "private" ? "pickFriend" : "pickGroup"](target_id), {
                     type,
-                    ...data
+                    ...data,
                 });
                 break;
             }
-            case 'share': {
-                await this[target_type === 'private' ? 'pickFriend' : 'pickGroup'](target_id).shareUrl(item.data);
+            case "share": {
+                await this[target_type === "private" ? "pickFriend" : "pickGroup"](target_id).shareUrl(item.data);
                 break;
             }
-            case 'video':
-            case 'audio':
-            case 'image': {
-                if (item['file_id']?.startsWith('base64://'))
-                    item['file_id'] = Buffer.from(item['file_id'].slice(9), 'base64');
-                if (item['file']?.startsWith('base64://'))
-                    item['file'] = Buffer.from(item['file'].slice(9), 'base64');
+            case "video":
+            case "audio":
+            case "image": {
+                if (item["file_id"]?.startsWith("base64://"))
+                    item["file_id"] = Buffer.from(item["file_id"].slice(9), "base64");
+                if (item["file"]?.startsWith("base64://"))
+                    item["file"] = Buffer.from(item["file"].slice(9), "base64");
                 result.push({
                     type,
                     ...data,
-                    ...other
+                    ...other,
                 });
                 break;
             }
-            case 'reply': {
+            case "reply": {
                 const oneBot = this.getOneBot(uin);
-                const message_id = oneBot.V11.getStrByInt('message_id', data.id);
+                const message_id = oneBot.V11.getStrByInt("message_id", data.id);
                 const msg = await oneBot.internal.getMsg(message_id);
                 result.push({
-                    type: 'quote',
-                    ...msg
+                    type: "quote",
+                    ...msg,
+                });
+            }
+            case "text": {
+                result.push({
+                    type,
+                    ...data,
+                    ...other,
                 });
             }
         }
@@ -105,7 +112,7 @@ async function processMessages(uin, target_id, target_type, list) {
 }
 class IcqqAdapter extends adapter_1.Adapter {
     constructor(app, config) {
-        super(app, 'icqq', config);
+        super(app, "icqq", config);
         _IcqqAdapter_password.set(this, void 0);
         _IcqqAdapter_disposes.set(this, new Map());
         this.icon = `https://qzonestyle.gtimg.cn/qzone/qzact/act/external/tiqq/logo.png`;
@@ -113,26 +120,40 @@ class IcqqAdapter extends adapter_1.Adapter {
     async setOnline(uin) {
         const oneBot = this.getOneBot(uin);
         if (!oneBot)
-            throw new Error('No one');
+            throw new Error("No one");
         await oneBot.internal.login(parseInt(uin), __classPrivateFieldGet(this, _IcqqAdapter_password, "f"));
     }
     async setOffline(uin) {
         const oneBot = this.getOneBot(uin);
         if (!oneBot)
-            throw new Error('No one');
+            throw new Error("No one");
         await oneBot.internal.logout();
         oneBot.status = onebot_1.OneBotStatus.Bad;
     }
+    getMessage(uin, version) {
+        const oneBot = this.getOneBot(uin);
+        if (!oneBot)
+            throw new Error("No one");
+        return oneBot.internal.getMsg(version);
+    }
+    callApi(uin, version, [name, args]) {
+        const oneBot = this.getOneBot(uin);
+        if (!oneBot)
+            throw new Error("No one");
+        if (!oneBot.internal[name])
+            throw new Error(`internal no api ${name}`);
+        return oneBot[version][name](...args);
+    }
     createOneBot(uin, protocol, versions) {
         const oneBot = super.createOneBot(uin, protocol, versions);
         __classPrivateFieldSet(this, _IcqqAdapter_password, this.app.config[`icqq.${uin}`].password, "f");
         oneBot.avatar = `https://q1.qlogo.cn/g?b=qq&s=100&nk=` + uin;
-        const pkg = require(path.resolve(path.dirname(require.resolve('icqq')), '../package.json'));
+        const pkg = require(path.resolve(path.dirname(require.resolve("icqq")), "../package.json"));
         oneBot.dependency = `icqq v${pkg.version}`;
         oneBot.status = onebot_1.OneBotStatus.Online;
         oneBot.internal = new icqq_1.Client((0, utils_1.deepMerge)(protocol, (0, utils_1.deepClone)({
             ...exports.defaultIcqqConfig,
-            log_level: this.app.config.log_level
+            log_level: this.app.config.log_level,
         })));
         return oneBot;
     }
@@ -143,23 +164,26 @@ class IcqqAdapter extends adapter_1.Adapter {
             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",
             ...data,
         };
         if (data.source) {
-            const message_id = data.message_type === 'group' ? (0, message_1.genGroupMessageId)(data.group_id, data.sender.user_id, data.source?.seq, data.source?.rand, data.source?.time, data.source?.pktnum) :
-                (0, message_1.genDmMessageId)(data.sender.user_id, data.source?.seq, data.source?.rand, data.source?.time);
+            const message_id = data.message_type === "group"
+                ? (0, message_1.genGroupMessageId)(data.group_id, data.sender.user_id, data.source?.seq, data.source?.rand, data.source?.time, data.source?.pktnum)
+                : (0, message_1.genDmMessageId)(data.sender.user_id, data.source?.seq, data.source?.rand, data.source?.time);
             data.message[0] = {
-                type: 'reply',
-                id: version === 'V11' ? oneBot.V11.transformToInt('message_id', message_id) : message_id,
+                type: "reply",
+                id: version === "V11"
+                    ? oneBot.V11.transformToInt("message_id", message_id)
+                    : message_id,
             };
         }
-        if (version === 'V11' && result.message_id) {
-            result.message_id = oneBot.V11.transformToInt('message_id', result.message_id);
+        if (version === "V11" && result.message_id) {
+            result.message_id = oneBot.V11.transformToInt("message_id", result.message_id);
         }
         return result;
     }
@@ -169,9 +193,11 @@ class IcqqAdapter extends adapter_1.Adapter {
         let quote;
         if (source)
             quote = await client.getMsg(source);
-        const result = await client.sendPrivateMsg(parseInt(user_id), await processMessages.call(this, uin, user_id, 'private', message), quote);
+        const result = await client.sendPrivateMsg(parseInt(user_id), await processMessages.call(this, uin, user_id, "private", message), quote);
         return {
-            message_id: version === 'V11' ? this.oneBots.get(uin).V11.transformToInt('message_id', result.message_id) : result.message_id
+            message_id: version === "V11"
+                ? this.oneBots.get(uin).V11.transformToInt("message_id", result.message_id)
+                : result.message_id,
         };
     }
     deleteMessage(uin, version, args) {
@@ -184,19 +210,23 @@ class IcqqAdapter extends adapter_1.Adapter {
         let quote;
         if (source)
             quote = await client.getMsg(source);
-        const result = await client.sendGroupMsg(parseInt(group_id), await processMessages.call(this, group_id, 'group', message), quote);
+        const result = await client.sendGroupMsg(parseInt(group_id), await processMessages.call(this, uin, group_id, "group", message), quote);
         return {
-            message_id: version === 'V11' ? this.oneBots.get(uin).V11.transformToInt('message_id', result.message_id) : result.message_id
+            message_id: version === "V11"
+                ? this.oneBots.get(uin).V11.transformToInt("message_id", result.message_id)
+                : result.message_id,
         };
     }
     async sendGuildMessage(uin, version, args) {
         const [target_id, message, source] = args;
         const client = this.oneBots.get(uin)?.internal;
-        const [guild_id, channel_id] = target_id.split(':');
-        const result = await client.sendGuildMsg(guild_id, channel_id, await processMessages.call(this, target_id, 'channel', message));
+        const [guild_id, channel_id] = target_id.split(":");
+        const result = await client.sendGuildMsg(guild_id, channel_id, await processMessages.call(this, uin, target_id, "channel", message));
         const message_id = `${result.seq}:${result.rand}:${result.time}`;
         return {
-            message_id: version === 'V11' ? this.oneBots.get(uin).V11.transformToInt('message_id', message_id) : message_id
+            message_id: version === "V11"
+                ? this.oneBots.get(uin).V11.transformToInt("message_id", message_id)
+                : message_id,
         };
     }
     call(uin, version, method, args = []) {
@@ -213,27 +243,27 @@ class IcqqAdapter 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;
         });
     }
     toSegment(version, message) {
         return [].concat(message).map(item => {
-            if (typeof item !== 'object')
+            if (typeof item !== "object")
                 item = {
-                    type: 'text',
+                    type: "text",
                     data: {
-                        text: item
-                    }
+                        text: item,
+                    },
                 };
             const { type, ...data } = item;
             return {
                 type,
-                data
+                data,
             };
         });
     }
@@ -242,11 +272,11 @@ class IcqqAdapter extends adapter_1.Adapter {
         if (!regExpMatchArray)
             return [
                 {
-                    type: 'text',
+                    type: "text",
                     data: {
-                        text: message
-                    }
-                }
+                        text: message,
+                    },
+                },
             ];
         const result = [];
         while (message.length) {
@@ -256,53 +286,56 @@ class IcqqAdapter extends adapter_1.Adapter {
             const prevText = message.substring(0, match.length);
             if (prevText) {
                 result.push({
-                    type: 'text',
+                    type: "text",
                     data: {
-                        text: prevText
-                    }
+                        text: prevText,
+                    },
                 });
             }
-            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];
-                }))
+                })),
             });
             message = message.substring(match.length);
         }
         if (message.length) {
             result.push({
-                type: 'text',
+                type: "text",
                 data: {
-                    text: message
-                }
+                    text: message,
+                },
             });
         }
         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')
+            if (item.type === "text")
                 return item.data?.text || item.text;
             const dataStr = Object.entries(item.data || item).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.data?.[key] || item[key]}`;
             });
-            return `[CQ:${item.type},${dataStr.join(',')}]`;
-        }).join('');
+            return `[CQ:${item.type},${dataStr.join(",")}]`;
+        })
+            .join("");
     }
     getSelfInfo(uin, version) {
         const client = this.oneBots.get(uin).internal;
@@ -315,62 +348,62 @@ class IcqqAdapter extends adapter_1.Adapter {
         const _this = this;
         const disposeArr = [];
         const client = oneBot.internal;
-        client.trap('system.login.qrcode', function qrcodeHelper() {
-            _this.logger.log('扫码后回车继续');
-            process_1.default.stdin.once('data', () => {
+        client.trap("system.login.qrcode", function qrcodeHelper() {
+            _this.logger.log("扫码后回车继续");
+            process_1.default.stdin.once("data", () => {
                 this.login();
             });
             disposeArr.push(() => {
-                this.off('system.login.qrcode', qrcodeHelper);
+                this.off("system.login.qrcode", qrcodeHelper);
             });
         });
-        client.trap('system.login.device', function deviceHelper(e) {
-            _this.logger.mark('请选择验证方式：1.短信验证  2.url验证');
-            process_1.default.stdin.once('data', (buf) => {
+        client.trap("system.login.device", function deviceHelper(e) {
+            _this.logger.mark("请选择验证方式：1.短信验证  2.url验证");
+            process_1.default.stdin.once("data", buf => {
                 const input = buf.toString().trim();
-                if (input === '1') {
+                if (input === "1") {
                     this.sendSmsCode();
-                    _this.logger.mark('请输入短信验证码:');
-                    const terminalInputHandler = (buf) => {
+                    _this.logger.mark("请输入短信验证码:");
+                    const terminalInputHandler = buf => {
                         client.submitSmsCode(buf.toString().trim());
                     };
-                    process_1.default.stdin.once('data', terminalInputHandler);
+                    process_1.default.stdin.once("data", terminalInputHandler);
                 }
                 else {
                     _this.logger.mark(`请前往：${e.url} 完成验证后回车继续`);
                     const terminalInputHandler = () => {
                         client.login();
                     };
-                    process_1.default.stdin.once('data', terminalInputHandler);
+                    process_1.default.stdin.once("data", terminalInputHandler);
                 }
             });
             disposeArr.push(() => {
-                this.off('system.login.device', deviceHelper);
+                this.off("system.login.device", deviceHelper);
             });
         });
-        client.trap('system.login.slider', function sliderHelper(e) {
-            _this.logger.mark('请输入滑块验证返回的ticket');
-            process_1.default.stdin.once('data', (e) => {
+        client.trap("system.login.slider", function sliderHelper(e) {
+            _this.logger.mark("请输入滑块验证返回的ticket");
+            process_1.default.stdin.once("data", e => {
                 this.submitSlider(e.toString().trim());
             });
             disposeArr.push(() => {
-                this.off('system.login.slider', sliderHelper);
+                this.off("system.login.slider", sliderHelper);
             });
         });
-        disposeArr.push(client.on('message', (event) => {
-            this.emit('message.receive', oneBot.uin, event);
+        disposeArr.push(client.on("message", event => {
+            this.emit("message.receive", oneBot.uin, event);
         }));
-        disposeArr.push(client.on('notice', (event) => {
-            this.emit('notice.receive', oneBot.uin, event);
+        disposeArr.push(client.on("notice", event => {
+            this.emit("notice.receive", oneBot.uin, event);
         }));
-        disposeArr.push(client.on('request', (event) => {
-            this.emit('request.receive', oneBot.uin, event);
+        disposeArr.push(client.on("request", event => {
+            this.emit("request.receive", oneBot.uin, event);
         }));
         this.setOnline(oneBot.uin);
         return new Promise((resolve, reject) => {
-            client.trap('system.login.error', function errorHandler(e) {
-                if (e.message.includes('密码错误')) {
-                    process_1.default.stdin.once('data', (e) => {
+            client.trap("system.login.error", function errorHandler(e) {
+                if (e.message.includes("密码错误")) {
+                    process_1.default.stdin.once("data", e => {
                         this.login(e.toString().trim());
                     });
                 }
@@ -379,7 +412,7 @@ class IcqqAdapter extends adapter_1.Adapter {
                     oneBot.status = onebot_1.OneBotStatus.Bad;
                     clean();
                 }
-                this.off('system.login.error', errorHandler);
+                this.off("system.login.error", errorHandler);
             });
             const clean = () => {
                 clearTimeout(timer);
@@ -387,13 +420,13 @@ class IcqqAdapter extends adapter_1.Adapter {
                     disposeArr.shift()();
                 }
             };
-            client.trap('system.online', () => {
+            client.trap("system.online", () => {
                 oneBot.nickname = client.nickname;
                 oneBot.status = onebot_1.OneBotStatus.Good;
                 this.app.ws.clients.forEach(client => {
                     client.send(JSON.stringify({
-                        event: 'bot.change',
-                        data: oneBot.info
+                        event: "bot.change",
+                        data: oneBot.info,
                     }));
                 });
                 clearTimeout(timer);
@@ -402,7 +435,7 @@ class IcqqAdapter extends adapter_1.Adapter {
             const timer = setTimeout(() => {
                 oneBot.status = onebot_1.OneBotStatus.Bad;
                 clean();
-                reject('登录超时');
+                reject("登录超时");
             }, this.app.config.timeout * 1000);
         });
     }
@@ -435,5 +468,5 @@ _IcqqAdapter_password = new WeakMap(), _IcqqAdapter_disposes = new WeakMap();
 exports.default = IcqqAdapter;
 exports.defaultIcqqConfig = {
     platform: 2,
-    data_dir: path.join(process_1.default.cwd(), 'data')
+    data_dir: path.join(process_1.default.cwd(), "data"),
 };

package/lib/adapters/icqq/utils.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processMessage = void 0;
 const utils_1 = require("../../utils");
 async function processMessage(elements) {
-    let music = elements.find((e) => e.type === "music");
+    let music = elements.find(e => e.type === "music");
     if (music) {
         (0, utils_1.remove)(elements, music);
         if (String(music.platform) === "custom") {
             music.platform = music["subtype"]; // gocq 的平台数据存储在 subtype 内，兼容 icqq 时要求前端必须发送 id 字段
         }
     }
-    let share = elements.find((e) => e.type === "share");
+    let share = elements.find(e => e.type === "share");
     if (share)
         (0, utils_1.remove)(elements, share);
     for (const element of elements) {

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

@@ -2,7 +2,7 @@ import { Adapter } from "../../adapter";
 import { App } from "../../server/app";
 import { OneBot } from "../../onebot";
 import { Bot, Sendable } from "qq-group-bot";
-export default class QQAdapter extends Adapter<'qq'> {
+export default class QQAdapter extends Adapter<"qq"> {
     #private;
     constructor(app: App, config: QQAdapter.Config);
     startOneBot(oneBot: OneBot<Bot>): Promise<() => void>;
@@ -24,7 +24,7 @@ export default class QQAdapter extends Adapter<'qq'> {
     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 {
             qq: QQAdapter.Config;
@@ -32,7 +32,7 @@ declare module '../../adapter' {
     }
 }
 export declare namespace QQAdapter {
-    interface Config extends Adapter.Config<'qq'> {
-        protocol: Omit<Bot.Config, 'appid'>;
+    interface Config extends Adapter.Config<"qq"> {
+        protocol: Omit<Bot.Config, "appid">;
     }
 }