onebots 0.0.13 → 0.0.15

package/lib/server/app.js

@@ -1,232 +1,232 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineConfig = exports.createApp = exports.App = void 0;
-const koa_1 = __importDefault(require("koa"));
-const os = __importStar(require("os"));
-const fs_1 = require("fs");
-const log4js_1 = require("log4js");
-const path_1 = require("path");
-const http_1 = require("http");
-const js_yaml_1 = __importDefault(require("js-yaml"));
-const koa_bodyparser_1 = __importDefault(require("koa-bodyparser"));
-const onebot_1 = require("../onebot");
-const mime = require('mime-types');
-const utils_1 = require("../utils");
-const router_1 = require("./router");
-const fs_2 = require("fs");
-const V11_1 = require("../service/V11");
-const V12_1 = require("../service/V12");
-class App extends koa_1.default {
-    constructor(config = {}) {
-        super(config);
-        this.oneBots = [];
-        this.config = (0, utils_1.deepMerge)((0, utils_1.deepClone)(App.defaultConfig), config);
-        this.logger = (0, log4js_1.getLogger)('[oicq-oneBot]');
-        this.logger.level = this.config.log_level;
-        this.router = new router_1.Router({ prefix: config.path });
-        this.use((0, koa_bodyparser_1.default)())
-            .use(this.router.routes())
-            .use(this.router.allowedMethods());
-        this.httpServer = (0, http_1.createServer)(this.callback());
-        this.createOneBots();
-    }
-    getLogger(uin, version = '') {
-        const logger = (0, log4js_1.getLogger)(`[oicq-oneBot${version}:${uin}]`);
-        logger.level = this.config.log_level;
-        return logger;
-    }
-    getBots() {
-        const result = new Map();
-        Object.entries(this.config).forEach(([key, value]) => {
-            if (parseInt(key).toString() === key && value && typeof value === 'object') {
-                result.set(parseInt(key), value);
-            }
-        });
-        return result;
-    }
-    createOneBots() {
-        for (const [uin, config] of this.getBots()) {
-            this.createOneBot(uin, config);
-        }
-    }
-    addAccount(uin, config) {
-        if (typeof uin !== "number")
-            uin = Number(uin);
-        if (Number.isNaN(uin))
-            throw new Error('无效的账号');
-        if (this.oneBots.find(oneBot => oneBot.uin === uin))
-            throw new Error('账户已存在');
-        this.config[uin] = config;
-        const oneBot = this.createOneBot(uin, config);
-        oneBot.startListen();
-        (0, fs_1.writeFileSync)(App.configPath, js_yaml_1.default.dump((0, utils_1.deepClone)(this.config)));
-    }
-    updateAccount(uin, config) {
-        if (typeof uin !== "number")
-            uin = Number(uin);
-        if (Number.isNaN(uin))
-            throw new Error('无效的账号');
-        const oneBot = this.oneBots.find(oneBot => oneBot.uin === uin);
-        if (!oneBot)
-            return this.addAccount(uin, config);
-        const newConfig = (0, utils_1.deepMerge)(this.config[uin], config);
-        this.removeAccount(uin);
-        this.addAccount(uin, newConfig);
-    }
-    removeAccount(uin, force) {
-        if (typeof uin !== "number")
-            uin = Number(uin);
-        if (Number.isNaN(uin))
-            throw new Error('无效的账号');
-        const currentIdx = this.oneBots.findIndex(oneBot => oneBot.uin === uin);
-        if (currentIdx < 0)
-            throw new Error('账户不存在');
-        const oneBot = this.oneBots[currentIdx];
-        oneBot.stop(force);
-        delete this.config[uin];
-        this.oneBots.splice(currentIdx, 1);
-        (0, fs_1.writeFileSync)(App.configPath, js_yaml_1.default.dump(this.config));
-    }
-    createOneBot(uin, config) {
-        const oneBot = new onebot_1.OneBot(this, uin, config);
-        this.oneBots.push(oneBot);
-        return oneBot;
-    }
-    start() {
-        for (const oneBot of this.oneBots) {
-            oneBot.start();
-        }
-        this.httpServer.listen(this.config.port);
-        this.router.get('/list', (ctx) => {
-            ctx.body = this.oneBots.map(bot => {
-                return {
-                    uin: bot.uin,
-                    config: bot.config.map(c => (0, utils_1.protectedFields)(c, 'password', "access_token")),
-                    urls: bot.config.map(c => `/${c.version}/${bot.uin}`)
-                };
-            });
-        });
-        this.router.get('/qrcode', (ctx) => {
-            const { uin } = ctx.query;
-            const uinUrl = (0, path_1.join)(App.configDir, 'data', uin);
-            if (!(0, fs_1.existsSync)(uinUrl)) {
-                return ctx.res.writeHead(400).end('未登录');
-            }
-            const qrcodePath = (0, path_1.join)(App.configDir, 'data', uin, 'qrcode.png');
-            let file = null;
-            try {
-                file = (0, fs_2.readFileSync)(qrcodePath); //读取文件
-            }
-            catch (error) {
-                return ctx.res.writeHead(404).end(error.message);
-            }
-            let mimeType = mime.lookup(qrcodePath); //读取图片文件类型
-            ctx.set('content-type', mimeType); //设置返回类型
-            ctx.body = file; //返回图片
-        });
-        this.router.get('/detail', (ctx) => {
-            let { uin } = ctx.request.query;
-            const oneBot = this.oneBots.find(bot => bot.uin === Number(uin));
-            ctx.body = {
-                uin,
-                config: oneBot.config.map(c => (0, utils_1.protectedFields)(c, 'password', "access_token")),
-                urls: oneBot.config.map(c => `/${uin}/${c.version}`)
-            };
-        });
-        this.router.post('/add', (ctx, next) => {
-            const { uin, ...config } = ctx.request.body;
-            try {
-                this.addAccount(uin, config);
-                ctx.body = `添加成功`;
-            }
-            catch (e) {
-                ctx.body = e.message;
-            }
-        });
-        this.router.post('/edit', (ctx, next) => {
-            const { uin, ...config } = ctx.request.body;
-            try {
-                this.updateAccount(Number(uin), config);
-                ctx.body = `修改成功`;
-            }
-            catch (e) {
-                ctx.body = e.message;
-            }
-        });
-        this.router.get('/remove', (ctx, next) => {
-            const { uin, force } = ctx.request.query;
-            try {
-                this.removeAccount(Number(uin), Boolean(force));
-                ctx.body = `移除成功`;
-            }
-            catch (e) {
-                console.log(e);
-                ctx.body = e.message;
-            }
-        });
-        this.logger.mark(`server listen at http://0.0.0.0:${this.config.port}/${this.config.path ? this.config.path : ''}`);
-    }
-}
-exports.App = App;
-_a = App;
-App.configDir = (0, path_1.join)(os.homedir(), '.onebots');
-App.configPath = (0, path_1.join)(_a.configDir, 'config.yaml');
-function createApp(config = 'config.yaml') {
-    if (typeof config === 'string') {
-        if (!(0, fs_1.existsSync)(App.configDir)) {
-            (0, fs_1.mkdirSync)(App.configDir);
-        }
-        App.configPath = (0, path_1.join)(App.configDir, config);
-        if (!(0, fs_1.existsSync)(App.configPath)) {
-            (0, fs_1.copyFileSync)((0, path_1.resolve)(__dirname, '../config.sample.yaml'), App.configPath);
-            console.log('未找到对应配置文件，已自动生成默认配置文件，请修改配置文件后重新启动');
-            console.log(`配置文件在:  ${App.configPath}`);
-            process.exit();
-        }
-        config = js_yaml_1.default.load((0, fs_2.readFileSync)(App.configPath, 'utf8'));
-    }
-    return new App(config);
-}
-exports.createApp = createApp;
-function defineConfig(config) {
-    return config;
-}
-exports.defineConfig = defineConfig;
-(function (App) {
-    App.defaultConfig = {
-        port: 6727,
-        platform: 5,
-        general: {
-            V11: V11_1.V11.defaultConfig,
-            V12: V12_1.V12.defaultConfig
-        },
-        log_level: 'info',
-    };
-})(App = exports.App || (exports.App = {}));
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defineConfig = exports.createApp = exports.App = void 0;
+const koa_1 = __importDefault(require("koa"));
+const os = __importStar(require("os"));
+const fs_1 = require("fs");
+const log4js_1 = require("log4js");
+const path_1 = require("path");
+const http_1 = require("http");
+const js_yaml_1 = __importDefault(require("js-yaml"));
+const koa_bodyparser_1 = __importDefault(require("koa-bodyparser"));
+const onebot_1 = require("../onebot");
+const mime = require('mime-types');
+const utils_1 = require("../utils");
+const router_1 = require("./router");
+const fs_2 = require("fs");
+const V11_1 = require("../service/V11");
+const V12_1 = require("../service/V12");
+class App extends koa_1.default {
+    constructor(config = {}) {
+        super(config);
+        this.oneBots = [];
+        this.config = (0, utils_1.deepMerge)((0, utils_1.deepClone)(App.defaultConfig), config);
+        this.logger = (0, log4js_1.getLogger)('[oicq-oneBot]');
+        this.logger.level = this.config.log_level;
+        this.router = new router_1.Router({ prefix: config.path });
+        this.use((0, koa_bodyparser_1.default)())
+            .use(this.router.routes())
+            .use(this.router.allowedMethods());
+        this.httpServer = (0, http_1.createServer)(this.callback());
+        this.createOneBots();
+    }
+    getLogger(uin, version = '') {
+        const logger = (0, log4js_1.getLogger)(`[oicq-oneBot${version}:${uin}]`);
+        logger.level = this.config.log_level;
+        return logger;
+    }
+    getBots() {
+        const result = new Map();
+        Object.entries(this.config).forEach(([key, value]) => {
+            if (parseInt(key).toString() === key && value && typeof value === 'object') {
+                result.set(parseInt(key), value);
+            }
+        });
+        return result;
+    }
+    createOneBots() {
+        for (const [uin, config] of this.getBots()) {
+            this.createOneBot(uin, config);
+        }
+    }
+    addAccount(uin, config) {
+        if (typeof uin !== "number")
+            uin = Number(uin);
+        if (Number.isNaN(uin))
+            throw new Error('无效的账号');
+        if (this.oneBots.find(oneBot => oneBot.uin === uin))
+            throw new Error('账户已存在');
+        this.config[uin] = config;
+        const oneBot = this.createOneBot(uin, config);
+        oneBot.startListen();
+        (0, fs_1.writeFileSync)(App.configPath, js_yaml_1.default.dump((0, utils_1.deepClone)(this.config)));
+    }
+    updateAccount(uin, config) {
+        if (typeof uin !== "number")
+            uin = Number(uin);
+        if (Number.isNaN(uin))
+            throw new Error('无效的账号');
+        const oneBot = this.oneBots.find(oneBot => oneBot.uin === uin);
+        if (!oneBot)
+            return this.addAccount(uin, config);
+        const newConfig = (0, utils_1.deepMerge)(this.config[uin], config);
+        this.removeAccount(uin);
+        this.addAccount(uin, newConfig);
+    }
+    removeAccount(uin, force) {
+        if (typeof uin !== "number")
+            uin = Number(uin);
+        if (Number.isNaN(uin))
+            throw new Error('无效的账号');
+        const currentIdx = this.oneBots.findIndex(oneBot => oneBot.uin === uin);
+        if (currentIdx < 0)
+            throw new Error('账户不存在');
+        const oneBot = this.oneBots[currentIdx];
+        oneBot.stop(force);
+        delete this.config[uin];
+        this.oneBots.splice(currentIdx, 1);
+        (0, fs_1.writeFileSync)(App.configPath, js_yaml_1.default.dump(this.config));
+    }
+    createOneBot(uin, config) {
+        const oneBot = new onebot_1.OneBot(this, uin, config);
+        this.oneBots.push(oneBot);
+        return oneBot;
+    }
+    start() {
+        for (const oneBot of this.oneBots) {
+            oneBot.start();
+        }
+        this.httpServer.listen(this.config.port);
+        this.router.get('/list', (ctx) => {
+            ctx.body = this.oneBots.map(bot => {
+                return {
+                    uin: bot.uin,
+                    config: bot.config.map(c => (0, utils_1.protectedFields)(c, 'password', "access_token")),
+                    urls: bot.config.map(c => `/${c.version}/${bot.uin}`)
+                };
+            });
+        });
+        this.router.get('/qrcode', (ctx) => {
+            const { uin } = ctx.query;
+            const uinUrl = (0, path_1.join)(App.configDir, 'data', uin);
+            if (!(0, fs_1.existsSync)(uinUrl)) {
+                return ctx.res.writeHead(400).end('未登录');
+            }
+            const qrcodePath = (0, path_1.join)(App.configDir, 'data', uin, 'qrcode.png');
+            let file = null;
+            try {
+                file = (0, fs_2.readFileSync)(qrcodePath); //读取文件
+            }
+            catch (error) {
+                return ctx.res.writeHead(404).end(error.message);
+            }
+            let mimeType = mime.lookup(qrcodePath); //读取图片文件类型
+            ctx.set('content-type', mimeType); //设置返回类型
+            ctx.body = file; //返回图片
+        });
+        this.router.get('/detail', (ctx) => {
+            let { uin } = ctx.request.query;
+            const oneBot = this.oneBots.find(bot => bot.uin === Number(uin));
+            ctx.body = {
+                uin,
+                config: oneBot.config.map(c => (0, utils_1.protectedFields)(c, 'password', "access_token")),
+                urls: oneBot.config.map(c => `/${uin}/${c.version}`)
+            };
+        });
+        this.router.post('/add', (ctx, next) => {
+            const { uin, ...config } = (ctx.request.body || {});
+            try {
+                this.addAccount(uin, config);
+                ctx.body = `添加成功`;
+            }
+            catch (e) {
+                ctx.body = e.message;
+            }
+        });
+        this.router.post('/edit', (ctx, next) => {
+            const { uin, ...config } = (ctx.request.body || {});
+            try {
+                this.updateAccount(Number(uin), config);
+                ctx.body = `修改成功`;
+            }
+            catch (e) {
+                ctx.body = e.message;
+            }
+        });
+        this.router.get('/remove', (ctx, next) => {
+            const { uin, force } = ctx.request.query;
+            try {
+                this.removeAccount(Number(uin), Boolean(force));
+                ctx.body = `移除成功`;
+            }
+            catch (e) {
+                console.log(e);
+                ctx.body = e.message;
+            }
+        });
+        this.logger.mark(`server listen at http://0.0.0.0:${this.config.port}/${this.config.path ? this.config.path : ''}`);
+    }
+}
+exports.App = App;
+_a = App;
+App.configDir = (0, path_1.join)(os.homedir(), '.onebots');
+App.configPath = (0, path_1.join)(_a.configDir, 'config.yaml');
+function createApp(config = 'config.yaml') {
+    if (typeof config === 'string') {
+        if (!(0, fs_1.existsSync)(App.configDir)) {
+            (0, fs_1.mkdirSync)(App.configDir);
+        }
+        App.configPath = (0, path_1.join)(App.configDir, config);
+        if (!(0, fs_1.existsSync)(App.configPath)) {
+            (0, fs_1.copyFileSync)((0, path_1.resolve)(__dirname, '../config.sample.yaml'), App.configPath);
+            console.log('未找到对应配置文件，已自动生成默认配置文件，请修改配置文件后重新启动');
+            console.log(`配置文件在:  ${App.configPath}`);
+            process.exit();
+        }
+        config = js_yaml_1.default.load((0, fs_2.readFileSync)(App.configPath, 'utf8'));
+    }
+    return new App(config);
+}
+exports.createApp = createApp;
+function defineConfig(config) {
+    return config;
+}
+exports.defineConfig = defineConfig;
+(function (App) {
+    App.defaultConfig = {
+        port: 6727,
+        platform: 5,
+        general: {
+            V11: V11_1.V11.defaultConfig,
+            V12: V12_1.V12.defaultConfig
+        },
+        log_level: 'info',
+    };
+})(App = exports.App || (exports.App = {}));

package/lib/server/router.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="node" />
-/// <reference types="koa__router" />
-import KoaRouter from '@koa/router';
-import { WebSocketServer } from "ws";
-import http from "http";
-export declare class Router extends KoaRouter {
-    wsStack: WebSocketServer[];
-    ws(path: string, server: http.Server): import("ws").Server<import("ws").WebSocket>;
-}
+/// <reference types="node" />
+/// <reference types="koa__router" />
+import KoaRouter from '@koa/router';
+import { WebSocketServer } from "ws";
+import http from "http";
+export declare class Router extends KoaRouter {
+    wsStack: WebSocketServer[];
+    ws(path: string, server: http.Server): import("ws").Server<import("ws").WebSocket>;
+}

package/lib/server/router.js

@@ -1,32 +1,32 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Router = void 0;
-const router_1 = __importDefault(require("@koa/router"));
-const ws_1 = require("ws");
-const url_1 = require("url");
-class Router extends router_1.default {
-    constructor() {
-        super(...arguments);
-        this.wsStack = [];
-    }
-    ws(path, server) {
-        const wsServer = new ws_1.WebSocketServer({ noServer: true, path });
-        this.wsStack.push(wsServer);
-        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);
-                });
-            }
-        });
-        return wsServer;
-    }
-}
-exports.Router = Router;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Router = void 0;
+const router_1 = __importDefault(require("@koa/router"));
+const ws_1 = require("ws");
+const url_1 = require("url");
+class Router extends router_1.default {
+    constructor() {
+        super(...arguments);
+        this.wsStack = [];
+    }
+    ws(path, server) {
+        const wsServer = new ws_1.WebSocketServer({ noServer: true, path });
+        this.wsStack.push(wsServer);
+        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);
+                });
+            }
+        });
+        return wsServer;
+    }
+}
+exports.Router = Router;