Merge pull request #201 from autonomys/update/enhance

Solve devExp issues
autonomys · Dec 11, 2024 · 9aa9862 · 9aa9862
2 parents 78863c8 + b2c74b1
commit 9aa9862
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/packages/auto-drive/src/api/models/file.ts b/packages/auto-drive/src/api/models/file.ts
@@ -3,5 +3,8 @@ export interface GenericFile {
   name: string
   mimeType?: string
   size: number
+}
+
+export interface GenericFileWithinFolder extends GenericFile {
   path: string
 }
diff --git a/packages/auto-drive/src/api/wrappers.ts b/packages/auto-drive/src/api/wrappers.ts
@@ -14,7 +14,7 @@ import {
   uploadFileChunk,
 } from './calls/index'
 import { AutoDriveApi } from './connection'
-import { GenericFile } from './models/file'
+import { GenericFile, GenericFileWithinFolder } from './models/file'
 import { constructFromInput, constructZipBlobFromTreeAndPaths } from './models/folderTree'
 import { UploadChunksStatus, UploadFileStatus, UploadFolderStatus } from './models/uploads'
 
@@ -64,9 +64,10 @@ const uploadFileChunks = (
 export const uploadFileFromInput = (
   api: AutoDriveApi,
   file: File,
-  { password, compression = true }: UploadFileOptions,
+  options: UploadFileOptions = {},
   uploadChunkSize?: number,
 ): PromisedObservable<UploadFileStatus> => {
+  const { password = undefined, compression = true } = options
   return new PromisedObservable<UploadFileStatus>(async (subscriber) => {
     const { stringToCid, compressFile, CompressionAlgorithm, encryptFile, EncryptionAlgorithm } =
       await import('@autonomys/auto-dag-data')
@@ -135,9 +136,11 @@ export const uploadFileFromInput = (
 export const uploadFile = (
   api: AutoDriveApi,
   file: GenericFile,
-  { password, compression = true }: UploadFileOptions,
+  options: UploadFileOptions = {},
   uploadChunkSize?: number,
 ): PromisedObservable<UploadFileStatus> => {
+  const { password = undefined, compression = true } = options
+
   return new PromisedObservable<UploadFileStatus>(async (subscriber) => {
     const { stringToCid, compressFile, CompressionAlgorithm, encryptFile, EncryptionAlgorithm } =
       await import('@autonomys/auto-dag-data')
@@ -226,7 +229,6 @@ export const uploadFolderFromInput = async (
         name: `${name}.zip`,
         mimeType: 'application/zip',
         size: zipBlob.size,
-        path: name,
       },
       {
         password,
@@ -284,7 +286,7 @@ export const uploadFolderFromInput = async (
 export const uploadFileWithinFolderUpload = (
   api: AutoDriveApi,
   uploadId: string,
-  file: GenericFile,
+  file: GenericFileWithinFolder,
   uploadChunkSize?: number,
 ): PromisedObservable<UploadChunksStatus> => {
   return new PromisedObservable<UploadChunksStatus>(async (subscriber) => {

diff --git a/packages/auto-drive/src/fs/wrappers.ts b/packages/auto-drive/src/fs/wrappers.ts
@@ -2,7 +2,7 @@ import fs from 'fs'
 import mime from 'mime-types'
 import { AutoDriveApi } from '../api/connection.js'
 import { completeUpload, createFolderUpload } from '../api/index.js'
-import { GenericFile } from '../api/models/file.js'
+import { GenericFileWithinFolder } from '../api/models/file.js'
 import { constructFromFileSystemEntries } from '../api/models/folderTree.js'
 import { UploadFileStatus, UploadFolderStatus } from '../api/models/uploads.js'
 import { uploadFile, UploadFileOptions, uploadFileWithinFolderUpload } from '../api/wrappers.js'
@@ -31,9 +31,10 @@ import { constructZipFromTreeAndFileSystemPaths, getFiles } from './utils.js'
 export const uploadFileFromFilepath = (
   api: AutoDriveApi,
   filePath: string,
-  { password, compression = true }: UploadFileOptions,
+  options: UploadFileOptions = {},
   uploadChunkSize?: number,
 ): PromisedObservable<UploadFileStatus> => {
+  const { password = undefined, compression = true } = options
   const name = filePath.split('/').pop()!
 
   return uploadFile(
@@ -43,7 +44,6 @@ export const uploadFileFromFilepath = (
       name,
       mimeType: mime.lookup(name) || undefined,
       size: fs.statSync(filePath).size,
-      path: filePath,
     },
     {
       password,
@@ -90,7 +90,6 @@ export const uploadFolderFromFolderPath = async (
         name: `${name}.zip`,
         mimeType: 'application/zip',
         size: zipBlob.size,
-        path: name,
       },
       {
         password,
@@ -111,7 +110,7 @@ export const uploadFolderFromFolderPath = async (
       },
     })
 
-    const genericFiles: GenericFile[] = files.map((file) => ({
+    const genericFiles: GenericFileWithinFolder[] = files.map((file) => ({
       read: () => fs.createReadStream(file),
       name: file.split('/').pop()!,
       mimeType: mime.lookup(file.split('/').pop()!) || undefined,