onebots 0.4.67 → 0.4.69

package/lib/server/app.d.ts

@@ -67,7 +67,7 @@ export declare class App extends Koa {
     reload(config: App.Config): Promise<void>;
     stop(): Promise<void>;
 }
-export declare function createOnebots(config: App.Config | string, cp: ChildProcess | null): App;
+export declare function createOnebots(config?: App.Config | string, cp?: ChildProcess | null): App;
 export declare function defineConfig(config: App.Config): App.Config;
 export declare namespace App {
     const ADAPTERS: Map<string, AdapterClass>;

package/lib/server/app.js

@@ -307,24 +307,30 @@ class App extends koa_1.default {
 }
 exports.App = App;
 App.configDir = path.join(os.homedir(), ".onebots");
-function createOnebots(config = "config.yaml", cp) {
+function createOnebots(config = "config.yaml", cp = null) {
     if (typeof config === "string") {
         config = path.resolve(process_1.default.cwd(), config);
         App.configDir = path.dirname(config);
         if (!(0, fs_1.existsSync)(App.configDir)) {
             (0, fs_1.mkdirSync)(App.configDir);
         }
-        if (!(0, fs_1.existsSync)(App.dataDir)) {
-            (0, fs_1.mkdirSync)(App.dataDir);
-            console.log("已为你创建数据存储目录", App.dataDir);
-        }
-        if (!(0, fs_1.existsSync)(App.configPath)) {
-            (0, fs_1.copyFileSync)(path.resolve(__dirname, "../config.sample.yaml"), App.configPath);
+        config = js_yaml_1.default.load((0, fs_2.readFileSync)(App.configPath, "utf8"));
+    }
+    if (!(0, fs_1.existsSync)(App.configPath)) {
+        (0, fs_1.copyFileSync)(path.resolve(__dirname, "../config.sample.yaml"), App.configPath);
+        if (typeof config === "string") {
             console.log("未找到对应配置文件，已自动生成默认配置文件，请修改配置文件后重新启动");
             console.log(`配置文件在:  ${App.configPath}`);
             process_1.default.exit();
         }
-        config = js_yaml_1.default.load((0, fs_2.readFileSync)(App.configPath, "utf8"));
+        else {
+            console.log("未找到对应配置文件，已自动生成默认配置文件");
+            console.log(`配置文件在:  ${App.configPath}`);
+        }
+    }
+    if (!(0, fs_1.existsSync)(App.dataDir)) {
+        (0, fs_1.mkdirSync)(App.dataDir);
+        console.log("已为你创建数据存储目录", App.dataDir);
     }
     (0, log4js_1.configure)({
         appenders: {
@@ -334,6 +340,7 @@ function createOnebots(config = "config.yaml", cp) {
             },
             files: {
                 type: "file",
+                maxLogSize: 1024 * 1024 * 50,
                 filename: path.join(process_1.default.cwd(), "onebots.log"),
             },
         },

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

@@ -1,5 +1,4 @@
 import { V11 } from "../../../service/V11";
-import { Message } from "@icqqjs/icqq";
 export declare class CommonAction {
     /**
      * 获取登录信息
@@ -18,7 +17,7 @@ export declare class CommonAction {
      * @param message_id {string} 消息id
      * @param onebot_id {number}
      */
-    getMsg(this: V11, message_id: number): Promise<Message>;
+    getMsg(this: V11, message_id: number): Promise<V11.MessageRet>;
     /**
      * 获取合并消息
      * @param id {string} 合并id

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

@@ -32,7 +32,9 @@ class CommonAction {
      */
     async getMsg(message_id) {
         const msg_id = this.getStrByInt("message_id", message_id);
-        let msg = await this.adapter.call(this.oneBot.uin, "V11", "getMessage", [msg_id]);
+        let msg = await this.adapter.call(this.oneBot.uin, "V11", "getMessage", [
+            msg_id,
+        ]);
         msg.message_id = message_id; // nonebot v11 要求 message_id 是 number 类型
         msg["real_id"] = msg.message_id; // nonebot 的reply类型会检测real_id是否存在，虽然它从未使用
         return msg;

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

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-import { EventMap } from "@icqqjs/icqq";
 import { Config } from "./config";
 import { OneBot } from "../../onebot";
 import { Action } from "./action";
@@ -141,16 +140,6 @@ export declare namespace V12 {
             detail_type: "status_update";
             status: ReturnType<Action["getStatus"]>;
         };
-    } & TransformEventMap;
-    type TransformEventMap = {
-        [P in keyof EventMap]: TransformEventParams<Parameters<EventMap[P]>>;
-    };
-    type TransformEventParams<T extends any[]> = T extends [infer L, ...infer R] ? L extends object ? L & {
-        args: R;
-    } : {
-        args: [L, ...R];
-    } : {
-        args: T;
     };
     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>;

package/lib/service/V12/index.js

@@ -14,7 +14,6 @@ const https_1 = __importDefault(require("https"));
 const ws_1 = require("ws");
 const utils_2 = require("../../utils");
 const db_1 = require("../../db");
-const message_1 = require("@icqqjs/icqq/lib/message");
 const service_1 = require("../../service");
 const app_1 = require("../../server/app");
 class V12 extends service_1.Service {
@@ -353,15 +352,6 @@ class V12 extends service_1.Service {
                 data.message_type || data.notice_type || data.request_type || data.system_type;
         data.message =
             data.type === "message" ? this.adapter.toSegment("V12", data.message) : data.message;
-        if (data.source)
-            data.source = {
-                ...data.source,
-                message_id: data.detail_type === "private"
-                    ? (0, message_1.genDmMessageId)(data.source.user_id, data.source.seq, data.source.rand, data.source.time)
-                    : (0, message_1.genGroupMessageId)(data.group_id, data.source.user_id, data.source.seq, data.source.rand, data.source.time),
-                user_id: data.source.user_id,
-                message: data.source.message,
-            };
         return V12.formatPayload(this.oneBot.uin, event, data);
     }
     system_online(data) { }
@@ -403,7 +393,7 @@ class V12 extends service_1.Service {
     }
     transformMedia(segment) {
         const file = this.getFile(segment.data.file_id);
-        if (file)
+        if (file && file.data)
             return {
                 type: segment.type,
                 data: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.4.67",
+  "version": "0.4.69",
   "description": "基于icqq的多例oneBot实现",
   "main": "lib/index.js",
   "bin": {