ability to async read chunk data , fix leak data error for react nati…

…ve (#TODO)
transloadit · Nov 30, 2024 · c45d4f3 · c45d4f3
1 parent 44a378a
commit c45d4f3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/packages/@uppy/aws-s3/src/HTTPCommunicationQueue.ts b/packages/@uppy/aws-s3/src/HTTPCommunicationQueue.ts
@@ -253,7 +253,7 @@ export class HTTPCommunicationQueue<M extends Meta, B extends Body> {
     }).abortOn(signal)
 
     let body: FormData | Blob
-    const data = chunk.getData()
+    const data = await chunk.getData()
     if (method.toUpperCase() === 'POST') {
       const formData = new FormData()
       Object.entries(fields!).forEach(([key, value]) =>
@@ -387,7 +387,7 @@ export class HTTPCommunicationQueue<M extends Meta, B extends Body> {
 
     for (;;) {
       throwIfAborted(signal)
-      const chunkData = chunk.getData()
+      const chunkData = await chunk.getData()
       const { onProgress, onComplete } = chunk
       let signature
 

diff --git a/packages/@uppy/aws-s3/src/MultipartUploader.ts b/packages/@uppy/aws-s3/src/MultipartUploader.ts
@@ -7,6 +7,7 @@ const MB = 1024 * 1024
 
 interface MultipartUploaderOptions<M extends Meta, B extends Body> {
   getChunkSize?: (file: { size: number }) => number
+  getChunkData?: (start: number, end: number, opts: { chunkSize: number }) => Promise<Blob>
   onProgress?: (bytesUploaded: number, bytesTotal: number) => void
   onPartComplete?: (part: { PartNumber: number; ETag: string }) => void
   shouldUseMultipart?: boolean | ((file: UppyFile<M, B>) => boolean)
@@ -33,7 +34,7 @@ const defaultOptions = {
 } satisfies Partial<MultipartUploaderOptions<any, any>>
 
 export interface Chunk {
-  getData: () => Blob
+  getData: () => Promise<Blob>
   onProgress: (ev: ProgressEvent) => void
   onComplete: (etag: string) => void
   shouldUseMultipart: boolean
@@ -146,9 +147,10 @@ class MultipartUploader<M extends Meta, B extends Body> {
         const end = Math.min(fileSize, offset + chunkSize)
 
         // Defer data fetching/slicing until we actually need the data, because it's slow if we have a lot of files
-        const getData = () => {
+        const getData = async () => {
           const i2 = offset
-          return this.#data.slice(i2, end)
+          return this.options.getChunkData ? this.options.getChunkData(i2, end, { chunkSize }) :
+            this.#data.slice(i2, end)
         }
 
         this.#chunks[j] = {
@@ -171,7 +173,7 @@ class MultipartUploader<M extends Meta, B extends Body> {
     } else {
       this.#chunks = [
         {
-          getData: () => this.#data,
+          getData: async () => this.#data,
           onProgress: this.#onPartProgress(0),
           onComplete: this.#onPartComplete(0),
           shouldUseMultipart,

diff --git a/packages/@uppy/aws-s3/src/index.ts b/packages/@uppy/aws-s3/src/index.ts
@@ -204,6 +204,7 @@ type AWSS3MultipartWithoutCompanionMandatorySignPart<
 }
 type AWSS3MultipartWithoutCompanionMandatory<M extends Meta, B extends Body> = {
   getChunkSize?: (file: { size: number }) => number
+  getChunkData?: (start: number, end: number, opts: { chunkSize: number }) => Promise<Blob>
   createMultipartUpload: (file: UppyFile<M, B>) => MaybePromise<UploadResult>
   listParts: (
     file: UppyFile<M, B>,
@@ -301,6 +302,7 @@ export default class AwsS3Multipart<
     Pick<
       AWSS3MultipartWithoutCompanionMandatory<M, B>,
       | 'getChunkSize'
+      | 'getChunkData'
       | 'createMultipartUpload'
       | 'listParts'
       | 'abortMultipartUpload'
@@ -867,7 +869,10 @@ export default class AwsS3Multipart<
           this.opts.getChunkSize ?
             this.opts.getChunkSize.bind(this)
           : undefined,
-
+        getChunkData:
+          this.opts.getChunkData ?
+            this.opts.getChunkData.bind(this)
+            : undefined,
         onProgress,
         onError,
         onSuccess,