onebots 0.2.5 → 0.2.6

package/lib/onebot.d.ts

@@ -18,7 +18,7 @@ export declare class OneBot<V extends OneBot.Version> extends EventEmitter {
     client: Client;
     instances: (V11 | V12)[];
     constructor(app: App, uin: number, config: MayBeArray<OneBotConfig>);
-    start(): Promise<void>;
+    start(): Promise<[boolean, any]>;
     startListen(): void;
     stop(force?: boolean): Promise<void>;
     dispatch(event: any, data: any): void;

package/lib/onebot.js

@@ -73,7 +73,7 @@ class OneBot extends events_1.EventEmitter {
             }
         });
     }
-    async start() {
+    start() {
         this.startListen();
         const disposeArr = [];
         const clean = () => {
@@ -93,7 +93,7 @@ class OneBot extends events_1.EventEmitter {
         this.client.trap('system.login.device', function deviceHelper(e) {
             console.log('请选择验证方式：1.短信验证  2.url验证');
             process.stdin.once('data', (buf) => {
-                const input = e.toString().trim();
+                const input = buf.toString().trim();
                 if (input === '1') {
                     this.sendSmsCode();
                     console.log('请输入短信验证码:');
@@ -133,7 +133,25 @@ class OneBot extends events_1.EventEmitter {
             });
         });
         this.client.trap('system.online', clean);
-        await this.client.login(this.uin, this.password);
+        return new Promise(async (resolve) => {
+            const callback = (result) => {
+                if (timer) {
+                    clearTimeout(timer);
+                    timer = null;
+                }
+                resolve(result);
+                while (disposes.length) {
+                    const dispose = disposes.shift();
+                    dispose();
+                }
+            };
+            let timer = setTimeout(() => {
+                callback([false, '登录超时']);
+            }, this.app.config.timeout * 1000);
+            await this.client.login(this.uin, this.password);
+            const disposes = [this.client.trapOnce('system.online', () => { callback([true, null]); }),
+                this.client.trapOnce('system.login.error', (e) => callback([false, e.message]))];
+        });
     }
     startListen() {
         this.client.trap('system', this.dispatch.bind(this, 'system'));

package/lib/server/app.d.ts

@@ -33,7 +33,7 @@ export declare class App extends Koa {
     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;
+    start(): Promise<void>;
 }
 export declare function createApp(config?: App.Config | string): App;
 export declare function defineConfig(config: App.Config): App.Config;
@@ -41,6 +41,7 @@ export declare namespace App {
     type Config = {
         port?: number;
         path?: string;
+        timeout?: number;
         log_level?: LogLevel;
         platform?: Platform;
         general?: {

package/lib/server/app.js

@@ -119,16 +119,7 @@ class App extends koa_1.default {
         this.oneBots.push(oneBot);
         return oneBot;
     }
-    start() {
-        for (const oneBot of this.oneBots) {
-            oneBot.start();
-        }
-        process.on('uncaughtException', (e) => {
-            console.error('uncaughtException', e);
-        });
-        process.on('unhandledRejection', (e) => {
-            console.error('unhandledRejection', e);
-        });
+    async start() {
         this.httpServer.listen(this.config.port);
         this.router.get('/list', (ctx) => {
             ctx.body = this.oneBots.map(bot => {
@@ -197,7 +188,18 @@ class App extends koa_1.default {
                 ctx.body = e.message;
             }
         });
+        process.on('uncaughtException', (e) => {
+            console.error('uncaughtException', e);
+        });
+        process.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 : ''}`);
+        for (const oneBot of this.oneBots) {
+            const [isSuccess, reason] = await oneBot.start();
+            if (!isSuccess)
+                this.logger.warn(`【${oneBot.uin}】： 登录失败,错误信息\n：`, reason);
+        }
     }
 }
 _a = App;
@@ -231,6 +233,7 @@ exports.defineConfig = defineConfig;
 (function (App) {
     App.defaultConfig = {
         port: 6727,
+        timeout: 30,
         platform: 5,
         general: {
             V11: V11_1.V11.defaultConfig,

package/package.json

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