onebots 0.4.39 → 0.4.41

package/lib/adapters/dingtalk/index.js

@@ -204,11 +204,11 @@ class DingtalkAdapter extends adapter_1.Adapter {
             [version === 'V12' ? 'type' : 'post_type']: event,
             version: version,
             self: {
-                platform: 'qq',
+                platform: 'dingtalk',
                 user_id: data.self_id
             },
             detail_type: data.message_type || data.notice_type || data.request_type,
-            platform: 'qq',
+            platform: 'dingtalk',
             time: data.timestamp,
             ...data,
         };

package/lib/adapters/wechat/index.js

@@ -196,15 +196,20 @@ class WechatAdapter extends adapter_1.Adapter {
             [version === 'V12' ? 'type' : 'post_type']: event,
             version: version,
             self: {
-                platform: 'qq',
+                platform: 'wechat',
                 user_id: data.self_id
             },
             detail_type: data.message_type || data.notice_type || data.request_type,
-            platform: 'qq',
+            platform: 'wechat',
+            group: data.group?.info,
+            member: data.member?.info,
+            friend: data.friend?.info,
             time: data.timestamp,
             ...data,
         };
         delete result.bot;
+        delete result.c;
+        delete result.parser;
         return result;
     }
     async start(uin) {

package/lib/server/app.js

@@ -180,7 +180,7 @@ class App extends koa_1.default {
         process_1.default.on('disconnect', () => {
             fs.unwatchFile(App.logFile, fileListener);
         });
-        this.ws.on('connection', (client) => {
+        this.ws.on('connection', async (client) => {
             client.send(JSON.stringify({
                 event: 'system.sync',
                 data: {
@@ -189,7 +189,7 @@ class App extends koa_1.default {
                         return adapter.info;
                     }),
                     app: this.info,
-                    logs: fs.existsSync(App.logFile) ? fs.readFileSync(App.logFile, 'utf8') : ''
+                    logs: fs.existsSync(App.logFile) ? await (0, utils_1.readLine)(100, App.logFile, 'utf8') : ''
                 }
             }));
             client.on('message', async (raw) => {

package/lib/service/V12/index.js

@@ -359,9 +359,9 @@ class V12 extends service_1.Service {
             id: (0, utils_2.uuid)(),
             impl: 'onebots',
             version: 12,
-            platform: 'qq',
+            platform: this.oneBot.platform,
             self: {
-                platform: 'qq',
+                platform: this.oneBot.platform,
                 user_id: `${this.oneBot.uin}`
             },
         };
@@ -372,7 +372,7 @@ class V12 extends service_1.Service {
         }), {
             self_id: `${this.oneBot.uin}`,
             self: {
-                platform: 'qq',
+                platform: this.oneBot.platform,
                 user_id: `${this.oneBot.uin}`
             },
         });
@@ -579,7 +579,7 @@ class V12 extends service_1.Service {
         const headers = {
             "X-Self-ID": String(this.oneBot.uin),
             "X-Client-Role": "Universal",
-            "User-Agent": "OneBot/12 (qq) Node-onebots/" + utils_1.version,
+            "User-Agent": `OneBot/12 (${this.oneBot.platform}) Node-onebots/V12`,
             "Sec-WebSocket-Protocol": "12.onebots.v" + utils_1.version
         };
         if (config.access_token)

package/lib/utils.d.ts

@@ -1,5 +1,8 @@
+/// <reference types="node" />
 import { Dict } from "@zhinjs/shared";
+import * as fs from "fs";
 export declare const version: any;
+export declare function readLine(maxLen: number, ...params: Parameters<typeof fs.createReadStream>): Promise<string[]>;
 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;

package/lib/utils.js

@@ -23,10 +23,30 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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.readLine = exports.version = void 0;
 const crypto = __importStar(require("crypto"));
+const fs = __importStar(require("fs"));
+const readline = __importStar(require("readline"));
 const packageJson = require('../package.json');
 exports.version = packageJson.version;
+function readLine(maxLen, ...params) {
+    return new Promise(resolve => {
+        const result = [];
+        const rl = readline.createInterface({
+            input: fs.createReadStream(...params),
+            crlfDelay: Infinity
+        });
+        rl.on('line', (line) => {
+            result.push(line);
+            if (result.length > maxLen)
+                result.shift();
+        });
+        rl.on('close', () => {
+            resolve(result);
+        });
+    });
+}
+exports.readLine = readLine;
 // 合并对象/数组
 function deepMerge(base, ...from) {
     if (base === null || base === undefined)

package/package.json

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