onebots 0.4.20 → 0.4.21

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

@@ -8,7 +8,7 @@ export declare class FriendAction {
      * @param message {import('icqq').Sendable} 发送的消息
      * @param message_id {string} 引用的消息ID
      */
-    sendPrivateMsg(this: V11, user_id: number, message: string | SegmentElem | SegmentElem[], message_id?: string): Promise<void | import("icqq").MessageRet>;
+    sendPrivateMsg(this: V11, user_id: number, message: string | SegmentElem | SegmentElem[], message_id?: string): Promise<any>;
     /**
      * 获取好友列表
      */

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FriendAction = void 0;
 const utils_1 = require("../../../service/V11/utils");
+const shareMusicCustom_1 = require("../../../service/shareMusicCustom");
 class FriendAction {
     /**
      * 发送私聊消息
@@ -13,7 +14,7 @@ class FriendAction {
         const msg = message_id ? await this.client.getMsg(message_id) : undefined;
         const { element, quote, music, share } = await utils_1.processMessage.apply(this.client, [message, msg]);
         if (music)
-            return await this.client.pickFriend(user_id).shareMusic(music.platform, music.id);
+            return await shareMusicCustom_1.shareMusic.call(this.client.pickFriend(user_id), music);
         if (share)
             return await this.client.pickFriend(user_id).shareUrl(music.data);
         if (element.length) {

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

@@ -7,7 +7,7 @@ export declare class GroupAction {
      * @param message {import('icqq').Sendable} 消息
      * @param message_id {string} 引用的消息ID
      */
-    sendGroupMsg(this: V11, group_id: number, message: string | SegmentElem | SegmentElem[], message_id?: string): Promise<void | import("icqq").MessageRet>;
+    sendGroupMsg(this: V11, group_id: number, message: string | SegmentElem | SegmentElem[], message_id?: string): Promise<any>;
     /**
      * 群组踢人
      * @param group_id {number} 群id

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GroupAction = void 0;
 const utils_1 = require("../../../service/V11/utils");
+const shareMusicCustom_1 = require("../../../service/shareMusicCustom");
 class GroupAction {
     /**
      * 发送群聊消息
@@ -13,7 +14,7 @@ class GroupAction {
         const msg = message_id ? await this.client.getMsg(message_id) : undefined;
         const { element, quote, music, share } = await utils_1.processMessage.apply(this.client, [message, msg]);
         if (music)
-            return await this.client.pickGroup(group_id).shareMusic(music.platform, music.id);
+            return await shareMusicCustom_1.shareMusic.call(this.client.pickGroup(group_id), music);
         if (share)
             return await this.client.pickGroup(group_id).shareUrl(music.data);
         if (element.length) {

package/lib/service/V11/db_sqlite.d.ts

@@ -1,6 +1,7 @@
 import { MsgEntry } from "./db_entities";
 import { DataSource, Repository } from "typeorm";
 import { Logger } from "log4js";
+import { AsyncLock } from "../../types";
 export declare class Database {
     logger: Logger;
     dbPath: string;
@@ -11,6 +12,7 @@ export declare class Database {
     msgHistoryPreserveDays: number;
     msgHistoryCheckInterval: number;
     msgRepo: Repository<MsgEntry>;
+    dbLock: AsyncLock;
     constructor(dbPath: string, logger: Logger);
     initDB(): Promise<void>;
     /**

package/lib/service/V11/db_sqlite.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Database = void 0;
 const db_entities_1 = require("./db_entities");
 const typeorm_1 = require("typeorm");
+const types_1 = require("../../types");
 class Database {
     constructor(dbPath, logger) {
         /**
@@ -12,6 +13,7 @@ class Database {
         this.msgHistoryCheckInterval = 1 * 24 * 3600 * 1000; // 历史记录检查间隔
         this.dbPath = dbPath;
         this.logger = logger;
+        this.dbLock = new types_1.AsyncLock();
         this.dataSource = new typeorm_1.DataSource({
             type: "better-sqlite3",
             database: dbPath,
@@ -39,15 +41,25 @@ class Database {
      * @param msgData
      */
     async addOrUpdateMsg(msgData) {
-        let msgDataExists = await this.getMsgByBase64Id(msgData.base64_id);
-        if (msgDataExists) {
-            msgData.id = msgDataExists.id;
-            await this.msgRepo.update({ id: msgData.id }, msgData);
-            return msgDataExists.id;
+        await this.dbLock.lock();
+        try {
+            let msgDataExists = await this.getMsgByParams(msgData.user_id, msgData.group_id, msgData.seq);
+            if (msgDataExists) {
+                // send_msg() 返回值和同步的 message 消息哪个先来不确定，send_msg 返回值后来时不允许更新数据库
+                if (msgData.content.length == 0) {
+                    return;
+                }
+                msgData.id = msgDataExists.id;
+                await this.msgRepo.update({ id: msgData.id }, msgData);
+                return msgDataExists.id;
+            }
+            msgData = await this.msgRepo.save(msgData);
+            this.logger.debug(`addMsg with id:${msgData.id}`);
+            return msgData.id;
+        }
+        finally {
+            this.dbLock.unlock();
         }
-        msgData = await this.msgRepo.save(msgData);
-        this.logger.debug(`addMsg with id:${msgData.id}`);
-        return msgData.id;
     }
     /**
      * 通过 icqq 的 base64 格式的 message_id 获取一个 MsgData 对象

package/lib/service/V11/index.d.ts

@@ -39,7 +39,16 @@ export declare class V11 extends EventEmitter implements OneBot.Base {
     system_online(data: any): void;
     dispatch(data: any): Promise<void>;
     private _formatEvent;
-    private addMsgIntoDB;
+    private addMsgToDB;
+    /**
+     * 从 send_msg_xxx() 调用的返回值中提取消息存入数据库(可以让前端在没有收到同步的message数据前就有能力拿到消息对应的base64_id)
+     * (也有可能来的比message慢，后来的话会被数据库忽略)
+     * @param user_id 发送者
+     * @param group_id 群号，私聊为0
+     * @param seq 消息序号
+     * @param base64_id icqq返回的base64格式的消息id
+     */
+    private addMsgToDBFromSendMsgResult;
     private getReplyMsgIdFromDB;
     private _httpRequestHandler;
     /**

package/lib/service/V11/index.js

@@ -219,7 +219,7 @@ class V11 extends events_1.EventEmitter {
             }
         }
         if (data.message_id) {
-            data.message_id = await this.addMsgIntoDB(data);
+            data.message_id = await this.addMsgToDB(data);
         }
         if (data.post_type == 'notice' && String(data.notice_type).endsWith('_recall')) {
             this.db.markMsgAsRecalled(data.base64_id);
@@ -292,7 +292,7 @@ class V11 extends events_1.EventEmitter {
             return JSON.stringify(data);
         }
     }
-    async addMsgIntoDB(data) {
+    async addMsgToDB(data) {
         if (!data.sender || !('user_id' in data.sender)) { // eg. notice
             return;
         }
@@ -312,6 +312,24 @@ class V11 extends events_1.EventEmitter {
         msg.content = data.cqCode;
         return await this.db.addOrUpdateMsg(msg);
     }
+    /**
+     * 从 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) {
+        let msg = new db_entities_1.MsgEntry();
+        msg.base64_id = base64_id;
+        msg.seq = seq;
+        msg.user_id = user_id;
+        msg.nickname = '';
+        msg.group_id = group_id;
+        msg.content = '';
+        return await this.db.addOrUpdateMsg(msg);
+    }
     async getReplyMsgIdFromDB(data) {
         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);
@@ -568,19 +586,10 @@ class V11 extends events_1.EventEmitter {
                 result.data = [...result.data.values()];
             if (result.data?.message)
                 result.data.message = (0, icqq_cq_enable_1.toSegment)(result.data.message);
-            /**
-             * > send_msg 时返回的result也有 message_id 字段并且是base64格式，但由于base64与特定消息并不是一对一关系，因此转换成number类型的msgid并无意义
-             * 如需判断发送的消息和接收到的消息是否是同一个消息，请使用 group_id + seq 对比
-             *
-             * > 但 get_msg 返回的是从数据库获取的message_id，因此是有效的
-             */
-            // if (result.data?.message_id && result.data?.seq) {
-            //     let message_id = result.data?.message_id
-            //     if(!(typeof message_id == 'number' || /^\d+$/.test(message_id))) {
-            //         // this.db.set(`KVMap.${result.data.seq}`,result.data.message_id )
-            //         result.data.message_id = result.data.seq
-            //     }
-            // }
+            // 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;
             }

package/lib/service/shareMusicCustom.d.ts

@@ -0,0 +1,19 @@
+import { Contactable } from "icqq/lib/internal";
+import { MusicElem } from "icqq/lib/message";
+import { Encodable } from "icqq/lib/core/protobuf";
+/** 发送音乐分享(允许自定义参数) */
+export declare function shareMusic(this: Contactable, music: MusicElem): Promise<void>;
+/**
+ * 构造频道b77音乐分享
+ * @param channel_id {string} 子频道id
+ * @param guild_id {string} 频道id
+ * @param music 音乐分享数据
+ */
+export declare function buildMusic(channel_id: string, guild_id: string, music: MusicElem): Promise<Encodable>;
+/**
+ * 构造b77音乐分享
+ * @param target {number} 群id或者好友qq
+ * @param bu {0|1} 类型表示：0 为好友 1 为群
+ * @param music 音乐分享数据
+ */
+export declare function buildMusic(target: number, bu: 0 | 1, music: MusicElem): Promise<Encodable>;

package/lib/service/shareMusicCustom.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildMusic = exports.shareMusic = void 0;
+const message_1 = require("icqq/lib/message");
+const core_1 = require("icqq/lib/core");
+const process_1 = require("process");
+/** 发送音乐分享(允许自定义参数) */
+async function shareMusic(music) {
+    const body = await buildMusic((this.gid || this.uid), this.dm ? 0 : 1, music);
+    await this.c.sendOidb("OidbSvc.0xb77_9", core_1.pb.encode(body));
+}
+exports.shareMusic = shareMusic;
+async function buildMusic(target, bu, music) {
+    const { appid, package_name, sign, getMusicInfo } = message_1.musicFactory[music.platform];
+    let style = 4;
+    try {
+        let { singer = null, title = null, jumpUrl = null, musicUrl = null, preview = null } = music.id ? await getMusicInfo(music.id) : {};
+        singer = music['content'] || music.singer || singer; // 自定义参数优先级高于默认值(gocq的参数名与icqq有区别，做下兼容)
+        title = music.title || title;
+        jumpUrl = music.jumpUrl || jumpUrl;
+        musicUrl = music['url'] || music['voice'] || music.musicUrl || musicUrl;
+        preview = music['image'] || music.preview || preview;
+        if (!musicUrl)
+            style = 0;
+        return {
+            1: appid,
+            2: 1,
+            3: style,
+            5: {
+                1: 1,
+                2: "0.0.0",
+                3: package_name,
+                4: sign
+            },
+            10: typeof bu === 'string' ? 3 : bu,
+            11: target,
+            12: {
+                10: title,
+                11: singer,
+                12: "[分享]" + title,
+                13: jumpUrl,
+                14: preview,
+                16: musicUrl,
+            },
+            19: typeof bu === 'string' ? Number(bu) : undefined
+        };
+    }
+    catch (e) {
+        throw new Error("unknown music id: " + music.id + ", in platform: " + music.platform + ", with title: " + process_1.title);
+    }
+}
+exports.buildMusic = buildMusic;

package/lib/types.d.ts

@@ -1,3 +1,12 @@
 export type LogLevel = "trace" | "debug" | "info" | "warn" | "error" | "fatal" | "mark" | "off";
 export type Dispose = () => any;
 export type MayBeArray<T extends any> = T | T[];
+/**
+* 异步锁---
+*/
+export declare class AsyncLock {
+    private _lock;
+    private _waitList;
+    lock(): Promise<void>;
+    unlock(): void;
+}

package/lib/types.js

@@ -1,2 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.AsyncLock = void 0;
+/**
+* 异步锁---
+*/
+class AsyncLock {
+    constructor() {
+        this._lock = false;
+        this._waitList = [];
+    }
+    async lock() {
+        if (this._lock) {
+            await new Promise((resolve) => {
+                this._waitList.push(resolve);
+            });
+        }
+        this._lock = true;
+    }
+    unlock() {
+        this._lock = false;
+        if (this._waitList.length > 0) {
+            let resolve = this._waitList.shift();
+            resolve && resolve();
+        }
+    }
+}
+exports.AsyncLock = AsyncLock;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.4.20",
+  "version": "0.4.21",
   "description": "基于icqq的多例oneBot实现",
   "engines": {
     "node": ">=16"