From 563aeccd0fdb10ec35fd9c45399c905772873d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Sun, 8 Sep 2024 10:07:49 +0800
Subject: [PATCH] refactor: fileNameEncode

---
 src/common/helper.ts    | 38 ++++++++++++++++++++++++++++++--------
 src/onebot/api/group.ts |  2 +-
 src/onebot/api/msg.ts   | 13 +++++++------
 src/onebot/entities.ts  |  2 +-
 4 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/src/common/helper.ts b/src/common/helper.ts
index 693187fb..a8728e73 100644
--- a/src/common/helper.ts
+++ b/src/common/helper.ts
@@ -25,8 +25,13 @@ export async function solveAsyncProblem<T extends (...args: any[]) => Promise<an
 }
 
 export class FileNapCatOneBotUUID {
-    static encodeModelId(peer: Peer, modelId: string, fileId: string): string {
-        return `NapCatOneBot|ModelIdFile|${peer.chatType}|${peer.peerUid}|${modelId}|${fileId}`;
+    static encodeModelId(peer: Peer, modelId: string, fileId: string, endString: string = ""): string {
+        let data = `NapCatOneBot|ModelIdFile|${peer.chatType}|${peer.peerUid}|${modelId}|${fileId}`;
+        //前四个字节塞data长度
+        let length = Buffer.alloc(4 + data.length);
+        length.writeUInt32BE(data.length, 0);
+        length.write(data, 4);
+        return length.toString('hex') + endString;
     }
 
     static decodeModelId(uuid: string): undefined | {
@@ -34,8 +39,14 @@ export class FileNapCatOneBotUUID {
         modelId: string,
         fileId: string
     } {
-        if (!uuid.startsWith('NapCatOneBot|ModelIdFile|')) return undefined;
-        const data = uuid.split('|');
+        //前四个字节是data长度
+        let length = Buffer.from(uuid.slice(0, 8), 'hex').readUInt32BE(0);
+        //根据length计算需要读取的长度
+        let dataId = uuid.slice(8, 8 + length);
+        //hex还原为string
+        const realData = Buffer.from(dataId, 'hex').toString();
+        if (!realData.startsWith('NapCatOneBot|ModelIdFile|')) return undefined;
+        const data = realData.split('|');
         if (data.length !== 6) return undefined;
         const [, , chatType, peerUid, modelId, fileId] = data;
         return {
@@ -48,8 +59,13 @@ export class FileNapCatOneBotUUID {
         };
     }
 
-    static encode(peer: Peer, msgId: string, elementId: string): string {
-        return `NapCatOneBot|MsgFile|${peer.chatType}|${peer.peerUid}|${msgId}|${elementId}`;
+    static encode(peer: Peer, msgId: string, elementId: string, endString: string = ""): string {
+        const data = `NapCatOneBot|MsgFile|${peer.chatType}|${peer.peerUid}|${msgId}|${elementId}`;
+        //前四个字节塞data长度
+        const length = Buffer.alloc(4 + data.length);
+        length.writeUInt32BE(data.length, 0);
+        length.write(data, 4);
+        return length.toString('hex');
     }
 
     static decode(uuid: string): undefined | {
@@ -57,8 +73,14 @@ export class FileNapCatOneBotUUID {
         msgId: string,
         elementId: string
     } {
-        if (!uuid.startsWith('NapCatOneBot|MsgFile|')) return undefined;
-        const data = uuid.split('|');
+        //前四个字节是data长度
+        const length = Buffer.from(uuid.slice(0, 8), 'hex').readUInt32BE(0);
+        //根据length计算需要读取的长度
+        const dataId = uuid.slice(8, 8 + length);
+        //hex还原为string
+        const realData = Buffer.from(dataId, 'hex').toString();
+        if (!realData.startsWith('NapCatOneBot|MsgFile|')) return undefined;
+        const data = realData.split('|');
         if (data.length !== 6) return undefined;
         const [, , chatType, peerUid, msgId, elementId] = data;
         return {
diff --git a/src/onebot/api/group.ts b/src/onebot/api/group.ts
index 40f0380e..07d31c60 100644
--- a/src/onebot/api/group.ts
+++ b/src/onebot/api/group.ts
@@ -77,7 +77,7 @@ export class OneBotGroupApi {
                         id: FileNapCatOneBotUUID.encode({
                             chatType: ChatType.KCHATTYPEGROUP,
                             peerUid: msg.peerUid,
-                        }, msg.msgId, element.elementId),
+                        }, msg.msgId, element.elementId, element.fileElement.fileName),
                         name: element.fileElement.fileName,
                         size: parseInt(element.fileElement.fileSize),
                         busid: element.fileElement.fileBizId || 0,
diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts
index bd36e2fa..21757111 100644
--- a/src/onebot/api/msg.ts
+++ b/src/onebot/api/msg.ts
@@ -106,7 +106,7 @@ export class OneBotMsgApi {
                     peerUid: msg.peerUid,
                     guildId: '',
                 };
-                const encodedFileId = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId);
+                const encodedFileId = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileName);
                 return {
                     type: OB11MessageDataType.image,
                     data: {
@@ -136,7 +136,7 @@ export class OneBotMsgApi {
                     file: element.fileName,
                     path: element.filePath,
                     url: element.filePath,
-                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
+                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileName),
                     file_size: element.fileSize,
                     file_unique: element.fileName,
                 },
@@ -179,7 +179,7 @@ export class OneBotMsgApi {
                 type: OB11MessageDataType.image,
                 data: {
                     file: 'marketface',
-                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
+                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, ".jpg"),
                     path: elementWrapper.elementId,
                     url: elementWrapper.elementId,
                     file_unique: _.key
@@ -264,7 +264,7 @@ export class OneBotMsgApi {
                     file: element.fileName,
                     path: videoDownUrl,
                     url: videoDownUrl,
-                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
+                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileName),
                     file_size: element.fileSize,
                     file_unique: element.fileName,
                 },
@@ -277,12 +277,13 @@ export class OneBotMsgApi {
                 peerUid: msg.peerUid,
                 guildId: '',
             };
+            const fileCode = FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId, element.fileName);
             return {
                 type: OB11MessageDataType.voice,
                 data: {
-                    file: element.fileName,
+                    file: fileCode,
                     path: element.filePath,
-                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
+                    file_id: fileCode,
                     file_size: element.fileSize,
                 },
             };
diff --git a/src/onebot/entities.ts b/src/onebot/entities.ts
index 32f2a692..12d5f39f 100644
--- a/src/onebot/entities.ts
+++ b/src/onebot/entities.ts
@@ -109,7 +109,7 @@ export class OB11Entities {
     static file(peerId: string, file: Exclude<GroupFileInfoUpdateParamType['item'][0]['fileInfo'], undefined>): OB11GroupFile {
         return {
             group_id: parseInt(peerId),
-            file_id: FileNapCatOneBotUUID.encodeModelId({ chatType: 2, peerUid: peerId }, file.fileModelId, file.fileId),
+            file_id: FileNapCatOneBotUUID.encodeModelId({ chatType: 2, peerUid: peerId }, file.fileModelId, file.fileId, file.fileName),
             file_name: file.fileName,
             busid: file.busId,
             size: parseInt(file.fileSize),