onebots 0.0.9 → 0.0.11

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

@@ -20,7 +20,7 @@ export declare class OneBot<V extends OneBot.Version> extends EventEmitter {
     constructor(app: App, uin: number, config: MayBeArray<OneBotConfig>);
     start(): Promise<void>;
     startListen(): void;
-    stop(): Promise<void>;
+    stop(force?: boolean): Promise<void>;
     dispatch(data: any): void;
 }
 export declare enum OneBotStatus {

package/lib/onebot.js

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

@@ -59,7 +59,8 @@ export declare class CommonAction {
     };
     callLogin(this: V11, func: string, ...args: any[]): Promise<unknown>;
     submitSlider(this: V11, ticket: string): Promise<any>;
-    login(this: V11, password?: string): any;
     submitSmsCode(this: V11, code: string): Promise<any>;
     sendSmsCode(this: V11): Promise<any>;
+    login(this: V11, password?: string): any;
+    logout(this: V11, keepalive?: boolean): Promise<unknown>;
 }

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

@@ -105,9 +105,6 @@ class CommonAction {
     async submitSlider(ticket) {
         return this.action.callLogin.apply(this, ['submitSlider', ticket]);
     }
-    login(password) {
-        return this.action.callLogin.apply(this, ['login', password]);
-    }
     async submitSmsCode(code) {
         return this.action.callLogin.apply(this, ['submitSmsCode', code]);
     }
@@ -128,5 +125,18 @@ class CommonAction {
             this.client.sendSmsCode();
         });
     }
+    login(password) {
+        return this.action.callLogin.apply(this, ['login', password]);
+    }
+    logout(keepalive) {
+        return new Promise(async (resolve) => {
+            const receiveResult = (e) => {
+                this.client.off('system.offline', receiveResult);
+                resolve(e);
+            };
+            this.client.on('system.offline', receiveResult);
+            await this.client.logout(keepalive);
+        });
+    }
 }
 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(): Promise<void>;
+    stop(force?: boolean): Promise<void>;
     dispatch(data: any): void;
     private _httpRequestHandler;
     /**

package/lib/service/V11/index.js

@@ -163,11 +163,13 @@ class V11 extends events_1.EventEmitter {
             }
         });
     }
-    async stop() {
+    async stop(force) {
         if (this.client.status === oicq_1.OnlineStatus.Online) {
-            await this.client.logout();
+            await this.client.terminate();
+        }
+        if (force) {
+            (0, fs_1.rmSync)(this.client.dir, { force: true, recursive: true });
         }
-        (0, fs_1.unlinkSync)(this.client.dir);
     }
     dispatch(data) {
         if (!data.post_type)

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

@@ -1,7 +1,6 @@
 import { V12 } from '../../../service/V12';
 import { OnlineStatus } from "oicq";
 import { Action } from "./";
-import { V11 } from "../../../service/V11";
 export declare class CommonAction {
     sendMsg(): void;
     /**
@@ -24,10 +23,11 @@ export declare class CommonAction {
         version: string;
         onebot_version: string;
     };
-    callLogin(this: V11, func: string, ...args: any[]): Promise<unknown>;
-    submitSlider(this: V11, ticket: string): Promise<any>;
-    login(this: V11, password?: string): any;
-    submitSmsCode(this: V11, code: string): Promise<any>;
+    callLogin(this: V12, func: string, ...args: any[]): Promise<unknown>;
+    submitSlider(this: V12, ticket: string): Promise<any>;
+    submitSmsCode(this: V12, code: string): Promise<any>;
     sendSmsCode(this: V12): Promise<any>;
+    login(this: V12, password?: string): any;
+    logout(this: V12, keepalive?: boolean): Promise<unknown>;
     getSupportedActions(this: V12): string[];
 }

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

@@ -66,9 +66,6 @@ class CommonAction {
     async submitSlider(ticket) {
         return this.action.callLogin.apply(this, ['submitSlider', ticket]);
     }
-    login(password) {
-        return this.action.callLogin.apply(this, ['login', password]);
-    }
     async submitSmsCode(code) {
         return this.action.callLogin.apply(this, ['submitSmsCode', code]);
     }
@@ -89,6 +86,19 @@ class CommonAction {
             this.client.sendSmsCode();
         });
     }
+    login(password) {
+        return this.action.callLogin.apply(this, ['login', password]);
+    }
+    logout(keepalive) {
+        return new Promise(async (resolve) => {
+            const receiveResult = (e) => {
+                this.client.off('system.offline', receiveResult);
+                resolve(e);
+            };
+            this.client.on('system.offline', receiveResult);
+            await this.client.logout(keepalive);
+        });
+    }
     getSupportedActions() {
         return [...new Set((0, utils_1.getProperties)(this.action))].filter(key => {
             return key !== 'constructor';

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

@@ -199,11 +199,13 @@ class V12 extends events_1.EventEmitter {
             }
         });
     }
-    async stop() {
+    async stop(force) {
         if (this.client.status === oicq_1.OnlineStatus.Online) {
-            await this.client.logout();
+            await this.client.terminate();
+        }
+        if (force) {
+            (0, fs_1.rmSync)(this.client.dir, { force: true, recursive: true });
         }
-        (0, fs_1.unlinkSync)(this.client.dir);
     }
     dispatch(data = {}) {
         if (!data)

package/package.json

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