onebots 0.4.19 → 0.4.21

package/README.md

@@ -83,15 +83,17 @@ general: # 通用配置，在单个配置省略时的默认值
     # ...其他配置项参考icqq的Config配置
 # 每个账号的单独配置(用于覆盖通用配置)
 123456789:
+  password: '' # 账号密码，未配置则扫码登陆
   version: V11 # 使用的oneBot版本
   # ...其他配置项参见上方对应oneBot版本的通用配置
   protocol:
     platform: 2
     sign_api_addr: '' #你的签名地址
-    password: '' # 账号密码，未配置则扫码登陆
     # ...其他配置项参考icqq的Config配置
 ```
+
 # 配置解释
+
 ## Config
 | 配置项      | 类型                           | 默认值     | desc   |
 |:---------|:-----------------------------|:--------|:-------|
@@ -100,11 +102,12 @@ general: # 通用配置，在单个配置省略时的默认值
 | general  | OneBotConfig                 | general | 通用配置   |
 | [number] | OneBotConfig\|OneBotConfig[] | -       | 机器人配置  |
 ## OneBotConfig
-| 配置项      | 类型        | 默认值       | desc   |
-|:---------|:----------|:----------|:-------|
-| V11      | ConfigV11 | configV11 | V11配置  |
-| V12      | ConfigV12 | configV12 | V12配置  |
-| protocol | Config    | {}        | icqq配置 |
+| 配置项      | 类型        | 默认值       | desc               |
+|:---------|:----------|:----------|:-------------------|
+| password | string    | -         | 账号密码 未填写或填写为空则扫码登陆 |
+| V11      | ConfigV11 | configV11 | V11配置              |
+| V12      | ConfigV12 | configV12 | V12配置              |
+| protocol | Config    | {}        | icqq配置             |
 ## ConfigV11
 | 配置项                 | 类型       | 默认值    | desc       |
 |:--------------------|:---------|:-------|:-----------|

package/lib/config.sample.yaml

@@ -31,6 +31,8 @@ general: # 通用配置，在单个配置省略时的默认值
 # 每个账号的单独配置(用于覆盖通用配置)
 123456789:
   version: V11 # 使用的oneBot版本
+  password:'' # 账号密码，未配置则扫码登陆
+  group_whitelist: [] # 群消息派发白名单，只有数组中的群号才派发，为空则全部派发
   protocol: # 将会覆盖通用配置中的protocol
     platform: 1
   # 。。。其他配置项参见上方对应oneBot版本的通用配置

package/lib/onebot.d.ts

@@ -22,7 +22,8 @@ export declare class OneBot<V extends OneBot.Version> extends EventEmitter {
     start(): Promise<[boolean, any]>;
     startListen(): void;
     stop(force?: boolean): Promise<void>;
-    dispatch(event: any, data: any): void;
+    system_online(event: any, data: any): void;
+    dispatch(event: any, data: any): Promise<void>;
 }
 export declare enum OneBotStatus {
     Good = 0,
@@ -34,11 +35,13 @@ export declare namespace OneBot {
     type Config<V extends Version = 'V11'> = ({
         version?: V;
         password?: string;
+        group_whitelist?: number[];
         protocol?: IcqqConfig;
     } & (V extends 'V11' ? V11.Config : V12.Config));
     interface Base {
         start(path?: string): any;
         stop(): any;
+        system_online(...args: any[]): any;
         dispatch(...args: any[]): any;
         apply(...args: any[]): any;
     }

package/lib/onebot.js

@@ -162,6 +162,7 @@ class OneBot extends events_1.EventEmitter {
         });
     }
     startListen() {
+        this.client.on('system.online', this.system_online.bind(this, "system.online"));
         this.client.trap('system', this.dispatch.bind(this, 'system'));
         this.client.trap('notice', this.dispatch.bind(this, 'notice'));
         this.client.trap('request', this.dispatch.bind(this, 'request'));
@@ -176,20 +177,34 @@ class OneBot extends events_1.EventEmitter {
         }
         this.client.logout(force);
     }
-    dispatch(event, data) {
+    system_online(event, data) {
         for (const instance of this.instances) {
+            instance.system_online(data);
+        }
+    }
+    async dispatch(event, data) {
+        let group_id = data["group_id"];
+        for (const instance of this.instances) {
+            if (group_id) {
+                // 群消息派发白名单
+                let lst = instance.config.group_whitelist;
+                if (lst && lst.length > 0 && !lst.includes(group_id))
+                    continue;
+            }
             const result = instance.format(event, data);
-            if (data.source) {
+            if (data.source) { // 有 data.source 字段代表这是个回复
                 switch (data.message_type) {
                     case 'group':
                         data.message.unshift({
                             type: 'reply',
+                            seq: data.source.seq,
                             id: (0, icqq_2.genGroupMessageId)(data.group_id, data.source.user_id, data.source.seq, data.source.rand, data.source.time)
                         });
                         break;
                     case 'private':
                         data.message.unshift({
                             type: 'reply',
+                            seq: data.source.seq,
                             id: (0, icqq_2.genDmMessageId)(data.source.user_id, data.source.seq, data.source.rand, data.source.time)
                         });
                         break;

package/lib/server/app.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 /// <reference types="koa-bodyparser" />
 import Koa from 'koa';
+import "reflect-metadata";
 import { Logger } from "log4js";
 import { Server } from "http";
 import { Config as IcqqConfig } from "icqq";

package/lib/server/app.js

@@ -30,6 +30,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineConfig = exports.createApp = exports.App = void 0;
 const koa_1 = __importDefault(require("koa"));
 const os = __importStar(require("os"));
+require("reflect-metadata");
 const fs_1 = require("fs");
 const log4js_1 = require("log4js");
 const http_1 = require("http");

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

@@ -1,3 +1,4 @@
+import { Message } from "icqq";
 import { V11 } from "../../../service/V11";
 export declare class CommonAction {
     /**
@@ -16,7 +17,7 @@ export declare class CommonAction {
      * 获取消息
      * @param message_id {string} 消息id
      */
-    getMsg(this: V11, message_id: string): Promise<import("icqq").GroupMessage | import("icqq").PrivateMessage>;
+    getMsg(this: V11, message_id: number): Promise<Message>;
     /**
      * 获取合并消息
      * @param id {string} 合并id

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

@@ -24,8 +24,16 @@ class CommonAction {
      * 获取消息
      * @param message_id {string} 消息id
      */
-    getMsg(message_id) {
-        return this.client.getMsg(message_id);
+    async getMsg(message_id) {
+        if (message_id == 0)
+            throw new Error('getMsg: message_id[0] is invalid');
+        let msg_entry = await this.db.getMsgById(message_id);
+        if (!msg_entry)
+            throw new Error(`getMsg: can not find msg[${message_id}] in db`);
+        let msg = await this.client.getMsg(msg_entry.base64_id);
+        msg.message_id = String(message_id); // nonebot v11 要求 message_id 是 number 类型
+        msg["real_id"] = msg.message_id; // nonebot 的reply类型会检测real_id是否存在，虽然它从未使用
+        return msg;
     }
     /**
      * 获取合并消息

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_entities.d.ts

@@ -0,0 +1,13 @@
+export declare class MsgEntry {
+    id?: number;
+    base64_id: string;
+    seq: number;
+    user_id: number;
+    nickname: string;
+    group_id: number;
+    group_name: string;
+    content: string;
+    recalled: boolean;
+    create_time: Date;
+    recall_time?: Date;
+}

package/lib/service/V11/db_entities.js

@@ -0,0 +1,63 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MsgEntry = void 0;
+const typeorm_1 = require("typeorm");
+let MsgEntry = class MsgEntry {
+};
+exports.MsgEntry = MsgEntry;
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)(),
+    __metadata("design:type", Number)
+], MsgEntry.prototype, "id", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    __metadata("design:type", String)
+], MsgEntry.prototype, "base64_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    __metadata("design:type", Number)
+], MsgEntry.prototype, "seq", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    __metadata("design:type", Number)
+], MsgEntry.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    __metadata("design:type", String)
+], MsgEntry.prototype, "nickname", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    __metadata("design:type", Number)
+], MsgEntry.prototype, "group_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    __metadata("design:type", String)
+], MsgEntry.prototype, "group_name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ length: 1024 }),
+    __metadata("design:type", String)
+], MsgEntry.prototype, "content", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ default: false }),
+    __metadata("design:type", Boolean)
+], MsgEntry.prototype, "recalled", void 0);
+__decorate([
+    (0, typeorm_1.CreateDateColumn)(),
+    __metadata("design:type", Date)
+], MsgEntry.prototype, "create_time", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", Date)
+], MsgEntry.prototype, "recall_time", void 0);
+exports.MsgEntry = MsgEntry = __decorate([
+    (0, typeorm_1.Entity)()
+], MsgEntry);

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

@@ -0,0 +1,52 @@
+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;
+    dataSource: DataSource;
+    /**
+     * 消息在数据库中的保留时间
+     */
+    msgHistoryPreserveDays: number;
+    msgHistoryCheckInterval: number;
+    msgRepo: Repository<MsgEntry>;
+    dbLock: AsyncLock;
+    constructor(dbPath: string, logger: Logger);
+    initDB(): Promise<void>;
+    /**
+     * 增加或更新一条消息到数据库
+     * @param msgData
+     */
+    addOrUpdateMsg(msgData: MsgEntry): Promise<number>;
+    /**
+     * 通过 icqq 的 base64 格式的 message_id 获取一个 MsgData 对象
+     * @param base64_id
+     * @returns
+     */
+    getMsgByBase64Id(base64_id: string): Promise<MsgEntry | null>;
+    /**
+     * 通过 number 类型的 id 自增主键获取一个 MsgData 对象
+     * @param id
+     * @returns
+     */
+    getMsgById(id: number): Promise<MsgEntry | null>;
+    /**
+     * 通过参数从数据库中查找消息
+     * @param user_id
+     * @param group_id
+     * @param seq
+     */
+    getMsgByParams(user_id: number, group_id: number, seq: number): Promise<MsgEntry | null>;
+    /**
+     * 将一条消息标记为 recalled
+     * @param base64_id
+     * @param id
+     */
+    markMsgAsRecalled(base64_id?: string, id?: number): Promise<void>;
+    /**
+     * 根据 `msgPreserveDays` 变量定义的保留期限收缩数据库
+     */
+    shrinkDB(): Promise<void>;
+}

package/lib/service/V11/db_sqlite.js

@@ -0,0 +1,117 @@
+"use strict";
+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) {
+        /**
+         * 消息在数据库中的保留时间
+         */
+        this.msgHistoryPreserveDays = 14; // 历史消息默认存储2周
+        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,
+            entities: [db_entities_1.MsgEntry],
+        });
+        this.initDB();
+    }
+    async initDB() {
+        try {
+            await this.dataSource.initialize();
+            await this.dataSource.synchronize(false);
+        }
+        catch (err) {
+            this.logger.error(`sqlite [${this.dbPath}] open fail!`, err);
+            return;
+        }
+        this.msgRepo = this.dataSource.getRepository(db_entities_1.MsgEntry);
+        this.logger.debug(`sqlite [${this.dbPath}] open success`);
+        setInterval(() => {
+            this.shrinkDB();
+        }, this.msgHistoryCheckInterval);
+    }
+    /**
+     * 增加或更新一条消息到数据库
+     * @param msgData
+     */
+    async addOrUpdateMsg(msgData) {
+        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();
+        }
+    }
+    /**
+     * 通过 icqq 的 base64 格式的 message_id 获取一个 MsgData 对象
+     * @param base64_id
+     * @returns
+     */
+    async getMsgByBase64Id(base64_id) {
+        let ret = await this.msgRepo.findOneBy({ base64_id: base64_id });
+        return ret;
+    }
+    /**
+     * 通过 number 类型的 id 自增主键获取一个 MsgData 对象
+     * @param id
+     * @returns
+     */
+    async getMsgById(id) {
+        let ret = await this.msgRepo.findOneBy({ id: id });
+        return ret;
+    }
+    /**
+     * 通过参数从数据库中查找消息
+     * @param user_id
+     * @param group_id
+     * @param seq
+     */
+    async getMsgByParams(user_id, group_id, seq) {
+        let ret = await this.msgRepo.findOneBy({ user_id: user_id, group_id: group_id, seq: seq });
+        return ret;
+    }
+    /**
+     * 将一条消息标记为 recalled
+     * @param base64_id
+     * @param id
+     */
+    async markMsgAsRecalled(base64_id, id) {
+        if (base64_id || id)
+            await this.msgRepo.update(base64_id ? { base64_id: base64_id } : { id: id }, { recalled: true, recall_time: new Date() });
+        else
+            throw new Error("base64_id 或 id 参数至少一个应该被赋值");
+    }
+    /**
+     * 根据 `msgPreserveDays` 变量定义的保留期限收缩数据库
+     */
+    async shrinkDB() {
+        let dt = new Date();
+        dt.setDate(dt.getDate() - this.msgHistoryPreserveDays);
+        await this.msgRepo
+            .createQueryBuilder()
+            .delete()
+            .from(db_entities_1.MsgEntry)
+            .where("create_time < :dt", { dt: dt })
+            .execute();
+    }
+}
+exports.Database = Database;

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

@@ -8,8 +8,7 @@ import { Logger } from "log4js";
 import { WebSocket, WebSocketServer } from "ws";
 import { Dispose } from "../../types";
 import { EventEmitter } from "events";
-import { Database } from "../../db";
-import { V12 } from "../../service/V12";
+import { Database } from "./db_sqlite";
 export declare class V11 extends EventEmitter implements OneBot.Base {
     oneBot: OneBot<'V11'>;
     client: Client;
@@ -19,11 +18,7 @@ export declare class V11 extends EventEmitter implements OneBot.Base {
     protected timestamp: number;
     protected heartbeat?: NodeJS.Timeout;
     private path;
-    db: Database<{
-        eventBuffer: V12.Payload<keyof Action>[];
-        KVMap: Record<number, string>;
-        files: Record<string, V12.FileInfo>;
-    }>;
+    db: Database;
     disposes: Dispose[];
     protected _queue: Array<{
         method: keyof Action;
@@ -41,8 +36,20 @@ export declare class V11 extends EventEmitter implements OneBot.Base {
     private startWsReverse;
     stop(force?: boolean): Promise<void>;
     format(_: any, data: any): any;
-    dispatch(data: any): void;
+    system_online(data: any): void;
+    dispatch(data: any): Promise<void>;
     private _formatEvent;
+    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;
     /**
      * 处理ws消息

package/lib/service/V11/index.js

@@ -16,9 +16,10 @@ const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
 const events_1 = require("events");
 const fs_1 = require("fs");
-const db_1 = require("../../db");
+const db_sqlite_1 = require("./db_sqlite");
 const path_1 = require("path");
 const app_1 = require("../../server/app");
+const db_entities_1 = require("./db_entities");
 class V11 extends events_1.EventEmitter {
     constructor(oneBot, client, config) {
         super();
@@ -31,9 +32,8 @@ class V11 extends events_1.EventEmitter {
         this.queue_running = false;
         this.wsr = new Set();
         this.action = new action_1.Action();
-        this.db = new db_1.Database((0, path_1.join)(app_1.App.configDir, 'data', this.oneBot.uin + '.json'));
-        this.db.sync({ eventBuffer: [], KVMap: {}, files: {} });
         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);
     }
     start(path) {
         this.path = `/${this.oneBot.uin}`;
@@ -190,19 +190,27 @@ class V11 extends events_1.EventEmitter {
     format(_, data) {
         return data;
     }
-    dispatch(data) {
-        if (!data.post_type)
-            data.post_type = 'system';
-        if (data.post_type === 'system') {
-        }
+    system_online(data) {
+        this.logger.info("【好友列表】");
+        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('');
+    }
+    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.message = (0, icqq_cq_enable_1.toSegment)(data.message);
+                if (data.source) { // reply
+                    let msg0 = data.message[0];
+                    msg0.data['id'] = await this.getReplyMsgIdFromDB(data);
+                }
             }
             else {
                 if (data.source) {
-                    this.db.set(`KVMap.${data.source.seq}`, data.message[0].id);
                     data.message.shift();
+                    // segment 更好用, cq 一般只用来显示，就不存储真实id了, 有需求的自己去改
                     data.message = (0, icqq_cq_enable_1.toCqcode)(data).replace(/^(\[CQ:reply,id=)(.+?)\]/, `$1${data.source.seq}]`);
                 }
                 else {
@@ -211,12 +219,14 @@ class V11 extends events_1.EventEmitter {
             }
         }
         if (data.message_id) {
-            this.db.set(`KVMap.${data.seq}`, data.message_id);
-            data.message_id = data.seq;
+            data.message_id = await this.addMsgToDB(data);
+        }
+        if (data.post_type == 'notice' && String(data.notice_type).endsWith('_recall')) {
+            this.db.markMsgAsRecalled(data.base64_id);
         }
         if (data.font) {
             const fontNo = Buffer.from(data.font).readUInt32BE();
-            this.db.set(`KVMap.${data.fontNo}`, data.font);
+            // this.db.set(`KVMap.${data.fontNo}`,data.font)
             data.font = fontNo;
         }
         data.time = Math.floor(Date.now() / 1000);
@@ -282,6 +292,49 @@ class V11 extends events_1.EventEmitter {
             return JSON.stringify(data);
         }
     }
+    async addMsgToDB(data) {
+        if (!data.sender || !('user_id' in data.sender)) { // eg. notice
+            return;
+        }
+        let msg = new db_entities_1.MsgEntry();
+        msg.base64_id = data.message_id;
+        msg.seq = data.seq;
+        msg.user_id = data.sender.user_id;
+        msg.nickname = data.sender.nickname;
+        if (data.message_type === 'group') {
+            msg.group_id = data.group_id;
+            msg.group_name = data["group_name"] || ''; // 可能不存在(gocq默认不发)
+        }
+        else {
+            msg.group_id = 0;
+            msg.group_name = '';
+        }
+        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);
+        return msg ? msg.id : 0;
+    }
     async _httpRequestHandler(ctx) {
         if (ctx.method === 'OPTIONS') {
             return ctx.writeHead(200, {
@@ -375,7 +428,9 @@ class V11 extends events_1.EventEmitter {
                     error: {
                         code, message
                     },
-                    echo: data?.echo
+                    echo: data?.echo,
+                    msg: e.message,
+                    action: data.action
                 }));
             }
         });
@@ -447,7 +502,7 @@ 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 = this.db.get(`KVMap.${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");
@@ -510,7 +565,7 @@ class V11 extends events_1.EventEmitter {
             }
             else {
                 try {
-                    ret = this.action[method].apply(this, args);
+                    ret = await this.action[method].apply(this, args);
                 }
                 catch (e) {
                     return JSON.stringify(V11.error(e.message));
@@ -531,9 +586,9 @@ 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);
-            if (result.data?.message_id && result.data?.seq) {
-                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/V11/utils.js

@@ -9,8 +9,12 @@ async function processMessage(message, source) {
     if (quote)
         (0, utils_1.remove)(elements, quote);
     let music = elements.find(e => e.type === 'music');
-    if (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');
     if (share)
         (0, utils_1.remove)(elements, share);

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

@@ -47,7 +47,8 @@ export declare class V12 extends EventEmitter implements OneBot.Base {
         friend: any;
         member: any;
     };
-    dispatch(data: Record<string, any>): void;
+    system_online(data: any): void;
+    dispatch(data: Record<string, any>): Promise<void>;
     apply(req: V12.RequestAction): Promise<string>;
     private httpAuth;
     private httpRequestHandler;

package/lib/service/V12/index.js

@@ -351,7 +351,9 @@ class V12 extends events_1.EventEmitter {
             };
         return V12.formatPayload(this.oneBot.uin, event, data);
     }
-    dispatch(data) {
+    system_online(data) {
+    }
+    async dispatch(data) {
         const payload = {
             id: (0, utils_2.uuid)(),
             impl: 'onebots',

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/lib/utils.d.ts

@@ -4,6 +4,12 @@ export declare function transformObj(obj: any, callback: any): any;
 export declare function deepClone<T extends any>(obj: T): T;
 export declare function pick<T extends object, K extends keyof T>(source: T, keys?: Iterable<K>, forced?: boolean): Pick<T, K>;
 export declare function omit<T, K extends keyof T>(source: T, keys?: Iterable<K>): Omit<T, K>;
+/**
+ * 将驼峰命名替换为下划线分割命名
+ * @param name
+ * @returns
+ * @todo 是否应该改名 ToUnderLine()？
+ */
 export declare function toLine<T extends string>(name: T): string;
 export interface Class {
     new (...args: any[]): any;

package/lib/utils.js

@@ -114,6 +114,12 @@ function omit(source, keys) {
     return result;
 }
 exports.omit = omit;
+/**
+ * 将驼峰命名替换为下划线分割命名
+ * @param name
+ * @returns
+ * @todo 是否应该改名 ToUnderLine()？
+ */
 function toLine(name) {
     return name.replace(/([A-Z])/g, "_$1").toLowerCase();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.4.19",
+  "version": "0.4.21",
   "description": "基于icqq的多例oneBot实现",
   "engines": {
     "node": ">=16"
@@ -64,6 +64,9 @@
     "koa-bodyparser": "^4.3.0",
     "log4js": "^6.5.2",
     "mime-types": "^2.1.35",
-    "ws": "^8.8.0"
+    "ws": "^8.8.0",
+    "better-sqlite3": "^8.6.0",
+    "reflect-metadata": "^0.1.13",
+    "typeorm": "^0.3.17"
   }
 }