onebots 0.0.13 → 0.0.14

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

@@ -1,4 +1,3 @@
-import { OnlineStatus } from "oicq";
 import { V11 } from "../../../service/V11";
 export declare class CommonAction {
     /**
@@ -54,7 +53,7 @@ export declare class CommonAction {
      */
     setRestart(this: V11, delay: number): boolean;
     getStatus(this: V11): {
-        online: OnlineStatus;
+        online: boolean;
         good: boolean;
     };
     callLogin(this: V11, func: string, ...args: any[]): Promise<unknown>;

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

@@ -76,7 +76,7 @@ class CommonAction {
     }
     getStatus() {
         return {
-            online: this.client.status = oicq_1.OnlineStatus.Online,
+            online: this.client.status === oicq_1.OnlineStatus.Online,
             good: this.oneBot.status === onebot_1.OneBotStatus.Good
         };
     }

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

@@ -59,11 +59,11 @@ export declare class V11 extends EventEmitter implements OneBot.Base {
 export declare namespace V11 {
     interface Result<T extends any> {
         retcode: number;
-        status: "success" | 'async' | 'error';
+        status: "ok" | 'async' | 'error';
         data: T;
         error: string;
     }
-    function success<T extends any>(data: T, retcode?: number, pending?: boolean): Result<T>;
+    function ok<T extends any>(data: T, retcode?: number, pending?: boolean): Result<T>;
     function error(error: string, retcode?: number): Result<any>;
     const defaultConfig: Config;
     function genMetaEvent(uin: number, type: string): {

package/lib/service/V11/index.js

@@ -6,11 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.V11 = void 0;
 const oicq_1 = require("oicq");
 const action_1 = require("./action");
+const onebot_1 = require("../../onebot");
 const ws_1 = require("ws");
 const url_1 = require("url");
 const utils_1 = require("../../utils");
 const oicq2_cq_enable_1 = require("oicq2-cq-enable");
-const onebot_1 = require("../../onebot");
+const onebot_2 = require("../../onebot");
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
 const events_1 = require("events");
@@ -61,6 +62,10 @@ class V11 extends events_1.EventEmitter {
             this.heartbeat = setInterval(() => {
                 this.dispatch({
                     self_id: this.client.uin,
+                    status: {
+                        online: this.client.status === oicq_1.OnlineStatus.Online,
+                        good: this.oneBot.status === onebot_1.OneBotStatus.Good
+                    },
                     time: Math.floor(Date.now() / 1000),
                     post_type: "meta_event",
                     meta_event_type: "heartbeat",
@@ -157,9 +162,14 @@ class V11 extends events_1.EventEmitter {
     }
     startWsReverse(url) {
         const ws = this._createWsr(url);
-        this.on('dispatch', (unserialized) => {
+        this.on('dispatch', (serialized) => {
             if (this.wsr.has(ws)) {
-                ws.send(JSON.stringify(unserialized));
+                ws.send(serialized, (err) => {
+                    if (err)
+                        this.logger.error(`反向WS(${ws.url})上报事件失败: ` + err.message);
+                    else
+                        this.logger.debug(`反向WS(${ws.url})上报事件成功: ` + serialized);
+                });
             }
         });
     }
@@ -179,6 +189,7 @@ class V11 extends events_1.EventEmitter {
         if (data.message && data.post_type === 'message') {
             data.message = this.config.post_message_format === 'array' ? (0, oicq2_cq_enable_1.toSegment)(data.message) : (0, oicq2_cq_enable_1.toCqcode)(data);
         }
+        data.time = Math.floor(Date.now() / 1000);
         this.emit('dispatch', JSON.stringify(data));
     }
     async _httpRequestHandler(ctx) {
@@ -258,7 +269,7 @@ class V11 extends events_1.EventEmitter {
             }
             catch (e) {
                 let code, message;
-                if (e instanceof onebot_1.NotFoundError) {
+                if (e instanceof onebot_2.NotFoundError) {
                     code = 1404;
                     message = "不支持的api";
                 }
@@ -375,7 +386,7 @@ class V11 extends events_1.EventEmitter {
             const args = [];
             for (let k of ARGS) {
                 if (Reflect.has(params, k)) {
-                    if (onebot_1.BOOLS.includes(k))
+                    if (onebot_2.BOOLS.includes(k))
                         params[k] = (0, utils_1.toBool)(params[k]);
                     if (k === 'message') {
                         if (typeof params[k] === 'string') {
@@ -392,7 +403,7 @@ class V11 extends events_1.EventEmitter {
             if (is_queue) {
                 this._queue.push({ method, args });
                 this._runQueue();
-                result = V11.success(null, 0, true);
+                result = V11.ok(null, 0, true);
             }
             else {
                 try {
@@ -403,14 +414,14 @@ class V11 extends events_1.EventEmitter {
                 }
                 if (ret instanceof Promise) {
                     if (is_async) {
-                        result = V11.success(null, 0, true);
+                        result = V11.ok(null, 0, true);
                     }
                     else {
-                        result = V11.success(await ret, 0, false);
+                        result = V11.ok(await ret, 0, false);
                     }
                 }
                 else {
-                    result = V11.success(await ret, 0, false);
+                    result = V11.ok(await ret, 0, false);
                 }
             }
             if (result.data instanceof Map)
@@ -421,7 +432,7 @@ class V11 extends events_1.EventEmitter {
             return JSON.stringify(result);
         }
         else
-            throw new onebot_1.NotFoundError();
+            throw new onebot_2.NotFoundError();
     }
     /**
      * 限速队列调用
@@ -443,15 +454,15 @@ class V11 extends events_1.EventEmitter {
 }
 exports.V11 = V11;
 (function (V11) {
-    function success(data, retcode = 0, pending) {
+    function ok(data, retcode = 0, pending) {
         return {
             retcode,
-            status: pending ? 'async' : 'success',
+            status: pending ? 'async' : 'ok',
             data,
             error: null
         };
     }
-    V11.success = success;
+    V11.ok = ok;
     function error(error, retcode = 1) {
         return {
             retcode,

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

@@ -68,7 +68,7 @@ export declare namespace V12 {
         url: string;
     }
     interface Result<T extends any> {
-        status: 'ok' | 'failed';
+        status: 'success' | 'failed';
         retcode: 0 | 10001 | 10002 | 10003 | 10004 | 10005 | 10006 | 10007;
         data: T;
         message: string;

package/lib/service/V12/index.js

@@ -455,7 +455,7 @@ class V12 extends events_1.EventEmitter {
                     this._quickOperate(event, res);
                     ret = JSON.stringify({
                         retcode: 0,
-                        status: "ok",
+                        status: "success",
                         data: null,
                         message: null,
                         echo: data.echo
@@ -507,7 +507,7 @@ exports.V12 = V12;
     function success(data, retcode = 0, echo) {
         return {
             retcode,
-            status: retcode === 0 ? 'ok' : 'failed',
+            status: retcode === 0 ? 'success' : 'failed',
             data,
             message: '',
             echo

package/package.json

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