onebots 0.0.10 → 0.0.12

package/lib/server/app.js

@@ -170,7 +170,7 @@ class App extends koa_1.default {
                 ctx.body = e.message;
             }
         });
-        this.router.get('/edit', (ctx, next) => {
+        this.router.post('/edit', (ctx, next) => {
             const { uin, ...config } = ctx.request.body;
             try {
                 this.updateAccount(Number(uin), config);

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.js

@@ -165,7 +165,7 @@ class V11 extends events_1.EventEmitter {
     }
     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 });

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.js

@@ -201,7 +201,7 @@ class V12 extends events_1.EventEmitter {
     }
     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 });

package/package.json

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