From 242bbfdb144cb2a92b535b13fa9e72046837a25d Mon Sep 17 00:00:00 2001
From: Clansty <i@gao4.pw>
Date: Sun, 29 Dec 2024 22:03:04 +0800
Subject: [PATCH] chore: uriToLocalFile

---
 src/common/file.ts                          |  7 +++----
 src/onebot/action/go-cqhttp/DownloadFile.ts | 16 ++++++++--------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/common/file.ts b/src/common/file.ts
index 6dac529b..2abf0689 100644
--- a/src/common/file.ts
+++ b/src/common/file.ts
@@ -175,10 +175,9 @@ export async function checkUriType(Uri: string) {
     return { Uri: Uri, Type: FileUriType.Unknown };
 }
 
-export async function uriToLocalFile(dir: string, uri: string): Promise<Uri2LocalRes> {
+export async function uriToLocalFile(dir: string, uri: string, filename: string = randomUUID(), headers?: Record<string, string>): Promise<Uri2LocalRes> {
     const { Uri: HandledUri, Type: UriType } = await checkUriType(uri);
 
-    const filename = randomUUID();
     const filePath = path.join(dir, filename);
 
     switch (UriType) {
@@ -191,7 +190,7 @@ export async function uriToLocalFile(dir: string, uri: string): Promise<Uri2Loca
     }
 
     case FileUriType.Remote: {
-        const buffer = await httpDownload(HandledUri);
+        const buffer = await httpDownload({ url: HandledUri, headers: headers });
         fs.writeFileSync(filePath, buffer, { flag: 'wx' });
         return { success: true, errMsg: '', fileName: filename, path: filePath };
     }
@@ -206,4 +205,4 @@ export async function uriToLocalFile(dir: string, uri: string): Promise<Uri2Loca
     default:
         return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
     }
-}
\ No newline at end of file
+}
diff --git a/src/onebot/action/go-cqhttp/DownloadFile.ts b/src/onebot/action/go-cqhttp/DownloadFile.ts
index 8f56c469..76d24ffc 100644
--- a/src/onebot/action/go-cqhttp/DownloadFile.ts
+++ b/src/onebot/action/go-cqhttp/DownloadFile.ts
@@ -2,7 +2,7 @@ import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '@/onebot/action/router';
 import fs from 'fs';
 import { join as joinPath } from 'node:path';
-import { calculateFileMD5, httpDownload } from '@/common/file';
+import { calculateFileMD5, httpDownload, uriToLocalFile } from '@/common/file';
 import { randomUUID } from 'crypto';
 import { Static, Type } from '@sinclair/typebox';
 
@@ -26,20 +26,20 @@ export default class GoCQHTTPDownloadFile extends OneBotAction<Payload, FileResp
     async _handle(payload: Payload): Promise<FileResponse> {
         const isRandomName = !payload.name;
         const name = payload.name || randomUUID();
-        const filePath = joinPath(this.core.NapCatTempPath, name);
+        let result: Awaited<ReturnType<typeof uriToLocalFile>>;
 
         if (payload.base64) {
-            fs.writeFileSync(filePath, payload.base64, 'base64');
-        } else if (payload.url?.startsWith('file://')) {
-            const path = payload.url.substring(7);
-            fs.copyFileSync(path, filePath);
+            result = await uriToLocalFile(this.core.NapCatTempPath, `base64://${payload.base64}`, name);
         } else if (payload.url) {
             const headers = this.getHeaders(payload.headers);
-            const buffer = await httpDownload({ url: payload.url, headers: headers });
-            fs.writeFileSync(filePath, Buffer.from(buffer), 'binary');
+            result = await uriToLocalFile(this.core.NapCatTempPath, payload.url, name, headers);
         } else {
             throw new Error('不存在任何文件, 无法下载');
         }
+        if (!result.success) {
+            throw new Error(result.errMsg);
+        }
+        const filePath = result.path;
         if (fs.existsSync(filePath)) {
 
             if (isRandomName) {