onebots 0.0.23 → 0.0.24

package/lib/db.d.ts

@@ -9,7 +9,7 @@ export declare class Db extends EventEmitter {
     set(key: string, value: any, escape?: boolean): any;
     has(key: string, escape?: boolean): boolean;
     delete(key: string, escape?: boolean): boolean;
-    write(): Promise<void>;
+    write(): void;
 }
 export declare namespace Db {
     interface Config {

package/lib/db.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Db = void 0;
 const fs_1 = require("fs");
-const promises_1 = require("fs/promises");
 const events_1 = require("events");
 class Db extends events_1.EventEmitter {
     constructor(path, force_create = true) {
@@ -38,33 +37,22 @@ class Db extends events_1.EventEmitter {
             throw new Error('不可达的位置:' + key.toString());
         }
         return result && typeof result === 'object' ? new Proxy(result, {
-            get(target, p) {
-                return target[p];
+            get(target, p, receiver) {
+                return Reflect.get(target, p, receiver);
             },
             set(target, p, value, receiver) {
-                const result = target[p] = value;
-                _this.write();
+                const result = Reflect.set(target, p, value, receiver);
+                _this.set(`${key}.${value}`, value);
                 return result;
             }
         }) : result;
     }
     set(key, value, escape = true) {
         const func = new Function('value', `return this.data.${key}=value`);
-        const _this = this;
-        let result;
-        result = escape ? func.apply(this, [value]) : this.data[key] = value;
+        let result = escape ? func.apply(this, [value]) : this.data[key] = value;
         this.raw_data = JSON.stringify(this.data, null, 2);
         this.write();
-        return result && typeof result === 'object' ? new Proxy(result, {
-            get(target, p) {
-                return target[p];
-            },
-            set(target, p, value, receiver) {
-                const result = target[p] = value;
-                _this.write();
-                return result;
-            }
-        }) : result;
+        return result;
     }
     has(key, escape = true) {
         return escape ? new Function(`return !!this.data.${key}`).apply(this) : !!this.data[key];
@@ -74,11 +62,11 @@ class Db extends events_1.EventEmitter {
         this.write();
         return result;
     }
-    async write() {
+    write() {
         try {
             const raw_data = JSON.stringify(this.data, null, 2);
             if (raw_data !== this.raw_data) {
-                await (0, promises_1.writeFile)(this.path, raw_data);
+                (0, fs_1.writeFileSync)(this.path, raw_data);
                 this.raw_data = raw_data;
             }
         }

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

@@ -34,6 +34,7 @@ export declare class V12 extends EventEmitter implements OneBot.Base {
         self_id: number;
         time: number;
         detail_type: E;
+        type: string;
         sub_type: string;
     } & Omit<V12.BotEventMap[E], E>;
     dispatch(data: Record<string, any>): void;
@@ -155,6 +156,7 @@ export declare namespace V12 {
     type BotEventMap = {
         system: Record<string, any>;
         connect: {
+            type: any;
             detail_type: 'connect';
             version: ReturnType<Action['getVersion']>;
         };
@@ -183,6 +185,7 @@ export declare namespace V12 {
         self_id: number;
         time: number;
         detail_type: K;
+        type: string;
         sub_type: string;
     } & Omit<BotEventMap[K], K>;
 }

package/lib/service/V12/index.js

@@ -478,7 +478,7 @@ class V12 extends events_1.EventEmitter {
         };
         if (config.access_token)
             headers.Authorization = "Bearer " + config.access_token;
-        const ws = new ws_1.WebSocket(url, { headers });
+        const ws = new ws_1.WebSocket(url, '12.onebots.v0.0.15', { headers });
         ws.on("error", (err) => {
             this.logger.error(err.message);
         });
@@ -618,14 +618,14 @@ exports.V12 = V12;
     }
     V12.error = error;
     function formatPayload(uin, type, data) {
-        const result = {
+        return {
             self_id: uin,
             time: Math.floor(Date.now() / 1000),
             detail_type: type,
+            type: 'meta',
             sub_type: '',
             ...data
         };
-        return result;
     }
     V12.formatPayload = formatPayload;
 })(V12 = exports.V12 || (exports.V12 = {}));

package/package.json

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