onebots 0.0.17 → 0.0.19

package/lib/onebot.d.ts

@@ -21,7 +21,7 @@ export declare class OneBot<V extends OneBot.Version> extends EventEmitter {
     start(): Promise<void>;
     startListen(): void;
     stop(force?: boolean): Promise<void>;
-    dispatch(data: any): void;
+    dispatch(event: any, data: any): void;
 }
 export declare enum OneBotStatus {
     Good = 0,

package/lib/onebot.js

@@ -101,10 +101,10 @@ class OneBot extends events_1.EventEmitter {
         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.client.on('system', this.dispatch.bind(this, 'system'));
+        this.client.on('notice', this.dispatch.bind(this, 'notice'));
+        this.client.on('request', this.dispatch.bind(this, 'request'));
+        this.client.on('message', this.dispatch.bind(this, 'message'));
         for (const instance of this.instances) {
             instance.start(this.instances.length > 1 ? '/' + instance.version : undefined);
         }
@@ -113,14 +113,12 @@ class OneBot extends events_1.EventEmitter {
         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));
-        this.client.off('message', this.dispatch.bind(this));
+        this.client.removeAllListeners();
     }
-    dispatch(data) {
+    dispatch(event, data) {
         for (const instance of this.instances) {
-            instance.dispatch(data);
+            const result = instance.format(event, data);
+            instance.dispatch(result);
         }
     }
 }

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

@@ -33,6 +33,7 @@ export declare class V11 extends EventEmitter implements OneBot.Base {
     private startWs;
     private startWsReverse;
     stop(force?: boolean): Promise<void>;
+    format(_: any, data: any): any;
     dispatch(data: any): void;
     private _httpRequestHandler;
     /**

package/lib/service/V11/index.js

@@ -181,6 +181,9 @@ class V11 extends events_1.EventEmitter {
             (0, fs_1.rmSync)(this.client.dir, { force: true, recursive: true });
         }
     }
+    format(_, data) {
+        return data;
+    }
     dispatch(data) {
         if (!data.post_type)
             data.post_type = 'system';

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

@@ -10,6 +10,7 @@ export declare class CommonAction {
     deleteMsg(this: V12, message_id: string): Promise<boolean>;
     getSelfInfo(this: V12): {
         user_id: number;
+        platform: string;
         nickname: string;
         user_displayname: string;
     };

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

@@ -16,6 +16,7 @@ class CommonAction {
     getSelfInfo() {
         return {
             user_id: this.client.uin,
+            platform: 'qq',
             nickname: this.client.nickname,
             user_displayname: ''
         };

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";
@@ -29,6 +29,12 @@ export declare class V12 extends EventEmitter implements OneBot.Base {
     private startWs;
     private startWsReverse;
     stop(force?: boolean): Promise<void>;
+    format<E extends keyof V12.BotEventMap>(event: E, ...args: [V12.BotEventMap[E]]): {
+        self_id: number;
+        time: number;
+        detail_type: E;
+        sub_type: string;
+    } & Omit<V12.BotEventMap[E], E>;
     dispatch(data: Record<string, any>): void;
     apply(req: any): Promise<string>;
     private _httpRequestHandler;
@@ -46,6 +52,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 +141,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 +155,23 @@ 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 formatPayload<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");
@@ -88,7 +87,7 @@ class V12 extends events_1.EventEmitter {
         });
         if (this.config.heartbeat) {
             this.heartbeat = setInterval(() => {
-                this.dispatch(V12.genMetaEvent(this.client.uin, 'heartbeat', {
+                this.dispatch(V12.formatPayload(this.client.uin, 'heartbeat', {
                     detail_type: "heartbeat",
                     interval: new Date().getTime() + this.config.heartbeat * 1000
                 }));
@@ -209,27 +208,50 @@ class V12 extends events_1.EventEmitter {
             (0, fs_1.rmSync)(this.client.dir, { force: true, recursive: true });
         }
     }
-    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';
+    format(event, ...args) {
+        const data = (typeof args[0]) === 'object' ? args.shift() || {} : {};
+        data.type = data.post_type;
+        if (!data.type) {
+            data.type = 'meta';
+            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';
+            }
+        }
+        if (data.type === 'notice') {
+            switch (data.detail_type) {
+                case 'friend':
+                    data.detail_type += data.sub_type;
+                    break;
+                case 'group':
+                    if (['increase', 'decrease'].includes(data.sub_type))
+                        data.detail_type = 'group_member_' + data.sub_type;
+                    else if (data.sub_type === 'recall')
+                        data.detail_type = 'group_message_delete';
             }
         }
+        if (data.type === 'system')
+            data.type = 'meta';
+        data.alt_message = data.raw_message;
+        data.self = this.action.getSelfInfo.apply(this);
+        if (!data.detail_type)
+            data.detail_type = data.message_type || data.notice_type || data.request_type || data.system_type;
+        data.message = data.type === 'message' ? V12.toSegment(data.message) : data.message;
+        return V12.formatPayload(this.client.uin, event, data);
+    }
+    dispatch(data) {
         const payload = {
             id: (0, utils_1.uuid)(),
             impl: 'oicq_onebot',
@@ -239,23 +261,8 @@ 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,
         };
-        if (payload.type === 'notice') {
-            switch (payload.detail_type) {
-                case 'friend':
-                    payload.detail_type += payload.sub_type;
-                    break;
-                case 'group':
-                    if (['increase', 'decrease'].includes(payload.sub_type))
-                        payload.detail_type = 'group_member_' + payload.sub_type;
-                    else if (payload.sub_type === 'recall')
-                        payload.detail_type = 'group_message_delete';
-            }
-        }
         this.emit('dispatch', payload);
     }
     async apply(req) {
@@ -264,7 +271,7 @@ class V12 extends events_1.EventEmitter {
         let is_async = action.includes("_async");
         if (is_async)
             action = action.replace("_async", "");
-        if (action === 'send_msg') {
+        if (action === 'send_message') {
             if (["private", "group", "discuss", 'channel'].includes(params.detail_type)) {
                 action = "send_" + params.detail_type + "_msg";
             }
@@ -292,12 +299,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,12 +489,45 @@ class V12 extends events_1.EventEmitter {
                 }));
             }
         });
-        this.dispatch(V12.genMetaEvent(this.client.uin, "connect", this.action.getVersion.apply(this)));
-        this.dispatch(V12.genMetaEvent(this.client.uin, "status_update", this.action.getStatus.apply(this)));
+        this.dispatch(V12.formatPayload(this.client.uin, "connect", this.action.getVersion.apply(this)));
+        this.dispatch(V12.formatPayload(this.client.uin, "status_update", this.action.getStatus.apply(this)));
     }
 }
 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: '',
@@ -524,16 +559,15 @@ exports.V12 = V12;
         };
     }
     V12.error = error;
-    function genMetaEvent(uin, type, data) {
-        return {
+    function formatPayload(uin, type, data) {
+        const result = {
             self_id: uin,
             time: Math.floor(Date.now() / 1000),
-            type: "meta",
-            status: 'ok',
             detail_type: type,
             sub_type: '',
             ...data
         };
+        return result;
     }
-    V12.genMetaEvent = genMetaEvent;
+    V12.formatPayload = formatPayload;
 })(V12 = exports.V12 || (exports.V12 = {}));

package/package.json

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