refactor: GetFile

src/common/helper.ts

@@ -23,31 +23,28 @@ export async function solveAsyncProblem<T extends (...args: any[]) => Promise<an
         });
     });
 }
-
-//下面这个类是用于将uid+msgid合并的类
-export class UUIDConverter {
-    static encode(highStr: string, lowStr: string): string {
-        const high = BigInt(highStr);
-        const low = BigInt(lowStr);
-        const highHex = high.toString(16).padStart(16, '0');
-        const lowHex = low.toString(16).padStart(16, '0');
-        const combinedHex = highHex + lowHex;
-        return `${combinedHex.substring(0, 8)}-${combinedHex.substring(8, 12)}-${combinedHex.substring(
-            12,
-            16,
-        )}-${combinedHex.substring(16, 20)}-${combinedHex.substring(20)}`;
-    }
-
-    static decode(uuid: string): { high: string; low: string } {
-        const hex = uuid.replace(/-/g, '');
-        const high = BigInt('0x' + hex.substring(0, 16));
-        const low = BigInt('0x' + hex.substring(16));
-        return { high: high.toString(), low: low.toString() };
-    }
-}
 export class FileNapCatOneBotUUID {
+    static encodeModelId(peer: Peer, modelId: string): string {
+        return `NapCatOneBot-ModeldFile-${peer.chatType}-${peer.peerUid}-${modelId}`;
+    }
+    static decodeModelId(uuid: string): undefined | {
+        peer: Peer,
+        modelId: string
+    } {
+        if (!uuid.startsWith('NapCatOneBot-ModeldFile-')) return undefined;
+        const data = uuid.split('-');
+        if (data.length !== 5) return undefined;
+        const [, , chatType, peerUid, modelId] = data;
+        return {
+            peer: {
+                chatType: chatType as any,
+                peerUid: peerUid
+            },
+            modelId,
+        };
+    }
     static encode(peer: Peer, msgId: string, elementId: string): string {
-        return `NapCatOneBot-File-${peer.chatType}-${peer.peerUid}-${msgId}-${elementId}`;
+        return `NapCatOneBot-MsgFile-${peer.chatType}-${peer.peerUid}-${msgId}-${elementId}`;
     }
     static decode(uuid: string): undefined | {
         peer: Peer,

src/core/apis/file.ts

@@ -302,7 +302,18 @@ export class NTQQFileApi {
     async downloadMediaByUuid() {
         //napCatCore.session.getRichMediaService().downloadFileForFileUuid();
     }
-
+    async downloadFileForModelId(peer: Peer, modelId: string, timeout = 1000 * 60 * 2) {
+        const [, fileTransNotifyInfo] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelRichMediaService/downloadFileForModelId',
+            'NodeIKernelMsgListener/onRichMediaDownloadComplete',
+            [peer, [modelId]],
+            () => true,
+            (arg) => arg?.commonFileInfo?.fileModelId === modelId,
+            1,
+            timeout,
+        );
+        return fileTransNotifyInfo.filePath;
+    }
     async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
         //logDebug('receive downloadMedia task', msgId, chatType, peerUid, elementId, thumbPath, sourcePath, timeout, force);
         // 用于下载收到的消息中的图片等

src/core/listeners/NodeIKernelMsgListener.ts

@@ -1,5 +1,25 @@
 import { ChatType, RawMessage } from '@/core/entities';
-
+export interface CommonFileInfo {
+    bizType: null;
+    chatType: number;
+    elemId: string;
+    favId: null;
+    fileModelId: string;
+    fileName: string;
+    fileSize: string;
+    md5: string;
+    md510m: string;
+    msgId: string;
+    msgTime: string;
+    parent: null;
+    peerUid: string;
+    picThumbPath: null;
+    sha: string;
+    sha3: string;
+    subId: string;
+    uuid: string;
+    [property: string]: any;
+}
 export interface OnRichMediaDownloadCompleteParams {
     fileModelId: string,
     msgElementId: string,
@@ -15,7 +35,7 @@ export interface OnRichMediaDownloadCompleteParams {
     totalSize: string,
     trasferStatus: number,
     step: number,
-    commonFileInfo: unknown | null,
+    commonFileInfo?: CommonFileInfo,
     fileSrvErrCode: string,
     clientMsg: string,
     businessId: number,

src/core/services/NodeIKernelRichMediaService.ts

@@ -155,7 +155,7 @@ export interface NodeIKernelRichMediaService {
     }): unknown;
 
     //arg3为“”
-    downloadFileForModelId(peer: Peer, ModelId: string[], arg3: string): unknown;
+    downloadFileForModelId(peer: Peer, ModelId: string[]): Promise<unknown>;
 
     //第三个参数 Array<Type>
     // this.fileId = "";

src/onebot/action/file/GetFile.ts

@@ -32,18 +32,18 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
         const NTQQMsgApi = this.core.apis.MsgApi;
         const NTQQFileApi = this.core.apis.FileApi;
 
-        const contextFile = FileNapCatOneBotUUID.decode(payload.file);
+        const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file);
 
         //接收消息标记模式
-        if (contextFile) {
-            const { peer, msgId, elementId } = contextFile;
+        if (contextMsgFile) {
+            const { peer, msgId, elementId } = contextMsgFile;
 
             const downloadPath = await NTQQFileApi.downloadMedia(msgId, peer.chatType, peer.peerUid, elementId, '', '');
 
             const mixElement = (await NTQQMsgApi.getMsgsByMsgId(peer, [msgId]))?.msgList
                 .find(msg => msg.msgId === msgId)?.elements.find(e => e.elementId === elementId);
-            const mixElementInner = mixElement?.videoElement ?? mixElement?.fileElement ?? mixElement?.pttElement ?? mixElement?.picElement ;
-            if(!mixElementInner) throw new Error('element not found');
+            const mixElementInner = mixElement?.videoElement ?? mixElement?.fileElement ?? mixElement?.pttElement ?? mixElement?.picElement;
+            if (!mixElementInner) throw new Error('element not found');
 
             const fileSize = mixElementInner.fileSize?.toString() || '';
             const fileName = mixElementInner.fileName || '';
@@ -65,6 +65,26 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
             return res;
         }
         //群文件模式
+        const contextModelIdFile = FileNapCatOneBotUUID.decodeModelId(payload.file);
+        if (contextModelIdFile) {
+            const { peer, modelId } = contextModelIdFile;
+            const downloadPath = await NTQQFileApi.downloadFileForModelId(peer, modelId);
+            const res: GetFileResponse = {
+                file: downloadPath,
+                url: downloadPath,
+                file_size: '',
+                file_name: '',
+            };
+
+            if (this.obContext.configLoader.configData.enableLocalFile2Url && downloadPath) {
+                try {
+                    res.base64 = await fs.readFile(downloadPath, 'base64');
+                } catch (e) {
+                    throw new Error('文件下载失败. ' + e);
+                }
+            }
+            return res;
+        }
 
         //搜索名字模式
         const NTSearchNameResult = (await NTQQFileApi.searchfile([payload.file])).resultItems;