@autonomys/auto-drive 1.1.4 → 1.2.1

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) {
@@ -52,38 +19,42 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadFile = exports.uploadFileWithinFolderUpload = exports.uploadFolderFromInput = exports.uploadFile = exports.uploadFileFromInput = void 0;
+exports.getSubscriptionInfo = exports.getPendingCredits = exports.downloadFile = exports.uploadFileWithinFolderUpload = exports.uploadFolderFromInput = exports.uploadObjectAsJSON = exports.uploadFile = exports.uploadFileFromInput = void 0;
 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;
@@ -158,50 +131,80 @@ exports.uploadFileFromInput = uploadFileFromInput;
  * @param {string} [options.password] - The password for encryption (optional).
  * @param {boolean} [options.compression=true] - Whether to compress the file (optional).
  * @param {number} [uploadChunkSize] - The size of each chunk to upload (optional).
- * @returns {PromisedObservable<UploadFileStatus>} - An observable that emits the upload status.
+ * @returns {Promise<string>} - The CID of the uploaded file.
  * @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 object as a JSON file to the server.
+ *
+ * This function serializes the provided object to a JSON string,
+ * and then uploads the JSON string as a file to the server.
+ *
+ * @param {AutoDriveApi} api - The API instance used to send requests.
+ * @param {File | GenericFile} file - The file to be uploaded, which can be a File or a GenericFile.
+ * @param {UploadFileOptions} options - Options for the upload process.
+ * @param {string} [options.password] - The password for encryption (optional).
+ * @param {boolean} [options.compression=true] - Whether to compress the file (optional).
+ * @param {number} [uploadChunkSize] - The size of each chunk to upload (optional).
+ * @returns {Promise<string>} - The CID of the uploaded file.
+ * @throws {Error} - Throws an error if the upload fails at any stage.
+ */
+const uploadObjectAsJSON = (api_1, object_1, name_1, ...args_1) => __awaiter(void 0, [api_1, object_1, name_1, ...args_1], void 0, function* (api, object, name, options = {}, uploadChunkSize) {
+    try {
+        const json = Buffer.from(JSON.stringify(object));
+        return (0, exports.uploadFile)(api, {
+            read: () => (0, async_1.bufferToIterable)(json),
+            name: name || 'object.json',
+            mimeType: 'application/json',
+            size: json.length,
+        }, options, uploadChunkSize);
+    }
+    catch (e) {
+        throw new Error('Failed to serialize object to JSON');
+    }
+});
+exports.uploadObjectAsJSON = uploadObjectAsJSON;
 /**
  * Uploads an entire folder to the server.
  *
@@ -219,7 +222,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 +238,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 +274,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 +296,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) {
@@ -317,3 +315,16 @@ const downloadFile = (api, cid, password) => __awaiter(void 0, void 0, void 0, f
     return iterable;
 });
 exports.downloadFile = downloadFile;
+const getPendingCredits = (api) => __awaiter(void 0, void 0, void 0, function* () {
+    const me = yield index_1.apiCalls.getMe(api);
+    return {
+        upload: me.subscription.pendingUploadCredits,
+        download: me.subscription.pendingDownloadCredits,
+    };
+});
+exports.getPendingCredits = getPendingCredits;
+const getSubscriptionInfo = (api) => __awaiter(void 0, void 0, void 0, function* () {
+    const me = yield index_1.apiCalls.getMe(api);
+    return me.subscription;
+});
+exports.getSubscriptionInfo = getSubscriptionInfo;

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"}

package/dist/fs/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) {
@@ -50,10 +17,10 @@ const fs_1 = __importDefault(require("fs"));
 const mime_types_1 = __importDefault(require("mime-types"));
 const index_js_1 = require("../api/index.js");
 const folderTree_js_1 = require("../api/models/folderTree.js");
+const uploads_js_1 = require("../api/models/uploads.js");
 const wrappers_js_1 = require("../api/wrappers.js");
 const index_js_2 = require("../utils/index.js");
 const misc_js_1 = require("../utils/misc.js");
-const observable_js_1 = require("../utils/observable.js");
 const utils_js_1 = require("./utils.js");
 /**
  * Uploads a file to the server with optional encryption and compression.
@@ -73,7 +40,7 @@ const utils_js_1 = require("./utils.js");
  * @throws {Error} - Throws an error if the upload fails at any stage.
  */
 const uploadFileFromFilepath = (api, filePath, options = {}, uploadChunkSize) => {
-    const { password = undefined, compression = true } = options;
+    const { password = undefined, compression = true, onProgress } = options;
     const name = filePath.split('/').pop();
     return (0, wrappers_js_1.uploadFile)(api, {
         read: () => fs_1.default.createReadStream(filePath),
@@ -83,6 +50,7 @@ const uploadFileFromFilepath = (api, filePath, options = {}, uploadChunkSize) =>
     }, {
         password,
         compression,
+        onProgress,
     }, uploadChunkSize);
 };
 exports.uploadFileFromFilepath = uploadFileFromFilepath;
@@ -104,7 +72,7 @@ exports.uploadFileFromFilepath = uploadFileFromFilepath;
  * @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.
  */
-const uploadFolderFromFolderPath = (api_1, folderPath_1, ...args_1) => __awaiter(void 0, [api_1, folderPath_1, ...args_1], void 0, function* (api, folderPath, { uploadChunkSize, password } = {}) {
+const uploadFolderFromFolderPath = (api_1, folderPath_1, ...args_1) => __awaiter(void 0, [api_1, folderPath_1, ...args_1], void 0, function* (api, folderPath, { uploadChunkSize, password, onProgress, } = {}) {
     const files = yield (0, utils_js_1.getFiles)(folderPath);
     const fileTree = (0, folderTree_js_1.constructFromFileSystemEntries)(files);
     if (password) {
@@ -119,38 +87,38 @@ const uploadFolderFromFolderPath = (api_1, folderPath_1, ...args_1) => __awaiter
         }, {
             password,
             compression: true,
+            onProgress: (progressInPercentage) => {
+                onProgress === null || onProgress === void 0 ? void 0 : onProgress((0, misc_js_1.progressToPercentage)(progressInPercentage, zipBlob.size));
+            },
         });
     }
-    return new observable_js_1.PromisedObservable((subscriber) => __awaiter(void 0, void 0, void 0, function* () {
-        const { CompressionAlgorithm } = yield Promise.resolve().then(() => __importStar(require('@autonomys/auto-dag-data')));
-        const folderUpload = yield index_js_1.apiCalls.createFolderUpload(api, {
-            fileTree,
-            uploadOptions: {
-                compression: {
-                    algorithm: CompressionAlgorithm.ZLIB,
-                    level: 9,
-                },
+    const folderUpload = yield index_js_1.apiCalls.createFolderUpload(api, {
+        fileTree,
+        uploadOptions: {
+            compression: {
+                algorithm: uploads_js_1.CompressionAlgorithm.ZLIB,
+                level: 9,
             },
-        });
-        const genericFiles = files.map((file) => ({
-            read: () => fs_1.default.createReadStream(file),
-            name: file.split('/').pop(),
-            mimeType: mime_types_1.default.lookup(file.split('/').pop()) || undefined,
-            size: fs_1.default.statSync(file).size,
-            path: file,
-        }));
-        const totalSize = genericFiles.reduce((acc, file) => acc + file.size, 0);
-        let progress = 0;
-        for (const file of genericFiles) {
-            yield (0, wrappers_js_1.uploadFileWithinFolderUpload)(api, folderUpload.id, file, uploadChunkSize).forEach((e) => subscriber.next({
-                type: 'folder',
-                progress: (0, misc_js_1.progressToPercentage)(progress + e.uploadBytes, totalSize),
-            }));
-            progress += file.size;
-        }
-        const result = yield index_js_1.apiCalls.completeUpload(api, { uploadId: folderUpload.id });
-        subscriber.next({ type: 'folder', progress: 100, cid: result.cid });
-        subscriber.complete();
+        },
+    });
+    const genericFiles = files.map((file) => ({
+        read: () => fs_1.default.createReadStream(file),
+        name: file.split('/').pop(),
+        mimeType: mime_types_1.default.lookup(file.split('/').pop()) || undefined,
+        size: fs_1.default.statSync(file).size,
+        path: file,
     }));
+    const totalSize = genericFiles.reduce((acc, file) => acc + file.size, 0);
+    let progress = 0;
+    for (const file of genericFiles) {
+        yield (0, wrappers_js_1.uploadFileWithinFolderUpload)(api, folderUpload.id, file, uploadChunkSize, {
+            onProgress: (uploadedBytes) => {
+                onProgress === null || onProgress === void 0 ? void 0 : onProgress((0, misc_js_1.progressToPercentage)(progress + uploadedBytes, totalSize));
+            },
+        });
+        progress += file.size;
+    }
+    const result = yield index_js_1.apiCalls.completeUpload(api, { uploadId: folderUpload.id });
+    return result.cid;
 });
 exports.uploadFolderFromFolderPath = uploadFolderFromFolderPath;

package/dist/utils/async.d.ts

@@ -2,4 +2,5 @@ import { Buffer } from 'buffer';
 export declare const asyncByChunk: (asyncIterable: AsyncIterable<Buffer>, chunkSize: number) => AsyncGenerator<Buffer<ArrayBuffer>, void, unknown>;
 export declare const asyncFromStream: (stream: ReadableStream<Uint8Array>) => AsyncIterable<Buffer>;
 export declare const fileToIterable: (file: File | Blob) => AsyncIterable<Buffer>;
+export declare const bufferToIterable: (buffer: Buffer) => AsyncIterable<Buffer>;
 //# sourceMappingURL=async.d.ts.map

package/dist/utils/async.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"async.d.ts","sourceRoot":"","sources":["../../src/utils/async.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE/B,eAAO,MAAM,YAAY,kBACR,aAAa,CAAC,MAAM,CAAC,aACzB,MAAM,uDAelB,CAAA;AAED,eAAO,MAAM,eAAe,WAClB,cAAc,CAAC,UAAU,CAAC,KACjC,aAAa,CAAC,MAAM,CAOtB,CAAA;AAED,eAAO,MAAM,cAAc,SAA0B,IAAI,GAAG,IAAI,KAAG,aAAa,CAAC,MAAM,CAKtF,CAAA"}
+{"version":3,"file":"async.d.ts","sourceRoot":"","sources":["../../src/utils/async.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE/B,eAAO,MAAM,YAAY,kBACR,aAAa,CAAC,MAAM,CAAC,aACzB,MAAM,uDAelB,CAAA;AAED,eAAO,MAAM,eAAe,WAClB,cAAc,CAAC,UAAU,CAAC,KACjC,aAAa,CAAC,MAAM,CAOtB,CAAA;AAED,eAAO,MAAM,cAAc,SAA0B,IAAI,GAAG,IAAI,KAAG,aAAa,CAAC,MAAM,CAKtF,CAAA;AAED,eAAO,MAAM,gBAAgB,WAA4B,MAAM,KAAG,aAAa,CAAC,MAAM,CAErF,CAAA"}

package/dist/utils/async.js

@@ -20,7 +20,7 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
     function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileToIterable = exports.asyncFromStream = exports.asyncByChunk = void 0;
+exports.bufferToIterable = exports.fileToIterable = exports.asyncFromStream = exports.asyncByChunk = void 0;
 const buffer_1 = require("buffer");
 const asyncByChunk = function (asyncIterable, chunkSize) {
     return __asyncGenerator(this, arguments, function* () {
@@ -71,3 +71,9 @@ const fileToIterable = function (file) {
     });
 };
 exports.fileToIterable = fileToIterable;
+const bufferToIterable = function (buffer) {
+    return __asyncGenerator(this, arguments, function* () {
+        yield yield __await(buffer);
+    });
+};
+exports.bufferToIterable = bufferToIterable;

package/dist/utils/autohash.d.ts

@@ -0,0 +1,17 @@
+import type { CID } from 'multiformats/cid';
+interface AutoCIDTransformers {
+    stringToCid: (cid: string) => CID;
+    blake3HashFromCid: (cid: CID) => Uint8Array;
+}
+export declare class AutoCID {
+    private readonly cid;
+    private readonly tools;
+    constructor(cid: string, tools: AutoCIDTransformers);
+    static create(cid: string): Promise<AutoCID>;
+    get asString(): string;
+    get asCID(): CID;
+    get asBlake3Hash(): Buffer;
+}
+export declare const getToolsFromAutoDagData: Promise<AutoCIDTransformers>;
+export {};
+//# sourceMappingURL=autohash.d.ts.map

package/dist/utils/autohash.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"autohash.d.ts","sourceRoot":"","sources":["../../src/utils/autohash.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAE3C,UAAU,mBAAmB;IAC3B,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAA;IACjC,iBAAiB,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,UAAU,CAAA;CAC5C;AAED,qBAAa,OAAO;IAEhB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,KAAK;gBADL,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,mBAAmB;WAGhC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKlD,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,KAAK,IAAI,GAAG,CAEf;IAED,IAAI,YAAY,IAAI,MAAM,CAEzB;CACF;AAED,eAAO,MAAM,uBAAuB,EAAE,OAAO,CAAC,mBAAmB,CAO/D,CAAA"}