onebots 0.4.30 → 0.4.32

package/lib/adapters/icqq/index.js

@@ -96,7 +96,10 @@ class IcqqAdapter extends adapter_1.Adapter {
     createOneBot(uin, protocol, versions) {
         const oneBot = super.createOneBot(uin, protocol, versions);
         __classPrivateFieldSet(this, _IcqqAdapter_password, this.app.config[`icqq.${uin}`].password, "f");
-        oneBot.internal = new icqq_1.Client((0, utils_1.deepMerge)(protocol, (0, utils_1.deepClone)(exports.defaultIcqqConfig)));
+        oneBot.internal = new icqq_1.Client((0, utils_1.deepMerge)(protocol, (0, utils_1.deepClone)({
+            ...exports.defaultIcqqConfig,
+            log_level: this.app.config.log_level
+        })));
         return oneBot;
     }
     formatEventPayload(version, event, data) {
@@ -207,8 +210,8 @@ class IcqqAdapter extends adapter_1.Adapter {
     toCqcode(version, messageArr) {
         return [].concat(messageArr).map(item => {
             if (item.type === 'text')
-                return item.data.text;
-            const dataStr = Object.entries(item.data).map(([key, value]) => {
+                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')}`;
@@ -219,7 +222,7 @@ class IcqqAdapter extends adapter_1.Adapter {
                 if (value instanceof Array)
                     return `${key}=${value.map(v => JSON.stringify(v)).join(',')}`;
                 // is String
-                return `${key}=${item.data[key]}`;
+                return `${key}=${item.data?.[key] || item[key]}`;
             });
             return `[CQ:${item.type},${dataStr.join(',')}]`;
         }).join('');

package/lib/adapters/qq/index.js

@@ -26,7 +26,6 @@ class QQAdapter extends adapter_1.Adapter {
             }
             qqBot.stop();
         };
-        const _this = this;
         const messageHandler = (event) => {
             this.emit('message.receive', oneBot.uin, event);
         };
@@ -73,10 +72,13 @@ class QQAdapter extends adapter_1.Adapter {
                         text: item
                     }
                 };
-            const { type, ...data } = item;
+            const { type, data, ...other } = item;
             return {
                 type,
-                data
+                data: {
+                    ...data,
+                    ...other
+                }
             };
         });
     }
@@ -125,7 +127,7 @@ class QQAdapter extends adapter_1.Adapter {
     formatEventPayload(version, event, data) {
         const result = {
             id: data.id,
-            type: event,
+            [version === 'V12' ? 'type' : 'post_type']: event,
             version: version,
             self: {
                 platform: 'qq',
@@ -133,9 +135,10 @@ class QQAdapter extends adapter_1.Adapter {
             },
             detail_type: data.message_type || data.notice_type || data.request_type,
             platform: 'qq',
+            time: data.timestamp,
             ...data,
         };
-        delete data.bot;
+        delete result.bot;
         return result;
     }
     async start(uin) {

package/lib/config.sample.yaml

@@ -25,8 +25,6 @@ general: # 通用配置，在单个配置省略时的默认值
     use_ws: true # 是否启用 websocket
     webhook: [ ] # http 上报地址
     ws_reverse: [ ] # 反向ws连接地址
-  protocol:
-    platform: 2
 # 每个账号的单独配置(用于覆盖通用配置)
 icqq.123456789: # `${适配器名称}:${账号}`
   versions:

package/lib/db.d.ts

@@ -1,16 +1,21 @@
-import { Keys, Value } from "@zhinjs/shared";
-export declare class Database<T extends object = object> {
-    private readonly path;
+export declare class JsonDB {
+    private readonly filePath;
     private data;
-    constructor(path: string);
-    sync(defaultValue: T): void;
-    get<K extends Keys<T>>(key: K): Value<T, K>;
-    delete<K extends Keys<T>>(key: K): boolean;
-    set<K extends Keys<T>>(key: K, value: Value<T, K>): void;
-}
-export declare namespace Database {
-    interface Config {
-        path: string;
-        force?: boolean;
-    }
+    constructor(filePath: string);
+    private init;
+    private write;
+    private read;
+    findIndex<T>(route: string, predicate: (value: T, index: number, obj: T[]) => unknown): number;
+    indexOf<T>(route: string, item: T): number;
+    get<T>(route: string, initialValue?: T): T | undefined;
+    set<T>(route: string, data: T): T;
+    delete(route: string): boolean;
+    private getArray;
+    unshift<T>(route: string, ...data: T[]): number;
+    shift<T>(route: string): T;
+    push<T>(route: string, ...data: T[]): number;
+    pop<T>(route: string): T;
+    splice<T>(route: string, index?: number, deleteCount?: number, ...data: T[]): T[];
+    find<T>(route: string, callback: (item: T) => boolean): T | undefined;
+    filter<T>(route: string, callback: (item: T) => boolean): T[];
 }

package/lib/db.js

@@ -1,58 +1,149 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Database = void 0;
-const fs_1 = require("fs");
-const shared_1 = require("@zhinjs/shared");
-class Database {
-    constructor(path) {
-        this.path = path;
+exports.JsonDB = void 0;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const utils_1 = require("./utils");
+class JsonDB {
+    constructor(filePath) {
+        this.filePath = filePath;
         this.data = {};
-        if (!this.path.toLowerCase().endsWith(".json"))
-            this.path = this.path + ".json";
-        if (!(0, fs_1.existsSync)(this.path)) {
-            (0, fs_1.writeFileSync)(this.path, "", "utf-8");
-        }
+        const dir = path.dirname(this.filePath);
+        if (fs.existsSync(dir))
+            fs.mkdirSync(dir, { recursive: true });
+        if (!this.filePath.endsWith('.jsondb'))
+            this.filePath = this.filePath + '.jsondb';
+        if (!fs.existsSync(this.filePath))
+            this.write();
+        this.init();
     }
-    sync(defaultValue) {
-        try {
-            this.data = JSON.parse((0, fs_1.readFileSync)(this.path, "utf-8"));
-        }
-        catch {
-            this.data = defaultValue;
-            (0, fs_1.writeFileSync)(this.path, JSON.stringify(defaultValue, null, 2), "utf-8");
+    init() {
+        this.read();
+    }
+    write() {
+        fs.writeFileSync(this.filePath, (0, utils_1.stringifyObj)(this.data), 'utf8');
+    }
+    read() {
+        this.data = (0, utils_1.parseObjFromStr)(fs.readFileSync(this.filePath, 'utf8'));
+    }
+    findIndex(route, predicate) {
+        const arr = this.getArray(route);
+        return arr.findIndex(predicate);
+    }
+    indexOf(route, item) {
+        return this.findIndex(route, (value) => value === item);
+    }
+    get(route, initialValue) {
+        this.read();
+        const parentPath = route.split('.');
+        const key = parentPath.pop();
+        if (!key)
+            return this.data;
+        let temp = this.data;
+        while (parentPath.length) {
+            const currentKey = parentPath.shift();
+            if (!Reflect.has(temp, currentKey))
+                Reflect.set(temp, key, {});
+            temp = Reflect.get(temp, currentKey);
         }
+        if (temp[key] !== undefined)
+            return temp[key];
+        temp[key] = initialValue;
+        this.write();
+        return initialValue;
+    }
+    set(route, data) {
+        const parentPath = route.split('.');
+        const key = parentPath.pop();
+        if (!key)
+            throw new SyntaxError(`route can't empty`);
+        const parentObj = this.get(parentPath.join('.'), {});
+        if (!parentObj)
+            throw new SyntaxError(`can't set property ${key} of undefined`);
+        parentObj[key] = data;
+        this.write();
+        return data;
+    }
+    delete(route) {
+        const parentPath = route.split('.');
+        const key = parentPath.pop();
+        if (!key)
+            throw new SyntaxError(`route can't empty`);
+        const parentObj = this.get(parentPath.join('.'), {});
+        if (!parentObj)
+            throw new SyntaxError(`property ${key} is not exist of undefined`);
+        const result = delete parentObj[key];
+        this.write();
+        return result;
+    }
+    getArray(route) {
+        if (!route)
+            throw new Error(`route can't empty`);
+        const arr = this.get(route, []);
+        if (!arr)
+            throw new SyntaxError(`route ${route} is not define`);
+        if (!Array.isArray(arr))
+            throw new TypeError(`data ${route} is not an Array`);
+        return arr;
+    }
+    unshift(route, ...data) {
+        const arr = this.getArray(route);
+        const result = arr.unshift(...data);
+        this.write();
+        return result;
+    }
+    shift(route) {
+        const arr = this.getArray(route);
+        const result = arr.shift();
+        this.write();
+        return result;
+    }
+    push(route, ...data) {
+        const arr = this.getArray(route);
+        const result = arr.push(...data);
+        this.write();
+        return result;
+    }
+    pop(route) {
+        const arr = this.getArray(route);
+        const result = arr.pop();
+        this.write();
+        return result;
+    }
+    splice(route, index = 0, deleteCount = 0, ...data) {
+        const arr = this.getArray(route);
+        const result = arr.splice(index, deleteCount, ...data);
+        this.write();
+        return result;
+    }
+    find(route, callback) {
+        return this.getArray(route).find(callback);
     }
-    get(key) {
-        const value = (0, shared_1.getValue)(this.data, key);
-        if (typeof value !== "object")
-            return value;
-        const saveValue = () => {
-            this.set(key, value);
-        };
-        return new Proxy(value, {
-            set(target, k, v) {
-                const res = Reflect.set(target, k, v);
-                saveValue();
-                return res;
-            },
-            deleteProperty(target, p) {
-                const res = Reflect.deleteProperty(target, p);
-                saveValue();
-                return res;
-            },
-            defineProperty(target, p, r) {
-                const res = Reflect.defineProperty(target, p, r);
-                saveValue();
-                return res;
-            },
-        });
-    }
-    delete(key) {
-        return (0, shared_1.deleteValue)(this.data, key);
-    }
-    set(key, value) {
-        (0, shared_1.setValue)(this.data, key, value);
-        return (0, fs_1.writeFileSync)(this.path, JSON.stringify(this.data, null, 2), "utf-8");
+    filter(route, callback) {
+        return this.getArray(route).filter(callback);
     }
 }
-exports.Database = Database;
+exports.JsonDB = JsonDB;

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

@@ -19,7 +19,9 @@ class CommonAction {
     async deleteMsg(message_id) {
         if (message_id == 0)
             throw new Error('getMsg: message_id[0] is invalid');
-        let msg_entry = await this.db.getMsgById(message_id);
+        let msg_entry = this.db.find('messages', (message) => {
+            return message.id === message_id;
+        });
         if (!msg_entry)
             throw new Error(`getMsg: can not find msg[${message_id}] in db`);
         return this.adapter.call(this.oneBot.uin, 'V11', 'deleteMsg', [msg_entry.base64_id]);
@@ -32,7 +34,9 @@ class CommonAction {
     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);
+        let msg_entry = this.db.find('messages', (message) => {
+            return message.id === message_id;
+        });
         if (!msg_entry)
             throw new Error(`getMsg: can not find msg[${message_id}] in db`);
         let msg = await this.adapter.call(this.oneBot.uin, 'V11', 'getMsg', [msg_entry.base64_id]);

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

@@ -28,5 +28,5 @@ export declare class FriendAction {
      * @param user_id {number} 用户id
      * @param times 点赞次数
      */
-    sendUserLike(this: V11, user_id: number, times?: number): Promise<any>;
+    sendLike(this: V11, user_id: number, times?: number): Promise<any>;
 }

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

@@ -38,8 +38,8 @@ class FriendAction {
      * @param user_id {number} 用户id
      * @param times 点赞次数
      */
-    async sendUserLike(user_id, times) {
-        return this.adapter.call(this.oneBot.uin, 'V11', 'sendUserLike', [user_id, times]);
+    async sendLike(user_id, times) {
+        return this.adapter.call(this.oneBot.uin, 'V11', 'sendLike', [user_id, times]);
     }
 }
 exports.FriendAction = FriendAction;

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

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

package/lib/service/V11/db_entities.js

@@ -1,63 +1,2 @@
 "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", String)
-], 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/index.d.ts

@@ -5,9 +5,9 @@ import { OneBot, OneBotStatus } from "../../onebot";
 import { Logger } from "log4js";
 import { WebSocket, WebSocketServer } from "ws";
 import { Dispose } from "../../types";
-import { Database } from "./db_sqlite";
 import { Service } from "../../service";
 import { Dict } from "@zhinjs/shared";
+import { JsonDB } from "../../db";
 export declare class V11 extends Service<"V11"> implements OneBot.Base {
     oneBot: OneBot<"V11">;
     config: OneBot.Config<"V11">;
@@ -15,7 +15,7 @@ export declare class V11 extends Service<"V11"> implements OneBot.Base {
     version: OneBot.Version;
     protected timestamp: number;
     protected heartbeat?: NodeJS.Timeout;
-    db: Database;
+    db: JsonDB;
     disposes: Dispose[];
     protected _queue: Array<{
         method: keyof Action;

package/lib/service/V11/index.js

@@ -13,11 +13,10 @@ const utils_1 = require("../../utils");
 const onebot_2 = require("../../onebot");
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
-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");
 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 {
@@ -32,7 +31,7 @@ class V11 extends service_1.Service {
         this.wsr = new Set();
         this.action = new action_1.Action();
         this.logger = this.oneBot.adapter.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);
+        this.db = new db_1.JsonDB((0, path_1.join)(app_1.App.configDir, 'data', `${this.oneBot.uin}_v11.jsondb`));
         this.oneBot.on("online", async () => {
             this.logger.info("【好友列表】");
             const friendList = await this.oneBot.getFriendList("V11");
@@ -228,7 +227,13 @@ class V11 extends service_1.Service {
             data.message_id = await this.addMsgToDB(data);
         }
         if (data.post_type == "notice" && String(data.notice_type).endsWith("_recall")) {
-            this.db.markMsgAsRecalled(data.base64_id);
+            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();
@@ -304,21 +309,21 @@ class V11 extends service_1.Service {
             // 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 || data.message;
-        return await this.db.addOrUpdateMsg(msg);
+        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)
@@ -329,20 +334,27 @@ class V11 extends service_1.Service {
      * @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.group_name = "";
-        msg.content = "";
-        return await this.db.addOrUpdateMsg(msg);
+        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.getMsgByParams(data.source.user_id, group_id, data.source.seq);
-        return msg ? msg.id : 0;
+        let msg = await this.db.find('messages', (message) => {
+            return message.user_id === data.user_id && message.group_id === group_id && message.seq === data.source.seq;
+        });
+        return msg?.id || 0;
     }
     async _httpRequestHandler(ctx) {
         if (ctx.method === "OPTIONS") {
@@ -517,7 +529,9 @@ 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.getMsgById(params.message_id)).id; // 调用api时把本地的数字id转为base64发给icqq
+            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");
@@ -540,9 +554,6 @@ class V11 extends service_1.Service {
             else
                 throw new Error("required message_type or input (user_id/group_id)");
         }
-        else if (action === "send_like") {
-            action = "send_user_like";
-        }
         const method = (0, utils_1.toHump)(action);
         if (Reflect.has(this.action, method)) {
             const ARGS = String(Reflect.get(this.action, method)).match(/\(.*\)/)?.[0]

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

@@ -19,6 +19,8 @@ export declare class V12 extends Service<'V12'> implements OneBot.Base {
     wsr: Set<WebSocket>;
     private db;
     constructor(oneBot: OneBot<'V12'>, config: OneBot.Config<'V12'>);
+    addHistory(payload: V12.Payload<keyof Action>): number;
+    shiftHistory(): unknown;
     get history(): V12.Payload<keyof Action>[];
     getFile(file_id: string): V12.FileInfo;
     delFile(file_id: string): boolean;

package/lib/service/V12/index.js

@@ -25,20 +25,24 @@ class V12 extends service_1.Service {
         this.version = 'V12';
         this.timestamp = Date.now();
         this.wsr = new Set();
-        this.db = new db_1.Database((0, path_1.join)(app_1.App.configDir, 'data', this.oneBot.uin + '.json'));
-        this.db.sync({ eventBuffer: [], msgIdMap: {}, files: {} });
+        this.db = new db_1.JsonDB((0, path_1.join)(app_1.App.configDir, 'data', `${this.oneBot.uin}_v12.jsondb`));
         this.action = new action_1.Action();
         this.logger = this.oneBot.adapter.getLogger(this.oneBot.uin, this.version);
     }
+    addHistory(payload) {
+        return this.db.push('eventBuffer', payload);
+    }
+    shiftHistory() {
+        return this.db.shift('eventBuffer');
+    }
     get history() {
-        return this.db.get('eventBuffer');
+        return this.db.get('eventBuffer', []);
     }
     getFile(file_id) {
         return this.db.get(`files.${file_id}`);
     }
     delFile(file_id) {
-        const files = this.db.get(`files`);
-        return delete files[file_id];
+        return this.db.delete(`files.${file_id}`);
     }
     saveFile(fileInfo) {
         const file_id = (0, utils_2.uuid)();
@@ -46,7 +50,7 @@ class V12 extends service_1.Service {
         return file_id;
     }
     get files() {
-        const files = this.db.get('files');
+        const files = this.db.get('files', {});
         return Object.keys(files).map((file_id) => {
             return {
                 file_id,
@@ -153,9 +157,9 @@ class V12 extends service_1.Service {
             if (!['message', 'notice', 'request', 'meta'].includes(payload.type))
                 return;
             if (config.event_enabled) {
-                this.history.push(payload);
+                this.addHistory(payload);
                 if (config.event_buffer_size !== 0 && this.history.length > config.event_buffer_size)
-                    this.history.shift();
+                    this.shiftHistory();
             }
         });
     }
@@ -360,12 +364,18 @@ class V12 extends service_1.Service {
                 platform: 'qq',
                 user_id: `${this.oneBot.uin}`
             },
-            ...(0, utils_2.transformObj)(data, (key, value) => {
-                if (!['user_id', 'group_id', 'discuss_id', 'member_id', 'channel_id', 'guild_id'].includes(key))
-                    return value;
-                return value + '';
-            }),
         };
+        Object.assign(payload, (0, utils_2.transformObj)(data, (key, value) => {
+            if (!['user_id', 'group_id', 'discuss_id', 'member_id', 'channel_id', 'guild_id'].includes(key))
+                return value;
+            return value + '';
+        }), {
+            self_id: `${this.oneBot.uin}`,
+            self: {
+                platform: 'qq',
+                user_id: `${this.oneBot.uin}`
+            },
+        });
         if (!this.filterFn(payload))
             return;
         this.emit('dispatch', payload);
@@ -563,6 +573,9 @@ class V12 extends service_1.Service {
      */
     _createWsr(url, config) {
         const timestmap = Date.now();
+        let remoteUrl = url;
+        if (config.access_token)
+            remoteUrl += `?access_token=${config.access_token}`;
         const headers = {
             "X-Self-ID": String(this.oneBot.uin),
             "X-Client-Role": "Universal",
@@ -571,7 +584,7 @@ class V12 extends service_1.Service {
         };
         if (config.access_token)
             headers.Authorization = "Bearer " + config.access_token;
-        const ws = new ws_1.WebSocket(url, '12.onebots.v' + utils_1.version, { headers });
+        const ws = new ws_1.WebSocket(remoteUrl, { headers });
         ws.on("error", (err) => {
             this.logger.error(err.message);
         });

package/lib/utils.d.ts

@@ -1,12 +1,10 @@
+import { Dict } from "@zhinjs/shared";
 export declare const version: any;
 export declare function deepMerge(base: any, ...from: any[]): any;
 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>;
-export declare function randomId(seed: string): number;
-export declare function randomId(seed: string, length: number): number;
-export declare function randomId(seed: string, min: number, max: number): number;
 /**
  * 将驼峰命名替换为下划线分割命名
  * @param name
@@ -22,5 +20,14 @@ export declare function toHump(action: string): string;
 export declare function remove<T>(list: T[], item: T): void;
 export declare function toBool(v: any): boolean;
 export declare function uuid(): string;
+export declare function randomInt(max: number): number;
+export declare function randomInt(min: number, max: number): number;
 export declare function protectedFields<T>(source: T, ...keys: ((keyof T) | string)[]): T;
 export declare function getProperties(obj: any): any;
+export declare function setValueToObj(obj: Dict, keys: string[], value: any): boolean;
+export declare function setValueToObj(obj: Dict, key: string, value: any): boolean;
+export declare function getValueOfObj<T = any>(obj: Dict, key: string[]): T;
+export declare function getValueOfObj<T = any>(obj: Dict, key: string): T;
+export declare function getDataKeyOfObj(data: any, obj: Dict): string;
+export declare function parseObjFromStr(str: string): any;
+export declare function stringifyObj(value: any): string;

package/lib/utils.js

@@ -22,13 +22,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProperties = exports.protectedFields = exports.uuid = exports.toBool = exports.remove = exports.toHump = exports.Mixin = exports.toLine = exports.randomId = exports.omit = exports.pick = exports.deepClone = exports.transformObj = exports.deepMerge = exports.version = void 0;
+exports.stringifyObj = exports.parseObjFromStr = exports.getDataKeyOfObj = exports.getValueOfObj = exports.setValueToObj = exports.getProperties = exports.protectedFields = exports.randomInt = exports.uuid = exports.toBool = exports.remove = exports.toHump = exports.Mixin = exports.toLine = exports.omit = exports.pick = exports.deepClone = exports.transformObj = exports.deepMerge = exports.version = void 0;
 const crypto = __importStar(require("crypto"));
-const seed_random_1 = __importDefault(require("seed-random"));
 const packageJson = require('../package.json');
 exports.version = packageJson.version;
 // 合并对象/数组
@@ -118,19 +114,6 @@ function omit(source, keys) {
     return result;
 }
 exports.omit = omit;
-function randomId(seed, ...args) {
-    let [min = 0, max = 1] = args;
-    let formatter = (n) => n;
-    if (args.length === 1) {
-        const len = Math.min(Number.MAX_SAFE_INTEGER.toString().length, args[0]);
-        min = 10 ** (len - 1);
-        max = Math.min(Number.MAX_SAFE_INTEGER, 10 ** len - 1);
-        formatter = (n) => Math.floor(n);
-    }
-    const rand = (0, seed_random_1.default)(seed);
-    return formatter(rand() * (max - min) + min);
-}
-exports.randomId = randomId;
 /**
  * 将驼峰命名替换为下划线分割命名
  * @param name
@@ -175,6 +158,13 @@ function uuid() {
     return hex.substr(0, 8) + "-" + hex.substr(8, 4) + "-" + hex.substr(12, 4) + "-" + hex.substr(16, 4) + "-" + hex.substr(20);
 }
 exports.uuid = uuid;
+function randomInt(...args) {
+    let min = args[0] || 0, max = args[1];
+    if (args.length === 1)
+        max = min, min = 0;
+    return Math.floor(Math.random() * (max - min) + min);
+}
+exports.randomInt = randomInt;
 function protectedFields(source, ...keys) {
     const protocolValue = (value) => {
         if (value && typeof value === 'object')
@@ -197,3 +187,95 @@ function getProperties(obj) {
     return Object.getOwnPropertyNames(obj).concat(getProperties(obj.__proto__));
 }
 exports.getProperties = getProperties;
+function setValueToObj(obj, key, value) {
+    const keys = Array.isArray(key) ? key : key.split('.').filter(Boolean);
+    const lastKey = keys.pop();
+    if (!lastKey)
+        throw new SyntaxError(`key is empty`);
+    while (keys.length) {
+        const k = keys.shift();
+        obj = Reflect.get(obj, k);
+        if (!obj)
+            throw new SyntaxError(`can't set ${lastKey} to undefined`);
+    }
+    return Reflect.set(obj, lastKey, value);
+}
+exports.setValueToObj = setValueToObj;
+function getValueOfObj(obj, key) {
+    const keys = Array.isArray(key) ? key : key.split('.').filter(Boolean);
+    const lastKey = keys.pop();
+    if (!lastKey)
+        throw new SyntaxError(`key is empty`);
+    while (keys.length) {
+        const k = keys.shift();
+        obj = Reflect.get(obj, k);
+        if (!obj)
+            throw new SyntaxError(`can't set ${lastKey} to undefined`);
+    }
+    return Reflect.get(obj, lastKey);
+}
+exports.getValueOfObj = getValueOfObj;
+function getDataKeyOfObj(data, obj) {
+    const _get = (data, obj, prefix) => {
+        for (const [key, value] of Object.entries(obj)) {
+            if (value === data)
+                return [...prefix, key].join('.');
+            if (!value || typeof value !== 'object')
+                continue;
+            const result = _get(data, value, prefix);
+            if (result)
+                return result;
+        }
+    };
+    return _get(data, obj, []);
+}
+exports.getDataKeyOfObj = getDataKeyOfObj;
+function parseObjFromStr(str) {
+    const result = JSON.parse(str);
+    const format = (data, keys) => {
+        if (!data)
+            return;
+        if (typeof data !== 'object' && typeof data !== 'string')
+            return;
+        if (typeof data === 'object')
+            return Object.entries(data).map(([k, v]) => format(v, [...keys, k]));
+        if (/\[Function:.+]/.test(data))
+            return setValueToObj(result, [...keys], new Function(`return (${data.slice(10, -1)})`)());
+        if (/\[Circular:.+]/.test(data))
+            setValueToObj(result, [...keys], getValueOfObj(result, data.slice(10, -1)));
+    };
+    format(result, []);
+    return result;
+}
+exports.parseObjFromStr = parseObjFromStr;
+function stringifyObj(value) {
+    if (!value || typeof value !== 'object')
+        return value;
+    if (Array.isArray(value))
+        return `[${value.map(stringifyObj).join()}]`;
+    let result = { ...value }, cache = new WeakMap();
+    const _stringify = (obj, prefix) => {
+        for (const key of Reflect.ownKeys(obj)) {
+            if (typeof key === 'symbol')
+                continue;
+            const val = Reflect.get(obj, key);
+            if (!val || typeof val !== 'object') {
+                if (typeof val === 'function') {
+                    setValueToObj(result, [...prefix, String(key)], `[Function:${(val + '').replace(/\n/g, '')}]`);
+                    continue;
+                }
+                setValueToObj(result, [...prefix, String(key)], val);
+                continue;
+            }
+            if (cache.has(val)) {
+                setValueToObj(result, [...prefix, String(key)], `[Circular:${getDataKeyOfObj(val, value)}]`);
+                continue;
+            }
+            cache.set(val, getValueOfObj(value, [...prefix, String(key)]));
+            _stringify(val, [...prefix, String(key)]);
+        }
+    };
+    _stringify(value, []);
+    return JSON.stringify(result, null, 2);
+}
+exports.stringifyObj = stringifyObj;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "onebots",
-    "version": "0.4.30",
+    "version": "0.4.32",
     "description": "基于icqq的多例oneBot实现",
     "engines": {
         "node": ">=16"
@@ -56,8 +56,7 @@
         "/**/LICENSE"
     ],
     "peerDependencies": {
-        "icqq": "latest",
-        "sqlite3": "^5.1.6"
+        "icqq": "latest"
     },
     "dependencies": {
         "@koa/router": "^10.1.1",
@@ -69,8 +68,6 @@
         "log4js": "^6.5.2",
         "mime-types": "^2.1.35",
         "reflect-metadata": "^0.1.13",
-        "seed-random": "^2.2.0",
-        "typeorm": "^0.3.17",
         "ws": "^8.8.0"
     }
 }

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

@@ -1,52 +0,0 @@
-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: string, 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

@@ -1,115 +0,0 @@
-"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: "sqlite",
-            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 msgDataExists.id;
-                }
-                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;