onebots 0.0.8 → 0.0.10

package/README.md

@@ -49,14 +49,14 @@ onebots
 ```
 # 使用接口管理oneBot
 
-| url     | method | params           | desc                  |
-|:--------| :--- |:-----------------|:----------------------|
-| /list   | GET |                  | 获取当前运行的机器人列表          |
-| /detail | GET | uin              | 获取指定机器人配置             |
-| /qrcode | GET | uin              | 获取指定机器人登录二维码          |
-| /add    | POST | {uin,...config}  | 添加机器人 config 为机器人配置   |
-| /edit   | POST | {uin,...config}  | 修改机器人配置 config 为机器人配置 |
-| /remove | get | uin | 移除机器人                 |
+| url     | method | params          | desc                           |
+|:--------| :--- |:----------------|:-------------------------------|
+| /list   | GET |                 | 获取当前运行的机器人列表                   |
+| /detail | GET | uin             | 获取指定机器人配置                      |
+| /qrcode | GET | uin             | 获取指定机器人登录二维码                   |
+| /add    | POST | {uin,...config} | 添加机器人 config 为机器人配置            |
+| /edit   | POST | {uin,...config} | 修改机器人配置 config 为机器人配置          |
+| /remove | get | uin,force       | 移除机器人,force为true时，将删除机器人data目录 |
 
 # 鸣谢
 1. [takayama-lily/oicq](https://github.com/takayama-lily/oicq) 底层服务支持

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(force?: boolean): 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(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));

package/lib/server/app.d.ts

@@ -31,7 +31,7 @@ export declare class App extends Koa {
     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}`): void;
+    removeAccount(uin: number | `${number}`, force?: boolean): void;
     createOneBot(uin: number, config: MayBeArray<OneBot.Config<OneBot.Version>>): OneBot<OneBot.Version>;
     start(): void;
 }

package/lib/server/app.js

@@ -100,7 +100,7 @@ class App extends koa_1.default {
         this.removeAccount(uin);
         this.addAccount(uin, newConfig);
     }
-    removeAccount(uin) {
+    removeAccount(uin, force) {
         if (typeof uin !== "number")
             uin = Number(uin);
         if (Number.isNaN(uin))
@@ -109,7 +109,7 @@ class App extends koa_1.default {
         if (currentIdx < 0)
             throw new Error('账户不存在');
         const oneBot = this.oneBots[currentIdx];
-        oneBot.stop();
+        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));
@@ -181,9 +181,9 @@ class App extends koa_1.default {
             }
         });
         this.router.get('/remove', (ctx, next) => {
-            const { uin } = ctx.request.query;
+            const { uin, force } = ctx.request.query;
             try {
-                this.removeAccount(Number(uin));
+                this.removeAccount(Number(uin), Boolean(force));
                 ctx.body = `移除成功`;
             }
             catch (e) {

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

@@ -112,7 +112,21 @@ class CommonAction {
         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(force?: boolean): 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,13 @@ class V11 extends events_1.EventEmitter {
             }
         });
     }
-    stop() {
-        this.client.logout();
+    async stop(force) {
+        if (this.client.status === oicq_1.OnlineStatus.Online) {
+            await this.client.logout();
+        }
+        if (force) {
+            (0, fs_1.rmSync)(this.client.dir, { force: true, recursive: true });
+        }
     }
     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

@@ -73,7 +73,21 @@ class CommonAction {
         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.d.ts

@@ -28,7 +28,7 @@ export declare class V12 extends EventEmitter implements OneBot.Base {
     private startWebhook;
     private startWs;
     private startWsReverse;
-    stop(): Promise<void>;
+    stop(force?: boolean): Promise<void>;
     dispatch<T extends Record<string, any>>(data?: T): void;
     apply(req: any): Promise<string>;
     private _httpRequestHandler;

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,13 @@ class V12 extends events_1.EventEmitter {
             }
         });
     }
-    stop() {
-        return this.client.logout();
+    async stop(force) {
+        if (this.client.status === oicq_1.OnlineStatus.Online) {
+            await this.client.logout();
+        }
+        if (force) {
+            (0, fs_1.rmSync)(this.client.dir, { force: true, recursive: true });
+        }
     }
     dispatch(data = {}) {
         if (!data)

package/package.json

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