fix: upload file error (#248)

* add log

* fix: upload file

* fix: upload file error

Author: c121914yu

modules/tool/utils/string.ts

@@ -9,6 +9,6 @@ export const replaceSensitiveText = (text: string) => {
   return text;
 };
 
-export const getNanoid = (length: number) => {
+export const getNanoid = (length: number = 12) => {
   return customAlphabet('1234567890abcdefghijklmnopqrstuvwxyz', length)();
 };

modules/tool/utils/uploadFile.ts

@@ -1,6 +1,7 @@
 import type { FileMetadata } from '@/s3/config';
 import type { FileInput } from '@/s3/type';
 import { parentPort } from 'worker_threads';
+import { getNanoid } from './string';
 
 export const uploadFile = async (data: FileInput) => {
   // 判断是否在 worker 线程中
@@ -12,8 +13,13 @@ export const uploadFile = async (data: FileInput) => {
       const timer = setTimeout(() => {
         reject('Upload file timeout');
       }, 120000);
-      global.uploadFileResponseFn = ({ data, error }) => {
+
+      if (!global.uploadFileResponseFnMap) {
+        global.uploadFileResponseFnMap = new Map();
+      }
+      const fn = ({ data, error }: { data?: FileMetadata; error?: string }) => {
         clearTimeout(timer);
+        global.uploadFileResponseFnMap.delete(id);
         if (error) {
           reject(error);
         } else if (data) {
@@ -22,6 +28,8 @@ export const uploadFile = async (data: FileInput) => {
           reject('Unknow error');
         }
       };
+      const id = getNanoid();
+      global.uploadFileResponseFnMap.set(id, fn);
 
       // Serialize buffer data to avoid transferList issues
       // Convert Buffer/Uint8Array to a plain object that can be safely cloned
@@ -41,7 +49,10 @@ export const uploadFile = async (data: FileInput) => {
 
       parentPort?.postMessage({
         type: 'uploadFile',
-        data: serializedData
+        data: {
+          id,
+          file: serializedData
+        }
       });
     });
   } else {

src/worker/index.ts

@@ -201,12 +201,13 @@ export async function dispatchWithNewWorker(data: {
       } else if (type === 'uploadFile') {
         try {
           const result = await fileUploadS3Server.uploadFileAdvanced({
-            ...data,
-            ...(data.buffer ? { buffer: Buffer.from(data.buffer) } : {})
+            ...data.file,
+            ...(data.file.buffer ? { buffer: Buffer.from(data.file.buffer) } : {})
           });
           worker.postMessage({
             type: 'uploadFileResponse',
             data: {
+              id: data.id,
               data: result
             }
           });
@@ -215,6 +216,7 @@ export async function dispatchWithNewWorker(data: {
           worker.postMessage({
             type: 'uploadFileResponse',
             data: {
+              id: data.id,
               error: `Tool upload file error: ${getErrText(error)}`
             }
           });

src/worker/type.ts

@@ -5,7 +5,7 @@ import { ToolCallbackReturnSchema } from '@tool/type/tool';
 import { FileInputSchema } from '@/s3/type';
 
 declare global {
-  var uploadFileResponseFn: (data: { data?: FileMetadata; error?: string }) => void | undefined;
+  var uploadFileResponseFnMap: Map<string, (data: { data?: FileMetadata; error?: string }) => void>;
 }
 
 /**
@@ -14,7 +14,7 @@ declare global {
 export const Worker2MainMessageSchema = z.discriminatedUnion('type', [
   z.object({
     type: z.literal('uploadFile'),
-    data: FileInputSchema
+    data: z.object({ id: z.string(), file: FileInputSchema })
   }),
   z.object({
     type: z.literal('log'),
@@ -46,6 +46,7 @@ export const Main2WorkerMessageSchema = z.discriminatedUnion('type', [
   z.object({
     type: z.literal('uploadFileResponse'),
     data: z.object({
+      id: z.string(),
       data: FileMetadataSchema.optional(),
       error: z.string().optional()
     })

src/worker/worker.ts

@@ -72,7 +72,10 @@ parentPort?.on('message', async (params: Main2WorkerMessageType) => {
       break;
     }
     case 'uploadFileResponse': {
-      global.uploadFileResponseFn?.(data);
+      const fn = global.uploadFileResponseFnMap.get(data.id);
+      if (fn) {
+        fn(data);
+      }
       break;
     }
   }