onebots 0.4.16 → 0.4.18

package/README.md

@@ -2,7 +2,7 @@
     <h1>基于icqq的oneBot实现</h1>
     <p>
 
-![npm](https://img.shields.io/npm/v/onebots)
+[![npm](https://img.shields.io/npm/v/onebots)](https://www.npmjs.com/package/onebots)
 [![Release and Publish](https://github.com/icqqjs/onebots/actions/workflows/release.yml/badge.svg?branch=master&event=push)](https://github.com/icqqjs/onebots/actions/workflows/release.yml)
 [![dm](https://shields.io/npm/dm/onebots)](https://www.npmjs.com/package/onebots)
 [![oneBot V11](https://img.shields.io/badge/OneBot-11-black?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHAAAABwCAMAAADxPgR5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAxQTFRF////29vbr6+vAAAAk1hCcwAAAAR0Uk5T////AEAqqfQAAAKcSURBVHja7NrbctswDATQXfD//zlpO7FlmwAWIOnOtNaTM5JwDMa8E+PNFz7g3waJ24fviyDPgfhz8fHP39cBcBL9KoJbQUxjA2iYqHL3FAnvzhL4GtVNUcoSZe6eSHizBcK5LL7dBr2AUZlev1ARRHCljzRALIEog6H3U6bCIyqIZdAT0eBuJYaGiJaHSjmkYIZd+qSGWAQnIaz2OArVnX6vrItQvbhZJtVGB5qX9wKqCMkb9W7aexfCO/rwQRBzsDIsYx4AOz0nhAtWu7bqkEQBO0Pr+Ftjt5fFCUEbm0Sbgdu8WSgJ5NgH2iu46R/o1UcBXJsFusWF/QUaz3RwJMEgngfaGGdSxJkE/Yg4lOBryBiMwvAhZrVMUUvwqU7F05b5WLaUIN4M4hRocQQRnEedgsn7TZB3UCpRrIJwQfqvGwsg18EnI2uSVNC8t+0QmMXogvbPg/xk+Mnw/6kW/rraUlvqgmFreAA09xW5t0AFlHrQZ3CsgvZm0FbHNKyBmheBKIF2cCA8A600aHPmFtRB1XvMsJAiza7LpPog0UJwccKdzw8rdf8MyN2ePYF896LC5hTzdZqxb6VNXInaupARLDNBWgI8spq4T0Qb5H4vWfPmHo8OyB1ito+AysNNz0oglj1U955sjUN9d41LnrX2D/u7eRwxyOaOpfyevCWbTgDEoilsOnu7zsKhjRCsnD/QzhdkYLBLXjiK4f3UWmcx2M7PO21CKVTH84638NTplt6JIQH0ZwCNuiWAfvuLhdrcOYPVO9eW3A67l7hZtgaY9GZo9AFc6cryjoeFBIWeU+npnk/nLE0OxCHL1eQsc1IciehjpJv5mqCsjeopaH6r15/MrxNnVhu7tmcslay2gO2Z1QfcfX0JMACG41/u0RrI9QAAAABJRU5ErkJggg==)](https://onebot.dev/)

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

@@ -42,6 +42,7 @@ export declare class V11 extends EventEmitter implements OneBot.Base {
     stop(force?: boolean): Promise<void>;
     format(_: any, data: any): any;
     dispatch(data: any): void;
+    private _formatEvent;
     private _httpRequestHandler;
     /**
      * 处理ws消息

package/lib/service/V11/index.js

@@ -224,7 +224,63 @@ class V11 extends events_1.EventEmitter {
         //     if (!['user_id', 'group_id', 'discuss_id', 'member_id', 'channel_id', 'guild_id'].includes(key)) return value
         //     return value + ''
         // })
-        this.emit('dispatch', JSON.stringify(data));
+        this.emit('dispatch', this._formatEvent(data));
+    }
+    _formatEvent(data) {
+        if (data.post_type === 'notice') {
+            // console.log(JSON.stringify(data))
+            const data1 = { ...data };
+            if (data.notice_type === 'group') {
+                delete data1.group;
+                delete data1.member;
+                switch (data.sub_type) {
+                    case 'decrease':
+                        data1.sub_type = data.operator_id === data.user_id ? 'leave' : data.user_id === this.client.uin ? 'kick_me' : 'kick';
+                        data1.notice_type = `${data.notice_type}_${data.sub_type}`;
+                        break;
+                    case 'increase':
+                        data1.notice_type = `${data.notice_type}_${data.sub_type}`;
+                        data1.sub_type = 'approve'; // todo 尚未实现
+                        data1.operator_id = data1.user_id; // todo 尚未实现
+                        break;
+                    case 'ban':
+                        data1.notice_type = `${data.notice_type}_${data.sub_type}`;
+                        data1.subtype = data.duration ? 'ban' : 'lift_ban';
+                        break;
+                    case 'recall':
+                        data1.notice_type = `${data.notice_type}_${data.sub_type}`;
+                        delete data1.sub_type;
+                        break;
+                    case 'admin':
+                        data1.notice_type = `${data.notice_type}_${data.sub_type}`;
+                        data1.sub_type = data.set ? 'set' : 'unset';
+                        break;
+                    case 'poke':
+                        data1.notice_type = 'notify';
+                        data1.user_id = data.operator_id;
+                        break;
+                    default:
+                        break;
+                }
+            }
+            else {
+                delete data1.friend;
+                switch (data.sub_type) {
+                    case 'increase':
+                        data1.notice_type = `friend_add`;
+                        break;
+                    case 'recall':
+                        data1.notice_type = `friend_recall`;
+                        break;
+                    default:
+                        break;
+                }
+            }
+            return JSON.stringify(data1);
+        }
+        else {
+            return JSON.stringify(data);
+        }
     }
     async _httpRequestHandler(ctx) {
         if (ctx.method === 'OPTIONS') {
@@ -280,10 +336,11 @@ class V11 extends events_1.EventEmitter {
      */
     _webSocketHandler(ws) {
         ws.on("message", async (msg) => {
-            this.logger.info(" 收到ws消息：" + msg);
+            const msgStr = msg.toString();
+            this.logger.info(" 收到ws消息：", msgStr.length > 2e3 ? msgStr.slice(0, 2e3) + ` ... ${msgStr.length - 2e3} more chars` : msgStr);
             var data;
             try {
-                data = JSON.parse(String(msg));
+                data = JSON.parse(msgStr);
                 let ret;
                 if (data.action.startsWith(".handle_quick_operation")) {
                     const event = data.params.context, res = data.params.operation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onebots",
-  "version": "0.4.16",
+  "version": "0.4.18",
   "description": "基于icqq的多例oneBot实现",
   "engines": {
     "node": ">=16"
@@ -63,6 +63,7 @@
     "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",
     "log4js": "^6.5.2",
+    "mime-types": "^2.1.35",
     "ws": "^8.8.0"
   }
 }