Merge branch 'dev'

# Conflicts:
#	manifest.json
#	src/common/data.ts

manifest.json

@@ -1,31 +1,33 @@
 {
-    "manifest_version": 4,
+  "manifest_version": 4,
-    "type": "extension",
+  "type": "extension",
-    "name": "LLOneBot",
+  "name": "LLOneBot",
-    "slug": "LLOneBot",
+  "slug": "LLOneBot",
-    "description": "LiteLoaderQQNT的OneBotApi",
+  "description": "LiteLoaderQQNT的OneBotApi",
-    "version": "3.2.2",
+  "version": "3.3.0",
-    "thumbnail": "./icon.png",
+  "thumbnail": "./icon.png",
-    "authors": [{
+  "authors": [
-        "name": "linyuchen",
+    {
-        "link": "https://github.com/linyuchen"
+      "name": "linyuchen",
-    }],
+      "link": "https://github.com/linyuchen"
-    "repository": {
+    }
+  ],
+  "repository": {
     "repo": "linyuchen/LiteLoaderQQNT-OneBotApi",
     "branch": "main",
     "release": {
-        "tag": "latest",
+      "tag": "latest",
-        "name": "LLOneBot.zip"
+      "name": "LLOneBot.zip"
-    }
-},
-    "platform": [
-        "win32",
-        "linux",
-        "darwin"
-    ],
-    "injects": {
-        "renderer": "./renderer.js",
-        "main": "./main.js",
-        "preload": "./preload.js"
     }
+  },
+  "platform": [
+    "win32",
+    "linux",
+    "darwin"
+  ],
+  "injects": {
+    "renderer": "./renderer.js",
+    "main": "./main.js",
+    "preload": "./preload.js"
+  }
 }

src/common/data.ts

@@ -88,5 +88,5 @@ export function getStrangerByUin(uin: string) {
     }
 }
 
-export const version = "v3.2.2"
+export const version = "v3.3.0"
 export const heartInterval = 15000 // 毫秒

src/main/main.ts

@@ -1,22 +1,16 @@
 // 运行在 Electron 主进程 下的插件入口
 
-import * as path from "path";
 import { BrowserWindow, ipcMain } from 'electron';
-import * as util from 'util';
 
 import { Config } from "../common/types";
-import {
+import { CHANNEL_GET_CONFIG, CHANNEL_LOG, CHANNEL_SET_CONFIG, } from "../common/channels";
-    CHANNEL_GET_CONFIG,
-    CHANNEL_LOG,
-    CHANNEL_SET_CONFIG,
-} from "../common/channels";
 import { postMsg, setToken, startHTTPServer, startWSServer } from "../onebot11/server";
 import { CONFIG_DIR, getConfigUtil, log } from "../common/utils";
-import { addHistoryMsg, msgHistory, selfInfo } from "../common/data";
+import { addHistoryMsg, getGroupMember, msgHistory, selfInfo, uidMaps } from "../common/data";
 import { hookNTQQApiReceive, ReceiveCmd, registerReceiveHook } from "../ntqqapi/hook";
 import { OB11Constructor } from "../onebot11/constructor";
 import { NTQQApi } from "../ntqqapi/ntcall";
-import { Group, RawMessage, SelfInfo } from "../ntqqapi/types";
+import { ChatType, RawMessage } from "../ntqqapi/types";
 
 const fs = require('fs');
 
@@ -39,13 +33,13 @@ function onLoad() {
     ipcMain.on(CHANNEL_SET_CONFIG, (event: any, arg: Config) => {
         let oldConfig = getConfigUtil().getConfig();
         getConfigUtil().setConfig(arg)
-        if (arg.port != oldConfig.port){
+        if (arg.port != oldConfig.port) {
             startHTTPServer(arg.port)
         }
-        if (arg.wsPort != oldConfig.wsPort){
+        if (arg.wsPort != oldConfig.wsPort) {
             startWSServer(arg.wsPort)
         }
-        if (arg.token != oldConfig.token){
+        if (arg.token != oldConfig.token) {
             setToken(arg.token);
         }
     })
@@ -58,6 +52,7 @@ function onLoad() {
     function postRawMsg(msgList: RawMessage[]) {
         const {debug, reportSelfMessage} = getConfigUtil().getConfig();
         for (let message of msgList) {
+            log("收到新消息", message)
             message.msgShortId = msgHistory[message.msgId]?.msgShortId
             if (!message.msgShortId) {
                 addHistoryMsg(message)
@@ -76,7 +71,7 @@ function onLoad() {
     }
 
 
-    function start() {
+    async function start() {
         registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload) => {
             try {
                 // log("received msg length", payload.msgList.length);
@@ -85,7 +80,38 @@ function onLoad() {
                 log("report message error: ", e.toString())
             }
         })
-
+        registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.UPDATE_MSG, async (payload) => {
+            for (const message of payload.msgList) {
+                // log("message update", message, message.sendStatus)
+                if (message.sendStatus === 2) {
+                    // 撤回消息上报
+                    const oriMessage = msgHistory[message.msgId]
+                    if (!oriMessage) {
+                        continue
+                    }
+                    if (message.chatType == ChatType.friend) {
+                        const friendRecallEvent = OB11Constructor.friendRecallEvent(message.senderUin, oriMessage.msgShortId)
+                        postMsg(friendRecallEvent)
+                    } else if (message.chatType == ChatType.group) {
+                        let operatorId = message.senderUin
+                        for (const element of message.elements) {
+                            const operatorUid = element.grayTipElement?.revokeElement.operatorUid
+                            const operator = await getGroupMember(message.peerUin, null, operatorUid)
+                            operatorId = operator.uin
+                        }
+                        const groupRecallEvent = OB11Constructor.groupRecallEvent(
+                            message.peerUin,
+                            message.senderUin,
+                            operatorId,
+                            oriMessage.msgShortId
+                        )
+                        postMsg(groupRecallEvent)
+                    }
+                    continue
+                }
+                addHistoryMsg(message)
+            }
+        })
         registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, (payload) => {
             const {reportSelfMessage} = getConfigUtil().getConfig()
             if (!reportSelfMessage) {
@@ -128,9 +154,8 @@ function onLoad() {
                 log("get self nickname failed", e.toString())
                 return setTimeout(init, 1000)
             }
-            start();
+            start().then();
-        }
+        } else {
-        else{
             setTimeout(init, 1000)
         }
     }

src/ntqqapi/constructor.ts

@@ -1,5 +1,13 @@
-import {ElementType, SendPicElement, SendPttElement, SendReplyElement, SendTextElement, AtType} from "./types";
+import {
-import {NTQQApi} from "./ntcall";
+    ElementType,
+    SendPicElement,
+    SendPttElement,
+    SendReplyElement,
+    SendTextElement,
+    AtType,
+    SendFaceElement
+} from "./types";
+import { NTQQApi } from "./ntcall";
 
 
 export class SendMsgElementConstructor {
@@ -44,7 +52,7 @@ export class SendMsgElementConstructor {
         }
     }
 
-    static async pic(picPath: string): Promise<SendPicElement>{
+    static async pic(picPath: string): Promise<SendPicElement> {
         const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(picPath);
         const imageSize = await NTQQApi.getImageSize(picPath);
         const picElement = {
@@ -70,7 +78,7 @@ export class SendMsgElementConstructor {
         };
     }
 
-    static async ptt(pttPath: string):Promise<SendPttElement> {
+    static async ptt(pttPath: string): Promise<SendPttElement> {
         const {md5, fileName, path, fileSize} = await NTQQApi.uploadFile(pttPath);
         return {
             elementType: ElementType.PTT,
@@ -94,4 +102,15 @@ export class SendMsgElementConstructor {
             }
         };
     }
+
+    static face(faceId: number): SendFaceElement {
+        return {
+            elementType: ElementType.FACE,
+            elementId: "",
+            faceElement: {
+                faceIndex: faceId,
+                faceType: 1
+            }
+        }
+    }
 }

src/ntqqapi/hook.ts

@@ -34,7 +34,7 @@ interface NTQQApiReturnData<PayloadType = unknown> extends Array<any> {
 
 let receiveHooks: Array<{
     method: ReceiveCmd,
-    hookFunc: (payload: any) => void,
+    hookFunc: ((payload: any) => void | Promise<void>)
     id: string
 }> = []
 
@@ -50,7 +50,10 @@ export function hookNTQQApiReceive(window: BrowserWindow) {
                     if (hook.method === ntQQApiMethodName) {
                         new Promise((resolve, reject) => {
                             try {
-                                hook.hookFunc(receiveData.payload);
+                                let _ = hook.hookFunc(receiveData.payload)
+                                if (hook.hookFunc.constructor.name === "AsyncFunction"){
+                                    (_ as Promise<void>).then()
+                                }
                             } catch (e) {
                                 log("hook error", e, receiveData.payload)
                             }
@@ -129,11 +132,7 @@ registerReceiveHook<{
 //     log("user info", payload);
 // })
 
-registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.UPDATE_MSG, (payload) => {
+
-    for (const message of payload.msgList) {
-        addHistoryMsg(message)
-    }
-})
 
 registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload) => {
     for (const message of payload.msgList) {

src/ntqqapi/types.ts

@@ -7,13 +7,14 @@ export interface User {
     remark?: string
 }
 
-export interface SelfInfo extends User{
+export interface SelfInfo extends User {
 
 }
 
-export interface Friend extends User{}
+export interface Friend extends User {
+}
 
-export interface Group{
+export interface Group {
     groupCode: string,
     maxMember: number,
     memberCount: number,
@@ -62,6 +63,7 @@ export enum ElementType {
     TEXT = 1,
     PIC = 2,
     PTT = 4,
+    FACE = 6,
     REPLY = 7,
 }
 
@@ -76,6 +78,7 @@ export interface SendTextElement {
         atNtUid: string,
     }
 }
+
 export interface SendPttElement {
     elementType: ElementType.PTT,
     elementId: "",
@@ -127,7 +130,13 @@ export interface SendReplyElement {
     }
 }
 
-export type SendMessageElement = SendTextElement | SendPttElement | SendPicElement | SendReplyElement
+export interface SendFaceElement {
+    elementType: ElementType.FACE,
+    elementId: "",
+    faceElement: FaceElement
+}
+
+export type SendMessageElement = SendTextElement | SendPttElement | SendPicElement | SendReplyElement | SendFaceElement
 
 export enum AtType {
     notAt = 0,
@@ -140,6 +149,7 @@ export enum ChatType {
     group = 2,
     temp = 100
 }
+
 export interface PttElement {
     canConvert2Text: boolean;
     duration: number; // 秒数
@@ -180,6 +190,22 @@ export interface PicElement {
     fileUuid: string;
 }
 
+export interface GrayTipElement {
+    revokeElement: {
+        operatorRole: string;
+        operatorUid: string;
+        operatorNick: string;
+        operatorRemark: string;
+        operatorMemRemark?: string;
+        wording: string;  // 自定义的撤回提示语
+    }
+}
+
+export interface FaceElement {
+    faceIndex: number,
+    faceType: 1
+}
+
 export interface RawMessage {
     msgId: string;
     msgShortId?: number;  // 自己维护的消息id
@@ -191,6 +217,7 @@ export interface RawMessage {
     sendNickName: string;
     sendMemberName?: string; // 发送者群名片
     chatType: ChatType;
+    sendStatus?: number;  // 消息状态，2是已撤回
     elements: {
         elementId: string,
         replyElement: {
@@ -208,17 +235,7 @@ export interface RawMessage {
         picElement: PicElement;
         pttElement: PttElement;
         arkElement: ArkElement;
+        grayTipElement: GrayTipElement;
+        faceElement: FaceElement;
     }[];
 }
-
-export interface MessageElement {
-    raw: RawMessage;
-    peer: any;
-    sender: {
-        uid: string; // 一串加密的字符串
-        memberName: string;
-        nickname: string;
-    };
-}
-
-

src/onebot11/actions/GetMsg.ts

@@ -17,6 +17,9 @@ class GetMsg extends BaseAction<PayloadType, OB11Message> {
 
     protected async _handle(payload: PayloadType){
         // log("history msg ids", Object.keys(msgHistory));
+        if (!payload.message_id){
+            throw("参数message_id不能为空")
+        }
         const msg = getHistoryMsgByShortId(payload.message_id)
         if (msg) {
             const msgData = await OB11Constructor.message(msg);

src/onebot11/actions/GetStatus.ts

@@ -1,8 +1,10 @@
 import BaseAction from "./BaseAction";
 import {OB11Status} from "../types";
+import { ActionName } from "./types";
 
 
 export default class GetStatus extends BaseAction<any, OB11Status> {
+    actionName = ActionName.GetStatus
     protected async _handle(payload: any): Promise<OB11Status> {
         return {
             online: null,

src/onebot11/actions/SendMsg.ts

@@ -1,19 +1,10 @@
-import { AtType, ChatType, Group } from "../../ntqqapi/types";
+import { AtType, ChatType, Group, SendMessageElement } from "../../ntqqapi/types";
-import {
+import { addHistoryMsg, friends, getGroup, getHistoryMsgByShortId, getStrangerByUin, } from "../../common/data";
-    addHistoryMsg,
-    friends,
-    getGroup,
-    getHistoryMsgByShortId,
-    getStrangerByUin,
-} from "../../common/data";
 import { OB11MessageData, OB11MessageDataType, OB11PostSendMsg } from '../types';
-import { NTQQApi } from "../../ntqqapi/ntcall";
+import { NTQQApi, Peer } from "../../ntqqapi/ntcall";
-import { Peer } from "../../ntqqapi/ntcall";
-import { SendMessageElement } from "../../ntqqapi/types";
 import { SendMsgElementConstructor } from "../../ntqqapi/constructor";
 import { uri2local } from "../utils";
 import { v4 as uuid4 } from 'uuid';
-import { log } from "../../common/utils";
 import BaseAction from "./BaseAction";
 import { ActionName } from "./types";
 import * as fs from "fs";
@@ -25,7 +16,7 @@ export interface ReturnDataType {
 class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
     actionName = ActionName.SendMsg
 
-    protected async _handle(payload: OB11PostSendMsg){
+    protected async _handle(payload: OB11PostSendMsg) {
         const peer: Peer = {
             chatType: ChatType.friend,
             peerUid: ""
@@ -40,18 +31,16 @@ class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
             peer.chatType = ChatType.group
             // peer.name = group.name
             peer.peerUid = group.groupCode
-        }
+        } else if (payload?.user_id) {
-        else if (payload?.user_id) {
             const friend = friends.find(f => f.uin == payload.user_id.toString())
             if (friend) {
                 // peer.name = friend.nickName
                 peer.peerUid = friend.uid
-            }
+            } else {
-            else {
                 peer.chatType = ChatType.temp
                 const tempUser = getStrangerByUin(payload.user_id.toString())
                 if (!tempUser) {
-                    throw(`找不到私聊对象${payload.user_id}`)
+                    throw (`找不到私聊对象${payload.user_id}`)
                 }
                 // peer.name = tempUser.nickName
                 peer.peerUid = tempUser.uid
@@ -64,8 +53,7 @@ class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                     text: payload.message
                 }
             }] as OB11MessageData[]
-        }
+        } else if (!Array.isArray(payload.message)) {
-        else if (!Array.isArray(payload.message)) {
             payload.message = [payload.message]
         }
         const sendElements: SendMessageElement[] = []
@@ -76,22 +64,23 @@ class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                     if (text) {
                         sendElements.push(SendMsgElementConstructor.text(sendMsg.data!.text))
                     }
-                } break;
+                }
+                    break;
                 case OB11MessageDataType.at: {
                     let atQQ = sendMsg.data?.qq;
                     if (atQQ) {
                         atQQ = atQQ.toString()
                         if (atQQ === "all") {
                             sendElements.push(SendMsgElementConstructor.at(atQQ, atQQ, AtType.atAll, "全体成员"))
-                        }
+                        } else {
-                        else {
                             const atMember = group?.members.find(m => m.uin == atQQ)
                             if (atMember) {
                                 sendElements.push(SendMsgElementConstructor.at(atQQ, atMember.uid, AtType.atUser, atMember.cardName || atMember.nick))
                             }
                         }
                     }
-                } break;
+                }
+                    break;
                 case OB11MessageDataType.reply: {
                     let replyMsgId = sendMsg.data.id;
                     if (replyMsgId) {
@@ -101,20 +90,27 @@ class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                             sendElements.push(SendMsgElementConstructor.reply(replyMsg.msgSeq, replyMsg.msgId, replyMsg.senderUin, replyMsg.senderUin))
                         }
                     }
-                } break;
+                }
+                    break;
+                case OB11MessageDataType.face: {
+                    const faceId = sendMsg.data?.id
+                    if (faceId) {
+                        sendElements.push(SendMsgElementConstructor.face(parseInt(faceId)))
+                    }
+                }
+                    break;
                 case OB11MessageDataType.image:
                 case OB11MessageDataType.voice: {
                     const file = sendMsg.data?.file
                     if (file) {
                         const {path, isLocal} = (await uri2local(uuid4(), file))
                         if (path) {
-                            if (!isLocal){ // 只删除http和base64转过来的文件
+                            if (!isLocal) { // 只删除http和base64转过来的文件
                                 deleteAfterSentFiles.push(path)
                             }
-                            if (sendMsg.type === OB11MessageDataType.image){
+                            if (sendMsg.type === OB11MessageDataType.image) {
                                 sendElements.push(await SendMsgElementConstructor.pic(path))
-                            }
+                            } else {
-                            else {
                                 sendElements.push(await SendMsgElementConstructor.ptt(path))
                             }
                         }
@@ -126,10 +122,11 @@ class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         try {
             const returnMsg = await NTQQApi.sendMsg(peer, sendElements)
             addHistoryMsg(returnMsg)
-            deleteAfterSentFiles.map(f=>fs.unlink(f, ()=>{}))
+            deleteAfterSentFiles.map(f => fs.unlink(f, () => {
-            return { message_id: returnMsg.msgShortId }
+            }))
+            return {message_id: returnMsg.msgShortId}
         } catch (e) {
-            throw(e.toString())
+            throw (e.toString())
         }
     }
 }

src/onebot11/actions/index.ts

@@ -12,6 +12,7 @@ import DeleteMsg from "./DeleteMsg";
 import GetVersionInfo from "./GetVersionInfo";
 import CanSendRecord from "./CanSendRecord";
 import CanSendImage from "./CanSendImage";
+import GetStatus from "./GetStatus";
 
 export const actionHandlers = [
     new GetMsg(),
@@ -22,5 +23,6 @@ export const actionHandlers = [
     new DeleteMsg(),
     new GetVersionInfo(),
     new CanSendRecord(),
-    new CanSendImage()
+    new CanSendImage(),
+    new GetStatus()
 ]

src/onebot11/constructor.ts

@@ -4,15 +4,16 @@ import {
     OB11Message,
     OB11Group,
     OB11GroupMember,
-    OB11User, OB11LifeCycleEvent, OB11HeartEvent
+    OB11User
 } from "./types";
 import { AtType, ChatType, Group, GroupMember, IMAGE_HTTP_HOST, RawMessage, SelfInfo, User } from '../ntqqapi/types';
 import { getFriend, getGroupMember, getHistoryMsgBySeq, heartInterval, msgHistory, selfInfo } from '../common/data';
 import { file2base64, getConfigUtil, log } from "../common/utils";
 import { NTQQApi } from "../ntqqapi/ntcall";
+import {OB11EventConstructor} from "./events/constructor";
 
 
-export class OB11Constructor {
+export class OB11Constructor extends OB11EventConstructor{
     static async message(msg: RawMessage): Promise<OB11Message> {
 
         const {enableBase64} = getConfigUtil().getConfig()
@@ -112,6 +113,9 @@ export class OB11Constructor {
             } else if (element.arkElement) {
                 message_data["type"] = OB11MessageDataType.json;
                 message_data["data"]["data"] = element.arkElement.bytesData;
+            } else if (element.faceElement){
+                message_data["type"] = OB11MessageDataType.face;
+                message_data["data"]["id"] = element.faceElement.faceIndex.toString();
             }
             if (message_data.data.http_file) {
                 message_data.data.file = message_data.data.http_file
@@ -186,28 +190,4 @@ export class OB11Constructor {
     static groups(groups: Group[]): OB11Group[] {
         return groups.map(OB11Constructor.group)
     }
-
-    static lifeCycleEvent(): OB11LifeCycleEvent {
-        return {
-            time: Math.floor(Date.now() / 1000),
-            self_id: parseInt(selfInfo.uin),
-            post_type: "meta_event",
-            meta_event_type: "lifecycle",
-            sub_type: "connect"
-        }
-    }
-
-    static heartEvent(): OB11HeartEvent {
-        return {
-            time: Math.floor(Date.now() / 1000),
-            self_id: parseInt(selfInfo.uin),
-            post_type: "meta_event",
-            meta_event_type: "heartbeat",
-            status: {
-                online: true,
-                good: true
-            },
-            interval: heartInterval
-        }
-    }
 }

src/onebot11/events/constructor.ts

@@ -0,0 +1,58 @@
+import {
+    OB11EventBase,
+    OB11EventPostType, OB11FriendRecallNoticeEvent,
+    OB11GroupRecallNoticeEvent,
+    OB11HeartEvent,
+    OB11LifeCycleEvent, OB11MetaEvent, OB11NoticeEvent
+} from "./types";
+import { heartInterval, selfInfo } from "../../common/data";
+
+function eventBase(post_type: OB11EventPostType): OB11EventBase {
+    return {
+        time: Math.floor(Date.now() / 1000),
+        self_id: parseInt(selfInfo.uin),
+        post_type
+    }
+}
+
+export class OB11EventConstructor {
+    static lifeCycleEvent(): OB11LifeCycleEvent {
+        return {
+            ...eventBase(OB11EventPostType.META) as OB11MetaEvent,
+            meta_event_type: "lifecycle",
+            sub_type: "connect"
+        }
+    }
+
+    static heartEvent(): OB11HeartEvent {
+        return {
+            ...eventBase(OB11EventPostType.META) as OB11MetaEvent,
+            meta_event_type: "heartbeat",
+            status: {
+                online: true,
+                good: true
+            },
+            interval: heartInterval
+        }
+    }
+
+    static groupRecallEvent(group_id: string, user_id: string, operator_id: string, message_id: number): OB11GroupRecallNoticeEvent {
+        return {
+            ...eventBase(OB11EventPostType.NOTICE) as OB11NoticeEvent,
+            notice_type: "group_recall",
+            group_id: parseInt(group_id),
+            user_id: parseInt(user_id),
+            operator_id: parseInt(operator_id),
+            message_id
+        }
+    }
+
+    static friendRecallEvent(user_id: string, message_id: number): OB11FriendRecallNoticeEvent {
+        return {
+            ...eventBase(OB11EventPostType.NOTICE) as OB11NoticeEvent,
+            notice_type: "friend_recall",
+            user_id: parseInt(user_id),
+            message_id
+        }
+    }
+}

src/onebot11/events/types.ts

@@ -0,0 +1,67 @@
+import { OB11Status } from "../types";
+
+export enum OB11EventPostType{
+    META = "meta_event",
+    NOTICE = "notice"
+}
+
+export interface OB11EventBase {
+    time: number
+    self_id: number
+    post_type: OB11EventPostType
+}
+
+export interface OB11MetaEvent extends OB11EventBase{
+    post_type: OB11EventPostType.META
+    meta_event_type: "lifecycle" | "heartbeat"
+}
+
+export interface OB11NoticeEvent extends OB11EventBase{
+    post_type: OB11EventPostType.NOTICE
+    notice_type: "group_admin" | "group_decrease" | "group_increase" | "group_ban" | "friend_add" | "group_recall" | "friend_recall"
+}
+
+interface OB11GroupNoticeBase extends OB11NoticeEvent{
+    group_id: number
+    user_id: number
+}
+
+export interface OB11GroupAdminNoticeEvent extends OB11GroupNoticeBase{
+    notice_type: "group_admin"
+    sub_type: "set" | "unset"
+}
+
+export interface OB11GroupMemberDecNoticeEvent extends OB11GroupNoticeBase{
+    notice_type: "group_decrease"
+    sub_type: "leave" | "kick" | "kick_me"
+    operator_id: number
+}
+
+export interface OB11GroupMemberIncNoticeEvent extends OB11GroupNoticeBase{
+    notice_type: "group_increase"
+    sub_type: "approve" | "invite"
+    operator_id: number
+}
+
+export interface OB11GroupRecallNoticeEvent extends OB11GroupNoticeBase{
+    notice_type: "group_recall"
+    operator_id: number
+    message_id: number
+}
+
+export interface OB11FriendRecallNoticeEvent extends OB11NoticeEvent{
+    notice_type: "friend_recall"
+    user_id: number
+    message_id: number
+}
+
+export interface OB11LifeCycleEvent extends OB11MetaEvent {
+    meta_event_type: "lifecycle"
+    sub_type: "enable" | "disable" | "connect"
+}
+
+export interface OB11HeartEvent extends OB11MetaEvent {
+    meta_event_type: "heartbeat"
+    status: OB11Status
+    interval: number
+}

src/onebot11/server.ts

@@ -6,12 +6,13 @@ import { Request } from 'express';
 import { Response } from 'express';
 import { getConfigUtil, log } from "../common/utils";
 import { heartInterval, selfInfo } from "../common/data";
-import { OB11Message, OB11Return, OB11MessageData, OB11LifeCycleEvent, OB11MetaEvent } from './types';
+import { OB11Message, OB11Return, OB11MessageData } from './types';
 import { actionHandlers } from "./actions";
 import { OB11Response } from "./actions/utils";
 import { ActionName } from "./actions/types";
 import BaseAction from "./actions/BaseAction";
 import { OB11Constructor } from "./constructor";
+import { OB11EventBase, OB11LifeCycleEvent, OB11MetaEvent, OB11NoticeEvent } from "./events/types";
 
 let wsServer: websocket.Server = null;
 let accessToken = ""
@@ -59,8 +60,6 @@ const expressAuthorize = (req: Request, res: Response, next: () => void) => {
             return res.status(403).send(JSON.stringify({message: 'token verify failed!'}));
         }
     }
-
-
     next();
 
 };
@@ -86,7 +85,7 @@ let wsEventClients: websocket.WebSocket[] = [];
 type RouterHandler = (payload: any) => Promise<OB11Return<any>>
 let routers: Record<string, RouterHandler> = {};
 
-function wsReply(wsClient: websocket.WebSocket, data: OB11Return<any> | OB11Message | OB11MetaEvent) {
+function wsReply(wsClient: websocket.WebSocket, data: OB11Return<any> | PostMsgType) {
     try {
         wsClient.send(JSON.stringify(data))
         log("ws 消息上报", data)
@@ -104,7 +103,7 @@ export function startWSServer(port: number) {
     wsServer = new websocket.Server({port})
     wsServer.on("connection", (ws, req) => {
         const url = req.url.split("?").shift();
-        log("received ws connect", url)
+        log("receive ws connect", url)
         let token: string = ""
         const authHeader = req.headers['authorization'];
         if (authHeader) {
@@ -129,11 +128,6 @@ export function startWSServer(port: number) {
                 return ws.close()
             }
         }
-        // const queryParams = querystring.parse(parsedUrl.query);
-        // let token = req
-        // ws.send('Welcome to the LLOneBot WebSocket server! url:' + url);
-
-
         if (url == "/api" || url == "/api/" || url == "/") {
             ws.on("message", async (msg) => {
 
@@ -186,11 +180,13 @@ export function startWSServer(port: number) {
     })
 }
 
+type PostMsgType = OB11Message | OB11MetaEvent | OB11NoticeEvent
 
-export function postMsg(msg: OB11Message) {
+export function postMsg(msg: PostMsgType) {
     const {reportSelfMessage} = getConfigUtil().getConfig()
+    // 判断msg是否是event
     if (!reportSelfMessage) {
-        if (msg.user_id.toString() == selfInfo.uin) {
+        if ((msg as OB11Message).user_id.toString() == selfInfo.uin) {
             return
         }
     }
@@ -235,10 +231,10 @@ function registerRouter(action: string, handle: (payload: any) => Promise<any>)
     }
 
     expressAPP.post(url, expressAuthorize, (req: Request, res: Response) => {
-        _handle(res, req.body).then()
+        _handle(res, req.body || {}).then()
     });
     expressAPP.get(url, expressAuthorize, (req: Request, res: Response) => {
-        _handle(res, req.query as any).then()
+        _handle(res, req.query as any || {}).then()
     });
     routers[action] = handle
 }

src/onebot11/types.ts

@@ -1,19 +1,18 @@
-import { AtType } from "../ntqqapi/types";
+import { AtType, RawMessage } from "../ntqqapi/types";
-import { RawMessage } from "../ntqqapi/types";
 
-export interface OB11User{
+export interface OB11User {
     user_id: number;
     nickname: string;
     remark?: string
 }
 
-export enum OB11UserSex{
+export enum OB11UserSex {
     male = "male",
     female = "female",
     unknown = "unknown"
 }
 
-export enum OB11GroupMemberRole{
+export enum OB11GroupMemberRole {
     owner = "owner",
     admin = "admin",
     member = "member",
@@ -33,7 +32,7 @@ export interface OB11GroupMember {
     title?: string
 }
 
-export interface OB11Group{
+export interface OB11Group {
     group_id: number
     group_name: string
     member_count?: number
@@ -93,7 +92,8 @@ export interface OB11Return<DataType> {
     echo?: string
 }
 
-export interface OB11SendMsgReturn extends OB11Return<{message_id: string}>{}
+export interface OB11SendMsgReturn extends OB11Return<{ message_id: string }> {
+}
 
 export enum OB11MessageDataType {
     text = "text",
@@ -101,7 +101,8 @@ export enum OB11MessageDataType {
     voice = "record",
     at = "at",
     reply = "reply",
-    json = "json"
+    json = "json",
+    face = "face"
 }
 
 export type OB11MessageData = {
@@ -133,6 +134,11 @@ export type OB11MessageData = {
     data: {
         id: string,
     }
+} | {
+    type: OB11MessageDataType.face,
+    data: {
+        id: string
+    }
 }
 
 export interface OB11PostSendMsg {
@@ -149,25 +155,8 @@ export interface OB11Version {
 }
 
 
-export interface OB11MetaEvent {
-    time: number
-    self_id: number
-    post_type: "meta_event"
-    meta_event_type: "lifecycle" | "heartbeat"
-}
-
-export interface OB11LifeCycleEvent extends OB11MetaEvent{
-    meta_event_type: "lifecycle"
-    sub_type: "enable" | "disable" | "connect"
-}
-
 export interface OB11Status {
     online: boolean | null,
     good: boolean
 }
 
-export interface OB11HeartEvent extends OB11MetaEvent{
-    meta_event_type: "heartbeat"
-    status: OB11Status
-    interval: number
-}