onebots 0.0.26 → 0.0.27

package/lib/db.d.ts

@@ -1,6 +1,4 @@
-/// <reference types="node" />
-import { EventEmitter } from "events";
-export declare class Db extends EventEmitter {
+export declare class Db {
     private readonly path;
     private data;
     private raw_data;

package/lib/db.js

@@ -2,10 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Db = void 0;
 const fs_1 = require("fs");
-const events_1 = require("events");
-class Db extends events_1.EventEmitter {
+class Db {
     constructor(path, force_create = true) {
-        super();
         this.path = path;
         this.data = {};
         this.raw_data = '{}';
@@ -63,7 +61,7 @@ class Db extends events_1.EventEmitter {
     }
     write() {
         try {
-            const raw_data = JSON.stringify(this.data, null, 2);
+            const raw_data = JSON.stringify(this.data);
             if (raw_data !== this.raw_data) {
                 (0, fs_1.writeFileSync)(this.path, raw_data);
                 this.raw_data = raw_data;

package/lib/server/app.js

@@ -48,7 +48,7 @@ class App extends koa_1.default {
         super(config);
         this.oneBots = [];
         this.config = (0, utils_1.deepMerge)((0, utils_1.deepClone)(App.defaultConfig), config);
-        this.logger = (0, log4js_1.getLogger)('[oicq-oneBot]');
+        this.logger = (0, log4js_1.getLogger)('[oicq-OneBot]');
         this.logger.level = this.config.log_level;
         this.router = new router_1.Router({ prefix: config.path });
         this.use((0, koa_bodyparser_1.default)())
@@ -58,7 +58,7 @@ class App extends koa_1.default {
         this.createOneBots();
     }
     getLogger(uin, version = '') {
-        const logger = (0, log4js_1.getLogger)(`[oicq-oneBot${version}:${uin}]`);
+        const logger = (0, log4js_1.getLogger)(`[oicq-OneBot${version}:${uin}]`);
         logger.level = this.config.log_level;
         return logger;
     }

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

@@ -23,6 +23,7 @@ export declare class V12 extends EventEmitter implements OneBot.Base {
     private db;
     constructor(oneBot: OneBot<'V12'>, client: Client, config: V12.Config);
     get history(): Payload<keyof Action>[];
+    set history(value: Payload<keyof Action>[]);
     start(path?: string): void;
     private startHttp;
     private startWebhook;

package/lib/service/V12/index.js

@@ -28,13 +28,16 @@ class V12 extends events_1.EventEmitter {
         this.wsr = new Set();
         this.db = new db_1.Db((0, path_1.join)(app_1.App.configDir, 'data', this.client.uin + '.json'));
         if (!this.history)
-            this.db.set('eventBuffer', []);
+            this.history = [];
         this.action = new action_1.Action();
         this.logger = this.oneBot.app.getLogger(this.client.uin, this.version);
     }
     get history() {
         return this.db.get('eventBuffer');
     }
+    set history(value) {
+        this.db.set('eventBuffer', value);
+    }
     start(path) {
         this.path = `/${this.client.uin}`;
         if (path)
@@ -261,6 +264,10 @@ class V12 extends events_1.EventEmitter {
         if (this.client.status === oicq_1.OnlineStatus.Online) {
             await this.client.terminate();
         }
+        this.wss.close();
+        for (const ws of this.wsr) {
+            ws.close();
+        }
         if (force) {
             (0, fs_1.rmSync)(this.client.dir, { force: true, recursive: true });
         }
@@ -357,6 +364,7 @@ class V12 extends events_1.EventEmitter {
                         params[k] = (0, utils_1.toBool)(params[k]);
                     if (k === 'message') {
                         params[k] = V12.fromSegment(params[k]);
+                        console.log(params[k]);
                         params['message_id'] = params[k].find(e => e.type === 'reply')?.message_id;
                     }
                     args.push(params[k]);
@@ -564,6 +572,7 @@ exports.V12 = V12;
             const { type, data, ...other } = msg;
             return {
                 type: type.replace('mention', 'at').replace('at_all', 'at'),
+                qq: data['user_id'],
                 ...other,
                 ...data
             };

package/package.json

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