onebots 0.4.47 → 0.4.49

package/lib/db.js

@@ -34,8 +34,8 @@ class JsonDB {
         const dir = path.dirname(this.filePath);
         if (fs.existsSync(dir))
             fs.mkdirSync(dir, { recursive: true });
-        if (!this.filePath.endsWith('.jsondb'))
-            this.filePath = this.filePath + '.jsondb';
+        if (!this.filePath.endsWith(".jsondb"))
+            this.filePath = this.filePath + ".jsondb";
         if (!fs.existsSync(this.filePath))
             this.write();
         this.init();
@@ -44,21 +44,21 @@ class JsonDB {
         this.read();
     }
     write() {
-        fs.writeFileSync(this.filePath, (0, utils_1.stringifyObj)(this.data), 'utf8');
+        fs.writeFileSync(this.filePath, (0, utils_1.stringifyObj)(this.data), "utf8");
     }
     read() {
-        this.data = (0, utils_1.parseObjFromStr)(fs.readFileSync(this.filePath, 'utf8'));
+        this.data = (0, utils_1.parseObjFromStr)(fs.readFileSync(this.filePath, "utf8"));
     }
     findIndex(route, predicate) {
         const arr = this.getArray(route);
         return arr.findIndex(predicate);
     }
     indexOf(route, item) {
-        return this.findIndex(route, (value) => value === item);
+        return this.findIndex(route, value => value === item);
     }
     get(route, initialValue) {
         this.read();
-        const parentPath = route.split('.');
+        const parentPath = route.split(".");
         const key = parentPath.pop();
         if (!key)
             return this.data;
@@ -76,11 +76,11 @@ class JsonDB {
         return initialValue;
     }
     set(route, data) {
-        const parentPath = route.split('.').filter(c => c.length);
+        const parentPath = route.split(".").filter(c => c.length);
         const key = parentPath.pop();
         if (!key)
             throw new SyntaxError(`route can't empty`);
-        const parentObj = this.get(parentPath.join('.'), {});
+        const parentObj = this.get(parentPath.join("."), {});
         if (!parentObj)
             throw new SyntaxError(`can't set property ${key} of undefined`);
         parentObj[key] = data;
@@ -88,11 +88,11 @@ class JsonDB {
         return data;
     }
     delete(route) {
-        const parentPath = route.split('.');
+        const parentPath = route.split(".");
         const key = parentPath.pop();
         if (!key)
             throw new SyntaxError(`route can't empty`);
-        const parentObj = this.get(parentPath.join('.'), {});
+        const parentObj = this.get(parentPath.join("."), {});
         if (!parentObj)
             throw new SyntaxError(`property ${key} is not exist of undefined`);
         const result = delete parentObj[key];

package/lib/onebot.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { EventEmitter } from 'events';
+import { EventEmitter } from "events";
 import { V11 } from "./service/V11";
 import { V12 } from "./service/V12";
 import { Adapter } from "./adapter";
@@ -48,22 +48,22 @@ export declare enum OneBotStatus {
 }
 export declare namespace OneBot {
     type Filters = {};
-    type Version = 'V11' | 'V12';
+    type Version = "V11" | "V12";
     type Config<V extends Version = Version> = {
         version?: V;
         filters?: Service.Filters;
-    } & (V extends 'V11' ? V11.Config : V12.Config);
+    } & (V extends "V11" ? V11.Config : V12.Config);
     const UnsupportedMethodError: Error;
     const UnsupportedVersionError: Error;
-    type Payload<V extends Version = Version> = V extends 'V11' ? V11.Payload : V12.Payload;
-    type Segment<V extends Version = Version> = V extends 'V11' ? V11.Segment : V12.Segment;
-    type SelfInfo<V extends Version = Version> = V extends 'V11' ? V11.SelfInfo : V12.SelfInfo;
-    type GroupInfo<V extends Version> = V extends 'V11' ? V11.GroupInfo : V12.GroupInfo;
-    type UserInfo<V extends Version> = V extends 'V11' ? V11.UserInfo : V12.UserInfo;
-    type Message<V extends Version> = V extends 'V11' ? V11.Message : V12.Message;
-    type MessageElement<V extends Version> = V extends 'V11' ? V11.MessageElement : V12.MessageElement;
-    type GroupMemberInfo<V extends Version> = V extends 'V11' ? V11.GroupMemberInfo : V12.GroupMemberInfo;
-    type MessageRet<V extends Version> = V extends 'V11' ? V11.MessageRet : V12.MessageRet;
+    type Payload<V extends Version = Version> = V extends "V11" ? V11.Payload : V12.Payload;
+    type Segment<V extends Version = Version> = V extends "V11" ? V11.Segment : V12.Segment;
+    type SelfInfo<V extends Version = Version> = V extends "V11" ? V11.SelfInfo : V12.SelfInfo;
+    type GroupInfo<V extends Version> = V extends "V11" ? V11.GroupInfo : V12.GroupInfo;
+    type UserInfo<V extends Version> = V extends "V11" ? V11.UserInfo : V12.UserInfo;
+    type Message<V extends Version> = V extends "V11" ? V11.Message : V12.Message;
+    type MessageElement<V extends Version> = V extends "V11" ? V11.MessageElement : V12.MessageElement;
+    type GroupMemberInfo<V extends Version> = V extends "V11" ? V11.GroupMemberInfo : V12.GroupMemberInfo;
+    type MessageRet<V extends Version> = V extends "V11" ? V11.MessageRet : V12.MessageRet;
     interface Base {
         start(path?: string): any;
         stop(): any;

package/lib/onebot.js

@@ -20,7 +20,7 @@ const V12_1 = require("./service/V12");
 class NotFoundError extends Error {
     constructor() {
         super(...arguments);
-        this.message = '不支持的API';
+        this.message = "不支持的API";
     }
 }
 exports.NotFoundError = NotFoundError;
@@ -29,16 +29,16 @@ class OneBot extends events_1.EventEmitter {
         return this.adapter.app;
     }
     get V11() {
-        return this.instances.find(i => i.version === 'V11');
+        return this.instances.find(i => i.version === "V11");
     }
     get V12() {
-        return this.instances.find(i => i.version === 'V12');
+        return this.instances.find(i => i.version === "V12");
     }
     get platform() {
         return this.adapter.platform;
     }
     get logger() {
-        return __classPrivateFieldSet(this, _OneBot_logger, __classPrivateFieldGet(this, _OneBot_logger, "f") || this.adapter.getLogger(this.uin), "f");
+        return (__classPrivateFieldSet(this, _OneBot_logger, __classPrivateFieldGet(this, _OneBot_logger, "f") || this.adapter.getLogger(this.uin), "f"));
     }
     get info() {
         return {
@@ -50,7 +50,7 @@ class OneBot extends events_1.EventEmitter {
             dependency: this.dependency,
             urls: this.instances.map(ins => {
                 return `/${this.platform}/${this.uin}/${ins.version}`;
-            })
+            }),
         };
     }
     constructor(adapter, uin, version_configs) {
@@ -60,24 +60,24 @@ class OneBot extends events_1.EventEmitter {
         _OneBot_logger.set(this, void 0);
         this.config = version_configs.map(c => {
             if (!c.version)
-                c.version = 'V11';
+                c.version = "V11";
             switch (c.version) {
-                case 'V11':
+                case "V11":
                     return (0, utils_1.deepMerge)((0, utils_1.deepClone)(this.adapter.app.config.general.V11), c);
-                case 'V12':
+                case "V12":
                     return (0, utils_1.deepMerge)((0, utils_1.deepClone)(this.adapter.app.config.general.V12), c);
                 default:
-                    throw new Error('不支持的oneBot版本：' + c.version);
+                    throw new Error("不支持的oneBot版本：" + c.version);
             }
         });
         this.instances = this.config.map(c => {
             switch (c.version) {
-                case 'V11':
+                case "V11":
                     return new V11_1.V11(this, c);
-                case 'V12':
+                case "V12":
                     return new V12_1.V12(this, c);
                 default:
-                    throw new Error('不支持的oneBot版本：' + c.version);
+                    throw new Error("不支持的oneBot版本：" + c.version);
             }
         });
         this.status = OneBotStatus.Good;
@@ -91,7 +91,7 @@ class OneBot extends events_1.EventEmitter {
         for (const instance of this.instances) {
             await instance.stop(force);
         }
-        this.emit('stop');
+        this.emit("stop");
     }
     getGroupList(version) {
         return this.adapter.getGroupList(this.uin, version);
@@ -114,7 +114,16 @@ var OneBotStatus;
     OneBotStatus["Online"] = "online";
 })(OneBotStatus || (exports.OneBotStatus = OneBotStatus = {}));
 (function (OneBot) {
-    OneBot.UnsupportedMethodError = new Error('不支持的方法');
-    OneBot.UnsupportedVersionError = new Error('不支持的oneBot版本');
+    OneBot.UnsupportedMethodError = new Error("不支持的方法");
+    OneBot.UnsupportedVersionError = new Error("不支持的oneBot版本");
 })(OneBot || (exports.OneBot = OneBot = {}));
-exports.BOOLS = ["no_cache", "auto_escape", "as_long", "enable", "reject_add_request", "is_dismiss", "approve", "block"];
+exports.BOOLS = [
+    "no_cache",
+    "auto_escape",
+    "as_long",
+    "enable",
+    "reject_add_request",
+    "is_dismiss",
+    "approve",
+    "block",
+];

package/lib/server/app.d.ts

@@ -3,8 +3,8 @@
 /// <reference types="node" />
 /// <reference types="koa-bodyparser" />
 /// <reference types="node" />
-import Koa from 'koa';
-import * as os from 'os';
+import Koa from "koa";
+import * as os from "os";
 import "reflect-metadata";
 import { Logger } from "log4js";
 import { Server } from "http";

package/lib/server/app.js

@@ -47,16 +47,16 @@ const process_1 = __importDefault(require("process"));
 const fs = __importStar(require("fs"));
 class App extends koa_1.default {
     static get configPath() {
-        return path.join(App.configDir, 'config.yaml');
+        return path.join(App.configDir, "config.yaml");
     }
     static get dataDir() {
-        return path.join(App.configDir, 'data');
+        return path.join(App.configDir, "data");
     }
     static get logFile() {
-        return path.join(App.configDir, 'onebots.log');
+        return path.join(App.configDir, "onebots.log");
     }
     get info() {
-        const pkg = require(path.resolve(__dirname, '../../package.json'));
+        const pkg = require(path.resolve(__dirname, "../../package.json"));
         const free_memory = os.freemem();
         const total_memory = os.totalmem();
         return {
@@ -74,7 +74,7 @@ class App extends koa_1.default {
             process_use_memory: process_1.default.memoryUsage.rss(),
             node_version: process_1.default.version,
             sdk_version: pkg.version,
-            uptime: process_1.default.uptime() * 1000
+            uptime: process_1.default.uptime() * 1000,
         };
     }
     constructor(config = {}) {
@@ -84,20 +84,19 @@ class App extends koa_1.default {
         this.init();
     }
     init() {
-        this.logger = (0, log4js_1.getLogger)('[OneBots]');
+        this.logger = (0, log4js_1.getLogger)("[OneBots]");
         this.logger.level = this.config.log_level;
         this.router = new router_1.Router({ prefix: this.config.path });
-        this
-            .use((0, koa_bodyparser_1.default)())
+        this.use((0, koa_bodyparser_1.default)())
             .use(this.router.routes())
             .use(this.router.allowedMethods())
             .use((0, koa_basic_auth_1.default)({
             name: this.config.username,
-            pass: this.config.password
+            pass: this.config.password,
         }))
-            .use((0, koa_static_1.default)(path.resolve(__dirname, '../../dist')));
+            .use((0, koa_static_1.default)(path.resolve(__dirname, "../../dist")));
         this.httpServer = (0, http_1.createServer)(this.callback());
-        this.ws = this.router.ws('/', this.httpServer);
+        this.ws = this.router.ws("/", this.httpServer);
         this.createOneBots();
     }
     getLogger(patform) {
@@ -108,8 +107,8 @@ class App extends koa_1.default {
     getConfigMaps() {
         const result = [];
         for (const [key, value] of Object.entries(this.config)) {
-            const [adapter, ...uinArr] = key.split('.');
-            const uin = uinArr.join('.');
+            const [adapter, ...uinArr] = key.split(".");
+            const uin = uinArr.join(".");
             if (!uin)
                 continue;
             result.push([adapter, uin, value]);
@@ -157,9 +156,11 @@ class App extends koa_1.default {
         return adapter.createOneBot(uin, config.protocol, config.versions);
     }
     get oneBots() {
-        return [...this.adapters.values()].map((adapter) => {
+        return [...this.adapters.values()]
+            .map(adapter => {
             return [...adapter.oneBots.values()];
-        }).flat();
+        })
+            .flat();
     }
     findOrCreateAdapter(platform, config) {
         if (this.adapters.has(platform))
@@ -173,35 +174,35 @@ class App extends koa_1.default {
     }
     async start() {
         this.httpServer.listen(this.config.port);
-        const fileListener = (e) => {
-            if (e === 'change')
+        const fileListener = e => {
+            if (e === "change")
                 this.ws.clients.forEach(async (client) => {
                     client.send(JSON.stringify({
-                        event: 'system.log',
-                        data: await (0, utils_1.readLine)(1, App.logFile)
+                        event: "system.log",
+                        data: await (0, utils_1.readLine)(1, App.logFile),
                     }));
                 });
         };
         fs.watch(App.logFile, fileListener);
-        this.on('close', () => {
+        this.on("close", () => {
             fs.unwatchFile(App.logFile, fileListener);
         });
-        process_1.default.on('disconnect', () => {
+        process_1.default.on("disconnect", () => {
             fs.unwatchFile(App.logFile, fileListener);
         });
-        this.ws.on('connection', async (client) => {
+        this.ws.on("connection", async (client) => {
             client.send(JSON.stringify({
-                event: 'system.sync',
+                event: "system.sync",
                 data: {
-                    config: fs.readFileSync(App.configPath, 'utf8'),
+                    config: fs.readFileSync(App.configPath, "utf8"),
                     adapters: [...this.adapters.values()].map(adapter => {
                         return adapter.info;
                     }),
                     app: this.info,
-                    logs: fs.existsSync(App.logFile) ? await (0, utils_1.readLine)(100, App.logFile) : ''
-                }
+                    logs: fs.existsSync(App.logFile) ? await (0, utils_1.readLine)(100, App.logFile) : "",
+                },
             }));
-            client.on('message', async (raw) => {
+            client.on("message", async (raw) => {
                 let payload = {};
                 try {
                     payload = JSON.parse(raw.toString());
@@ -210,38 +211,38 @@ class App extends koa_1.default {
                     return;
                 }
                 switch (payload.action) {
-                    case 'system.input':
+                    case "system.input":
                         return process_1.default.stdin.write(`${payload.data}\n`);
-                    case 'system.saveConfig':
-                        return fs.writeFileSync(App.configPath, payload.data, 'utf8');
-                    case 'system.reload':
-                        const config = js_yaml_1.default.load(fs.readFileSync(App.configPath, 'utf8'));
+                    case "system.saveConfig":
+                        return fs.writeFileSync(App.configPath, payload.data, "utf8");
+                    case "system.reload":
+                        const config = js_yaml_1.default.load(fs.readFileSync(App.configPath, "utf8"));
                         return this.reload(config);
-                    case 'bot.start': {
+                    case "bot.start": {
                         const { platform, uin } = JSON.parse(payload.data);
                         await this.adapters.get(platform)?.setOnline(uin);
                         return client.send(JSON.stringify({
-                            event: 'bot.change',
-                            data: this.adapters.get(platform).getOneBot(uin).info
+                            event: "bot.change",
+                            data: this.adapters.get(platform).getOneBot(uin).info,
                         }));
                     }
-                    case 'bot.stop': {
+                    case "bot.stop": {
                         const { platform, uin } = JSON.parse(payload.data);
                         await this.adapters.get(platform)?.setOffline(uin);
                         return client.send(JSON.stringify({
-                            event: 'bot.change',
-                            data: this.adapters.get(platform).getOneBot(uin).info
+                            event: "bot.change",
+                            data: this.adapters.get(platform).getOneBot(uin).info,
                         }));
                     }
                 }
             });
         });
-        this.router.get('/list', (ctx) => {
+        this.router.get("/list", ctx => {
             ctx.body = this.oneBots.map(bot => {
                 return bot.info;
             });
         });
-        this.router.post('/add', (ctx, next) => {
+        this.router.post("/add", (ctx, next) => {
             const { uin, ...config } = (ctx.request.body || {});
             try {
                 this.addAccount(config.platform, uin, config);
@@ -251,7 +252,7 @@ class App extends koa_1.default {
                 ctx.body = e.message;
             }
         });
-        this.router.post('/edit', (ctx, next) => {
+        this.router.post("/edit", (ctx, next) => {
             const { uin, ...config } = (ctx.request.body || {});
             try {
                 this.updateAccount(config.platform, uin, config);
@@ -261,7 +262,7 @@ class App extends koa_1.default {
                 ctx.body = e.message;
             }
         });
-        this.router.get('/remove', (ctx, next) => {
+        this.router.get("/remove", (ctx, next) => {
             const { uin, platform, force } = ctx.request.query;
             try {
                 this.removeAccount(String(platform), String(uin), Boolean(force));
@@ -272,13 +273,13 @@ class App extends koa_1.default {
                 ctx.body = e.message;
             }
         });
-        process_1.default.on('uncaughtException', (e) => {
-            console.error('uncaughtException', e);
+        process_1.default.on("uncaughtException", e => {
+            console.error("uncaughtException", e);
         });
-        process_1.default.on('unhandledRejection', (e) => {
-            console.error('unhandledRejection', e);
+        process_1.default.on("unhandledRejection", e => {
+            console.error("unhandledRejection", e);
         });
-        this.logger.mark(`server listen at http://0.0.0.0:${this.config.port}/${this.config.path ? this.config.path : ''}`);
+        this.logger.mark(`server listen at http://0.0.0.0:${this.config.port}/${this.config.path ? this.config.path : ""}`);
         for (const [_, adapter] of this.adapters) {
             await adapter.start();
         }
@@ -296,13 +297,13 @@ class App extends koa_1.default {
         this.adapters.clear();
         // this.ws.close()
         this.httpServer.close();
-        this.emit('close');
+        this.emit("close");
     }
 }
 exports.App = App;
-App.configDir = path.join(os.homedir(), '.onebots');
-function createOnebots(config = 'config.yaml', cp) {
-    if (typeof config === 'string') {
+App.configDir = path.join(os.homedir(), ".onebots");
+function createOnebots(config = "config.yaml", cp) {
+    if (typeof config === "string") {
         config = path.resolve(process_1.default.cwd(), config);
         App.configDir = path.dirname(config);
         if (!(0, fs_1.existsSync)(App.configDir)) {
@@ -310,37 +311,37 @@ function createOnebots(config = 'config.yaml', cp) {
         }
         if (!(0, fs_1.existsSync)(App.dataDir)) {
             (0, fs_1.mkdirSync)(App.dataDir);
-            console.log('以为你创建数据存储目录', 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);
-            console.log('未找到对应配置文件，已自动生成默认配置文件，请修改配置文件后重新启动');
+            (0, fs_1.copyFileSync)(path.resolve(__dirname, "../config.sample.yaml"), App.configPath);
+            console.log("未找到对应配置文件，已自动生成默认配置文件，请修改配置文件后重新启动");
             console.log(`配置文件在:  ${App.configPath}`);
             process_1.default.exit();
         }
-        config = js_yaml_1.default.load((0, fs_2.readFileSync)(App.configPath, 'utf8'));
+        config = js_yaml_1.default.load((0, fs_2.readFileSync)(App.configPath, "utf8"));
     }
     (0, log4js_1.configure)({
         appenders: {
             out: {
-                type: 'stdout',
-                layout: { type: 'colored' }
+                type: "stdout",
+                layout: { type: "colored" },
             },
             files: {
-                type: 'file',
-                filename: path.join(process_1.default.cwd(), 'onebots.log')
-            }
+                type: "file",
+                filename: path.join(process_1.default.cwd(), "onebots.log"),
+            },
         },
         categories: {
             default: {
-                appenders: ['out', 'files'],
-                level: config.log_level || "info"
-            }
+                appenders: ["out", "files"],
+                level: config.log_level || "info",
+            },
         },
-        disableClustering: true
+        disableClustering: true,
     });
     if (cp)
-        process_1.default.on('disconnect', () => cp.kill());
+        process_1.default.on("disconnect", () => cp.kill());
     return new App(config);
 }
 exports.createOnebots = createOnebots;
@@ -352,14 +353,14 @@ exports.defineConfig = defineConfig;
     App.ADAPTERS = new Map();
     App.defaultConfig = {
         port: 6727,
-        username: 'admin',
-        password: '123456',
+        username: "admin",
+        password: "123456",
         timeout: 30,
         general: {
             V11: V11_1.V11.defaultConfig,
             V12: V12_1.V12.defaultConfig,
         },
-        log_level: 'info',
+        log_level: "info",
     };
     function registerAdapter(platform, adapter) {
         if (!adapter)
@@ -373,10 +374,10 @@ exports.defineConfig = defineConfig;
     App.registerAdapter = registerAdapter;
     function loadAdapter(platform) {
         const maybeNames = [
-            path.join(__dirname, '../adapters', platform), // 内置的
+            path.join(__dirname, "../adapters", platform), // 内置的
             `@onebots/adapter-${platform}`, // 我写的
             `onebots-adapter-${platform}`, // 别人按照规范写的
-            platform // 别人写的
+            platform, // 别人写的
         ];
         let adapter = null;
         for (const adapterName of maybeNames) {

package/lib/server/router.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="koa__router" />
-import KoaRouter from '@koa/router';
+import KoaRouter from "@koa/router";
 import { WebSocketServer } from "ws";
 import http from "http";
 export declare class WsServer extends WebSocketServer {

package/lib/server/router.js

@@ -15,7 +15,7 @@ class WsServer extends ws_1.WebSocketServer {
     async waitResult(event, ...args) {
         return new Promise(resolve => {
             const resolver = (result) => {
-                this.clients.forEach((client) => client.off('message', listener));
+                this.clients.forEach(client => client.off("message", listener));
                 clearTimeout(timer);
                 resolve(result);
             };
@@ -35,11 +35,11 @@ class WsServer extends ws_1.WebSocketServer {
                     resolver(data.result);
             };
             this.clients.forEach(client => {
-                client.on('message', listener);
+                client.on("message", listener);
                 client.send(JSON.stringify({
                     event,
                     echo,
-                    args
+                    args,
                 }));
             });
         });
@@ -54,14 +54,14 @@ class Router extends router_1.default {
     ws(path, server) {
         const wsServer = new WsServer({ noServer: true, path });
         this.wsStack.push(wsServer);
-        server.on('upgrade', (request, socket, head) => {
+        server.on("upgrade", (request, socket, head) => {
             const { pathname } = (0, url_1.parse)(request.url);
             if (this.wsStack.findIndex(wss => wss.options.path === path) === -1) {
                 socket.destroy();
             }
             else if (pathname === path) {
                 wsServer.handleUpgrade(request, socket, head, function done(ws) {
-                    wsServer.emit('connection', ws, request);
+                    wsServer.emit("connection", ws, request);
                 });
             }
         });

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

@@ -60,6 +60,7 @@ export declare class CommonAction {
     };
     submitSlider(this: V11, ticket: string): Promise<any>;
     submitSmsCode(this: V11, code: string): Promise<any>;
+    callApi(this: V11, name: string, args: any[]): Promise<any>;
     login(this: V11, password?: string): Promise<any>;
     logout(this: V11, keepalive?: boolean): Promise<any>;
 }