onebots 0.1.0 → 0.1.2

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

@@ -68,7 +68,7 @@ export declare namespace V11 {
     function error(error: string, retcode?: number): Result<any>;
     const defaultConfig: Config;
     function genMetaEvent(uin: number, type: string): {
-        self_id: number;
+        self_id: string;
         time: number;
         post_type: string;
         meta_event_type: string;

package/lib/service/V11/index.js

@@ -28,10 +28,10 @@ class V11 extends events_1.EventEmitter {
         this.queue_running = false;
         this.wsr = new Set();
         this.action = new action_1.Action();
-        this.logger = this.oneBot.app.getLogger(this.client.uin, this.version);
+        this.logger = this.oneBot.app.getLogger(this.oneBot.uin, this.version);
     }
     start(path) {
-        this.path = `/${this.client.uin}`;
+        this.path = `/${this.oneBot.uin}`;
         if (path)
             this.path += path;
         if (this.config.use_http)
@@ -61,7 +61,7 @@ class V11 extends events_1.EventEmitter {
         if (this.config.heartbeat) {
             this.heartbeat = setInterval(() => {
                 this.dispatch({
-                    self_id: this.client.uin,
+                    self_id: this.oneBot.uin + '',
                     status: {
                         online: this.client.status === icqq_1.OnlineStatus.Online,
                         good: this.oneBot.status === onebot_1.OneBotStatus.Good
@@ -87,7 +87,7 @@ class V11 extends events_1.EventEmitter {
                 headers: {
                     "Content-Type": "application/json",
                     "Content-Length": Buffer.byteLength(serialized),
-                    "X-Self-ID": String(this.client.uin),
+                    "X-Self-ID": String(this.oneBot.uin),
                     "User-Agent": "OneBot",
                 },
             };
@@ -193,6 +193,11 @@ class V11 extends events_1.EventEmitter {
             data.message = this.config.post_message_format === 'array' ? (0, icqq_cq_enable_1.toSegment)(data.message) : (0, icqq_cq_enable_1.toCqcode)(data);
         }
         data.time = Math.floor(Date.now() / 1000);
+        data = (0, utils_1.transformObj)(data, (key, value) => {
+            if (!['user_id', 'group_id', 'discuss_id', 'member_id', 'channel_id', 'guild_id'].includes(key))
+                return value;
+            return value + '';
+        });
         this.emit('dispatch', JSON.stringify(data));
     }
     async _httpRequestHandler(ctx) {
@@ -291,8 +296,8 @@ class V11 extends events_1.EventEmitter {
                 }));
             }
         });
-        ws.send(JSON.stringify(V11.genMetaEvent(this.client.uin, "connect")));
-        ws.send(JSON.stringify(V11.genMetaEvent(this.client.uin, "enable")));
+        ws.send(JSON.stringify(V11.genMetaEvent(this.oneBot.uin, "connect")));
+        ws.send(JSON.stringify(V11.genMetaEvent(this.oneBot.uin, "enable")));
     }
     /**
      * 创建反向ws
@@ -300,7 +305,7 @@ class V11 extends events_1.EventEmitter {
     _createWsr(url) {
         const timestmap = Date.now();
         const headers = {
-            "X-Self-ID": String(this.client.uin),
+            "X-Self-ID": String(this.oneBot.uin),
             "X-Client-Role": "Universal",
             "User-Agent": "OneBot",
         };
@@ -492,7 +497,7 @@ exports.V11 = V11;
     };
     function genMetaEvent(uin, type) {
         return {
-            self_id: uin,
+            self_id: uin + '',
             time: Math.floor(Date.now() / 1000),
             post_type: "meta_event",
             meta_event_type: "lifecycle",

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

@@ -32,7 +32,7 @@ export declare class V12 extends EventEmitter implements OneBot.Base {
     private startWsReverse;
     stop(force?: boolean): Promise<void>;
     format<E extends keyof V12.BotEventMap>(event: E, ...args: [V12.BotEventMap[E]]): {
-        self_id: number;
+        self_id: string;
         time: number;
         detail_type: E;
         type: string;
@@ -183,7 +183,7 @@ export declare namespace V12 {
     function success<T extends any>(data: T, retcode?: Result<T>['retcode'], echo?: string): Result<T>;
     function error(message: string, retcode?: Result<null>['retcode'], echo?: string): Result<null>;
     function formatPayload<K extends keyof BotEventMap>(uin: number, type: K, data: Omit<BotEventMap[K], K>): {
-        self_id: number;
+        self_id: string;
         time: number;
         detail_type: K;
         type: string;

package/lib/service/V12/index.js

@@ -26,11 +26,11 @@ class V12 extends events_1.EventEmitter {
         this.version = 'V12';
         this.timestamp = Date.now();
         this.wsr = new Set();
-        this.db = new db_1.Db((0, path_1.join)(app_1.App.configDir, 'data', this.client.uin + '.json'));
+        this.db = new db_1.Db((0, path_1.join)(app_1.App.configDir, 'data', this.oneBot.uin + '.json'));
         if (!this.history)
             this.history = [];
         this.action = new action_1.Action();
-        this.logger = this.oneBot.app.getLogger(this.client.uin, this.version);
+        this.logger = this.oneBot.app.getLogger(this.oneBot.uin, this.version);
     }
     get history() {
         return this.db.get('eventBuffer');
@@ -39,7 +39,7 @@ class V12 extends events_1.EventEmitter {
         this.db.set('eventBuffer', value);
     }
     start(path) {
-        this.path = `/${this.client.uin}`;
+        this.path = `/${this.oneBot.uin}`;
         if (path)
             this.path += path;
         if (this.config.use_http) {
@@ -90,7 +90,7 @@ class V12 extends events_1.EventEmitter {
         });
         if (this.config.heartbeat) {
             this.heartbeat = setInterval(() => {
-                this.dispatch(V12.formatPayload(this.client.uin, 'heartbeat', {
+                this.dispatch(V12.formatPayload(this.oneBot.uin, 'heartbeat', {
                     detail_type: "heartbeat",
                     interval: new Date().getTime() + this.config.heartbeat * 1000
                 }));
@@ -313,7 +313,7 @@ class V12 extends events_1.EventEmitter {
         if (!data.detail_type)
             data.detail_type = data.message_type || data.notice_type || data.request_type || data.system_type;
         data.message = data.type === 'message' ? V12.toSegment(data.message) : data.message;
-        return V12.formatPayload(this.client.uin, event, data);
+        return V12.formatPayload(this.oneBot.uin, event, data);
     }
     dispatch(data) {
         const payload = {
@@ -323,9 +323,13 @@ class V12 extends events_1.EventEmitter {
             platform: 'qq',
             self: {
                 platform: 'qq',
-                user_id: `${this.client.uin}`
+                user_id: `${this.oneBot.uin}`
             },
-            ...data,
+            ...(0, utils_1.transformObj)(data, (key, value) => {
+                if (!['user_id', 'group_id', 'discuss_id', 'member_id', 'channel_id', 'guild_id'].includes(key))
+                    return value;
+                return value + '';
+            }),
         };
         this.emit('dispatch', payload);
     }
@@ -478,7 +482,7 @@ class V12 extends events_1.EventEmitter {
     _createWsr(url, config) {
         const timestmap = Date.now();
         const headers = {
-            "X-Self-ID": String(this.client.uin),
+            "X-Self-ID": String(this.oneBot.uin),
             "X-Client-Role": "Universal",
             "User-Agent": "OneBot/12 (qq) Node-onebots/0.0.15",
             "Sec-WebSocket-Protocol": "12.onebots.v0.0.15"
@@ -554,8 +558,8 @@ class V12 extends events_1.EventEmitter {
                 }));
             }
         });
-        this.dispatch(V12.formatPayload(this.client.uin, "connect", this.action.getVersion.apply(this)));
-        this.dispatch(V12.formatPayload(this.client.uin, "status_update", this.action.getStatus.apply(this)));
+        this.dispatch(V12.formatPayload(this.oneBot.uin, "connect", this.action.getVersion.apply(this)));
+        this.dispatch(V12.formatPayload(this.oneBot.uin, "status_update", this.action.getStatus.apply(this)));
     }
 }
 exports.V12 = V12;
@@ -628,7 +632,7 @@ exports.V12 = V12;
     V12.error = error;
     function formatPayload(uin, type, data) {
         return {
-            self_id: uin,
+            self_id: uin + '',
             time: Math.floor(Date.now() / 1000),
             detail_type: type,
             type: 'meta',

package/lib/utils.d.ts

@@ -1,4 +1,5 @@
 export declare function deepMerge<T extends any>(base: T, ...from: T[]): T;
+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>;

package/lib/utils.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProperties = exports.protectedFields = exports.uuid = exports.toBool = exports.toLine = exports.remove = exports.toHump = exports.Mixin = exports.omit = exports.pick = exports.deepClone = exports.deepMerge = void 0;
+exports.getProperties = exports.protectedFields = exports.uuid = exports.toBool = exports.toLine = exports.remove = exports.toHump = exports.Mixin = exports.omit = exports.pick = exports.deepClone = exports.transformObj = exports.deepMerge = void 0;
 const crypto = __importStar(require("crypto"));
 // 合并对象/数组
 function deepMerge(base, ...from) {
@@ -57,6 +57,18 @@ function deepMerge(base, ...from) {
     return base;
 }
 exports.deepMerge = deepMerge;
+function transformObj(obj, callback) {
+    if (!obj)
+        return obj;
+    if (Array.isArray(obj))
+        return obj.map(item => transformObj(item, callback));
+    if (typeof obj !== 'object')
+        return obj;
+    return Object.fromEntries(Object.keys(obj).map(key => {
+        return [key, callback(key, obj[key])];
+    }));
+}
+exports.transformObj = transformObj;
 // 深拷贝
 function deepClone(obj) {
     if (typeof obj !== 'object')

package/package.json

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