onebots 0.0.16 → 0.0.18

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { Client } from "oicq";
+import { Client, EventMap, MessageElem, Sendable } from "oicq";
 import { Config } from './config';
 import { OneBot } from "../../onebot";
 import { Action } from "./action";
@@ -46,6 +46,47 @@ export declare class V12 extends EventEmitter implements OneBot.Base {
     protected _webSocketHandler(ws: WebSocket): void;
 }
 export declare namespace V12 {
+    function fromSegment(msgList: SegmentElem | string | number | (SegmentElem | string | number)[]): MessageElem[];
+    function toSegment(msgList: Sendable): SegmentElem<keyof SegmentMap>[];
+    interface SegmentMap {
+        face: {
+            id: number;
+            text: string;
+        };
+        text: {
+            text: string;
+        };
+        mention: {
+            user_id: string;
+        };
+        mention_all: null;
+        image: {
+            file_id: string;
+        };
+        voice: {
+            file_id: string;
+        };
+        audio: {
+            file_id: string;
+        };
+        file: {
+            file_id: string;
+        };
+        location: {
+            latitude: number;
+            longitude: number;
+            title: string;
+            content: string;
+        };
+        reply: {
+            message_id: string;
+            user_id: string;
+        };
+    }
+    type SegmentElem<K extends keyof SegmentMap = keyof SegmentMap> = {
+        type: K;
+        data: SegmentMap[K];
+    };
     interface Config {
         heartbeat?: number;
         access_token?: string;
@@ -94,7 +135,8 @@ export declare namespace V12 {
         params: any;
         echo?: string;
     }
-    type MetaEventMap = {
+    type BotEventMap = {
+        system: Record<string, any>;
         connect: {
             detail_type: 'connect';
             version: ReturnType<Action['getVersion']>;
@@ -107,15 +149,25 @@ export declare namespace V12 {
             detail_type: 'status_update';
             status: ReturnType<Action['getStatus']>;
         };
+    } & TransformEventMap;
+    type TransformEventMap = {
+        [P in keyof EventMap]: TransformEventParams<Parameters<EventMap[P]>>;
+    };
+    type TransformEventParams<T extends any[]> = T extends [infer L, ...infer R] ? L extends object ? L & {
+        args: R;
+    } : {
+        args: [L, ...R];
+    } : {
+        args: T;
     };
     function success<T extends any>(data: T, retcode?: Result<T>['retcode'], echo?: string): Result<T>;
     function error(message: string, retcode?: Result<null>['retcode'], echo?: string): Result<null>;
-    function genMetaEvent<K extends keyof MetaEventMap>(uin: number, type: K, data: Omit<MetaEventMap[K], K>): {
+    function genMetaEvent<K extends keyof BotEventMap>(uin: number, type: K, data: Omit<BotEventMap[K], K>): {
         self_id: number;
         time: number;
         type: string;
         status: string;
         detail_type: K;
         sub_type: string;
-    } & Omit<MetaEventMap[K], K>;
+    } & Omit<BotEventMap[K], K>;
 }

package/lib/service/V12/index.js

@@ -13,7 +13,6 @@ const url_1 = require("url");
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
 const ws_1 = require("ws");
-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");
@@ -190,8 +189,14 @@ class V12 extends events_1.EventEmitter {
     startWsReverse(config) {
         const ws = this._createWsr(config.url, config);
         this.on('dispatch', (unserialized) => {
+            const serialized = JSON.stringify(unserialized);
             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);
+                });
             }
         });
     }
@@ -206,22 +211,23 @@ class V12 extends events_1.EventEmitter {
     dispatch(data) {
         if (!data || typeof data !== "object")
             data = { args: data || [] };
-        if (!data['post_type']) {
-            data['sub_type'] = 'online';
-            if (data['image']) {
-                data['system_type'] = 'login';
-                data['sub_type'] = 'qrcode';
-            }
-            else if (data['url']) {
-                data['system_type'] = 'login';
-                data.sub_type = 'slider';
+        data.type = data.post_type;
+        if (!data.type) {
+            data.detail_type = 'online';
+            if (data.image) {
+                data.type = 'login';
+                data.detail_type = 'qrcode';
+            }
+            else if (data.url) {
+                data.type = 'login';
+                data.detail_type = 'slider';
                 if (data.phone) {
-                    data.sub_type = 'device';
+                    data.detail_type = 'device';
                 }
             }
             else if (data.message) {
-                data.system_type = 'login';
-                data.sub_type = 'error';
+                data.type = 'login';
+                data.detial_type = 'error';
             }
         }
         const payload = {
@@ -233,10 +239,11 @@ class V12 extends events_1.EventEmitter {
                 platform: 'qq',
                 user_id: `${this.client.uin}`
             },
-            type: data.post_type || 'meta',
             alt_message: data.raw_message,
             detail_type: data.message_type || data.notice_type || data.request_type || data.system_type,
-            ...data,
+            ...V12.genMetaEvent(this.client.uin, data.type, data),
+            message: data.type === 'message' ? V12.toSegment(data.message) : data.message,
+            type: data.type || 'meta',
         };
         if (payload.type === 'notice') {
             switch (payload.detail_type) {
@@ -286,12 +293,7 @@ class V12 extends events_1.EventEmitter {
                     if (onebot_1.BOOLS.includes(k))
                         params[k] = (0, utils_1.toBool)(params[k]);
                     if (k === 'message') {
-                        if (typeof params[k] === 'string') {
-                            params[k] = (0, oicq2_cq_enable_1.fromCqcode)(params[k]);
-                        }
-                        else {
-                            params[k] = (0, oicq2_cq_enable_1.fromSegment)(params[k]);
-                        }
+                        params[k] = V12.fromSegment(params[k]);
                     }
                     args.push(params[k]);
                 }
@@ -487,6 +489,39 @@ class V12 extends events_1.EventEmitter {
 }
 exports.V12 = V12;
 (function (V12) {
+    function fromSegment(msgList) {
+        msgList = [].concat(msgList);
+        return msgList.map((msg) => {
+            if (typeof msg !== 'object')
+                msg = String(msg);
+            if (typeof msg === 'string') {
+                return { type: 'text', text: msg };
+            }
+            const { type, data, ...other } = msg;
+            return {
+                type: type.replace('mention', 'at').replace('at_all', 'at'),
+                ...other,
+                ...data
+            };
+        });
+    }
+    V12.fromSegment = fromSegment;
+    function toSegment(msgList) {
+        msgList = [].concat(msgList);
+        return msgList.map((msg) => {
+            if (typeof msg === 'string')
+                return { type: 'text', data: { text: msg } };
+            let { type, ...other } = msg;
+            return {
+                type: type === 'at' ? other['qq'] ? 'mention' : "mention_all" : type,
+                data: {
+                    ...other,
+                    user_id: other['qq']
+                }
+            };
+        });
+    }
+    V12.toSegment = toSegment;
     V12.defaultConfig = {
         heartbeat: 3,
         access_token: '',

package/package.json

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