fix: group msg subtype: normal

perf: 初始化卡顿优化

README.md

@@ -1,9 +1,11 @@
 # LLOneBot API
 
-将NTQQLiteLoaderAPI封装成OneBot11标准的API
+LiteLoaderQQNT的OneBot11协议插件
 
 *注意：本文档对应的是 LiteLoader 1.0.0及以上版本，如果你使用的是旧版本请切换到本项目v1分支查看文档*
 
+*V3之后不再需要LLAPI*
+
 ## 安装方法
 
 1.安装[LiteLoaderQQNT](https://liteloaderqqnt.github.io/guide/install.html)
@@ -16,7 +18,7 @@
 
 ## 支持的API
 
-目前只支持http协议POST方法，不支持websocket，事件上报也是http协议
+目前只支持http协议，不支持websocket，事件上报也是http协议
 
 主要功能:
 - [x] 发送好友消息
@@ -46,6 +48,7 @@
 - [x] send_private_msg
 - [x] delete_msg
 - [x] get_group_list
+- [x] get_group_info
 - [x] get_group_member_list
 - [x] get_group_member_info
 - [x] get_friend_list
@@ -67,7 +70,7 @@
 <details>
     <summary>调用接口报404</summary>
 <br/>
-    目前没有支持全部的onebot规范接口，请检查是否调用了不支持的接口，并且所有接口都只支持POST方法，调用GET方法会报404
+    目前没有支持全部的onebot规范接口，请检查是否调用了不支持的接口
 </details>
 <br/>
 
@@ -94,11 +97,10 @@
 
 
 ## TODO
-
+- [x] 重构摆脱LLAPI，目前调用LLAPI只能在renderer进程调用，需重构成在main进程调用
 - [ ] 转发消息记录 
 - [ ] 好友点赞api
 - [ ] 支持websocket，等个有缘人提PR实现
-- [x] 重构摆脱LLAPI，目前调用LLAPI只能在renderer进程调用，需重构成在main进程调用
 
 ## onebot11文档
 <https://11.onebot.dev/>

manifest.json

@@ -4,7 +4,7 @@
     "name": "LLOneBot",
     "slug": "LLOneBot",
     "description": "LiteLoaderQQNT的OneBotApi",
-    "version": "3.0.1",
+    "version": "3.0.7",
     "thumbnail": "./icon.png",
     "authors": [{
         "name": "linyuchen",

src/common/data.ts

@@ -1,10 +1,31 @@
 import { NTQQApi } from '../ntqqapi/ntcall';
-import { Friend, Group, RawMessage, SelfInfo } from "../ntqqapi/types";
+import { Friend, Group, GroupMember, RawMessage, SelfInfo } from "../ntqqapi/types";
+import { log } from "./utils";
 
 export let groups: Group[] = []
 export let friends: Friend[] = []
 export let msgHistory: Record<string, RawMessage> = {}  // msgId: RawMessage
 
+let globalMsgId = Date.now()
+
+export function addHistoryMsg(msg: RawMessage): boolean{
+    let existMsg = msgHistory[msg.msgId]
+    if (existMsg){
+        Object.assign(existMsg, msg)
+        msg.msgShortId = existMsg.msgShortId;
+        return false
+    }
+    msg.msgShortId = ++globalMsgId
+    msgHistory[msg.msgId] = msg
+    return true
+}
+
+export function getHistoryMsgByShortId(shortId: number | string){
+    // log("getHistoryMsgByShortId", shortId, Object.values(msgHistory).map(m=>m.msgShortId))
+    return Object.values(msgHistory).find(msg => msg.msgShortId.toString() == shortId.toString())
+}
+
+
 export async function getFriend(qq: string): Promise<Friend | undefined> {
     let friend = friends.find(friend => friend.uin === qq)
     // if (!friend){
@@ -23,16 +44,23 @@ export async function getGroup(qq: string): Promise<Group | undefined> {
     return group
 }
 
-export async function getGroupMember(groupQQ: string, memberQQ: string) {
+export async function getGroupMember(groupQQ: string, memberQQ: string=null, memberUid: string=null) {
     const group = await getGroup(groupQQ)
     if (group) {
-        let member = group.members?.find(member => member.uin === memberQQ)
+        let filterFunc: (member: GroupMember) => boolean
+        if (memberQQ){
+            filterFunc = member => member.uin === memberQQ
+        }
+        else if (memberUid){
+            filterFunc = member => member.uid === memberUid
+        }
+        let member = group.members?.find(filterFunc)
         if (!member){
             const _members = await NTQQApi.getGroupMembers(groupQQ)
             if (_members.length){
                 group.members = _members
             }
-            member = group.members?.find(member => member.uin === memberQQ)
+            member = group.members?.find(filterFunc)
         }
         return member
     }

src/main/main.ts

@@ -10,10 +10,9 @@ import {
     CHANNEL_LOG,
     CHANNEL_SET_CONFIG,
 } from "../common/channels";
-import { ConfigUtil } from "../common/config";
 import { postMsg, startExpress } from "../onebot11/server";
 import { CONFIG_DIR, getConfigUtil, log } from "../common/utils";
-import { friends, groups, msgHistory, selfInfo } from "../common/data";
+import { addHistoryMsg, msgHistory, selfInfo } from "../common/data";
 import { hookNTQQApiReceive, ReceiveCmd, registerReceiveHook } from "../ntqqapi/hook";
 import { OB11Constructor } from "../onebot11/constructor";
 import { NTQQApi } from "../ntqqapi/ntcall";
@@ -48,7 +47,11 @@ function onLoad() {
 
     function postRawMsg(msgList: RawMessage[]) {
         const {debug, reportSelfMessage} = getConfigUtil().getConfig();
-        for (const message of msgList) {
+        for (let message of msgList) {
+            message.msgShortId = msgHistory[message.msgId]?.msgShortId
+            if (!message.msgShortId) {
+                addHistoryMsg(message)
+            }
             OB11Constructor.message(message).then((msg) => {
                 if (debug) {
                     msg.raw = message;
@@ -57,14 +60,17 @@ function onLoad() {
                     return
                 }
                 postMsg(msg);
+                // log("post msg", msg)
             }).catch(e => log("constructMessage error: ", e.toString()));
         }
     }
 
 
     function start() {
+        log("llonebot start")
         registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload) => {
             try {
+                // log("received msg length", payload.msgList.length);
                 postRawMsg(payload.msgList);
             } catch (e) {
                 log("report message error: ", e.toString())
@@ -76,17 +82,18 @@ function onLoad() {
             if (!reportSelfMessage) {
                 return
             }
-            log("reportSelfMessage", payload)
+            // log("reportSelfMessage", payload)
             try {
                 postRawMsg([payload.msgRecord]);
             } catch (e) {
                 log("report self message error: ", e.toString())
             }
         })
+        NTQQApi.getGroups(true).then()
         startExpress(getConfigUtil().getConfig().port)
     }
 
-    async function getSelfInfo() {
+    const init = async () => {
         try {
             const _ = await NTQQApi.getSelfInfo()
             Object.assign(selfInfo, _)
@@ -94,52 +101,27 @@ function onLoad() {
             log("get self simple info", _)
         } catch (e) {
             log("retry get self info")
-
         }
         if (selfInfo.uin) {
             try {
                 const userInfo = (await NTQQApi.getUserInfo(selfInfo.uid))
+                log("self info", userInfo);
                 if (userInfo) {
                     selfInfo.nick = userInfo.nick
                 } else {
-                    return setTimeout(() => {
-                        getSelfInfo().then()
-                    }, 100)
+                    return setTimeout(init, 1000)
                 }
             } catch (e) {
                 log("get self nickname failed", e.toString())
+                return setTimeout(init, 1000)
             }
             start();
-            // try {
-            //     friends.push(...(await NTQQApi.getFriends(true)))
-            //     log("get friends", friends)
-            //     let _groups: Group[] = []
-            //     for(let i=0; i++; i<3){
-            //         try{
-            //             _groups = await NTQQApi.getGroups(true)
-            //             log("get groups sucess", _groups)
-            //             break
-            //         } catch(e) {
-            //             log("get groups failed", e)
-            //         }
-            //     }
-            //     for (let g of _groups) {
-            //         g.members = (await NTQQApi.getGroupMembers(g.groupCode))
-            //         log("group members", g.members)
-            //         groups.push(g)
-            //     }
-
-            // } catch (e) {
-            //     log("!!!初始化失败", e.stack.toString())
-            // }
-        } else {
-            setTimeout(() => {
-                getSelfInfo().then()
-            }, 100)
+        }
+        else{
+            setTimeout(init, 1000)
         }
     }
-
-    getSelfInfo().then()
+    setTimeout(init, 1000)
 }
 
 

src/ntqqapi/hook.ts

@@ -1,24 +1,24 @@
-import {BrowserWindow} from 'electron';
-import {getConfigUtil, log} from "../common/utils";
-import {NTQQApi, NTQQApiClass, sendMessagePool} from "./ntcall";
+import { BrowserWindow } from 'electron';
+import { getConfigUtil, log } from "../common/utils";
+import { NTQQApi, NTQQApiClass, sendMessagePool } from "./ntcall";
 import { Group, User } from "./types";
 import { RawMessage } from "./types";
-import {friends, groups, msgHistory} from "../common/data";
+import { addHistoryMsg, friends, groups, msgHistory } from "../common/data";
 import { v4 as uuidv4 } from 'uuid';
 
-export let hookApiCallbacks: Record<string, (apiReturn: any)=>void>={}
+export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
 
 export enum ReceiveCmd {
     UPDATE_MSG = "nodeIKernelMsgListener/onMsgInfoListUpdate",
     NEW_MSG = "nodeIKernelMsgListener/onRecvMsg",
     SELF_SEND_MSG = "nodeIKernelMsgListener/onAddSendMsg",
-    USER_INFO = "nodeIKernelProfileListener/onProfileDetailInfoChanged",
+    USER_INFO = "nodeIKernelProfileListener/onProfileSimpleChanged",
     GROUPS = "nodeIKernelGroupListener/onGroupListUpdate",
     GROUPS_UNIX = "onGroupListUpdate",
     FRIENDS = "onBuddyListChange"
 }
 
-interface NTQQApiReturnData<PayloadType=unknown> extends Array<any> {
+interface NTQQApiReturnData<PayloadType = unknown> extends Array<any> {
     0: {
         "type": "request",
         "eventName": NTQQApiClass,
@@ -51,7 +51,7 @@ export function hookNTQQApiReceive(window: BrowserWindow) {
                         new Promise((resolve, reject) => {
                             try {
                                 hook.hookFunc(receiveData.payload);
-                            }catch (e) {
+                            } catch (e) {
                                 log("hook error", e, receiveData.payload)
                             }
                         }).then()
@@ -59,10 +59,10 @@ export function hookNTQQApiReceive(window: BrowserWindow) {
                 }
             }
         }
-        if (args[0]?.callbackId){
+        if (args[0]?.callbackId) {
             // log("hookApiCallback", hookApiCallbacks, args)
             const callbackId = args[0].callbackId;
-            if (hookApiCallbacks[callbackId]){
+            if (hookApiCallbacks[callbackId]) {
                 // log("callback found")
                 new Promise((resolve, reject) => {
                     hookApiCallbacks[callbackId](args[1]);
@@ -85,36 +85,43 @@ export function registerReceiveHook<PayloadType>(method: ReceiveCmd, hookFunc: (
     return id;
 }
 
-export function removeReceiveHook(id: string){
-    const index = receiveHooks.findIndex(h=>h.id === id)
+export function removeReceiveHook(id: string) {
+    const index = receiveHooks.findIndex(h => h.id === id)
     receiveHooks.splice(index, 1);
 }
 
-async function updateGroups(_groups: Group[]){
-    for(let group of _groups){
-        let existGroup = groups.find(g=>g.groupCode == group.groupCode)
-        if (!existGroup){
-            // log("update group")
-            let _membeers = await NTQQApi.getGroupMembers(group.groupCode)
-            if (_membeers){
-                group.members = _membeers
-            }
+async function updateGroups(_groups: Group[]) {
+    for (let group of _groups) {
+        let existGroup = groups.find(g => g.groupCode == group.groupCode)
+        if (!existGroup) {
+            NTQQApi.getGroupMembers(group.groupCode).then(members => {
+                if (members) {
+                    group.members = members
+                }
+            })
+            groups.push(group)
             log("update group members", group.members)
-        }
-        else{
-            group.members = [...existGroup.members]
+        } else {
+            Object.assign(existGroup, group)
         }
     }
-    groups.length = 0;
-    groups.push(..._groups)
 }
 
-registerReceiveHook<{groupList: Group[]}>(ReceiveCmd.GROUPS, (payload)=>updateGroups(payload.groupList).then())
-registerReceiveHook<{groupList: Group[]}>(ReceiveCmd.GROUPS_UNIX, (payload)=>updateGroups(payload.groupList).then())
-registerReceiveHook<{data:{categoryId: number, categroyName: string, categroyMbCount: number, buddyList: User[]}[]}>(ReceiveCmd.FRIENDS, payload=>{
-    friends.length = 0
+registerReceiveHook<{ groupList: Group[] }>(ReceiveCmd.GROUPS, (payload) => updateGroups(payload.groupList).then())
+registerReceiveHook<{ groupList: Group[] }>(ReceiveCmd.GROUPS_UNIX, (payload) => updateGroups(payload.groupList).then())
+registerReceiveHook<{
+    data: { categoryId: number, categroyName: string, categroyMbCount: number, buddyList: User[] }[]
+}>(ReceiveCmd.FRIENDS, payload => {
     for (const fData of payload.data) {
-        friends.push(...fData.buddyList)
+        const _friends = fData.buddyList;
+        for (let friend of _friends) {
+            let existFriend = friends.find(f => f.uin == friend.uin)
+            if (!existFriend) {
+                friends.push(friend)
+            } else {
+                Object.assign(existFriend, friend)
+            }
+        }
     }
 })
 
@@ -124,31 +131,30 @@ registerReceiveHook<{data:{categoryId: number, categroyName: string, categroyMbC
 
 registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.UPDATE_MSG, (payload) => {
     for (const message of payload.msgList) {
-        msgHistory[message.msgId] = message;
+        addHistoryMsg(message)
     }
 })
 
 registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload) => {
     for (const message of payload.msgList) {
-        log("收到新消息，push到历史记录", message)
-        if (!msgHistory[message.msgId]){
-            msgHistory[message.msgId] = message
-        }
-        else{
-            Object.assign(msgHistory[message.msgId], message)
-        }
+        // log("收到新消息，push到历史记录", message)
+        addHistoryMsg(message)
+    }
+    const msgIds = Object.keys(msgHistory);
+    if (msgIds.length > 30000) {
+        delete msgHistory[msgIds.sort()[0]]
     }
 })
 
-registerReceiveHook<{msgRecord: RawMessage}>(ReceiveCmd.SELF_SEND_MSG, ({msgRecord})=>{
+registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmd.SELF_SEND_MSG, ({msgRecord}) => {
     const message = msgRecord;
     const peerUid = message.peerUid;
     // log("收到自己发送成功的消息", Object.keys(sendMessagePool), message);
     const sendCallback = sendMessagePool[peerUid];
-    if (sendCallback){
-        try{
+    if (sendCallback) {
+        try {
             sendCallback(message);
-        }catch(e){
+        } catch (e) {
             log("receive self msg error", e.stack)
         }
     }

src/ntqqapi/ntcall.ts

@@ -142,10 +142,9 @@ export class NTQQApi {
     }
 
     static async getUserInfo(uid: string) {
-        const result = await callNTQQApi<{ info: User }>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.USER_INFO,
+        const result = await callNTQQApi<{ profiles: Map<string, User> }>(NTQQApiChannel.IPC_UP_2, NTQQApiClass.NT_API, NTQQApiMethod.USER_INFO,
             [{ force: true, uids: [uid] }, undefined], ReceiveCmd.USER_INFO)
-        return result.info
-
+        return result.profiles.get(uid)
     }
 
     static async getFriends(forced = false) {

src/ntqqapi/types.ts

@@ -182,6 +182,7 @@ export interface PicElement {
 
 export interface RawMessage {
     msgId: string;
+    msgShortId?: number;  // 自己维护的消息id
     msgTime: string;
     msgSeq: string;
     senderUin: string; // 发送者QQ号

src/onebot11/actions/DeleteMsg.ts

@@ -1,21 +1,21 @@
 import { ActionName } from "./types";
 import BaseAction from "./BaseAction";
 import { NTQQApi } from "../../ntqqapi/ntcall";
-import { msgHistory } from "../../common/data";
+import { getHistoryMsgByShortId, msgHistory } from "../../common/data";
 
 interface Payload {
-    message_id: string
+    message_id: number
 }
 
 class DeleteMsg extends BaseAction<Payload, void> {
     actionName = ActionName.DeleteMsg
 
     protected async _handle(payload:Payload){
-        let msg = msgHistory[payload.message_id]
+        let msg = getHistoryMsgByShortId(payload.message_id)
         await NTQQApi.recallMsg({
             chatType: msg.chatType,
             peerUid: msg.peerUid
-        }, [payload.message_id])
+        }, [msg.msgId])
     }
 }
 

src/onebot11/actions/GetMsg.ts

@@ -1,4 +1,4 @@
-import { msgHistory } from "../../common/data";
+import { getHistoryMsgByShortId, msgHistory } from "../../common/data";
 import { OB11Message } from '../types';
 import { OB11Constructor } from "../constructor";
 import { log } from "../../common/utils";
@@ -7,7 +7,7 @@ import { ActionName } from "./types";
 
 
 export interface PayloadType {
-    message_id: string
+    message_id: number
 }
 
 export type ReturnDataType = OB11Message
@@ -17,7 +17,7 @@ class GetMsg extends BaseAction<PayloadType, OB11Message> {
 
     protected async _handle(payload: PayloadType){
         // log("history msg ids", Object.keys(msgHistory));
-        const msg = msgHistory[payload.message_id.toString()]
+        const msg = getHistoryMsgByShortId(payload.message_id)
         if (msg) {
             const msgData = await OB11Constructor.message(msg);
             return msgData

src/onebot11/actions/SendMsg.ts

@@ -1,5 +1,11 @@
 import { AtType, ChatType, Group } from "../../ntqqapi/types";
-import { friends, getGroup, getStrangerByUin, msgHistory } from "../../common/data";
+import {
+    addHistoryMsg,
+    friends,
+    getGroup,
+    getHistoryMsgByShortId,
+    getStrangerByUin,
+} from "../../common/data";
 import { OB11MessageData, OB11MessageDataType, OB11PostSendMsg } from '../types';
 import { NTQQApi } from "../../ntqqapi/ntcall";
 import { Peer } from "../../ntqqapi/ntcall";
@@ -10,9 +16,10 @@ import { v4 as uuid4 } from 'uuid';
 import { log } from "../../common/utils";
 import BaseAction from "./BaseAction";
 import { ActionName } from "./types";
+import * as fs from "fs";
 
 export interface ReturnDataType {
-    message_id: string
+    message_id: number
 }
 
 class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
@@ -23,6 +30,7 @@ class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
             chatType: ChatType.friend,
             peerUid: ""
         }
+        let deleteAfterSentFiles: string[] = []
         let group: Group | undefined = undefined;
         if (payload?.group_id) {
             group = await getGroup(payload.group_id.toString())
@@ -88,27 +96,27 @@ class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                     let replyMsgId = sendMsg.data.id;
                     if (replyMsgId) {
                         replyMsgId = replyMsgId.toString()
-                        const replyMsg = msgHistory[replyMsgId]
+                        const replyMsg = getHistoryMsgByShortId(replyMsgId)
                         if (replyMsg) {
-                            sendElements.push(SendMsgElementConstructor.reply(replyMsg.msgSeq, replyMsgId, replyMsg.senderUin, replyMsg.senderUin))
-                        }
-                    }
-                } break;
-                case OB11MessageDataType.image: {
-                    const file = sendMsg.data?.file
-                    if (file) {
-                        const picPath = await (await uri2local(uuid4(), file)).path
-                        if (picPath) {
-                            sendElements.push(await SendMsgElementConstructor.pic(picPath))
+                            sendElements.push(SendMsgElementConstructor.reply(replyMsg.msgSeq, replyMsg.msgId, replyMsg.senderUin, replyMsg.senderUin))
                         }
                     }
                 } break;
+                case OB11MessageDataType.image:
                 case OB11MessageDataType.voice: {
                     const file = sendMsg.data?.file
                     if (file) {
-                        const voicePath = await (await uri2local(uuid4(), file)).path
-                        if (voicePath) {
-                            sendElements.push(await SendMsgElementConstructor.ptt(voicePath))
+                        const {path, isLocal} = (await uri2local(uuid4(), file))
+                        if (path) {
+                            if (!isLocal){ // 只删除http和base64转过来的文件
+                                deleteAfterSentFiles.push(path)
+                            }
+                            if (sendMsg.type === OB11MessageDataType.image){
+                                sendElements.push(await SendMsgElementConstructor.pic(path))
+                            }
+                            else {
+                                sendElements.push(await SendMsgElementConstructor.ptt(path))
+                            }
                         }
                     }
                 }
@@ -117,7 +125,9 @@ class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         // log("send msg:", peer, sendElements)
         try {
             const returnMsg = await NTQQApi.sendMsg(peer, sendElements)
-            return { message_id: returnMsg.msgId }
+            addHistoryMsg(returnMsg)
+            deleteAfterSentFiles.map(f=>fs.unlink(f, ()=>{}))
+            return { message_id: returnMsg.msgShortId }
         } catch (e) {
             throw(e.toString())
         }

src/onebot11/constructor.ts

@@ -1,19 +1,27 @@
-import {OB11MessageDataType, OB11GroupMemberRole, OB11Message, OB11MessageData, OB11Group, OB11GroupMember, OB11User} from "./types";
+import {
+    OB11MessageDataType,
+    OB11GroupMemberRole,
+    OB11Message,
+    OB11Group,
+    OB11GroupMember,
+    OB11User
+} from "./types";
 import { AtType, ChatType, Group, GroupMember, IMAGE_HTTP_HOST, RawMessage, SelfInfo, User } from '../ntqqapi/types';
-import { getFriend, getGroupMember, getHistoryMsgBySeq, selfInfo } from '../common/data';
-import {file2base64, getConfigUtil, log} from "../common/utils";
+import { getFriend, getGroupMember, getHistoryMsgBySeq, msgHistory, selfInfo } from '../common/data';
+import { file2base64, getConfigUtil, log } from "../common/utils";
 import { NTQQApi } from "../ntqqapi/ntcall";
 
 
 export class OB11Constructor {
     static async message(msg: RawMessage): Promise<OB11Message> {
+
         const {enableBase64} = getConfigUtil().getConfig()
         const message_type = msg.chatType == ChatType.group ? "group" : "private";
         const resMsg: OB11Message = {
             self_id: selfInfo.uin,
             user_id: msg.senderUin,
             time: parseInt(msg.msgTime) || 0,
-            message_id: msg.msgId,
+            message_id: msg.msgShortId,
             real_id: msg.msgId,
             message_type: msg.chatType == ChatType.group ? "group" : "private",
             sender: {
@@ -28,6 +36,7 @@ export class OB11Constructor {
             post_type: "message",
         }
         if (msg.chatType == ChatType.group) {
+            resMsg.sub_type = "normal"
             resMsg.group_id = msg.peerUin
             const member = await getGroupMember(msg.peerUin, msg.senderUin);
             if (member) {
@@ -54,10 +63,18 @@ export class OB11Constructor {
                     message_data["data"]["mention"] = "all"
                     message_data["data"]["qq"] = "all"
                 } else {
+                    let atUid = element.textElement.atNtUid
                     let atQQ = element.textElement.atUid
-                    // let atMember = await getGroupMember(msg.peerUin, uid)
-                    message_data["data"]["mention"] = atQQ
-                    message_data["data"]["qq"] = atQQ
+                    if (!atQQ || atQQ === "0") {
+                        const atMember = await getGroupMember(msg.peerUin, null, atUid)
+                        if (atMember) {
+                            atQQ = atMember.uin
+                        }
+                    }
+                    if (atQQ) {
+                        message_data["data"]["mention"] = atQQ
+                        message_data["data"]["qq"] = atQQ
+                    }
                 }
             } else if (element.textElement) {
                 message_data["type"] = "text"
@@ -70,16 +87,15 @@ export class OB11Constructor {
                 try {
                     await NTQQApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
                         element.elementId, element.picElement.thumbPath.get(0), element.picElement.sourcePath)
-                }catch (e) {
+                } catch (e) {
                     message_data["data"]["http_file"] = IMAGE_HTTP_HOST + element.picElement.originImageUrl
                 }
             } else if (element.replyElement) {
                 message_data["type"] = "reply"
                 const replyMsg = getHistoryMsgBySeq(element.replyElement.replayMsgSeq)
                 if (replyMsg) {
-                    message_data["data"]["id"] = replyMsg.msgId
-                }
-                else{
+                    message_data["data"]["id"] = replyMsg.msgShortId
+                } else {
                     continue
                 }
             } else if (element.pttElement) {
@@ -96,14 +112,12 @@ export class OB11Constructor {
                 message_data["type"] = OB11MessageDataType.json;
                 message_data["data"]["data"] = element.arkElement.bytesData;
             }
-            if (message_data.data.http_file){
+            if (message_data.data.http_file) {
                 message_data.data.file = message_data.data.http_file
-            }
-            else if (message_data.data.file) {
+            } else if (message_data.data.file) {
                 let filePath: string = message_data.data.file;
                 message_data.data.file = "file://" + filePath
                 if (enableBase64) {
-                    // filePath = filePath.replace("\\Ori\\", "\\Thumb\\")
                     let {err, data} = await file2base64(filePath);
                     if (err) {
                         console.log("文件转base64失败", err)
@@ -116,36 +130,26 @@ export class OB11Constructor {
                 resMsg.message.push(message_data);
             }
         }
-        // if (msgHistory.length > 10000) {
-        //     msgHistory.splice(0, 100)
-        // }
-        // msgHistory.push(message)
-        // if (!reportSelfMessage && onebot_message_data["user_id"] == self_qq) {
-        //     console.log("开启了不上传自己发送的消息，进行拦截 ", onebot_message_data);
-        // } else {
-        //     console.log("发送上传消息给ipc main", onebot_message_data);
-        //     window.llonebot.postData(onebot_message_data);
-        // }
         return resMsg;
     }
-    
-    static friend(friend: User): OB11User{
+
+    static friend(friend: User): OB11User {
         return {
             user_id: friend.uin,
             nickname: friend.nick,
             remark: friend.remark
         }
-        
+
     }
 
-    static selfInfo(selfInfo: SelfInfo): OB11User{
+    static selfInfo(selfInfo: SelfInfo): OB11User {
         return {
             user_id: selfInfo.uin,
             nickname: selfInfo.nick
         }
     }
 
-    static friends(friends: User[]): OB11User[]{
+    static friends(friends: User[]): OB11User[] {
         return friends.map(OB11Constructor.friend)
     }
 
@@ -157,7 +161,7 @@ export class OB11Constructor {
         }[role]
     }
 
-    static groupMember(group_id: string, member: GroupMember): OB11GroupMember{
+    static groupMember(group_id: string, member: GroupMember): OB11GroupMember {
         return {
             group_id,
             user_id: member.uin,
@@ -166,19 +170,19 @@ export class OB11Constructor {
         }
     }
 
-    static groupMembers(group: Group): OB11GroupMember[]{
+    static groupMembers(group: Group): OB11GroupMember[] {
         log("construct ob11 group members", group)
-        return group.members.map(m=>OB11Constructor.groupMember(group.groupCode, m))
+        return group.members.map(m => OB11Constructor.groupMember(group.groupCode, m))
     }
 
-    static group(group: Group): OB11Group{
+    static group(group: Group): OB11Group {
         return {
             group_id: group.groupCode,
             group_name: group.groupName
         }
     }
 
-    static groups(groups: Group[]): OB11Group[]{
+    static groups(groups: Group[]): OB11Group[] {
         return groups.map(OB11Constructor.group)
     }
 }

src/onebot11/types.ts

@@ -58,12 +58,12 @@ export enum OB11MessageType {
 export interface OB11Message {
     self_id?: string,
     time: number,
-    message_id: string,
+    message_id: number,
     real_id: string,
     user_id: string,
     group_id?: string,
     message_type: "private" | "group",
-    sub_type?: "friend" | "group" | "other",
+    sub_type?: "friend" | "group" | "normal",
     sender: OB11Sender,
     message: OB11MessageData[],
     raw_message: string,

src/onebot11/utils.ts

@@ -6,6 +6,12 @@ const fs = require("fs").promises;
 export async function uri2local(fileName: string, uri: string){
     let filePath = path.join(CONFIG_DIR, fileName)
     let url = new URL(uri);
+    let res = {
+        success: false,
+        errMsg: "",
+        path: "",
+        isLocal: false
+    }
     if (url.protocol == "base64:") {
         // base64转成文件
         let base64Data = uri.split("base64://")[1]
@@ -13,51 +19,44 @@ export async function uri2local(fileName: string, uri: string){
             const buffer = Buffer.from(base64Data, 'base64');
             await fs.writeFile(filePath, buffer);
         } catch (e: any) {
-            return {
-                success: false,
-                errMsg: `base64文件下载失败,` + e.toString(),
-                path: ""
-            }
+            res.errMsg = `base64文件下载失败,` + e.toString()
+            return res
         }
     } else if (url.protocol == "http:" || url.protocol == "https:") {
         // 下载文件
-        let res = await fetch(url)
-        if (!res.ok) {
-            return {
-                success: false,
-                errMsg: `${url}下载失败,` + res.statusText,
-                path: ""
-            }
+        let fetchRes = await fetch(url)
+        if (!fetchRes.ok) {
+            res.errMsg = `${url}下载失败,` + fetchRes.statusText
+            return res
         }
-        let blob = await res.blob();
+        let blob = await fetchRes.blob();
         let buffer = await blob.arrayBuffer();
         try {
             await fs.writeFile(filePath, Buffer.from(buffer));
         } catch (e: any) {
-            return {
-                success: false,
-                errMsg: `${url}下载失败,` + e.toString(),
-                path: ""
-            }
+            res.errMsg = `${url}下载失败,` + e.toString()
+            return res
         }
     } else if (url.protocol === "file:"){
-        await fs.copyFile(url.pathname, filePath);
-        // filePath = (await NTQQApi.uploadFile(url.pathname)).path;
+        // await fs.copyFile(url.pathname, filePath);
+        let pathname = decodeURIComponent(url.pathname)
+        if (process.platform === "win32"){
+            filePath = pathname.slice(1)
+        }
+        else{
+            filePath = pathname
+        }
+        res.isLocal = true
     }
     else{
-        return {
-            success: false,
-            errMsg: `不支持的file协议,` + url.protocol,
-            path: ""
-        }
+        res.errMsg = `不支持的file协议,` + url.protocol
+        return res
     }
-    if (isGIF(filePath)) {
+    if (isGIF(filePath) && !res.isLocal) {
         await fs.rename(filePath, filePath + ".gif");
         filePath += ".gif";
     }
-    return {
-        success: true,
-        errMsg: "",
-        path: filePath
-    };
+    res.success = true
+    res.path = filePath
+    return res
 }