onebots 0.0.7 → 0.0.9

package/lib/onebot.d.ts

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

package/lib/onebot.js

@@ -49,23 +49,23 @@ class OneBot extends events_1.EventEmitter {
             }
         });
     }
-    start() {
+    async start() {
         this.startListen();
-        this.client.login(this.password);
+        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));
-        this.instances.forEach(instance => {
+        for (const instance of this.instances) {
             instance.start(this.instances.length > 1 ? '/' + instance.version : undefined);
-        });
+        }
     }
-    stop() {
-        this.instances.forEach(instance => {
-            instance.stop();
-        });
+    async stop() {
+        for (const instance of this.instances) {
+            await instance.stop();
+        }
         this.client.off('system', this.dispatch.bind(this));
         this.client.off('notice', this.dispatch.bind(this));
         this.client.off('request', this.dispatch.bind(this));

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

@@ -61,5 +61,5 @@ export declare class CommonAction {
     submitSlider(this: V11, ticket: string): Promise<any>;
     login(this: V11, password?: string): any;
     submitSmsCode(this: V11, code: string): Promise<any>;
-    sendSmsCode(this: V11): void;
+    sendSmsCode(this: V11): Promise<any>;
 }

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

@@ -109,10 +109,24 @@ class CommonAction {
         return this.action.callLogin.apply(this, ['login', password]);
     }
     async submitSmsCode(code) {
-        return this.action.login.apply(this, ['submitSmsCode', code]);
+        return this.action.callLogin.apply(this, ['submitSmsCode', code]);
     }
     sendSmsCode() {
-        return this.client.sendSmsCode();
+        return new Promise(resolve => {
+            const receiveResult = (e) => {
+                const callback = (data) => {
+                    this.client.off('internal.verbose', receiveResult);
+                    this.client.off('system.login.error', receiveResult);
+                    resolve(data);
+                };
+                if ((typeof e === 'string' && e.includes('已发送')) || typeof e !== 'string') {
+                    callback(e);
+                }
+            };
+            this.client.on('internal.verbose', receiveResult);
+            this.client.on('system.login.error', receiveResult);
+            this.client.sendSmsCode();
+        });
     }
 }
 exports.CommonAction = CommonAction;

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

@@ -32,7 +32,7 @@ export declare class V11 extends EventEmitter implements OneBot.Base {
     private startHttpReverse;
     private startWs;
     private startWsReverse;
-    stop(): void;
+    stop(): Promise<void>;
     dispatch(data: any): void;
     private _httpRequestHandler;
     /**

package/lib/service/V11/index.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.V11 = void 0;
+const oicq_1 = require("oicq");
 const action_1 = require("./action");
 const ws_1 = require("ws");
 const url_1 = require("url");
@@ -13,6 +14,7 @@ const onebot_1 = require("../../onebot");
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
 const events_1 = require("events");
+const fs_1 = require("fs");
 class V11 extends events_1.EventEmitter {
     constructor(oneBot, client, config) {
         super();
@@ -161,8 +163,11 @@ class V11 extends events_1.EventEmitter {
             }
         });
     }
-    stop() {
-        this.client.logout();
+    async stop() {
+        if (this.client.status === oicq_1.OnlineStatus.Online) {
+            await this.client.logout();
+        }
+        (0, fs_1.unlinkSync)(this.client.dir);
     }
     dispatch(data) {
         if (!data.post_type)

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

@@ -28,6 +28,6 @@ export declare class CommonAction {
     submitSlider(this: V11, ticket: string): Promise<any>;
     login(this: V11, password?: string): any;
     submitSmsCode(this: V11, code: string): Promise<any>;
-    sendSmsCode(this: V12): void;
+    sendSmsCode(this: V12): Promise<any>;
     getSupportedActions(this: V12): string[];
 }

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

@@ -70,10 +70,24 @@ class CommonAction {
         return this.action.callLogin.apply(this, ['login', password]);
     }
     async submitSmsCode(code) {
-        return this.action.login.apply(this, ['submitSmsCode', code]);
+        return this.action.callLogin.apply(this, ['submitSmsCode', code]);
     }
     sendSmsCode() {
-        return this.client.sendSmsCode();
+        return new Promise(resolve => {
+            const receiveResult = (e) => {
+                const callback = (data) => {
+                    this.client.off('internal.verbose', receiveResult);
+                    this.client.off('system.login.error', receiveResult);
+                    resolve(data);
+                };
+                if ((typeof e === 'string' && e.includes('已发送')) || typeof e !== 'string') {
+                    callback(e);
+                }
+            };
+            this.client.on('internal.verbose', receiveResult);
+            this.client.on('system.login.error', receiveResult);
+            this.client.sendSmsCode();
+        });
     }
     getSupportedActions() {
         return [...new Set((0, utils_1.getProperties)(this.action))].filter(key => {

package/lib/service/V12/index.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.V12 = void 0;
+const oicq_1 = require("oicq");
 const path_1 = require("path");
 const onebot_1 = require("../../onebot");
 const action_1 = require("./action");
@@ -16,6 +17,7 @@ const oicq2_cq_enable_1 = require("oicq2-cq-enable");
 const utils_1 = require("../../utils");
 const db_1 = require("../../db");
 const app_1 = require("../../server/app");
+const fs_1 = require("fs");
 class V12 extends events_1.EventEmitter {
     constructor(oneBot, client, config) {
         super();
@@ -197,8 +199,11 @@ class V12 extends events_1.EventEmitter {
             }
         });
     }
-    stop() {
-        return this.client.logout();
+    async stop() {
+        if (this.client.status === oicq_1.OnlineStatus.Online) {
+            await this.client.logout();
+        }
+        (0, fs_1.unlinkSync)(this.client.dir);
     }
     dispatch(data = {}) {
         if (!data)

package/package.json

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