@dignetwork/dig-sdk 0.0.1-alpha.57 → 0.0.1-alpha.59

package/dist/DataIntegrityTree/DataIntegrityTree.d.ts

@@ -78,6 +78,9 @@ declare class DataIntegrityTree {
      * @returns The serialized Merkle tree.
      */
     serialize(rootHash?: string | null): object;
+    static getRootOfForeignTree(treeData: {
+        leaves: string[];
+    }): string;
     /**
      * Deserialize a JSON object to a Merkle tree.
      * @param rootHash - The root hash of the tree.

package/dist/DataIntegrityTree/DataIntegrityTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataIntegrityTree.d.ts","sourceRoot":"","sources":["../../src/DataIntegrityTree/DataIntegrityTree.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataIntegrityTree.d.ts","sourceRoot":"","sources":["../../src/DataIntegrityTree/DataIntegrityTree.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAuClC,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAGlB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;GAEG;AACH,cAAM,iBAAiB;IACrB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,OAAO,CAAS;IACjB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5D,OAAO,CAAC,IAAI,CAAa;gBAEb,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,wBAA6B;WAiDrD,IAAI,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,wBAAwB,GAChC,iBAAiB;IAOpB;;;OAGG;IACH,OAAO,CAAC,aAAa;IAQrB;;;OAGG;IACH,OAAO,CAAC,eAAe;IAUvB;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAa1B;;;;OAIG;YACW,WAAW;IAazB;;;;;OAKG;IACG,SAAS,CAAC,UAAU,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqFjE;;;OAGG;IACH,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAW5B;;;;OAIG;IACH,QAAQ,CAAC,QAAQ,GAAE,MAAM,GAAG,IAAW,GAAG,MAAM,EAAE;IAalD;;;OAGG;IACH,OAAO,CAAC,YAAY;IAOpB;;;;OAIG;IACH,OAAO,IAAI,MAAM;IAIjB;;;;OAIG;IACH,SAAS,CAAC,QAAQ,GAAE,MAAM,GAAG,IAAW,GAAG,MAAM;IAqBjD,MAAM,CAAC,oBAAoB,CAAC,QAAQ,EAAE;QAAE,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,MAAM;IAQnE;;;;OAIG;IACH,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU;IAwB7C,OAAO,CAAC,wBAAwB;IAuBhC;;OAEG;IACH,MAAM,IAAI,MAAM,GAAG,SAAS;IAoC5B;;OAEG;IACH,gBAAgB,IAAI,IAAI;IAIxB;;;;;OAKG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,GAAG,IAAW,GAAG,OAAO;IA+B/D;;;;;OAKG;IACH,cAAc,CACZ,MAAM,EAAE,MAAM,EACd,QAAQ,GAAE,MAAM,GAAG,IAAW,EAC9B,UAAU,GAAE,MAAM,GAAG,IAAW,EAChC,MAAM,GAAE,MAAM,GAAG,IAAW,GAC3B,QAAQ;IA4DX;;OAEG;IACH,eAAe,IAAI,IAAI;IAKvB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAUhE;;;;;;OAMG;IACH,QAAQ,CACN,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,QAAQ,GAAE,MAAM,GAAG,IAAW,GAC7B,MAAM;IAsCT;;;;;OAKG;IACH,WAAW,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IA4B5D;;;;;OAKG;IACH,WAAW,CACT,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB;QAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE;IA+B/D;;;;;OAKG;IACG,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAyD5E;;;;;;;;;OASG;WACU,mCAAmC,CAC9C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,EACtB,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,OAAO,CAAC;CAwFpB;AAED,OAAO,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/DataIntegrityTree/DataIntegrityTree.js

@@ -313,6 +313,11 @@ class DataIntegrityTree {
             files: Object.fromEntries(this.files),
         };
     }
+    static getRootOfForeignTree(treeData) {
+        const leaves = treeData.leaves.map((leaf) => Buffer.from(leaf, "hex"));
+        const tree = new merkletreejs_1.MerkleTree(leaves, crypto_js_1.SHA256, { sortPairs: true });
+        return tree.getRoot().toString("hex");
+    }
     /**
      * Deserialize a JSON object to a Merkle tree.
      * @param rootHash - The root hash of the tree.
@@ -603,7 +608,6 @@ class DataIntegrityTree {
             decompressStream.on("end", () => {
                 const uncompressedSha256 = hash.digest("hex");
                 const isValid = uncompressedSha256 === sha256;
-                console.log(`SHA-256 of uncompressed file: ${uncompressedSha256}`);
                 if (!isValid) {
                     return resolve(false);
                 }
@@ -661,7 +665,6 @@ class DataIntegrityTree {
             });
             decompressStream.on("end", () => {
                 const uncompressedSha256 = hash.digest("hex");
-                console.log(`SHA-256 of uncompressed file: ${uncompressedSha256}`);
                 if (uncompressedSha256 !== sha256) {
                     console.warn(`File hash mismatch. Expected: ${sha256}, got: ${uncompressedSha256}`);
                     return resolve(false);

package/dist/DigNetwork/PropagationServer.d.ts

@@ -31,18 +31,30 @@ export declare class PropagationServer {
         rootHashExists: boolean;
     }>;
     /**
-     * Start an upload session by sending a POST request to the server.
+     * Start an upload session by sending a POST request with the rootHash.dat file.
+     *
+     * @param {string} rootHash - The root hash used to name the .dat file.
+     * @param {string} datFilePath - The full path to the rootHash.dat file.
      */
-    startUploadSession(): Promise<void>;
+    startUploadSession(rootHash: string): Promise<void>;
     /**
      * Request a nonce for a file by sending a HEAD request to the server.
+     * Checks if the file already exists based on the 'x-file-exists' header.
      */
-    getFileNonce(filename: string): Promise<string>;
+    getFileNonce(filename: string): Promise<{
+        nonce: string;
+        fileExists: boolean;
+    }>;
     /**
      * Upload a file to the server by sending a PUT request.
      * Logs progress using cli-progress for each file.
      */
-    uploadFile(filePath: string): Promise<any>;
+    uploadFile(label: string, dataPath: string): Promise<any>;
+    /**
+     * Commit the upload session by sending a POST request to the server.
+     * This finalizes the upload and moves files from the temporary session directory to the permanent location.
+     */
+    commitUploadSession(): Promise<any>;
     /**
      * Static function to handle the entire upload process for multiple files based on rootHash.
      * @param {string} storeId - The ID of the DataStore.

package/dist/DigNetwork/PropagationServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PropagationServer.d.ts","sourceRoot":"","sources":["../../src/DigNetwork/PropagationServer.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,qBAAa,iBAAiB;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAQ;IAGpC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAYrB;gBAEU,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAY9C;;OAEG;IACG,gBAAgB;IAKtB;;OAEG;IACH,gBAAgB;IAQhB;;;;;OAKG;IACG,gBAAgB,CACpB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;QAAE,WAAW,EAAE,OAAO,CAAC;QAAC,cAAc,EAAE,OAAO,CAAA;KAAE,CAAC;IA4C7D;;OAEG;IACG,kBAAkB;IAqCxB;;OAEG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAoBrD;;;OAGG;IACG,UAAU,CAAC,QAAQ,EAAE,MAAM;IAwDjC;;;;;;OAMG;WACU,WAAW,CACtB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM;IAyCnB;;;;;OAKG;IACG,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA4ClD;;;;OAIG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM;IAkEnC;;;;;OAKG;WACU,aAAa,CACxB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM;CA4BpB"}
+{"version":3,"file":"PropagationServer.d.ts","sourceRoot":"","sources":["../../src/DigNetwork/PropagationServer.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,MAAM,OAAO,CAAC;AAiB1B,qBAAa,iBAAiB;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAE7B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAQ;IAIpC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAqCrB;gBAEU,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAY9C;;OAEG;IACG,gBAAgB;IAKtB;;OAEG;IACH,gBAAgB;IAQhB;;;;;OAKG;IACG,gBAAgB,CACpB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;QAAE,WAAW,EAAE,OAAO,CAAC;QAAC,cAAc,EAAE,OAAO,CAAA;KAAE,CAAC;IAwC7D;;;;;OAKG;IACG,kBAAkB,CAAC,QAAQ,EAAE,MAAM;IAqDzC;;;OAGG;IACG,YAAY,CAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,CAAC;IAyBlD;;;OAGG;IACG,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IA+DhD;;;OAGG;IACG,mBAAmB;IAgCzB;;;;;;OAMG;WACU,WAAW,CACtB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM;IAiDnB;;;;;OAKG;IACG,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA4ClD;;;;OAIG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM;IAgEnC;;;;;OAKG;WACU,aAAa,CACxB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM;CA4BpB"}

package/dist/DigNetwork/PropagationServer.js

@@ -17,6 +17,15 @@ const colorette_1 = require("colorette"); // For colored output
 const config_1 = require("../utils/config");
 const hashUtils_1 = require("../utils/hashUtils");
 const nanospinner_1 = require("nanospinner");
+// Helper function to trim long filenames with ellipsis and ensure consistent padding
+function formatFilename(filename, maxLength = 30) {
+    if (filename.length > maxLength) {
+        // Trim the filename and add ellipsis
+        return `...${filename.slice(-(maxLength - 3))}`.padEnd(maxLength, " ");
+    }
+    // For shorter filenames, just pad to the maxLength
+    return filename.padEnd(maxLength, " ");
+}
 class PropagationServer {
     constructor(storeId, ipAddress) {
         this.storeId = storeId;
@@ -33,7 +42,7 @@ class PropagationServer {
      */
     async initializeWallet() {
         this.wallet = await blockchain_1.Wallet.load("default");
-        this.publicKey = await this.wallet.getPublicSyntheticKey().toString('hex');
+        this.publicKey = await this.wallet.getPublicSyntheticKey().toString("hex");
     }
     /**
      * Create an Axios HTTPS Agent with self-signed certificate allowance.
@@ -66,18 +75,14 @@ class PropagationServer {
             const storeExists = response.headers["x-store-exists"] === "true";
             const rootHashExists = response.headers["x-has-root-hash"] === "true";
             if (storeExists) {
-                spinner.success({ text: (0, colorette_1.green)(`Store ${this.storeId} exists on peer!`) });
+                spinner.success({
+                    text: (0, colorette_1.green)(`Store ${this.storeId} exists on peer!`),
+                });
             }
             else {
-                spinner.error({ text: (0, colorette_1.red)(`Store ${this.storeId} does not exist. Credentials will be required to push.`) });
-            }
-            if (rootHash) {
-                if (rootHashExists) {
-                    console.log((0, colorette_1.green)(`Root hash ${rootHash} exists in the store.`));
-                }
-                else {
-                    console.log((0, colorette_1.red)(`Root hash ${rootHash} does not exist in the store.`));
-                }
+                spinner.error({
+                    text: (0, colorette_1.red)(`Store ${this.storeId} does not exist. Credentials will be required to push.`),
+                });
             }
             return { storeExists, rootHashExists };
         }
@@ -88,23 +93,38 @@ class PropagationServer {
         }
     }
     /**
-     * Start an upload session by sending a POST request to the server.
+     * Start an upload session by sending a POST request with the rootHash.dat file.
+     *
+     * @param {string} rootHash - The root hash used to name the .dat file.
+     * @param {string} datFilePath - The full path to the rootHash.dat file.
      */
-    async startUploadSession() {
+    async startUploadSession(rootHash) {
         const spinner = (0, nanospinner_1.createSpinner)(`Starting upload session for store ${this.storeId}...`).start();
         try {
+            const formData = new form_data_1.default();
+            const datFilePath = path_1.default.join(config_1.STORE_PATH, this.storeId, `${rootHash}.dat`);
+            // Ensure the rootHash.dat file exists
+            if (!fs_1.default.existsSync(datFilePath)) {
+                throw new Error(`File not found: ${datFilePath}`);
+            }
+            formData.append("file", fs_1.default.createReadStream(datFilePath), {
+                filename: `${rootHash}.dat`,
+            });
             const config = {
                 httpsAgent: this.createHttpsAgent(),
+                headers: {
+                    ...formData.getHeaders(),
+                },
             };
-            // Add Basic Auth headers if credentials are provided
+            // Add Basic Auth if username and password are present
             if (this.username && this.password) {
                 config.auth = {
                     username: this.username,
                     password: this.password,
                 };
             }
-            const url = `https://${this.ipAddress}:${PropagationServer.port}/upload/${this.storeId}`;
-            const response = await axios_1.default.post(url, { publicKey: this.publicKey }, config);
+            const url = `https://${this.ipAddress}:${PropagationServer.port}/upload/${this.storeId}?roothash=${rootHash}`;
+            const response = await axios_1.default.post(url, formData, config);
             this.sessionId = response.data.sessionId;
             spinner.success({
                 text: (0, colorette_1.green)(`Upload session started for DataStore ${this.storeId} with session ID ${this.sessionId}`),
@@ -118,6 +138,7 @@ class PropagationServer {
     }
     /**
      * Request a nonce for a file by sending a HEAD request to the server.
+     * Checks if the file already exists based on the 'x-file-exists' header.
      */
     async getFileNonce(filename) {
         try {
@@ -126,9 +147,11 @@ class PropagationServer {
             };
             const url = `https://${this.ipAddress}:${PropagationServer.port}/upload/${this.storeId}/${this.sessionId}/${filename}`;
             const response = await axios_1.default.head(url, config);
+            // Check for 'x-file-exists' header
+            const fileExists = response.headers["x-file-exists"] === "true";
+            // If file exists, no need to generate a nonce
             const nonce = response.headers["x-nonce"];
-            console.log((0, colorette_1.blue)(`Nonce received for file ${filename}: ${nonce}`));
-            return nonce;
+            return { nonce, fileExists };
         }
         catch (error) {
             console.error((0, colorette_1.red)(`Error generating nonce for file ${filename}:`), error.message);
@@ -139,9 +162,13 @@ class PropagationServer {
      * Upload a file to the server by sending a PUT request.
      * Logs progress using cli-progress for each file.
      */
-    async uploadFile(filePath) {
-        const filename = path_1.default.basename(filePath);
-        const nonce = await this.getFileNonce(filename);
+    async uploadFile(label, dataPath) {
+        const filePath = path_1.default.join(config_1.STORE_PATH, this.storeId, dataPath);
+        const { nonce, fileExists } = await this.getFileNonce(dataPath);
+        if (fileExists) {
+            console.log((0, colorette_1.blue)(`File ${label} already exists. Skipping upload.`));
+            return;
+        }
         const wallet = await blockchain_1.Wallet.load("default");
         const keyOwnershipSig = await wallet.createKeyOwnershipSignature(nonce);
         const publicKey = await wallet.getPublicSyntheticKey();
@@ -150,7 +177,7 @@ class PropagationServer {
         const fileSize = fs_1.default.statSync(filePath).size;
         // Create a new progress bar for each file
         const progressBar = PropagationServer.multiBar.create(fileSize, 0, {
-            filename: (0, colorette_1.yellow)(filename),
+            filename: (0, colorette_1.yellow)(path_1.default.basename(label)),
             percentage: 0,
         });
         let uploadedBytes = 0;
@@ -165,26 +192,54 @@ class PropagationServer {
             httpsAgent: this.createHttpsAgent(),
             // Tracking upload progress and updating the progress bar
             onUploadProgress: (progressEvent) => {
-                uploadedBytes += progressEvent.loaded;
-                const percentage = Math.round((uploadedBytes / fileSize) * 100);
+                const uploadedBytes = progressEvent.loaded;
+                const percentage = Math.round((100 * progressEvent.loaded) / progressEvent.total);
                 progressBar.update(uploadedBytes, { percentage });
             },
         };
         try {
-            const url = `https://${this.ipAddress}:${PropagationServer.port}/upload/${this.storeId}/${this.sessionId}/${filename}`;
+            const url = `https://${this.ipAddress}:${PropagationServer.port}/upload/${this.storeId}/${this.sessionId}/${dataPath}`;
             const response = await axios_1.default.put(url, formData, config);
-            console.log((0, colorette_1.green)(`✔ File ${filename} uploaded successfully.`));
             // Complete the progress bar
             progressBar.update(fileSize, { percentage: 100 });
             progressBar.stop();
             return response.data;
         }
         catch (error) {
-            console.error((0, colorette_1.red)(`✖ Error uploading file ${filename}:`), error.message);
+            console.error((0, colorette_1.red)(`✖ Error uploading file ${label}:`), error.message);
             progressBar.stop(); // Stop the progress bar in case of error
             throw error;
         }
     }
+    /**
+     * Commit the upload session by sending a POST request to the server.
+     * This finalizes the upload and moves files from the temporary session directory to the permanent location.
+     */
+    async commitUploadSession() {
+        const spinner = (0, nanospinner_1.createSpinner)(`Committing upload session for store ${this.storeId}...`).start();
+        try {
+            const config = {
+                httpsAgent: this.createHttpsAgent(),
+                auth: this.username && this.password
+                    ? {
+                        username: this.username,
+                        password: this.password,
+                    }
+                    : undefined,
+            };
+            const url = `https://${this.ipAddress}:${PropagationServer.port}/commit/${this.storeId}/${this.sessionId}`;
+            const response = await axios_1.default.post(url, {}, config);
+            spinner.success({
+                text: (0, colorette_1.green)(`Upload session ${this.sessionId} successfully committed.`),
+            });
+            return response.data;
+        }
+        catch (error) {
+            spinner.error({ text: (0, colorette_1.red)("Error committing upload session:") });
+            console.error((0, colorette_1.red)(error.message));
+            throw error;
+        }
+    }
     /**
      * Static function to handle the entire upload process for multiple files based on rootHash.
      * @param {string} storeId - The ID of the DataStore.
@@ -197,7 +252,7 @@ class PropagationServer {
         // Initialize wallet
         await propagationServer.initializeWallet();
         // Check if the store exists
-        const storeExists = await propagationServer.checkStoreExists();
+        const { storeExists, rootHashExists } = await propagationServer.checkStoreExists(rootHash);
         // If the store does not exist, prompt for credentials
         if (!storeExists) {
             console.log((0, colorette_1.red)(`Store ${storeId} does not exist. Prompting for credentials...`));
@@ -205,16 +260,20 @@ class PropagationServer {
             propagationServer.username = credentials.username;
             propagationServer.password = credentials.password;
         }
+        if (rootHashExists) {
+            console.log((0, colorette_1.blue)(`Root hash ${rootHash} already exists in the store. Skipping upload.`));
+            return;
+        }
         // Start the upload session
-        await propagationServer.startUploadSession();
+        await propagationServer.startUploadSession(rootHash);
         const dataStore = blockchain_1.DataStore.from(storeId);
-        const filePaths = await dataStore.getFileSetForRootHash(rootHash);
+        const files = await dataStore.getFileSetForRootHash(rootHash);
         // Upload each file
-        for (const filePath of filePaths) {
-            await propagationServer.uploadFile(filePath);
+        for (const file of files) {
+            await propagationServer.uploadFile(file.name, file.path);
         }
-        // Stop all progress bars after the files are uploaded
-        PropagationServer.multiBar.stop();
+        // Commit the session after all files have been uploaded
+        await propagationServer.commitUploadSession();
         console.log((0, colorette_1.green)(`✔ All files have been uploaded to DataStore ${storeId}.`));
     }
     /**
@@ -296,7 +355,8 @@ class PropagationServer {
                 fileWriteStream.on("finish", () => {
                     progressBar.update(totalLength, { percentage: 100 });
                     progressBar.stop();
-                    console.log((0, colorette_1.green)(`✔ File ${dataPath} downloaded successfully to ${downloadPath}.`));
+                    console.log((0, colorette_1.green)(`
+              File ${dataPath} downloaded successfully to ${downloadPath}.`));
                     resolve();
                 });
                 fileWriteStream.on("error", (error) => {
@@ -338,13 +398,29 @@ class PropagationServer {
 }
 exports.PropagationServer = PropagationServer;
 PropagationServer.port = 4159; // Static port used for all requests
-// MultiBar for handling multiple progress bars
+// Adjust cliProgress settings to align output properly and handle potential undefined values
+// MultiBar for handling multiple progress bars with green progress and margin between bars
 PropagationServer.multiBar = new cli_progress_1.default.MultiBar({
     clearOnComplete: false,
     hideCursor: true,
-    format: (0, colorette_1.green)(" {bar} ") +
-        (0, colorette_1.cyan)(" | {filename} | {percentage}% | {value}/{total} bytes"),
-    barsize: 40,
+    format: (options, params, payload) => {
+        // Bar length and padding settings
+        const barCompleteChar = (0, colorette_1.green)(options.barCompleteChar || "="); // Green bar for completed portion
+        const barIncompleteChar = options.barIncompleteChar || "-"; // Default incomplete character
+        const barSize = options.barsize || 40; // Default size of the bar
+        // Calculate the bar progress
+        const progressBar = `${barCompleteChar.repeat(Math.round(params.progress * barSize))}${barIncompleteChar.repeat(barSize - Math.round(params.progress * barSize))}`;
+        // Calculate the percentage manually
+        const percentage = Math.round((params.value / params.total) * 100);
+        // Format the filename to a fixed length
+        const formattedFilename = formatFilename(payload.filename, 30); // Trim to max 30 chars
+        // Padding the filename, percentage, and size
+        const percentageStr = `${percentage}%`.padEnd(4); // Ensure percentage is always 7 characters wide
+        const size = `${params.value}/${params.total} bytes`.padEnd(20); // Ensure size is always 20 characters wide
+        // Return the complete formatted progress bar with padding
+        return `${progressBar} | ${formattedFilename.padEnd(35)} | ${percentageStr} | ${size}`;
+    },
     stopOnComplete: true,
-    align: "center",
+    barsize: 40,
+    align: "left",
 }, cli_progress_1.default.Presets.shades_classic);

package/dist/blockchain/DataStore.d.ts

@@ -48,6 +48,15 @@ export declare class DataStore {
     isSynced(): Promise<boolean>;
     hasMetaWritePermissions(publicSyntheticKey?: Buffer): Promise<boolean>;
     updateMetadata(metadata: DataStoreMetadata): Promise<DataStoreDriver>;
-    getFileSetForRootHash(rootHash: string): Promise<string[]>;
+    /**
+     * Retrieve the file set for a given root hash and validate file integrity.
+     *
+     * @param {string} rootHash - The root hash to fetch the file set.
+     * @returns {Promise<{ fileName: string, file: string }[]>} - An array of unique file objects.
+     */
+    getFileSetForRootHash(rootHash: string): Promise<{
+        name: string;
+        path: string;
+    }[]>;
 }
 //# sourceMappingURL=DataStore.d.ts.map

package/dist/blockchain/DataStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataStore.d.ts","sourceRoot":"","sources":["../../src/blockchain/DataStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAOL,SAAS,IAAI,eAAe,EAE5B,iBAAiB,EAIlB,MAAM,8BAA8B,CAAC;AAWtC,OAAO,EAAE,eAAe,EAAW,MAAM,UAAU,CAAC;AAGpD,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAQjD,qBAAa,SAAS;IACpB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,IAAI,CAAoB;gBAEpB,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,wBAAwB;IAiB/D,IAAW,OAAO,IAAI,MAAM,CAE3B;IAED,IAAW,IAAI,IAAI,iBAAiB,CAEnC;IAEM,QAAQ,IAAI,MAAM;IAIlB,QAAQ,IAAI,MAAM;IAIlB,SAAS,IAAI,MAAM;WAMN,cAAc,IAAI,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;WAOtD,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS;WAK1C,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;WAYnC,MAAM,CACxB,MAAM,GAAE,qBAA0B,GACjC,OAAO,CAAC,SAAS,CAAC;mBAyCA,IAAI;IA4FzB;;;OAGG;IACU,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAK5C;;;OAGG;WACiB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIxD;;;;OAIG;mBACkB,mBAAmB;WAqB1B,YAAY,IAAI,SAAS,EAAE;IAW5B,aAAa,IAAI,OAAO,CAAC;QACpC,WAAW,EAAE,eAAe,CAAC;QAC7B,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IAyGW,iBAAiB,IAAI,OAAO,CAAC;QACxC,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;YA0BY,iBAAiB;IAYlB,cAAc,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IA2B5C,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAKzC,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAM5B,uBAAuB,CAClC,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,OAAO,CAAC;IAkBN,cAAc,CACzB,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,eAAe,CAAC;IA+Cd,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CA8CxE"}
+{"version":3,"file":"DataStore.d.ts","sourceRoot":"","sources":["../../src/blockchain/DataStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAOL,SAAS,IAAI,eAAe,EAE5B,iBAAiB,EAIlB,MAAM,8BAA8B,CAAC;AAWtC,OAAO,EAAE,eAAe,EAAW,MAAM,UAAU,CAAC;AAGpD,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAYjD,qBAAa,SAAS;IACpB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,IAAI,CAAoB;gBAEpB,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,wBAAwB;IAqB/D,IAAW,OAAO,IAAI,MAAM,CAE3B;IAED,IAAW,IAAI,IAAI,iBAAiB,CAEnC;IAEM,QAAQ,IAAI,MAAM;IAIlB,QAAQ,IAAI,MAAM;IAIlB,SAAS,IAAI,MAAM;WAMN,cAAc,IAAI,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;WAOtD,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS;WAK1C,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;WAYnC,MAAM,CACxB,MAAM,GAAE,qBAA0B,GACjC,OAAO,CAAC,SAAS,CAAC;mBAyCA,IAAI;IA4FzB;;;OAGG;IACU,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAK5C;;;OAGG;WACiB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIxD;;;;OAIG;mBACkB,mBAAmB;WAqB1B,YAAY,IAAI,SAAS,EAAE;IAW5B,aAAa,IAAI,OAAO,CAAC;QACpC,WAAW,EAAE,eAAe,CAAC;QAC7B,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IAyGW,iBAAiB,IAAI,OAAO,CAAC;QACxC,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;YA0BY,iBAAiB;IAYlB,cAAc,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IA+C5C,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAKzC,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAM5B,uBAAuB,CAClC,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,OAAO,CAAC;IAkBN,cAAc,CACzB,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,eAAe,CAAC;IA+C3B;;;;;OAKG;IACU,qBAAqB,CAChC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAsD7C"}

package/dist/blockchain/DataStore.js

@@ -18,11 +18,17 @@ const DataIntegrityTree_1 = require("../DataIntegrityTree");
 const prompts_1 = require("../prompts");
 const FileCache_1 = require("../utils/FileCache");
 const DataStoreSerializer_1 = require("./DataStoreSerializer");
+const node_cache_1 = __importDefault(require("node-cache"));
+// Initialize the cache with a TTL of 180 seconds (3 minutes)
+const rootHistoryCache = new node_cache_1.default({ stdTTL: 180 });
 const stat = (0, util_1.promisify)(fs_1.default.stat);
 const readdir = (0, util_1.promisify)(fs_1.default.readdir);
 class DataStore {
     constructor(storeId, options) {
         this.storeId = storeId;
+        // This will create the manifest file if it doesn't exist
+        // might be a hacky way to do this, but it works for now
+        this.getRootHistory();
         let _options;
         if (options) {
             _options = options;
@@ -284,18 +290,32 @@ class DataStore {
         });
     }
     async getRootHistory() {
+        // Check if the root history is cached for this storeId
+        const cachedHistory = rootHistoryCache.get(this.storeId);
+        if (cachedHistory) {
+            return cachedHistory;
+        }
+        // Fetch root history from peer if not cached
         const peer = await FullNodePeer_1.FullNodePeer.connect();
         const { createdAtHeight, createdAtHash } = await this.getCreationHeight();
         const { rootHashes, rootHashesTimestamps } = await peer.syncStoreFromLauncherId(Buffer.from(this.storeId, "hex"), createdAtHeight, createdAtHash, true);
         if (!rootHashes) {
             return [];
         }
-        // TODO: add 3 min cache to thisqwz ~
-        return rootHashes.map((rootHash, index) => ({
+        // Build the root history list
+        const rootHistory = rootHashes.map((rootHash, index) => ({
             root_hash: rootHash.toString("hex"),
             timestamp: Number(rootHashesTimestamps?.[index].toString()),
             synced: fs_1.default.existsSync(path_1.default.join(config_1.STORE_PATH, this.storeId, `${rootHash.toString("hex")}.dat`)),
         }));
+        // Store the root history in the cache
+        rootHistoryCache.set(this.storeId, rootHistory);
+        // Need this for the dataintegrity tree to work properly
+        fs_1.default.writeFileSync(path_1.default.join(config_1.STORE_PATH, this.storeId, "manifest.dat"), rootHistory
+            .filter((root) => root.synced)
+            .map((root) => root.root_hash)
+            .join("\n"));
+        return rootHistory;
     }
     async getMetaData() {
         const { latestStore } = await this.fetchCoinInfo();
@@ -337,29 +357,42 @@ class DataStore {
         }
         return updateStoreResponse.newStore;
     }
+    /**
+     * Retrieve the file set for a given root hash and validate file integrity.
+     *
+     * @param {string} rootHash - The root hash to fetch the file set.
+     * @returns {Promise<{ fileName: string, file: string }[]>} - An array of unique file objects.
+     */
     async getFileSetForRootHash(rootHash) {
         const datFilePath = path_1.default.join(config_1.STORE_PATH, this.storeId, `${rootHash}.dat`);
         const datFileContent = JSON.parse(fs_1.default.readFileSync(datFilePath, "utf-8"));
         const heightDatFilePath = path_1.default.join(config_1.STORE_PATH, this.storeId, "height.json");
-        const filesInvolved = [];
-        filesInvolved.push(datFilePath);
-        filesInvolved.push(heightDatFilePath);
+        // Use a Set to ensure uniqueness
+        const filesInvolved = new Set();
+        filesInvolved.add({
+            name: "height.json",
+            path: "height.json",
+        });
         // Iterate over each file and perform an integrity check
         for (const [fileKey, fileData] of Object.entries(datFileContent.files)) {
-            const filePath = (0, hashUtils_1.getFilePathFromSha256)(datFileContent.files[fileKey].sha256, path_1.default.join(config_1.STORE_PATH, this.storeId, "data"));
-            // Perform the integrity check before adding to the file set
+            const filePath = (0, hashUtils_1.getFilePathFromSha256)(datFileContent.files[fileKey].sha256, "data");
+            // Perform the integrity check
             const integrityCheck = await DataIntegrityTree_1.DataIntegrityTree.validateKeyIntegrityWithForeignTree(fileKey, datFileContent.files[fileKey].sha256, datFileContent, rootHash, path_1.default.join(config_1.STORE_PATH, this.storeId, "data"));
             if (integrityCheck) {
-                console.log((0, colorette_1.green)(`File ${fileKey} has passed the integrity check.`));
-                // Add the file to the file set only if the integrity check passes
-                filesInvolved.push(filePath);
+                console.log((0, colorette_1.green)(`✔ File ${fileKey} has passed the integrity check.`));
+                // Add the file to the Set
+                filesInvolved.add({
+                    name: Buffer.from(fileKey, "hex").toString("utf-8"),
+                    path: filePath,
+                });
             }
             else {
                 console.error((0, colorette_1.red)(`File ${fileKey} failed the integrity check.`));
                 throw new Error(`Integrity check failed for file: ${fileKey}. Aborting.`);
             }
         }
-        return filesInvolved;
+        // Convert Set to Array and return
+        return Array.from(filesInvolved);
     }
 }
 exports.DataStore = DataStore;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dignetwork/dig-sdk",
-  "version": "0.0.1-alpha.57",
+  "version": "0.0.1-alpha.59",
   "description": "",
   "type": "commonjs",
   "main": "./dist/index.js",