onebots 0.4.43 → 0.4.44

package/lib/service/V11/index.js

@@ -18,7 +18,6 @@ const app_1 = require("../../server/app");
 const service_1 = require("../../service");
 const db_1 = require("../../db");
 const sendMsgTypes = ["private", "group", "discuss"];
-const sendMsgMethodRegex = new RegExp(`send_(${sendMsgTypes.join("|")})_msg`);
 class V11 extends service_1.Service {
     constructor(oneBot, config) {
         super(oneBot.adapter, config);
@@ -42,6 +41,41 @@ class V11 extends service_1.Service {
             this.logger.info("");
         });
     }
+    transformToInt(path, value) {
+        if (!value || typeof value !== 'string')
+            throw new Error(`value must be string`);
+        value = value.replace(/\./g, '%46');
+        const obj = this.db.get(path, {});
+        if (obj[value])
+            return obj[value];
+        const int = (0, utils_1.randomInt)(1000, Number.MAX_SAFE_INTEGER);
+        const isExist = () => {
+            return Object.keys(obj).some((key) => {
+                return obj[key] === int;
+            });
+        };
+        // 虽然重复概率小，但还是避免下
+        if (isExist())
+            return this.transformToInt(path, value);
+        this.db.set(`${path}.${value}`, int);
+        return int;
+    }
+    transformStrToIntForObj(obj, keys) {
+        if (!obj)
+            return;
+        for (const key of keys) {
+            const value = obj[key];
+            if (typeof value !== 'string')
+                continue;
+            Reflect.set(obj, key, this.transformToInt(key, value));
+        }
+    }
+    getStrByInt(path, value) {
+        const obj = this.db.get(path);
+        return Object.keys(obj).find(str => {
+            return obj[str] === value;
+        })?.replace(/%46/g, '.') || value + '';
+    }
     start() {
         if (this.config.use_http)
             this.startHttp();
@@ -102,15 +136,15 @@ class V11 extends service_1.Service {
             }, this.config.heartbeat * 1000);
         }
         this.adapter.on("message.receive", (uin, event) => {
-            const payload = this.adapter.formatEventPayload("V11", "message", event);
+            const payload = this.adapter.formatEventPayload(uin, "V11", "message", event);
             this.dispatch(payload);
         });
         this.adapter.on("notice.receive", (uin, event) => {
-            const payload = this.adapter.formatEventPayload("V11", "notice", event);
+            const payload = this.adapter.formatEventPayload(uin, "V11", "notice", event);
             this.dispatch(payload);
         });
         this.adapter.on("request.receive", (uin, event) => {
-            const payload = this.adapter.formatEventPayload("V11", "request", event);
+            const payload = this.adapter.formatEventPayload(uin, "V11", "request", event);
             this.dispatch(payload);
         });
     }
@@ -214,32 +248,11 @@ class V11 extends service_1.Service {
         if (data.message && data.post_type === "message") {
             if (this.config.post_message_format === "array") {
                 data.message = this.adapter.toSegment("V11", data.message);
-                if (data.source) { // reply
-                    let msg0 = data.message[0];
-                    msg0.data["id"] = await this.getReplyMsgIdFromDB(data);
-                }
             }
             else {
                 data.message = this.adapter.toCqcode("V11", data.message);
             }
         }
-        if (data.message_id) {
-            data.message_id = await this.addMsgToDB(data);
-        }
-        if (data.post_type == "notice" && String(data.notice_type).endsWith("_recall")) {
-            const msgIdx = this.db.findIndex('messages', (message) => {
-                return message.base64_id === data.base64_id;
-            });
-            if (msgIdx >= 0) {
-                this.db.set(`messages.${msgIdx}.recalled`, true);
-                this.db.set(`messages.${msgIdx}.recall_time`, parseInt((Date.now() / 1000) + ''));
-            }
-        }
-        if (data.font) {
-            const fontNo = Buffer.from(data.font).readUInt32BE();
-            // this.db.set(`KVMap.${data.fontNo}`,data.font)
-            data.font = fontNo;
-        }
         data.time = Math.floor(Date.now() / 1000);
         // data = transformObj(data, (key, value) => {
         //     if (!['user_id', 'group_id', 'discuss_id', 'member_id', 'channel_id', 'guild_id'].includes(key)) return value
@@ -304,51 +317,6 @@ class V11 extends service_1.Service {
             return JSON.stringify(data);
         }
     }
-    async addMsgToDB(data) {
-        if (!data.sender || !("user_id" in data.sender)) {
-            // eg. notice
-            return;
-        }
-        const id = (0, utils_1.randomInt)(1, Number.MAX_SAFE_INTEGER);
-        this.db.push('messages', {
-            id,
-            base64_id: data.base64_id,
-            seq: data.seq,
-            user_id: data.sender.user_id,
-            nickname: data.sender.nickname,
-            group_id: data.group_id || 0,
-            group_name: data.group_name || '',
-            content: data.cqCode || data.message,
-            create_time: data.time,
-        });
-        if (this.db.get('messages').length > 1000)
-            this.db.shift('messages');
-        return id;
-    }
-    /**
-     * 从 send_msg_xxx() 调用的返回值中提取消息存入数据库(可以让前端在没有收到同步的message数据前就有能力拿到消息对应的base64_id)
-     * (也有可能来的比message慢，后来的话会被数据库忽略)
-     * @param user_id 发送者
-     * @param group_id 群号，私聊为0
-     * @param seq 消息序号
-     * @param base64_id icqq返回的base64格式的消息id
-     */
-    async addMsgToDBFromSendMsgResult(user_id, group_id, seq, base64_id) {
-        const id = (0, utils_1.randomInt)(1, Number.MAX_SAFE_INTEGER);
-        this.db.push('messages', {
-            id,
-            base64_id,
-            seq,
-            user_id,
-            nickname: '',
-            group_id,
-            group_name: '',
-            content: '',
-        });
-        if (this.db.get('messages').length > 1000)
-            this.db.shift('messages');
-        return id;
-    }
     async getReplyMsgIdFromDB(data) {
         let group_id = data.message_type === "group" ? data.group_id : 0;
         let msg = await this.db.find('messages', (message) => {
@@ -528,11 +496,6 @@ class V11 extends service_1.Service {
      */
     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.find('messages', (message) => {
-                return params.message_id === message.id;
-            }))?.base64_id; // 调用api时把本地的数字id转为base64发给icqq
-        }
         action = (0, utils_1.toLine)(action);
         let is_async = action.includes("_async");
         if (is_async)
@@ -547,10 +510,6 @@ class V11 extends service_1.Service {
                 action = "send_private_msg";
             else if (params.group_id)
                 action = "send_group_msg";
-            else if (params.discuss_id)
-                action = "send_discuss_msg";
-            else if (params.guild_id)
-                action = params.channel_id === "direct" ? "send_direct_msg" : "send_group_msg";
             else
                 throw new Error("required message_type or input (user_id/group_id)");
         }
@@ -580,7 +539,7 @@ class V11 extends service_1.Service {
                             }
                             params[k] = this.adapter.fromSegment("V11", params[k]);
                         }
-                        params["message_id"] = params[k].find(e => e.type === "reply")?.message_id;
+                        params["message_id"] = params[k].find(e => e.type === "reply")?.id || params['message_id'];
                     }
                     args.push(params[k]);
                 }
@@ -614,11 +573,6 @@ class V11 extends service_1.Service {
                 result.data = [...result.data.values()];
             if (result.data?.message)
                 result.data.message = this.adapter.toSegment("V11", 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.oneBot.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;
             }

package/lib/service/V12/action/friend.d.ts

@@ -1,14 +1,14 @@
 import { V12 } from "../index";
 export declare class FriendAction {
-    getUserInfo(this: V12, user_id: number): Promise<any>;
+    getUserInfo(this: V12, user_id: number): Promise<V12.MessageRet>;
     getFriendList(this: V12): Promise<any>;
     /**
      * 发送私聊消息
      * @param user_id {number} 用户id
-     * @param message {import('onebots/lib/service/v12').Sendable} 消息
-     * @param source {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
+     * @param message {V12.Sendable} 消息
+     * @param source {string} 引用id
      */
-    sendPrivateMsg(this: V12, user_id: number, message: V12.Sendable, source?: V12.SegmentElem<'reply'>): Promise<any>;
+    sendPrivateMsg(this: V12, user_id: number, message: V12.Sendable, source?: string): Promise<any>;
     /**
      * 为指定用户点赞
      * @param user_id {number} 用户id

package/lib/service/V12/action/friend.js

@@ -11,8 +11,8 @@ class FriendAction {
     /**
      * 发送私聊消息
      * @param user_id {number} 用户id
-     * @param message {import('onebots/lib/service/v12').Sendable} 消息
-     * @param source {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
+     * @param message {V12.Sendable} 消息
+     * @param source {string} 引用id
      */
     async sendPrivateMsg(user_id, message, source) {
         return this.adapter.call(this.oneBot.uin, 'V12', 'sendPrivateMessage', [user_id, message, source]);

package/lib/service/V12/action/group.d.ts

@@ -3,10 +3,10 @@ export declare class GroupAction {
     /**
      * 发送群聊消息
      * @param group_id {number} 群id
-     * @param message {import('onebots/lib/service/v12').Sendable} 消息
-     * @param source {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
+     * @param message {V12.Sendable} 消息
+     * @param source {source} 引用消息id
      */
-    sendGroupMsg(this: V12, group_id: number, message: V12.Sendable, source?: V12.SegmentElem<'reply'>): Promise<any>;
+    sendGroupMsg(this: V12, group_id: number, message: V12.Sendable, source?: string): Promise<V12.MessageRet>;
     /**
      * 群组踢人
      * @param group_id {number} 群id

package/lib/service/V12/action/group.js

@@ -5,8 +5,8 @@ class GroupAction {
     /**
      * 发送群聊消息
      * @param group_id {number} 群id
-     * @param message {import('onebots/lib/service/v12').Sendable} 消息
-     * @param source {import('onebots/lib/service/v12').SegmentElem<'reply'>} 引用内容
+     * @param message {V12.Sendable} 消息
+     * @param source {source} 引用消息id
      */
     async sendGroupMsg(group_id, message, source) {
         return this.adapter.call(this.oneBot.uin, 'V12', 'sendGroupMessage', [group_id, message, source]);

package/lib/service/V12/action/guild.d.ts

@@ -40,11 +40,11 @@ export declare class GuildAction {
     getGuildMemberList(this: V12, guild_id: string): Promise<any>;
     /**
      * 发送频道消息
-     * @param guild_id {string} 频道id
-     * @param channel_id {string} 子频道id
-     * @param message {import('icqq/lib/service').Sendable} 消息
+     * @param channel_id {string} 通道id
+     * @param message {V12.Sendable} 消息
+     * @param source
      */
-    sendGuildMsg(this: V12, guild_id: string, channel_id: string, message: V12.Sendable): Promise<any>;
+    sendGuildMsg(this: V12, channel_id: string, message: V12.Sendable, source?: string): Promise<V12.MessageRet>;
     createDirectSession(this: V12, guild_id: string, user_id: string): Promise<any>;
-    sendDirectMsg(this: V12, guild_id: string, message: V12.Sendable): Promise<any>;
+    sendDirectMsg(this: V12, guild_id: string, message: V12.Sendable, source?: string): Promise<V12.MessageRet>;
 }

package/lib/service/V12/action/guild.js

@@ -100,21 +100,18 @@ class GuildAction {
     }
     /**
      * 发送频道消息
-     * @param guild_id {string} 频道id
-     * @param channel_id {string} 子频道id
-     * @param message {import('icqq/lib/service').Sendable} 消息
+     * @param channel_id {string} 通道id
+     * @param message {V12.Sendable} 消息
+     * @param source
      */
-    async sendGuildMsg(guild_id, channel_id, message) {
-        if (channel_id === 'direct') {
-            return this.adapter.call(this.oneBot.uin, 'V12', 'sendDirectMessage', [guild_id, message]);
-        }
-        return this.adapter.call(this.oneBot.uin, 'V12', 'sendGuildMessage', [channel_id, message]);
+    async sendGuildMsg(channel_id, message, source) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'sendGuildMessage', [channel_id, message, source]);
     }
     async createDirectSession(guild_id, user_id) {
         return this.adapter.call(this.oneBot.uin, 'V12', 'createDirectSession', [guild_id, user_id]);
     }
-    async sendDirectMsg(guild_id, message) {
-        return this.adapter.call(this.oneBot.uin, 'V12', 'sendDirectMessage', [guild_id, message]);
+    async sendDirectMsg(guild_id, message, source) {
+        return this.adapter.call(this.oneBot.uin, 'V12', 'sendDirectMessage', [guild_id, message, source]);
     }
 }
 exports.GuildAction = GuildAction;

package/lib/service/V12/index.js

@@ -137,15 +137,15 @@ class V12 extends service_1.Service {
             }, this.config.heartbeat * 1000);
         }
         this.adapter.on('message.receive', (uin, event) => {
-            const payload = this.adapter.formatEventPayload('V12', 'message', event);
+            const payload = this.adapter.formatEventPayload(uin, 'V12', 'message', event);
             this.dispatch(payload);
         });
         this.adapter.on('notice.receive', (uin, event) => {
-            const payload = this.adapter.formatEventPayload('V12', 'notice', event);
+            const payload = this.adapter.formatEventPayload(uin, 'V12', 'notice', event);
             this.dispatch(payload);
         });
         this.adapter.on('request.receive', (uin, event) => {
-            const payload = this.adapter.formatEventPayload('V12', 'request', event);
+            const payload = this.adapter.formatEventPayload(uin, 'V12', 'request', event);
             this.dispatch(payload);
         });
     }
@@ -169,7 +169,7 @@ class V12 extends service_1.Service {
             timeout: config.timeout || this.config.request_timeout,
             headers: {
                 "Content-Type": "application/json",
-                "User-Agent": "OneBot/12 (qq) Node-onebots/" + utils_1.version,
+                "User-Agent": "OneBot/12 Node-onebots/" + 12,
                 "X-OneBot-Version": 12,
                 "X-Impl": "onebots",
             },
@@ -387,7 +387,7 @@ class V12 extends service_1.Service {
         if (is_async)
             action = action.replace("_async", "");
         if (action === 'send_message') {
-            if (["private", "group", "discuss", 'channel'].includes(params.detail_type)) {
+            if (["private", "group", "discuss", 'direct', 'guild'].includes(params.detail_type)) {
                 action = "send_" + params.detail_type + "_msg";
             }
             else if (params.user_id)
@@ -396,10 +396,12 @@ class V12 extends service_1.Service {
                 action = "send_group_msg";
             else if (params.discuss_id)
                 action = "send_discuss_msg";
-            else if (params.channel_id && params.guild_id)
+            else if (params.channel_id)
                 action = "send_guild_msg";
+            else if (params.guild_id)
+                action = 'send_direct_msg';
             else
-                throw new Error('required detail_type or input (user_id/group_id/(guild_id and channel_id))');
+                throw new Error('required detail_type or input (user_id/group_id/guild_id/channel_id)');
         }
         const method = (0, utils_2.toHump)(action);
         if (Reflect.has(this.action, method)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.4.43",
+  "version": "0.4.44",
   "description": "基于icqq的多例oneBot实现",
   "engines": {
     "node": ">=16"
@@ -70,8 +70,8 @@
   "peerDependencies": {
     "icqq": "latest",
     "lib-wechat": "latest",
-    "node-dd-bot": "latest",
-    "qq-group-bot": "latest"
+    "node-dd-bot": "^1.0.8",
+    "qq-group-bot": "^1.0.9"
   },
   "dependencies": {
     "@koa/router": "^10.1.1",