onebots 0.0.15 → 0.0.16

package/lib/onebot.js

@@ -1,86 +1,133 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BOOLS = exports.OneBotStatus = exports.OneBot = exports.NotFoundError = void 0;
-require("oicq2-cq-enable");
-const events_1 = require("events");
-const app_1 = require("./server/app");
-const utils_1 = require("./utils");
-const path_1 = require("path");
-const oicq_1 = require("oicq");
-const V11_1 = require("./service/V11");
-const V12_1 = require("./service/V12");
-class NotFoundError extends Error {
-    constructor() {
-        super(...arguments);
-        this.message = '不支持的API';
-    }
-}
-exports.NotFoundError = NotFoundError;
-class OneBot extends events_1.EventEmitter {
-    constructor(app, uin, config) {
-        super();
-        this.app = app;
-        this.uin = uin;
-        if (!Array.isArray(config))
-            config = new Array(config);
-        this.config = config.map(c => {
-            if (c.password)
-                this.password = c.password;
-            if (!c.version)
-                c.version = 'V11';
-            switch (c.version) {
-                case 'V11':
-                    return (0, utils_1.deepMerge)(this.app.config.general.V11, c);
-                case 'V12':
-                    return (0, utils_1.deepMerge)(this.app.config.general.V12, c);
-                default:
-                    throw new Error('不支持的oneBot版本：' + c.version);
-            }
-        });
-        this.client = new oicq_1.Client(uin, { platform: this.app.config.platform, data_dir: (0, path_1.join)(app_1.App.configDir, 'data') });
-        this.instances = this.config.map(c => {
-            switch (c.version) {
-                case 'V11':
-                    return new V11_1.V11(this, this.client, (0, utils_1.omit)(c, ['version', 'password']));
-                case 'V12':
-                    return new V12_1.V12(this, this.client, (0, utils_1.omit)(c, ['version', 'password']));
-                default:
-                    throw new Error('不支持的oneBot版本：' + c.version);
-            }
-        });
-    }
-    async start() {
-        this.startListen();
-        await this.client.login(this.password);
-    }
-    startListen() {
-        this.client.on('system', this.dispatch.bind(this));
-        this.client.on('notice', this.dispatch.bind(this));
-        this.client.on('request', this.dispatch.bind(this));
-        this.client.on('message', this.dispatch.bind(this));
-        for (const instance of this.instances) {
-            instance.start(this.instances.length > 1 ? '/' + instance.version : undefined);
-        }
-    }
-    async stop(force) {
-        for (const instance of this.instances) {
-            await instance.stop(force);
-        }
-        this.client.off('system', this.dispatch.bind(this));
-        this.client.off('notice', this.dispatch.bind(this));
-        this.client.off('request', this.dispatch.bind(this));
-        this.client.off('message', this.dispatch.bind(this));
-    }
-    dispatch(data) {
-        for (const instance of this.instances) {
-            instance.dispatch(data);
-        }
-    }
-}
-exports.OneBot = OneBot;
-var OneBotStatus;
-(function (OneBotStatus) {
-    OneBotStatus[OneBotStatus["Good"] = 0] = "Good";
-    OneBotStatus[OneBotStatus["Bad"] = 1] = "Bad";
-})(OneBotStatus = exports.OneBotStatus || (exports.OneBotStatus = {}));
-exports.BOOLS = ["no_cache", "auto_escape", "as_long", "enable", "reject_add_request", "is_dismiss", "approve", "block"];
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BOOLS = exports.OneBotStatus = exports.OneBot = exports.NotFoundError = void 0;
+require("oicq2-cq-enable");
+const events_1 = require("events");
+const app_1 = require("./server/app");
+const utils_1 = require("./utils");
+const path_1 = require("path");
+const oicq_1 = require("oicq");
+const V11_1 = require("./service/V11");
+const V12_1 = require("./service/V12");
+class NotFoundError extends Error {
+    constructor() {
+        super(...arguments);
+        this.message = '不支持的API';
+    }
+}
+exports.NotFoundError = NotFoundError;
+class OneBot extends events_1.EventEmitter {
+    constructor(app, uin, config) {
+        super();
+        this.app = app;
+        this.uin = uin;
+        if (!Array.isArray(config))
+            config = new Array(config);
+        this.config = config.map(c => {
+            if (c.password)
+                this.password = c.password;
+            if (!c.version)
+                c.version = 'V11';
+            switch (c.version) {
+                case 'V11':
+                    return (0, utils_1.deepMerge)(this.app.config.general.V11, c);
+                case 'V12':
+                    return (0, utils_1.deepMerge)(this.app.config.general.V12, c);
+                default:
+                    throw new Error('不支持的oneBot版本：' + c.version);
+            }
+        });
+        this.client = new oicq_1.Client(uin, { platform: this.app.config.platform, data_dir: (0, path_1.join)(app_1.App.configDir, 'data') });
+        this.instances = this.config.map(c => {
+            switch (c.version) {
+                case 'V11':
+                    return new V11_1.V11(this, this.client, (0, utils_1.omit)(c, ['version', 'password']));
+                case 'V12':
+                    return new V12_1.V12(this, this.client, (0, utils_1.omit)(c, ['version', 'password']));
+                default:
+                    throw new Error('不支持的oneBot版本：' + c.version);
+            }
+        });
+    }
+    async start() {
+        this.startListen();
+        const disposeArr = [];
+        const clean = () => {
+            while (disposeArr.length) {
+                disposeArr.shift()();
+            }
+        };
+        this.client.on('system.login.qrcode', function qrcodeHelper() {
+            console.log('扫码后回车继续');
+            process.stdin.once('data', () => {
+                this.login();
+            });
+            disposeArr.push(() => {
+                this.off('system.login.qrcode', qrcodeHelper);
+            });
+        });
+        this.client.on('system.login.device', function deviceHelper() {
+            console.log('请输入密保手机接收的验证码');
+            this.sendSmsCode();
+            process.stdin.once('data', (e) => {
+                this.submitSmsCode(e.toString().trim());
+            });
+            disposeArr.push(() => {
+                this.off('system.login.device', deviceHelper);
+            });
+        });
+        this.client.on('system.login.error', function errorHandler(e) {
+            if (e.message.includes('密码错误')) {
+                process.stdin.once('data', (e) => {
+                    this.login(e.toString().trim());
+                });
+            }
+            else {
+                process.exit();
+            }
+            this.off('system.login.error', errorHandler);
+        });
+        this.client.on('system.login.slider', function sliderHelper(e) {
+            console.log('滑块验证地址：' + e.url);
+            console.log('请输入滑块验证返回的ticket');
+            process.stdin.once('data', (e) => {
+                this.submitSlider(e.toString().trim());
+            });
+            disposeArr.push(() => {
+                this.off('system.login.slider', sliderHelper);
+            });
+        });
+        this.client.on('system.online', clean);
+        await this.client.login(this.password);
+    }
+    startListen() {
+        this.client.on('system', this.dispatch.bind(this));
+        this.client.on('notice', this.dispatch.bind(this));
+        this.client.on('request', this.dispatch.bind(this));
+        this.client.on('message', this.dispatch.bind(this));
+        for (const instance of this.instances) {
+            instance.start(this.instances.length > 1 ? '/' + instance.version : undefined);
+        }
+    }
+    async stop(force) {
+        for (const instance of this.instances) {
+            await instance.stop(force);
+        }
+        this.client.off('system', this.dispatch.bind(this));
+        this.client.off('notice', this.dispatch.bind(this));
+        this.client.off('request', this.dispatch.bind(this));
+        this.client.off('message', this.dispatch.bind(this));
+    }
+    dispatch(data) {
+        for (const instance of this.instances) {
+            instance.dispatch(data);
+        }
+    }
+}
+exports.OneBot = OneBot;
+var OneBotStatus;
+(function (OneBotStatus) {
+    OneBotStatus[OneBotStatus["Good"] = 0] = "Good";
+    OneBotStatus[OneBotStatus["Bad"] = 1] = "Bad";
+})(OneBotStatus = exports.OneBotStatus || (exports.OneBotStatus = {}));
+exports.BOOLS = ["no_cache", "auto_escape", "as_long", "enable", "reject_add_request", "is_dismiss", "approve", "block"];

package/lib/server/app.d.ts

@@ -1,52 +1,52 @@
-/// <reference types="node" />
-/// <reference types="koa-bodyparser" />
-import Koa from 'koa';
-import { Logger } from "log4js";
-import { Server } from "http";
-import { OneBot } from "../onebot";
-import { Router } from "./router";
-import { V11 } from "../service/V11";
-import { V12 } from "../service/V12";
-import { LogLevel, MayBeArray } from "../types";
-import { Platform } from "oicq";
-export interface KoaOptions {
-    env?: string;
-    keys?: string[];
-    proxy?: boolean;
-    subdomainOffset?: number;
-    proxyIpHeader?: string;
-    maxIpsCount?: number;
-}
-export declare class App extends Koa {
-    config: App.Config;
-    readonly httpServer: Server;
-    logger: Logger;
-    static configDir: string;
-    static configPath: string;
-    oneBots: OneBot<any>[];
-    router: Router;
-    constructor(config?: App.Config);
-    getLogger(uin: number | string, version?: string): Logger;
-    private getBots;
-    private createOneBots;
-    addAccount(uin: number | `${number}`, config: MayBeArray<OneBot.Config<OneBot.Version>>): void;
-    updateAccount(uin: number | `${number}`, config: MayBeArray<OneBot.Config<OneBot.Version>>): void;
-    removeAccount(uin: number | `${number}`, force?: boolean): void;
-    createOneBot(uin: number, config: MayBeArray<OneBot.Config<OneBot.Version>>): OneBot<OneBot.Version>;
-    start(): void;
-}
-export declare function createApp(config?: App.Config | string): App;
-export declare function defineConfig(config: App.Config): App.Config;
-export declare namespace App {
-    type Config = {
-        port?: number;
-        path?: string;
-        log_level?: LogLevel;
-        platform?: Platform;
-        general?: {
-            V11?: V11.Config;
-            V12?: V12.Config;
-        };
-    } & KoaOptions & Record<`${number}`, MayBeArray<OneBot.Config<OneBot.Version>>>;
-    const defaultConfig: Config;
-}
+/// <reference types="node" />
+/// <reference types="koa-bodyparser" />
+import Koa from 'koa';
+import { Logger } from "log4js";
+import { Server } from "http";
+import { OneBot } from "../onebot";
+import { Router } from "./router";
+import { V11 } from "../service/V11";
+import { V12 } from "../service/V12";
+import { LogLevel, MayBeArray } from "../types";
+import { Platform } from "oicq";
+export interface KoaOptions {
+    env?: string;
+    keys?: string[];
+    proxy?: boolean;
+    subdomainOffset?: number;
+    proxyIpHeader?: string;
+    maxIpsCount?: number;
+}
+export declare class App extends Koa {
+    config: App.Config;
+    readonly httpServer: Server;
+    logger: Logger;
+    static configDir: string;
+    static configPath: string;
+    oneBots: OneBot<any>[];
+    router: Router;
+    constructor(config?: App.Config);
+    getLogger(uin: number | string, version?: string): Logger;
+    private getBots;
+    private createOneBots;
+    addAccount(uin: number | `${number}`, config: MayBeArray<OneBot.Config<OneBot.Version>>): void;
+    updateAccount(uin: number | `${number}`, config: MayBeArray<OneBot.Config<OneBot.Version>>): void;
+    removeAccount(uin: number | `${number}`, force?: boolean): void;
+    createOneBot(uin: number, config: MayBeArray<OneBot.Config<OneBot.Version>>): OneBot<OneBot.Version>;
+    start(): void;
+}
+export declare function createApp(config?: App.Config | string): App;
+export declare function defineConfig(config: App.Config): App.Config;
+export declare namespace App {
+    type Config = {
+        port?: number;
+        path?: string;
+        log_level?: LogLevel;
+        platform?: Platform;
+        general?: {
+            V11?: V11.Config;
+            V12?: V12.Config;
+        };
+    } & KoaOptions & Record<`${number}`, MayBeArray<OneBot.Config<OneBot.Version>>>;
+    const defaultConfig: Config;
+}