@autonomys/auto-drive 1.1.4 → 1.2.0

package/README.md

@@ -25,43 +25,40 @@ yarn add @autonomys/auto-drive
 Here is an example of how to use the `uploadFileFromFilepath` method to upload a file with optional encryption and compression:
 
 ```typescript
-import { uploadFileFromFilepath } from '@autonomys/auto-drive'
+import { uploadFileFromFilepath,createAutoDriveApi } from '@autonomys/auto-drive'
 
 const api = createAutoDriveApi({ apiKey: 'your-api-key' }) // Initialize your API instance with API key
 const filePath = 'path/to/your/file.txt' // Specify the path to your file
 const options = {
   password: 'your-encryption-password', // Optional: specify a password for encryption
   compression: true,
+  // an optional callback useful for large file uploads
+  onProgress?: (progress: number) => {
+    console.log(`The upload is completed is ${progress}% completed`)
+  }
 }
 
-const uploadObservable = uploadFileFromFilepath(api, filePath, options)
-  .then(() => {
-    console.log('File uploaded successfully!')
-  })
-  .catch((error) => {
-    console.error('Error uploading file:', error)
-  })
+const cid = await uploadFileFromFilepath(api, filePath, options)
+
+console.log(`The file is uploaded and its cid is ${cid}`)
 ```
 
 ### How to upload [File](https://developer.mozilla.org/en-US/docs/Web/API/File) interface
 
 ```typescript
-import { uploadFileFromFilepath } from '@autonomys/auto-drive'
+import { uploadFileFromInput, createAutoDriveApi } from '@autonomys/auto-drive'
 
 const api = createAutoDriveApi({ apiKey: 'your-api-key' }) // Initialize your API instance with API key
-const filePath = 'path/to/your/file.txt' // Specify the path to your file
+
+// e.g Get File from object from HTML event
+const file: File = e.target.value // Substitute with your file
 const options = {
   password: 'your-encryption-password', // Optional: specify a password for encryption
   compression: true,
 }
+const cid = await uploadFileFromInput(api, file, options)
 
-const uploadObservable = uploadFile(api, filePath, options)
-  .then(() => {
-    console.log('File uploaded successfully!')
-  })
-  .catch((error) => {
-    console.error('Error uploading file:', error)
-  })
+console.log(`The file is uploaded and its cid is ${cid}`)
 ```
 
 ### How to upload a file from a custom interface?
@@ -83,7 +80,7 @@ For more info about asynn generator visit [this website](https://developer.mozil
 You could upload any file that could be represented in that way. For example, uploading a file as a `Buffer`
 
 ```typescript
-import { uploadFile } from '@autonomys/auto-drive'
+import { createAutoDriveApi, uploadFile } from '@autonomys/auto-drive'
 
 const api = createAutoDriveApi({ apiKey: 'your-api-key' }) // Initialize your API instance with API key
 const buffer = Buffer.from(...);
@@ -100,21 +97,21 @@ const genericFile = {
 const options = {
   password: 'your-encryption-password', // Optional: specify a password for encryption
   compression: true,
+  // an optional callback useful for large file uploads
+  onProgress?: (progress: number) => {
+    console.log(`The upload is completed is ${progress}% completed`)
+  }
 }
 
-const uploadObservable = uploadFile(api, genericFile, options)
-  .then(() => {
-    console.log('File uploaded successfully!')
-  })
-  .catch((error) => {
-    console.error('Error uploading file:', error)
-  })
+const cid = uploadFile(api, genericFile, options)
+
+console.log(`The file is uploaded and its cid is ${cid}`)
 ```
 
 ### How to upload a folder from folder? (Not available in browser)
 
 ```ts
-import { uploadFolderFromFolderPath } from '@autonomys/auto-drive'
+import { createAutoDriveApi, uploadFolderFromFolderPath } from '@autonomys/auto-drive'
 
 const api = createAutoDriveApi({ apiKey: 'your-api-key' }) // Initialize your API instance with API key
 const folderPath = 'path/to/your/folder' // Specify the path to your folder
@@ -122,74 +119,31 @@ const folderPath = 'path/to/your/folder' // Specify the path to your folder
 const options = {
   uploadChunkSize: 1024 * 1024, // Optional: specify the chunk size for uploads
   password: 'your-encryption-password', // Optional: If folder is encrypted
+  // an optional callback useful for large file uploads
+  onProgress: (progress: number) => {
+    console.log(`The upload is completed is ${progress}% completed`)
+  },
 }
 
-const uploadObservable = uploadFolderFromFolderPath(api, folderPath, options)
-```
-
-**Note: If a folder is tried to be encrypted a zip file would be generated and that file would be encrypted and uploaded.**
-
-### Handle observables
-
-Since uploads may take some time, specially in big-sized files. Uploads do implement `rxjs` observables so you could have feedback about the process or even show your users the progress of the upload.
-
-For that reason when file upload functions return `PromisedObservable<UploadFileStatus>`:
-
-```typescript
-export type UploadFileStatus = {
-  type: 'file'
-  progress: number
-  cid?: CID
-}
-```
-
-Being the cid only returned (and thus optional) when the upload is completed.
-
-Similarly, for folder uploads the functions return `PromisedObservable<UploadFolderStatus>`
-
-```ts
-export type UploadFolderStatus = {
-  type: 'folder'
-  progress: number
-  cid?: CID
-}
-```
-
-**e.g Show upload progress in React**
-
-```typescript
-const [progress, setProgress] = useState<number>(0)
+const folderCID = await uploadFolderFromFolderPath(api, folderPath, options)
 
-useEffect(async () => {
-  const finalStatus = await uploadFileFromInput(api, genericFile, options).forEach((status) => {
-    setProgress(status.progress)
-  })
-})
+console.log(`The folder is uploaded and its cid is ${folderCID}`)
 ```
 
-**e.g Ignore observables**
-
-Other users may want to not use the progress observability. For having a promise instead the field `promise` is a Promise that resolves into `UploadFileStatus` and `UploadFolderStatus` for files and folders respectively.
-
-e.g
-
-```ts
-const status = await uploadFileFromInput(api, genericFile, options).promise
-const cid = status.cid
-```
+**Note: If a folder is tried to be encrypted a zip file would be generated and that file would be encrypted and uploaded.**
 
 ### Example Usage of Download
 
 Here is an example of how to use the `downloadFile` method to download a file from the server:
 
 ```typescript
-import { downloadObject } from '@autonomys/auto-drive'
+import { createAutoDriveApi, downloadFile } from '@autonomys/auto-drive'
 
 const api = createAutoDriveApi({ apiKey: 'your-api-key' }) // Initialize your API instance with API key
 
 try {
   const cid = '..'
-  const stream = await downloadObject(api, { cid })
+  const stream = await downloadFile(api, cid)
   let file = Buffer.alloc(0)
   for await (const chunk of stream) {
     file = Buffer.concat([file, chunk])
@@ -205,16 +159,20 @@ try {
 Here is an example of how to use the `getRoots` method to retrieve the root directories:
 
 ```typescript
-import { createAutoDriveApi, downloadObject } from '@autonomys/auto-drive'
-import fs from 'fs'
+import { createAutoDriveApi, apiCalls, Scope } from '@autonomys/auto-drive'
 
 const api = createAutoDriveApi({ apiKey: 'your-api-key' }) // Initialize your API instance with API key
 
 try {
-  const stream = fs.createWriteStream('/path/to/file')
-  const asyncBuffer = await downloadObject(api, { cid })
-  for await (const buffer of asyncBuffer) {
-    stream.write(buffer)
+  const myFiles = await apiCalls.getRoots(api, {
+    scope: Scope.User,
+    limit: 100,
+    offset: 0,
+  })
+
+  console.log(`Retrieved ${myFiles.rows.length} files of ${myFiles.totalCount} total`)
+  for (const file of myFiles.rows) {
+    console.log(`${file.name} - ${file.headCid}: ${file.size}`)
   }
 } catch (error) {
   console.error('Error downloading file:', error)

package/dist/api/wrappers.d.ts

@@ -1,10 +1,9 @@
-import { PromisedObservable } from '../utils/observable';
 import { AutoDriveApi } from './connection';
 import { GenericFile, GenericFileWithinFolder } from './models/file';
-import { UploadChunksStatus, UploadFileStatus, UploadFolderStatus } from './models/uploads';
 export type UploadFileOptions = {
     password?: string;
     compression?: boolean;
+    onProgress?: (progress: number) => void;
 };
 /**
  * Uploads a file to the server with optional encryption and compression.
@@ -23,7 +22,7 @@ export type UploadFileOptions = {
  * @returns {PromisedObservable<UploadFileStatus>} - An observable that emits the upload status.
  * @throws {Error} - Throws an error if the upload fails at any stage.
  */
-export declare const uploadFileFromInput: (api: AutoDriveApi, file: File, options?: UploadFileOptions, uploadChunkSize?: number) => PromisedObservable<UploadFileStatus>;
+export declare const uploadFileFromInput: (api: AutoDriveApi, file: File, options?: UploadFileOptions, uploadChunkSize?: number) => Promise<string>;
 /**
  * Uploads a file to the server with optional encryption and compression.
  *
@@ -41,7 +40,7 @@ export declare const uploadFileFromInput: (api: AutoDriveApi, file: File, option
  * @returns {PromisedObservable<UploadFileStatus>} - An observable that emits the upload status.
  * @throws {Error} - Throws an error if the upload fails at any stage.
  */
-export declare const uploadFile: (api: AutoDriveApi, file: GenericFile, options?: UploadFileOptions, uploadChunkSize?: number) => PromisedObservable<UploadFileStatus>;
+export declare const uploadFile: (api: AutoDriveApi, file: GenericFile, options?: UploadFileOptions, uploadChunkSize?: number) => Promise<string>;
 /**
  * Uploads an entire folder to the server.
  *
@@ -59,10 +58,11 @@ export declare const uploadFile: (api: AutoDriveApi, file: GenericFile, options?
  * @returns {PromisedObservable<UploadFileStatus | UploadFolderStatus>} - An observable that emits the upload status.
  * @throws {Error} - Throws an error if the upload fails at any stage.
  */
-export declare const uploadFolderFromInput: (api: AutoDriveApi, fileList: FileList | File[], { uploadChunkSize, password }?: {
+export declare const uploadFolderFromInput: (api: AutoDriveApi, fileList: FileList | File[], { uploadChunkSize, password, onProgress, }?: {
     uploadChunkSize?: number;
     password?: string;
-}) => Promise<PromisedObservable<UploadFileStatus | UploadFolderStatus>>;
+    onProgress?: (progress: number) => void;
+}) => Promise<string>;
 /**
  * Uploads a file within an existing folder upload session.
  *
@@ -72,7 +72,7 @@ export declare const uploadFolderFromInput: (api: AutoDriveApi, fileList: FileLi
  *
  * @returns {Promise<void>} A promise that resolves when the file upload is complete.
  */
-export declare const uploadFileWithinFolderUpload: (api: AutoDriveApi, uploadId: string, file: GenericFileWithinFolder, uploadChunkSize?: number) => PromisedObservable<UploadChunksStatus>;
+export declare const uploadFileWithinFolderUpload: (api: AutoDriveApi, uploadId: string, file: GenericFileWithinFolder, uploadChunkSize?: number, options?: Pick<UploadFileOptions, "onProgress">) => Promise<string>;
 /**
  * Downloads a file from the AutoDrive service.
  *

package/dist/api/wrappers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrappers.d.ts","sourceRoot":"","sources":["../../src/api/wrappers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAEpE,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAE3F,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB,CAAA;AAuBD;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,mBAAmB,QACzB,YAAY,QACX,IAAI,YACD,iBAAiB,oBACR,MAAM,KACvB,kBAAkB,CAAC,gBAAgB,CAgDrC,CAAA;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,UAAU,QAChB,YAAY,QACX,WAAW,YACR,iBAAiB,oBACR,MAAM,KACvB,kBAAkB,CAAC,gBAAgB,CAiDrC,CAAA;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,qBAAqB,QAC3B,YAAY,YACP,QAAQ,GAAG,IAAI,EAAE,kCACI;IAAE,eAAe,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,KAC7E,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,GAAG,kBAAkB,CAAC,CA8DnE,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,4BAA4B,QAClC,YAAY,YACP,MAAM,QACV,uBAAuB,oBACX,MAAM,KACvB,kBAAkB,CAAC,kBAAkB,CAkBvC,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,QAClB,YAAY,OACZ,MAAM,aACA,MAAM,KAChB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAwB/B,CAAA"}
+{"version":3,"file":"wrappers.d.ts","sourceRoot":"","sources":["../../src/api/wrappers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAGpE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAA;CACxC,CAAA;AA6BD;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,mBAAmB,QACzB,YAAY,QACX,IAAI,YACD,iBAAiB,oBACR,MAAM,KACvB,OAAO,CAAC,MAAM,CAgDhB,CAAA;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,UAAU,QAChB,YAAY,QACX,WAAW,YACR,iBAAiB,oBACR,MAAM,KACvB,OAAO,CAAC,MAAM,CA+ChB,CAAA;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,qBAAqB,QAC3B,YAAY,YACP,QAAQ,GAAG,IAAI,EAAE,+CAKxB;IAAE,eAAe,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAA;CAAE,KAC1F,OAAO,CAAC,MAAM,CA2DhB,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,4BAA4B,QAClC,YAAY,YACP,MAAM,QACV,uBAAuB,oBACX,MAAM,YACf,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,KAC7C,OAAO,CAAC,MAAM,CAchB,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,QAClB,YAAY,OACZ,MAAM,aACA,MAAM,KAChB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAwB/B,CAAA"}

package/dist/api/wrappers.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -56,34 +23,38 @@ exports.downloadFile = exports.uploadFileWithinFolderUpload = exports.uploadFold
 const mime_types_1 = __importDefault(require("mime-types"));
 const async_1 = require("../utils/async");
 const misc_1 = require("../utils/misc");
-const observable_1 = require("../utils/observable");
 const index_1 = require("./calls/index");
 const folderTree_1 = require("./models/folderTree");
 const UPLOAD_FILE_CHUNK_SIZE = 1024 * 1024;
-const uploadFileChunks = (api, fileUploadId, asyncIterable, uploadChunkSize = UPLOAD_FILE_CHUNK_SIZE) => {
-    return new observable_1.PromisedObservable((subscriber) => __awaiter(void 0, void 0, void 0, function* () {
+const uploadFileChunks = (api, fileUploadId, asyncIterable, uploadChunkSize = UPLOAD_FILE_CHUNK_SIZE, onProgress) => {
+    return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, e_1, _b, _c;
-        let index = 0;
-        let uploadBytes = 0;
         try {
-            for (var _d = true, _e = __asyncValues((0, async_1.asyncByChunk)(asyncIterable, uploadChunkSize)), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
-                _c = _f.value;
-                _d = false;
-                const chunk = _c;
-                yield index_1.apiCalls.uploadFileChunk(api, { uploadId: fileUploadId, chunk, index });
-                uploadBytes += chunk.length;
-                subscriber.next({ uploadBytes });
-                index++;
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
+            let index = 0;
+            let uploadBytes = 0;
             try {
-                if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
+                for (var _d = true, _e = __asyncValues((0, async_1.asyncByChunk)(asyncIterable, uploadChunkSize)), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
+                    _c = _f.value;
+                    _d = false;
+                    const chunk = _c;
+                    yield index_1.apiCalls.uploadFileChunk(api, { uploadId: fileUploadId, chunk, index });
+                    uploadBytes += chunk.length;
+                    onProgress === null || onProgress === void 0 ? void 0 : onProgress(uploadBytes);
+                    index++;
+                }
             }
-            finally { if (e_1) throw e_1.error; }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            resolve();
+        }
+        catch (e) {
+            reject(e);
         }
-        subscriber.complete();
     }));
 };
 /**
@@ -105,8 +76,8 @@ const uploadFileChunks = (api, fileUploadId, asyncIterable, uploadChunkSize = UP
  */
 const uploadFileFromInput = (api, file, options = {}, uploadChunkSize) => {
     const { password = undefined, compression = true } = options;
-    return new observable_1.PromisedObservable((subscriber) => __awaiter(void 0, void 0, void 0, function* () {
-        const { stringToCid, compressFile, CompressionAlgorithm, encryptFile, EncryptionAlgorithm } = yield Promise.resolve().then(() => __importStar(require('@autonomys/auto-dag-data')));
+    return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
+        const { compressFile, CompressionAlgorithm, encryptFile, EncryptionAlgorithm } = yield import('@autonomys/auto-dag-data');
         let asyncIterable = (0, async_1.fileToIterable)(file);
         if (compression) {
             asyncIterable = compressFile(asyncIterable, {
@@ -137,10 +108,12 @@ const uploadFileFromInput = (api, file, options = {}, uploadChunkSize) => {
             filename: file.name,
             uploadOptions,
         });
-        yield uploadFileChunks(api, fileUpload.id, asyncIterable, uploadChunkSize).forEach((e) => subscriber.next({ type: 'file', progress: (0, misc_1.progressToPercentage)(e.uploadBytes, file.size) }));
+        yield uploadFileChunks(api, fileUpload.id, asyncIterable, uploadChunkSize, (bytes) => {
+            var _a;
+            (_a = options.onProgress) === null || _a === void 0 ? void 0 : _a.call(options, (0, misc_1.progressToPercentage)(bytes, file.size));
+        });
         const result = yield index_1.apiCalls.completeUpload(api, { uploadId: fileUpload.id });
-        subscriber.next({ type: 'file', progress: 100, cid: result.cid });
-        subscriber.complete();
+        resolve(result.cid);
     }));
 };
 exports.uploadFileFromInput = uploadFileFromInput;
@@ -161,46 +134,46 @@ exports.uploadFileFromInput = uploadFileFromInput;
  * @returns {PromisedObservable<UploadFileStatus>} - An observable that emits the upload status.
  * @throws {Error} - Throws an error if the upload fails at any stage.
  */
-const uploadFile = (api, file, options = {}, uploadChunkSize) => {
+const uploadFile = (api_1, file_1, ...args_1) => __awaiter(void 0, [api_1, file_1, ...args_1], void 0, function* (api, file, options = {}, uploadChunkSize) {
     const { password = undefined, compression = true } = options;
-    return new observable_1.PromisedObservable((subscriber) => __awaiter(void 0, void 0, void 0, function* () {
-        const { stringToCid, compressFile, CompressionAlgorithm, encryptFile, EncryptionAlgorithm } = yield Promise.resolve().then(() => __importStar(require('@autonomys/auto-dag-data')));
-        let asyncIterable = file.read();
-        if (compression) {
-            asyncIterable = compressFile(asyncIterable, {
+    const { compressFile, CompressionAlgorithm, encryptFile, EncryptionAlgorithm } = yield import('@autonomys/auto-dag-data');
+    let asyncIterable = file.read();
+    if (compression) {
+        asyncIterable = compressFile(asyncIterable, {
+            level: 9,
+            algorithm: CompressionAlgorithm.ZLIB,
+        });
+    }
+    if (password) {
+        asyncIterable = encryptFile(asyncIterable, password, {
+            algorithm: EncryptionAlgorithm.AES_256_GCM,
+        });
+    }
+    const uploadOptions = {
+        compression: compression
+            ? {
                 level: 9,
                 algorithm: CompressionAlgorithm.ZLIB,
-            });
-        }
-        if (password) {
-            asyncIterable = encryptFile(asyncIterable, password, {
+            }
+            : undefined,
+        encryption: password
+            ? {
                 algorithm: EncryptionAlgorithm.AES_256_GCM,
-            });
-        }
-        const uploadOptions = {
-            compression: compression
-                ? {
-                    level: 9,
-                    algorithm: CompressionAlgorithm.ZLIB,
-                }
-                : undefined,
-            encryption: password
-                ? {
-                    algorithm: EncryptionAlgorithm.AES_256_GCM,
-                }
-                : undefined,
-        };
-        const fileUpload = yield index_1.apiCalls.createFileUpload(api, {
-            mimeType: mime_types_1.default.lookup(file.name) || undefined,
-            filename: file.name,
-            uploadOptions,
-        });
-        yield uploadFileChunks(api, fileUpload.id, asyncIterable, uploadChunkSize).forEach((e) => subscriber.next({ type: 'file', progress: (0, misc_1.progressToPercentage)(e.uploadBytes, file.size) }));
-        const result = yield index_1.apiCalls.completeUpload(api, { uploadId: fileUpload.id });
-        subscriber.next({ type: 'file', progress: 100, cid: result.cid });
-        subscriber.complete();
-    }));
-};
+            }
+            : undefined,
+    };
+    const fileUpload = yield index_1.apiCalls.createFileUpload(api, {
+        mimeType: mime_types_1.default.lookup(file.name) || undefined,
+        filename: file.name,
+        uploadOptions,
+    });
+    yield uploadFileChunks(api, fileUpload.id, asyncIterable, uploadChunkSize, (bytes) => {
+        var _a;
+        (_a = options.onProgress) === null || _a === void 0 ? void 0 : _a.call(options, (0, misc_1.progressToPercentage)(bytes, file.size));
+    });
+    const result = yield index_1.apiCalls.completeUpload(api, { uploadId: fileUpload.id });
+    return result.cid;
+});
 exports.uploadFile = uploadFile;
 /**
  * Uploads an entire folder to the server.
@@ -219,7 +192,7 @@ exports.uploadFile = uploadFile;
  * @returns {PromisedObservable<UploadFileStatus | UploadFolderStatus>} - An observable that emits the upload status.
  * @throws {Error} - Throws an error if the upload fails at any stage.
  */
-const uploadFolderFromInput = (api_1, fileList_1, ...args_1) => __awaiter(void 0, [api_1, fileList_1, ...args_1], void 0, function* (api, fileList, { uploadChunkSize, password } = {}) {
+const uploadFolderFromInput = (api_1, fileList_1, ...args_1) => __awaiter(void 0, [api_1, fileList_1, ...args_1], void 0, function* (api, fileList, { uploadChunkSize, password, onProgress, } = {}) {
     const files = fileList instanceof FileList ? Array.from(fileList) : fileList;
     const fileTree = (0, folderTree_1.constructFromInput)(files);
     // If password is provided, we zip the files and upload the zip file
@@ -235,34 +208,31 @@ const uploadFolderFromInput = (api_1, fileList_1, ...args_1) => __awaiter(void 0
         }, {
             password,
             compression: true,
+            onProgress,
         });
     }
-    return new observable_1.PromisedObservable((subscriber) => __awaiter(void 0, void 0, void 0, function* () {
-        // Otherwise, we upload the files as a folder w/o compression or encryption
-        const folderUpload = yield index_1.apiCalls.createFolderUpload(api, {
-            fileTree,
+    // Otherwise, we upload the files as a folder w/o compression or encryption
+    const folderUpload = yield index_1.apiCalls.createFolderUpload(api, {
+        fileTree,
+    });
+    let currentBytesUploaded = 0;
+    const totalSize = files.reduce((acc, file) => acc + file.size, 0);
+    for (const file of files) {
+        yield (0, exports.uploadFileWithinFolderUpload)(api, folderUpload.id, {
+            read: () => (0, async_1.fileToIterable)(file),
+            name: file.name,
+            mimeType: mime_types_1.default.lookup(file.name) || undefined,
+            size: file.size,
+            path: file.webkitRelativePath,
+        }, uploadChunkSize, {
+            onProgress: (progress) => {
+                onProgress === null || onProgress === void 0 ? void 0 : onProgress((0, misc_1.progressToPercentage)(currentBytesUploaded + progress, totalSize));
+            },
         });
-        let currentBytesUploaded = 0;
-        const totalSize = files.reduce((acc, file) => acc + file.size, 0);
-        for (const file of files) {
-            yield (0, exports.uploadFileWithinFolderUpload)(api, folderUpload.id, {
-                read: () => (0, async_1.fileToIterable)(file),
-                name: file.name,
-                mimeType: mime_types_1.default.lookup(file.name) || undefined,
-                size: file.size,
-                path: file.webkitRelativePath,
-            }, uploadChunkSize).forEach((e) => {
-                subscriber.next({
-                    type: 'folder',
-                    progress: (0, misc_1.progressToPercentage)(currentBytesUploaded + e.uploadBytes, totalSize),
-                });
-            });
-            currentBytesUploaded += file.size;
-        }
-        const result = yield index_1.apiCalls.completeUpload(api, { uploadId: folderUpload.id });
-        subscriber.next({ type: 'folder', progress: 100, cid: result.cid });
-        subscriber.complete();
-    }));
+        currentBytesUploaded += file.size;
+    }
+    const result = yield index_1.apiCalls.completeUpload(api, { uploadId: folderUpload.id });
+    return result.cid;
 });
 exports.uploadFolderFromInput = uploadFolderFromInput;
 /**
@@ -274,20 +244,18 @@ exports.uploadFolderFromInput = uploadFolderFromInput;
  *
  * @returns {Promise<void>} A promise that resolves when the file upload is complete.
  */
-const uploadFileWithinFolderUpload = (api, uploadId, file, uploadChunkSize) => {
-    return new observable_1.PromisedObservable((subscriber) => __awaiter(void 0, void 0, void 0, function* () {
-        const fileUpload = yield index_1.apiCalls.createFileUploadWithinFolderUpload(api, {
-            uploadId,
-            name: file.name,
-            mimeType: file.mimeType,
-            relativeId: file.path,
-            uploadOptions: {},
-        });
-        yield uploadFileChunks(api, fileUpload.id, file.read(), uploadChunkSize).forEach((e) => subscriber.next({ uploadBytes: e.uploadBytes }));
-        yield index_1.apiCalls.completeUpload(api, { uploadId: fileUpload.id });
-        subscriber.complete();
-    }));
-};
+const uploadFileWithinFolderUpload = (api_1, uploadId_1, file_1, uploadChunkSize_1, ...args_1) => __awaiter(void 0, [api_1, uploadId_1, file_1, uploadChunkSize_1, ...args_1], void 0, function* (api, uploadId, file, uploadChunkSize, options = {}) {
+    const fileUpload = yield index_1.apiCalls.createFileUploadWithinFolderUpload(api, {
+        uploadId,
+        name: file.name,
+        mimeType: file.mimeType,
+        relativeId: file.path,
+        uploadOptions: {},
+    });
+    yield uploadFileChunks(api, fileUpload.id, file.read(), uploadChunkSize, options.onProgress);
+    const result = yield index_1.apiCalls.completeUpload(api, { uploadId: fileUpload.id });
+    return result.cid;
+});
 exports.uploadFileWithinFolderUpload = uploadFileWithinFolderUpload;
 /**
  * Downloads a file from the AutoDrive service.
@@ -298,7 +266,7 @@ exports.uploadFileWithinFolderUpload = uploadFileWithinFolderUpload;
  */
 const downloadFile = (api, cid, password) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
-    const { decompressFile, CompressionAlgorithm, EncryptionAlgorithm, decryptFile } = yield Promise.resolve().then(() => __importStar(require('@autonomys/auto-dag-data')));
+    const { decompressFile, CompressionAlgorithm, EncryptionAlgorithm, decryptFile } = yield import('@autonomys/auto-dag-data');
     const metadata = yield index_1.apiCalls.getObjectMetadata(api, { cid });
     let iterable = (0, async_1.asyncFromStream)(yield index_1.apiCalls.downloadObject(api, { cid }));
     if ((_a = metadata.uploadOptions) === null || _a === void 0 ? void 0 : _a.encryption) {

package/dist/fs/wrappers.d.ts

@@ -1,7 +1,5 @@
 import { AutoDriveApi } from '../api/connection.js';
-import { UploadFileStatus, UploadFolderStatus } from '../api/models/uploads.js';
 import { UploadFileOptions } from '../api/wrappers.js';
-import { PromisedObservable } from '../utils/observable.js';
 /**
  * Uploads a file to the server with optional encryption and compression.
  *
@@ -19,7 +17,7 @@ import { PromisedObservable } from '../utils/observable.js';
  * @returns {PromisedObservable<UploadFileStatus>} - An observable that emits the upload status.
  * @throws {Error} - Throws an error if the upload fails at any stage.
  */
-export declare const uploadFileFromFilepath: (api: AutoDriveApi, filePath: string, options?: UploadFileOptions, uploadChunkSize?: number) => PromisedObservable<UploadFileStatus>;
+export declare const uploadFileFromFilepath: (api: AutoDriveApi, filePath: string, options?: UploadFileOptions, uploadChunkSize?: number) => Promise<string>;
 /**
  * Uploads an entire folder to the server.
  *
@@ -38,8 +36,9 @@ export declare const uploadFileFromFilepath: (api: AutoDriveApi, filePath: strin
  * @returns {Promise<PromisedObservable<UploadFileStatus | UploadFolderStatus>>} - A promise that resolves to an observable that tracks the upload progress.
  * @throws {Error} - Throws an error if the upload fails at any stage.
  */
-export declare const uploadFolderFromFolderPath: (api: AutoDriveApi, folderPath: string, { uploadChunkSize, password }?: {
+export declare const uploadFolderFromFolderPath: (api: AutoDriveApi, folderPath: string, { uploadChunkSize, password, onProgress, }?: {
     uploadChunkSize?: number;
     password?: string;
-}) => Promise<PromisedObservable<UploadFileStatus | UploadFolderStatus>>;
+    onProgress?: (progressInPercentage: number) => void;
+}) => Promise<Promise<string>>;
 //# sourceMappingURL=wrappers.d.ts.map

package/dist/fs/wrappers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrappers.d.ts","sourceRoot":"","sources":["../../src/fs/wrappers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAInD,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC/E,OAAO,EAAc,iBAAiB,EAAgC,MAAM,oBAAoB,CAAA;AAGhG,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAG3D;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,sBAAsB,QAC5B,YAAY,YACP,MAAM,YACP,iBAAiB,oBACR,MAAM,KACvB,kBAAkB,CAAC,gBAAgB,CAkBrC,CAAA;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,0BAA0B,QAChC,YAAY,cACL,MAAM,kCACa;IAAE,eAAe,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,KAC7E,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,GAAG,kBAAkB,CAAC,CA6DnE,CAAA"}
+{"version":3,"file":"wrappers.d.ts","sourceRoot":"","sources":["../../src/fs/wrappers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAKnD,OAAO,EAAc,iBAAiB,EAAgC,MAAM,oBAAoB,CAAA;AAKhG;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,sBAAsB,QAC5B,YAAY,YACP,MAAM,YACP,iBAAiB,oBACR,MAAM,KACvB,OAAO,CAAC,MAAM,CAmBhB,CAAA;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,0BAA0B,QAChC,YAAY,cACL,MAAM,+CAKf;IACD,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,KAAK,IAAI,CAAA;CACpD,KACA,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CA0DzB,CAAA"}