fix: #769

fix: #721

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.5.6",
+  "version": "4.5.9",
   "icon": "./logo.png",
   "authors": [
     {

napcat.webui/src/components/file_manage/file_table.tsx

@@ -82,7 +82,7 @@ export default function FileTable({
     setPreviewImages([])
     setPreviewIndex(0)
     setShowImage(false)
-  }, [files])
+  }, [currentPath])
 
   const onPreviewImage = (name: string, images: PreviewImage[]) => {
     const index = images.findIndex((image) => image.key === name)

napcat.webui/src/components/file_manage/image_name_button.tsx

@@ -74,6 +74,9 @@ export default function ImageNameButton({
             src={data}
             alt={name}
             className="w-8 h-8 flex-shrink-0"
+            classNames={{
+              wrapper: 'w-8 h-8 flex-shrink-0'
+            }}
             radius="sm"
           />
         )

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.5.6",
+  "version": "4.5.9",
   "scripts": {
     "build:universal": "npm run build:webui && vite build --mode universal || exit 1",
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",

src/common/config-base.ts

@@ -66,7 +66,7 @@ export abstract class ConfigBase<T> {
 
     private handleError(e: unknown, message: string): void {
         if (e instanceof SyntaxError) {
-            this.core.context.logger.logError(`[Core] [Config] 操作配置文件格式错误，请检查配置文件:`, e.message);
+            this.core.context.logger.logError('[Core] [Config] 操作配置文件格式错误，请检查配置文件:', e.message);
         } else {
             this.core.context.logger.logError(`[Core] [Config] ${message}:`, (e as Error).message);
         }

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.5.6';
+export const napCatVersion = '4.5.9';

src/core/packet/context/operationContext.ts

@@ -8,13 +8,15 @@ import {
     PacketMsgPttElement,
     PacketMsgVideoElement
 } from '@/core/packet/message/element';
-import { ChatType } from '@/core';
+import {ChatType, MsgSourceType, NTMsgType, RawMessage} from '@/core';
 import {MiniAppRawData, MiniAppReqParams} from '@/core/packet/entities/miniApp';
 import {AIVoiceChatType} from '@/core/packet/entities/aiChat';
-import { NapProtoDecodeStructType, NapProtoEncodeStructType } from '@napneko/nap-proto-core';
+import {NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg} from '@napneko/nap-proto-core';
-import { IndexNode, MsgInfo } from '@/core/packet/transformer/proto';
+import {IndexNode, LongMsgResult, MsgInfo} from '@/core/packet/transformer/proto';
 import {OidbPacket} from '@/core/packet/transformer/base';
 import {ImageOcrResult} from '@/core/packet/entities/ocrResult';
+import {gunzipSync} from 'zlib';
+import {PacketMsgConverter} from '@/core/packet/message/converter';
 
 export class PacketOperationContext {
     private readonly context: PacketContext;
@@ -116,6 +118,13 @@ export class PacketOperationContext {
         return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
     }
 
+    async GetGroupImageUrl(groupUin: number, node: NapProtoEncodeStructType<typeof IndexNode>) {
+        const req = trans.DownloadGroupImage.build(groupUin, node);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadImage.parse(resp);
+        return `https://${res.download.info.domain}${res.download.info.urlPath}${res.download.rKeyParam}`;
+    }
+
     async ImageOCR(imgUrl: string) {
         const req = trans.ImageOCR.build(imgUrl);
         const resp = await this.context.client.sendOidbPacket(req, true);
@@ -195,4 +204,74 @@ export class PacketOperationContext {
             return res.msgInfo;
         }
     }
+
+    async FetchForwardMsg(res_id: string): Promise<RawMessage[]> {
+        const req = trans.DownloadForwardMsg.build(this.context.napcore.basicInfo.uid, res_id);
+        const resp = await this.context.client.sendOidbPacket(req, true);
+        const res = trans.DownloadForwardMsg.parse(resp);
+        const inflate = gunzipSync(res.result.payload);
+        const result = new NapProtoMsg(LongMsgResult).decode(inflate);
+
+        const main = result.action.find((r) => r.actionCommand === 'MultiMsg');
+        if (!main?.actionData.msgBody) {
+            throw new Error('msgBody is empty');
+        }
+
+        const messagesPromises = main.actionData.msgBody.map(async (msg) => {
+            if (!msg?.body?.richText?.elems) {
+                throw new Error('msg.body.richText.elems is empty');
+            }
+            const rawChains = new PacketMsgConverter().packetMsgToRaw(msg?.body?.richText?.elems);
+            const elements = await Promise.all(
+                rawChains.map(async ([element, rawElem]) => {
+                    if (element.picElement && rawElem?.commonElem?.pbElem) {
+                        const extra = new NapProtoMsg(MsgInfo).decode(rawElem.commonElem.pbElem);
+                        const index = extra?.msgInfoBody[0]?.index;
+                        if (msg?.responseHead.grp !== undefined) {
+                            const groupUin = msg?.responseHead.grp?.groupUin ?? 0;
+                            element.picElement = {
+                                ...element.picElement,
+                                originImageUrl: await this.GetGroupImageUrl(groupUin, index!)
+                            };
+                        } else {
+                            element.picElement = {
+                                ...element.picElement,
+                                originImageUrl: await this.GetImageUrl(this.context.napcore.basicInfo.uid, index!)
+                            };
+                        }
+                        return element;
+                    }
+                    return element;
+                })
+            );
+            return {
+                chatType: ChatType.KCHATTYPEGROUP,
+                elements: elements,
+                guildId: '',
+                isOnlineMsg: false,
+                msgId: '7467703692092974645',  // TODO: no necessary
+                msgRandom: '0',
+                msgSeq: String(msg.contentHead.sequence ?? 0),
+                msgTime: String(msg.contentHead.timeStamp ?? 0),
+                msgType: NTMsgType.KMSGTYPEMIX,
+                parentMsgIdList: [],
+                parentMsgPeer: {
+                    chatType: ChatType.KCHATTYPEGROUP,
+                    peerUid: String(msg?.responseHead.grp?.groupUin ?? 0),
+                },
+                peerName: '',
+                peerUid: '1094950020',
+                peerUin: '1094950020',
+                recallTime: '0',
+                records: [],
+                sendNickName: msg?.responseHead.grp?.memberName ?? '',
+                sendRemarkName: msg?.responseHead.grp?.memberName ?? '',
+                senderUid: '',
+                senderUin: '1094950020',
+                sourceType: MsgSourceType.K_DOWN_SOURCETYPE_UNKNOWN,
+                subMsgType: 1,
+            };
+        });
+        return await Promise.all(messagesPromises);
+    }
 }

src/core/packet/message/converter.ts

@@ -1,8 +1,8 @@
 import {
-    Peer,
     ChatType,
     ElementType,
     MessageElement,
+    Peer,
     RawMessage,
     SendArkElement,
     SendFaceElement,
@@ -32,6 +32,8 @@ import {
     PacketMultiMsgElement
 } from '@/core/packet/message/element';
 import {PacketMsg, PacketSendMsgElement} from '@/core/packet/message/message';
+import {NapProtoDecodeStructType} from '@napneko/nap-proto-core';
+import {Elem} from '@/core/packet/transformer/proto';
 
 const SupportedElementTypes = [
     ElementType.TEXT,
@@ -154,4 +156,16 @@ export class PacketMsgConverter {
             }).filter((e) => e !== null)
         };
     }
+
+    packetMsgToRaw(msg: NapProtoDecodeStructType<typeof Elem>[]): [MessageElement, NapProtoDecodeStructType<typeof Elem> | null][] {
+        const converters = [PacketMsgTextElement.parseElement,
+            PacketMsgAtElement.parseElement, PacketMsgReplyElement.parseElement, PacketMsgPicElement.parseElement];
+        return msg.map((element) => {
+            for (const converter of converters) {
+                const result = converter(element);
+                if (result) return result;
+            }
+            return null;
+        }).filter((e) => e !== null);
+    }
 }

src/core/packet/message/element.ts

@@ -1,20 +1,22 @@
 import * as zlib from 'node:zlib';
-import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
+import {NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg} from '@napneko/nap-proto-core';
 import {
     CustomFace,
     Elem,
+    FileExtra,
+    GroupFileExtra,
     MarkdownData,
     MentionExtra,
+    MsgInfo,
     NotOnlineImage,
+    OidbSvcTrpcTcp0XE37_800Response,
     QBigFaceExtra,
     QSmallFaceExtra,
-    MsgInfo,
-    OidbSvcTrpcTcp0XE37_800Response,
-    FileExtra,
-    GroupFileExtra
 } from '@/core/packet/transformer/proto';
 import {
+    ElementType,
     FaceType,
+    MessageElement,
     NTMsgAtType,
     PicType,
     SendArkElement,
@@ -32,6 +34,9 @@ import {
 import {ForwardMsgBuilder} from '@/common/forward-msg-builder';
 import {PacketMsg, PacketSendMsgElement} from '@/core/packet/message/message';
 
+export type ParseElementFnR = [MessageElement, NapProtoDecodeStructType<typeof Elem> | null] | undefined;
+type ParseElementFn = (elem: NapProtoDecodeStructType<typeof Elem>) => ParseElementFnR;
+
 // raw <-> packet
 // TODO: SendStructLongMsgElement
 export abstract class IPacketMsgElement<T extends PacketSendMsgElement> {
@@ -51,6 +56,8 @@ export abstract class IPacketMsgElement<T extends PacketSendMsgElement> {
         return [];
     }
 
+    static parseElement: ParseElementFn;
+
     toPreview(): string {
         return '[暂不支持该消息类型喵~]';
     }
@@ -72,10 +79,29 @@ export class PacketMsgTextElement extends IPacketMsgElement<SendTextElement> {
         }];
     }
 
+    static override parseElement = (elem: NapProtoDecodeStructType<typeof Elem>): ParseElementFnR => {
+        if (elem.text?.str && (elem.text?.attr6Buf === undefined || elem.text?.attr6Buf?.length === 0)) {
+            return [{
+                textElement: {
+                    content: elem.text?.str,
+                    atType: NTMsgAtType.ATTYPEUNKNOWN,
+                    atUid: '',
+                    atTinyId: '',
+                    atNtUid: '',
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            }, null];
+        }
+        return undefined;
+    };
+
     override toPreview(): string {
         return this.text;
+    };
 }
-}
+
+
 
 export class PacketMsgAtElement extends PacketMsgTextElement {
     targetUid: string;
@@ -101,6 +127,22 @@ export class PacketMsgAtElement extends PacketMsgTextElement {
             }
         }];
     }
+    static override parseElement = (elem: NapProtoDecodeStructType<typeof Elem>): ParseElementFnR => {
+        if (elem.text?.str && (elem.text?.attr6Buf?.length ?? 100) >= 11) {
+            return [{
+                textElement: {
+                    content: elem.text?.str,
+                    atType: NTMsgAtType.ATTYPEONE,
+                    atUid: String(Buffer.from(elem.text!.attr6Buf!).readUInt32BE(7)),  // FIXME: hack
+                    atTinyId: '',
+                    atNtUid: '',
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            }, null];
+        }
+        return undefined;
+    };
 }
 
 export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
@@ -143,6 +185,22 @@ export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
         }];
     }
 
+    static override parseElement = (elem: NapProtoDecodeStructType<typeof Elem>): ParseElementFnR => {
+        if (elem.srcMsg && elem.srcMsg.pbReserve) {
+            const reserve = elem.srcMsg.pbReserve;
+            return [{
+                replyElement: {
+                    replayMsgSeq: String(reserve.friendSeq ?? elem.srcMsg?.origSeqs?.[0] ?? 0),
+                    replayMsgId: String(reserve.messageId ?? 0),
+                    senderUin: String(elem?.srcMsg ?? 0)
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            }, null];
+        }
+        return undefined;
+    };
+
     override toPreview(): string {
         return '[回复消息]';
     }
@@ -198,6 +256,46 @@ export class PacketMsgFaceElement extends IPacketMsgElement<SendFaceElement> {
         }
     }
 
+    static override parseElement = (elem: NapProtoDecodeStructType<typeof Elem>): ParseElementFnR => {
+        if (elem.face?.index) {
+            return [{
+                faceElement: {
+                    faceIndex: elem.face.index,
+                    faceType: FaceType.Normal
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            }, null];
+        }
+        if (elem?.commonElem?.serviceType === 37 && elem?.commonElem?.pbElem) {
+            const qface = new NapProtoMsg(QBigFaceExtra).decode(elem?.commonElem?.pbElem);
+            if (qface?.faceId) {
+                return [{
+                    faceElement: {
+                        faceIndex: qface.faceId,
+                        faceType: FaceType.Normal
+                    },
+                    elementType: ElementType.UNKNOWN,
+                    elementId: '',
+                }, null];
+            }
+        }
+        if (elem?.commonElem?.serviceType === 33 && elem?.commonElem?.pbElem) {
+            const qface = new NapProtoMsg(QSmallFaceExtra).decode(elem?.commonElem?.pbElem);
+            if (qface?.faceId) {
+                return [{
+                    faceElement: {
+                        faceIndex: qface.faceId,
+                        faceType: FaceType.Normal
+                    },
+                    elementType: ElementType.UNKNOWN,
+                    elementId: '',
+                }, null];
+            }
+        }
+        return undefined;
+    };
+
     override toPreview(): string {
         return '[表情]';
     }
@@ -286,6 +384,60 @@ export class PacketMsgPicElement extends IPacketMsgElement<SendPicElement> {
         }];
     }
 
+    static override parseElement = (elem: NapProtoDecodeStructType<typeof Elem>): ParseElementFnR => {
+        if (elem?.commonElem?.serviceType === 48 || [10, 20].includes(elem?.commonElem?.businessType ?? 0)) {
+            const extra = new NapProtoMsg(MsgInfo).decode(elem.commonElem!.pbElem!);
+            const msgInfoBody = extra.msgInfoBody[0];
+            const index = msgInfoBody?.index;
+            return [{
+                picElement: {
+                    fileSize: index?.info.fileSize ?? 0,
+                    picWidth: index?.info?.width ?? 0,
+                    picHeight: index?.info?.height ?? 0,
+                    fileName: index?.info?.fileHash ?? '',
+                    sourcePath: '',
+                    original: false,
+                    picType: PicType.NEWPIC_APNG,
+                    fileUuid: '',
+                    fileSubId: '',
+                    thumbFileSize: 0,
+                    summary: '[图片]',
+                    thumbPath: new Map(),
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            }, elem];
+        }
+        if (elem?.notOnlineImage) {
+            const img = elem?.notOnlineImage; // url in originImageUrl
+            const preImg: MessageElement = {
+                picElement: {
+                    fileSize: img.fileLen ?? 0,
+                    picWidth: img.picWidth ?? 0,
+                    picHeight: img.picHeight ?? 0,
+                    fileName: Buffer.from(img.picMd5!).toString('hex') ?? '',
+                    sourcePath: '',
+                    original: false,
+                    picType: PicType.NEWPIC_APNG,
+                    fileUuid: '',
+                    fileSubId: '',
+                    thumbFileSize: 0,
+                    summary: '[图片]',
+                    thumbPath: new Map(),
+                },
+                elementType: ElementType.UNKNOWN,
+                elementId: '',
+            };
+            if (img.origUrl?.includes('&fileid=')) {
+                preImg.picElement!.originImageUrl = `https://multimedia.nt.qq.com.cn${img.origUrl}`;
+            } else {
+                preImg.picElement!.originImageUrl = `https://gchat.qpic.cn${img.origUrl}`;
+            }
+            return [preImg, elem];
+        }
+        return undefined;
+    };
+
     override toPreview(): string {
         return this.summary;
     }

src/core/packet/transformer/highway/DownloadGroupImage.ts

@@ -0,0 +1,50 @@
+import * as proto from '@/core/packet/transformer/proto';
+import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
+import { OidbPacket, PacketTransformer } from '@/core/packet/transformer/base';
+import OidbBase from '@/core/packet/transformer/oidb/oidbBase';
+import { IndexNode } from '@/core/packet/transformer/proto';
+
+class DownloadGroupImage extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
+    constructor() {
+        super();
+    }
+
+    build(group_uin: number, node: NapProtoEncodeStructType<typeof IndexNode>): OidbPacket {
+        const body = new NapProtoMsg(proto.NTV2RichMediaReq).encode({
+            reqHead: {
+                common: {
+                    requestId: 1,
+                    command: 200
+                },
+                scene: {
+                    requestType: 2,
+                    businessType: 1,
+                    sceneType: 2,
+                    group: {
+                        groupUin: group_uin
+                    }
+                },
+                client: {
+                    agentType: 2,
+                }
+            },
+            download: {
+                node: node,
+                download: {
+                    video: {
+                        busiType: 0,
+                        sceneType: 0
+                    }
+                }
+            }
+        });
+        return OidbBase.build(0x11C4, 200, body, true, false);
+    }
+
+    parse(data: Buffer) {
+        const oidbBody = OidbBase.parse(data).body;
+        return new NapProtoMsg(proto.NTV2RichMediaResp).decode(oidbBody);
+    }
+}
+
+export default new DownloadGroupImage();

src/core/packet/transformer/highway/DownloadImage.ts

@@ -14,7 +14,7 @@ class DownloadImage extends PacketTransformer<typeof proto.NTV2RichMediaResp> {
             reqHead: {
                 common: {
                     requestId: 1,
-                    command: 100
+                    command: 200
                 },
                 scene: {
                     requestType: 2,

src/core/packet/transformer/highway/index.ts

@@ -12,3 +12,4 @@ export { default as UploadPrivateImage } from './UploadPrivateImage';
 export { default as UploadPrivatePtt } from './UploadPrivatePtt';
 export { default as UploadPrivateVideo } from './UploadPrivateVideo';
 export { default as DownloadImage } from './DownloadImage';
+export { default as DownloadGroupImage } from './DownloadGroupImage';

src/core/packet/transformer/message/DownloadForwardMsg.ts

@@ -0,0 +1,37 @@
+import * as proto from '@/core/packet/transformer/proto';
+import { NapProtoMsg } from '@napneko/nap-proto-core';
+import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
+
+class DownloadForwardMsg extends PacketTransformer<typeof proto.RecvLongMsgResp> {
+    constructor() {
+        super();
+    }
+
+    build(uid: string, resId: string): OidbPacket {
+        const req = new NapProtoMsg(proto.RecvLongMsgReq).encode({
+            info: {
+                uid: {
+                    uid: uid
+                },
+                resId: resId,
+                acquire: true
+            },
+            settings: {
+                field1: 2,
+                field2: 0,
+                field3: 0,
+                field4: 0
+            }
+        });
+        return {
+            cmd: 'trpc.group.long_msg_interface.MsgService.SsoRecvLongMsg',
+            data: PacketHexStrBuilder(req)
+        };
+    }
+
+    parse(data: Buffer) {
+        return new NapProtoMsg(proto.RecvLongMsgResp).decode(data);
+    }
+}
+
+export default new DownloadForwardMsg();

src/core/packet/transformer/message/index.ts

@@ -1 +1,2 @@
 export { default as UploadForwardMsg } from './UploadForwardMsg';
+export { default as DownloadForwardMsg } from './DownloadForwardMsg';

src/core/packet/transformer/proto/message/action.ts

@@ -2,7 +2,7 @@ import { ProtoField, ScalarType } from '@napneko/nap-proto-core';
 import { PushMsgBody } from '@/core/packet/transformer/proto';
 
 export const LongMsgResult = {
-    action: ProtoField(2, () => LongMsgAction)
+    action: ProtoField(2, () => LongMsgAction, false, true)
 };
 
 export const LongMsgAction = {

src/framework/napcat.cjs

@@ -15,7 +15,6 @@ let napCatInitialized = false; // 添加一个标志
 function createServiceProxy(ServiceName) {
     return new Proxy(() => { }, {
         get: (target, FunctionName) => {
-            console.log(ServiceName, FunctionName);
             if (ServiceName === 'NodeIQQNTWrapperSession' && FunctionName === 'create') {
                 return () => new Proxy({}, {
                     get: function (target, ClassFunName, receiver) {

src/onebot/action/go-cqhttp/GetForwardMsg.ts

@@ -3,6 +3,7 @@ import { OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageForward,
 import { ActionName } from '@/onebot/action/router';
 import { MessageUnique } from '@/common/message-unique';
 import { Static, Type } from '@sinclair/typebox';
+import { ChatType, ElementType, MsgSourceType, NTMsgType, RawMessage } from '@/core';
 
 const SchemaData = Type.Object({
     message_id: Type.Optional(Type.Union([Type.Number(), Type.String()])),
@@ -57,24 +58,72 @@ export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, {
             throw new Error('message_id is required');
         }
 
+        const fakeForwardMsg = (res_id: string) => {
+            return {
+                chatType: ChatType.KCHATTYPEGROUP,
+                elements: [{
+                    elementType: ElementType.MULTIFORWARD,
+                    elementId: '',
+                    multiForwardMsgElement: {
+                        resId: res_id,
+                        fileName: '',
+                        xmlContent: '',
+                    }
+                }],
+                guildId: '',
+                isOnlineMsg: false,
+                msgId: '',  // TODO: no necessary
+                msgRandom: '0',
+                msgSeq: '',
+                msgTime: '',
+                msgType: NTMsgType.KMSGTYPEMIX,
+                parentMsgIdList: [],
+                parentMsgPeer: {
+                    chatType: ChatType.KCHATTYPEGROUP,
+                    peerUid: '',
+                },
+                peerName: '',
+                peerUid: '284840486',
+                peerUin: '284840486',
+                recallTime: '0',
+                records: [],
+                sendNickName: '',
+                sendRemarkName: '',
+                senderUid: '',
+                senderUin: '1094950020',
+                sourceType: MsgSourceType.K_DOWN_SOURCETYPE_UNKNOWN,
+                subMsgType: 1,
+            } as RawMessage;
+        };
+
+        const protocolFallbackLogic = async (res_id: string) => {
+            const ob = (await this.obContext.apis.MsgApi.parseMessageV2(fakeForwardMsg(res_id)))?.arrayMsg;
+            if (ob) {
+                return {
+                    messages: (ob?.message?.[0] as OB11MessageForward)?.data?.content
+                };
+            }
+            throw new Error('protocolFallbackLogic: 找不到相关的聊天记录');
+        };
+
         const rootMsgId = MessageUnique.getShortIdByMsgId(msgId.toString());
         const rootMsg = MessageUnique.getMsgIdAndPeerByShortId(rootMsgId ?? +msgId);
         if (!rootMsg) {
-            throw new Error('msg not found');
+            return await protocolFallbackLogic(msgId.toString());
         }
         const data = await this.core.apis.MsgApi.getMsgsByMsgId(rootMsg.Peer, [rootMsg.MsgId]);
 
         if (!data || data.result !== 0) {
-            throw new Error('找不到相关的聊天记录' + data?.errMsg);
+            return await protocolFallbackLogic(msgId.toString());
         }
 
         const singleMsg = data.msgList[0];
         if (!singleMsg) {
-            throw new Error('找不到相关的聊天记录');
+            return await protocolFallbackLogic(msgId.toString());
         }
         const resMsg = (await this.obContext.apis.MsgApi.parseMessageV2(singleMsg))?.arrayMsg;//强制array 以便处理
         if (!(resMsg?.message?.[0] as OB11MessageForward)?.data?.content) {
-            throw new Error('找不到相关的聊天记录');
+            return await protocolFallbackLogic(msgId.toString());
         }
         return {
             messages: (resMsg?.message?.[0] as OB11MessageForward)?.data?.content

src/onebot/api/msg.ts

@@ -1,25 +1,34 @@
 import {FileNapCatOneBotUUID} from '@/common/file-uuid';
 import {MessageUnique} from '@/common/message-unique';
 import {
-    NTMsgAtType,
     ChatType,
     CustomMusicSignPostData,
     ElementType,
     FaceIndex,
+    FaceType,
+    GrayTipElement,
+    GroupNotify,
     IdMusicSignPostData,
     MessageElement,
     NapCatCore,
     NTGrayTipElementSubTypeV2,
+    NTMsgAtType,
     Peer,
     RawMessage,
     SendMessageElement,
     SendTextElement,
-    FaceType,
-    GrayTipElement,
-    GroupNotify,
 } from '@/core';
 import faceConfig from '@/core/external/face_config.json';
-import { NapCatOneBot11Adapter, OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageFileBase, OB11MessageForward, OB11MessageImage, OB11MessageVideo, } from '@/onebot';
+import {
+    NapCatOneBot11Adapter,
+    OB11Message,
+    OB11MessageData,
+    OB11MessageDataType,
+    OB11MessageFileBase,
+    OB11MessageForward,
+    OB11MessageImage,
+    OB11MessageVideo,
+} from '@/onebot';
 import {OB11Construct} from '@/onebot/helper/data';
 import {EventType} from '@/onebot/event/OneBotEvent';
 import {encodeCQCode} from '@/onebot/helper/cqcode';
@@ -30,7 +39,7 @@ import { OB11FriendAddNoticeEvent } from '@/onebot/event/notice/OB11FriendAddNot
 import {ForwardMsgBuilder} from '@/common/forward-msg-builder';
 import {NapProtoMsg} from '@napneko/nap-proto-core';
 import {OB11GroupIncreaseEvent} from '../event/notice/OB11GroupIncreaseEvent';
-import { OB11GroupDecreaseEvent, GroupDecreaseSubType } from '../event/notice/OB11GroupDecreaseEvent';
+import {GroupDecreaseSubType, OB11GroupDecreaseEvent} from '../event/notice/OB11GroupDecreaseEvent';
 import {GroupAdmin} from '@/core/packet/transformer/proto/message/groupAdmin';
 import {OB11GroupAdminNoticeEvent} from '../event/notice/OB11GroupAdminNoticeEvent';
 import {GroupChange, GroupChangeInfo, GroupInvite, PushMsgBody} from '@/core/packet/transformer/proto';
@@ -264,7 +273,6 @@ export class OneBotMsgApi {
             }
 
 
-
             // 丢弃该消息段
             if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
                 this.core.context.logger.logError(
@@ -355,15 +363,22 @@ export class OneBotMsgApi {
             };
         },
 
-        multiForwardMsgElement: async (_, msg, _wrapper, context) => {
+        multiForwardMsgElement: async (element, msg, _wrapper, context) => {
             const parentMsgPeer = msg.parentMsgPeer ?? {
                 chatType: msg.chatType,
                 guildId: '',
                 peerUid: msg.peerUid,
             };
-            const multiMsgs = await this.getMultiMessages(msg, parentMsgPeer);
+            let multiMsgs = await this.getMultiMessages(msg, parentMsgPeer);
             // 拉取失败则跳过
-            if (!multiMsgs) return null;
+            if (!multiMsgs || multiMsgs.length === 0) {
+                try {
+                    multiMsgs = await this.core.apis.PacketApi.pkt.operation.FetchForwardMsg(element.resId);
+                } catch (e) {
+                    this.core.context.logger.logError('Protocol FetchForwardMsg fallback failed!', e);
+                    return null;
+                }
+            }
             const forward: OB11MessageForward = {
                 type: OB11MessageDataType.forward,
                 data: {id: msg.msgId}
@@ -692,7 +707,10 @@ export class OneBotMsgApi {
         if (grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
             if (grayTipElement.jsonGrayTipElement.busiId == 1061) {
                 const PokeEvent = await this.obContext.apis.FriendApi.parsePrivatePokeEvent(grayTipElement, Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid)));
-                if (PokeEvent) { return PokeEvent; };
+                if (PokeEvent) {
+                    return PokeEvent;
+                }
+                ;
             } else if (grayTipElement.jsonGrayTipElement.busiId == 19324 && msg.peerUid !== '') {
                 return new OB11FriendAddNoticeEvent(this.core, Number(await this.core.apis.UserApi.getUinByUidV2(msg.peerUid)));
             }
@@ -998,6 +1016,7 @@ export class OneBotMsgApi {
             return {path, fileName: inputdata.name ?? fileName};
         }
     }
+
     async handleObfuckName(name: string) {
         const contextMsgFile = FileNapCatOneBotUUID.decode(name);
         if (contextMsgFile && contextMsgFile.msgId && contextMsgFile.elementId) {
@@ -1021,6 +1040,7 @@ export class OneBotMsgApi {
         }
         throw new Error('文件名解析失败');
     }
+
     groupChangDecreseType2String(type: number): GroupDecreaseSubType {
         switch (type) {
         case 130:

src/onebot/config/index.ts

@@ -1,5 +1,5 @@
 import { ConfigBase } from '@/common/config-base';
-import { NapCatCore } from '@/core';
+import type { NapCatCore } from '@/core';
 import { OneBotConfig } from './config';
 import { AnySchema } from 'ajv';
 

src/webui/src/api/OB11Config.ts

@@ -1,13 +1,12 @@
 import { RequestHandler } from 'express';
 import { existsSync, readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
-
+import { loadConfig, OneBotConfig } from '@/onebot/config/config';
-import { OneBotConfig } from '@/onebot/config/config';
-
 import { webUiPathWrapper } from '@/webui';
 import { WebUiDataRuntime } from '@webapi/helper/Data';
 import { sendError, sendSuccess } from '@webapi/utils/response';
 import { isEmpty } from '@webapi/utils/check';
+import json5 from 'json5';
 
 // 获取OneBot11配置
 export const OB11GetConfigHandler: RequestHandler = (_, res) => {
@@ -19,16 +18,16 @@ export const OB11GetConfigHandler: RequestHandler = (_, res) => {
     }
     // 获取登录的QQ号
     const uin = WebUiDataRuntime.getQQLoginUin();
-    // 读取配置文件
+    // 读取配置文件路径
     const configFilePath = resolve(webUiPathWrapper.configPath, `./onebot11_${uin}.json`);
     // 尝试解析配置文件
     try {
-        // 读取配置文件
+        // 读取配置文件内容
-        const data = JSON.parse(
+        const configFileContent = existsSync(configFilePath)
-            existsSync(configFilePath)
             ? readFileSync(configFilePath).toString()
-                : readFileSync(resolve(webUiPathWrapper.configPath, './onebot11.json')).toString()
+            : readFileSync(resolve(webUiPathWrapper.configPath, './onebot11.json')).toString();
-        ) as OneBotConfig;
+        // 解析配置文件并加载配置
+        const data = loadConfig(json5.parse(configFileContent)) as OneBotConfig;
         // 返回配置文件
         return sendSuccess(res, data);
     } catch (e) {
@@ -50,7 +49,10 @@ export const OB11SetConfigHandler: RequestHandler = async (req, res) => {
     }
     // 写入配置
     try {
-        await WebUiDataRuntime.setOB11Config(JSON.parse(req.body.config));
+        // 解析并加载配置
+        const config = loadConfig(json5.parse(req.body.config)) as OneBotConfig;
+        // 写入配置
+        await WebUiDataRuntime.setOB11Config(config);
         return sendSuccess(res, null);
     } catch (e) {
         return sendError(res, 'Error: ' + e);