Add basic storage info to Upload model

packages/file-store/index.ts

@@ -164,6 +164,7 @@ export class FileStore extends DataStore {
             offset: stats.size,
             metadata: file.metadata,
             creation_date: file.creation_date,
+            storage: {type: 'file', path: file_path},
           })
         )
       })

packages/s3-store/index.ts

@@ -188,6 +188,7 @@ export class S3Store extends DataStore {
         offset: Number.parseInt(file.offset, 10),
         metadata: file.metadata,
         creation_date: file.creation_date,
+        storage: file.storage,
       }),
     }
     await this.cache.set(id, metadata)
@@ -530,6 +531,7 @@ export class S3Store extends DataStore {
     upload.creation_date = new Date().toISOString()
 
     const res = await this.client.createMultipartUpload(request)
+    upload.storage = {type: 's3', path: res.Key as string, bucket: this.bucket}
     await this.saveMetadata(upload, res.UploadId as string)
     log(`[${upload.id}] multipart upload created (${res.UploadId})`)
 
@@ -614,6 +616,7 @@ export class S3Store extends DataStore {
           offset: metadata.file.size as number,
           size: metadata.file.size,
           metadata: metadata.file.metadata,
+          storage: metadata.file.storage,
         })
       }
 
@@ -627,6 +630,7 @@ export class S3Store extends DataStore {
       ...metadata.file,
       offset: offset + (incompletePartSize ?? 0),
       size: metadata.file.size,
+      storage: metadata.file.storage,
     })
   }
 

packages/utils/src/models/DataStore.ts

@@ -50,7 +50,7 @@ export class DataStore extends EventEmitter {
    * the upload.
    */
   async getUpload(id: string): Promise<Upload> {
-    return new Upload({id, size: 0, offset: 0})
+    return new Upload({id, size: 0, offset: 0, storage: {type: 'datastore', path: ''}})
   }
 
   /**

packages/utils/src/models/Upload.ts

@@ -3,15 +3,21 @@ type TUpload = {
   size?: number
   offset: number
   metadata?: Record<string, string | null>
+  storage?: {
+    type: string
+    path: string
+    bucket?: string
+  }
   creation_date?: string
 }
 
 export class Upload {
   id: TUpload['id']
   metadata: TUpload['metadata']
-  size?: TUpload['size']
+  size: TUpload['size']
   offset: TUpload['offset']
   creation_date: TUpload['creation_date']
+  storage: TUpload['storage']
 
   constructor(upload: TUpload) {
     if (!upload.id) {
@@ -22,6 +28,7 @@ export class Upload {
     this.size = upload.size
     this.offset = upload.offset
     this.metadata = upload.metadata
+    this.storage = upload.storage
 
     this.creation_date = upload.creation_date ?? new Date().toISOString()
   }

test/stores.test.ts

@@ -42,6 +42,8 @@ export const shouldCreateUploads = function () {
 
     it('should resolve to file', async function () {
       const newFile = await this.datastore.create(file)
+      assert.ok(newFile.storage.path)
+      assert.ok(newFile.storage.type)
       assert.equal(newFile instanceof Upload, true)
     })