@autonomys/auto-drive 1.1.0 → 1.1.2

package/dist/api/models/file.d.ts

@@ -3,6 +3,8 @@ export interface GenericFile {
     name: string;
     mimeType?: string;
     size: number;
+}
+export interface GenericFileWithinFolder extends GenericFile {
     path: string;
 }
 //# sourceMappingURL=file.d.ts.map

package/dist/api/models/file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../../src/api/models/file.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,IAAI,IAAI,aAAa,CAAC,MAAM,CAAC,CAAA;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACb"}
+{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../../src/api/models/file.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,IAAI,IAAI,aAAa,CAAC,MAAM,CAAC,CAAA;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,uBAAwB,SAAQ,WAAW;IAC1D,IAAI,EAAE,MAAM,CAAA;CACb"}

package/dist/api/wrappers.d.ts

@@ -1,6 +1,6 @@
 import { PromisedObservable } from '../utils/observable';
 import { AutoDriveApi } from './connection';
-import { GenericFile } from './models/file';
+import { GenericFile, GenericFileWithinFolder } from './models/file';
 import { UploadChunksStatus, UploadFileStatus, UploadFolderStatus } from './models/uploads';
 export type UploadFileOptions = {
     password?: string;
@@ -23,7 +23,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, { password, compression }: UploadFileOptions, uploadChunkSize?: number) => PromisedObservable<UploadFileStatus>;
+export declare const uploadFileFromInput: (api: AutoDriveApi, file: File, options?: UploadFileOptions, uploadChunkSize?: number) => PromisedObservable<UploadFileStatus>;
 /**
  * Uploads a file to the server with optional encryption and compression.
  *
@@ -41,7 +41,7 @@ export declare const uploadFileFromInput: (api: AutoDriveApi, file: File, { pass
  * @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, { password, compression }: UploadFileOptions, uploadChunkSize?: number) => PromisedObservable<UploadFileStatus>;
+export declare const uploadFile: (api: AutoDriveApi, file: GenericFile, options?: UploadFileOptions, uploadChunkSize?: number) => PromisedObservable<UploadFileStatus>;
 /**
  * Uploads an entire folder to the server.
  *
@@ -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: GenericFile, uploadChunkSize?: number) => PromisedObservable<UploadChunksStatus>;
+export declare const uploadFileWithinFolderUpload: (api: AutoDriveApi, uploadId: string, file: GenericFileWithinFolder, uploadChunkSize?: number) => PromisedObservable<UploadChunksStatus>;
 /**
  * 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":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAWxD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,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,6BACwB,iBAAiB,oBACjC,MAAM,KACvB,kBAAkB,CAAC,gBAAgB,CA+CrC,CAAA;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,UAAU,QAChB,YAAY,QACX,WAAW,6BACiB,iBAAiB,oBACjC,MAAM,KACvB,kBAAkB,CAAC,gBAAgB,CA+CrC,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,CA+DnE,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,4BAA4B,QAClC,YAAY,YACP,MAAM,QACV,WAAW,oBACC,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,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAWxD,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"}

package/dist/api/wrappers.js

@@ -70,7 +70,8 @@ const uploadFileChunks = (api, fileUploadId, asyncIterable, uploadChunkSize = UP
  * @returns {PromisedObservable<UploadFileStatus>} - An observable that emits the upload status.
  * @throws {Error} - Throws an error if the upload fails at any stage.
  */
-const uploadFileFromInput = (api, file, { password, compression = true }, uploadChunkSize) => {
+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 import('@autonomys/auto-dag-data');
         let asyncIterable = (0, async_1.fileToIterable)(file);
@@ -127,7 +128,8 @@ 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, { password, compression = true }, uploadChunkSize) => {
+const uploadFile = (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 import('@autonomys/auto-dag-data');
         let asyncIterable = file.read();
@@ -197,7 +199,6 @@ const uploadFolderFromInput = (api_1, fileList_1, ...args_1) => __awaiter(void 0
             name: `${name}.zip`,
             mimeType: 'application/zip',
             size: zipBlob.size,
-            path: name,
         }, {
             password,
             compression: true,

package/dist/fs/wrappers.d.ts

@@ -19,7 +19,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, { password, compression }: UploadFileOptions, uploadChunkSize?: number) => PromisedObservable<UploadFileStatus>;
+export declare const uploadFileFromFilepath: (api: AutoDriveApi, filePath: string, options?: UploadFileOptions, uploadChunkSize?: number) => PromisedObservable<UploadFileStatus>;
 /**
  * Uploads an entire folder to the server.
  *

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,6BACkB,iBAAiB,oBACjC,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,CA8DnE,CAAA"}
+{"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"}

package/dist/fs/wrappers.js

@@ -39,14 +39,14 @@ const utils_js_1 = require("./utils.js");
  * @returns {PromisedObservable<UploadFileStatus>} - An observable that emits the upload status.
  * @throws {Error} - Throws an error if the upload fails at any stage.
  */
-const uploadFileFromFilepath = (api, filePath, { password, compression = true }, uploadChunkSize) => {
+const uploadFileFromFilepath = (api, filePath, options = {}, uploadChunkSize) => {
+    const { password = undefined, compression = true } = options;
     const name = filePath.split('/').pop();
     return (0, wrappers_js_1.uploadFile)(api, {
         read: () => fs_1.default.createReadStream(filePath),
         name,
         mimeType: mime_types_1.default.lookup(name) || undefined,
         size: fs_1.default.statSync(filePath).size,
-        path: filePath,
     }, {
         password,
         compression,
@@ -83,7 +83,6 @@ const uploadFolderFromFolderPath = (api_1, folderPath_1, ...args_1) => __awaiter
             name: `${name}.zip`,
             mimeType: 'application/zip',
             size: zipBlob.size,
-            path: name,
         }, {
             password,
             compression: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@autonomys/auto-drive",
   "packageManager": "yarn@4.2.2",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -24,7 +24,7 @@
     ".": {
       "browser": "./dist/browser.js",
       "node": "./dist/node.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/node.d.ts"
     }
   },
   "devDependencies": {
@@ -40,7 +40,7 @@
     "typescript": "^5.6.3"
   },
   "dependencies": {
-    "@autonomys/auto-dag-data": "^1.1.0",
+    "@autonomys/auto-dag-data": "^1.1.2",
     "jszip": "^3.10.1",
     "mime-types": "^2.1.35",
     "process": "^0.11.10",
@@ -48,5 +48,5 @@
     "stream": "^0.0.3",
     "zod": "^3.23.8"
   },
-  "gitHead": "8729780d591683cf6fd62333526cd91789994c87"
+  "gitHead": "e84f9598911e27aec4de31fbd6a7663f8e364a20"
 }

package/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
 }

package/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) => {

package/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,