@dignetwork/dig-sdk 0.0.1-alpha.46 → 0.0.1-alpha.48

package/dist/DataIntegrityTree/DataIntegrityTree.d.ts

@@ -154,7 +154,7 @@ declare class DataIntegrityTree {
      * @param expectedRootHash - The expected root hash of the Merkle tree.
      * @returns A boolean indicating if the SHA-256 is present in the foreign tree and the root hash matches.
      */
-    static validateKeyIntegrityWithForeignTree(key: string, sha256: string, serializedTree: object, expectedRootHash: string): boolean;
+    static validateKeyIntegrityWithForeignTree(hexkey: string, sha256: string, serializedTree: object, expectedRootHash: string, dataDir: string): Promise<boolean>;
 }
 export { DataIntegrityTree };
 //# sourceMappingURL=DataIntegrityTree.d.ts.map

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

package/dist/DataIntegrityTree/DataIntegrityTree.js

@@ -634,8 +634,8 @@ class DataIntegrityTree {
      * @param expectedRootHash - The expected root hash of the Merkle tree.
      * @returns A boolean indicating if the SHA-256 is present in the foreign tree and the root hash matches.
      */
-    static validateKeyIntegrityWithForeignTree(key, sha256, serializedTree, expectedRootHash) {
-        if (!isHexString(key)) {
+    static async validateKeyIntegrityWithForeignTree(hexkey, sha256, serializedTree, expectedRootHash, dataDir) {
+        if (!isHexString(hexkey)) {
             throw new Error("key must be a valid hex string");
         }
         if (!isHexString(sha256)) {
@@ -644,29 +644,59 @@ class DataIntegrityTree {
         if (!isHexString(expectedRootHash)) {
             throw new Error("expectedRootHash must be a valid hex string");
         }
-        // Deserialize the foreign tree
-        const leaves = serializedTree.leaves.map((leaf) => Buffer.from(leaf, "hex"));
-        const tree = new merkletreejs_1.MerkleTree(leaves, crypto_js_1.SHA256, { sortPairs: true });
-        // Verify that the deserialized tree's root matches the expected root hash
-        const treeRootHash = tree.getRoot().toString("hex");
-        if (treeRootHash !== expectedRootHash) {
-            console.warn(`Expected root hash ${expectedRootHash}, but got ${treeRootHash}`);
-            return false;
+        // File path based on sha256
+        const filePath = path.join(dataDir, sha256.match(/.{1,2}/g).join("/"));
+        // Check if the file exists
+        if (!fs.existsSync(filePath)) {
+            throw new Error(`File at path ${filePath} does not exist`);
         }
-        // Rebuild the files map from the serialized tree
-        // @ts-ignore
-        tree.files = new Map(Object.entries(serializedTree.files).map(([key, value]) => [
-            key,
-            { hash: value.hash, sha256: value.sha256 },
-        ]));
-        // Check if the SHA-256 exists in the foreign tree's files
-        const combinedHash = crypto
-            .createHash("sha256")
-            .update(`${toHex(key)}/${sha256}`)
-            .digest("hex");
-        const leaf = Buffer.from(combinedHash, "hex");
-        const isInTree = tree.getLeafIndex(leaf) !== -1;
-        return isInTree;
+        const compressedReadStream = fs.createReadStream(filePath);
+        const decompressStream = zlib.createGunzip();
+        const hash = crypto.createHash("sha256");
+        // Process file decompression and hash comparison
+        return new Promise((resolve, reject) => {
+            compressedReadStream.pipe(decompressStream);
+            decompressStream.on("data", (chunk) => {
+                hash.update(chunk);
+            });
+            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);
+                }
+                // Deserialize the foreign tree
+                const leaves = serializedTree.leaves.map((leaf) => Buffer.from(leaf, "hex"));
+                const tree = new merkletreejs_1.MerkleTree(leaves, crypto_js_1.SHA256, { sortPairs: true });
+                // Verify that the deserialized tree's root matches the expected root hash
+                const treeRootHash = tree.getRoot().toString("hex");
+                if (treeRootHash !== expectedRootHash) {
+                    console.warn(`Expected root hash ${expectedRootHash}, but got ${treeRootHash}`);
+                    return resolve(false);
+                }
+                // Rebuild the files map from the serialized tree
+                // @ts-ignore
+                tree.files = new Map(Object.entries(serializedTree.files).map(([key, value]) => [
+                    key,
+                    { hash: value.hash, sha256: value.sha256 },
+                ]));
+                // Check if the SHA-256 exists in the foreign tree's files
+                const combinedHash = crypto
+                    .createHash("sha256")
+                    .update(`${hexkey}/${sha256}`)
+                    .digest("hex");
+                const leaf = Buffer.from(combinedHash, "hex");
+                const isInTree = tree.getLeafIndex(leaf) !== -1;
+                resolve(isInTree);
+            });
+            decompressStream.on("error", (err) => {
+                reject(err);
+            });
+            compressedReadStream.on("error", (err) => {
+                reject(err);
+            });
+        });
     }
 }
 exports.DataIntegrityTree = DataIntegrityTree;

package/dist/DigNetwork/ContentServer.js

@@ -21,7 +21,7 @@ class ContentServer {
     // Method to get the content of a specified key from the peer, with optional challenge query
     async getKey(key, rootHash, challengeHex) {
         // Construct the base URL
-        let url = `http://${this.ipAddress}:${ContentServer.port}/chia.${this.storeId}.${rootHash}/${key}`;
+        let url = `https://${this.ipAddress}:${ContentServer.port}/chia.${this.storeId}.${rootHash}/${key}`;
         // If a challenge is provided, append it as a query parameter
         if (challengeHex) {
             url += `?challenge=${challengeHex}`;
@@ -42,32 +42,32 @@ class ContentServer {
     }
     // Method to get the .well-known information
     async getWellKnown() {
-        const url = `http://${this.ipAddress}:${ContentServer.port}/.well-known`;
+        const url = `https://${this.ipAddress}:${ContentServer.port}/.well-known`;
         return this.fetchJson(url);
     }
     // Method to get the list of known stores
     async getKnownStores() {
-        const url = `http://${this.ipAddress}:${ContentServer.port}/.well-known/stores`;
+        const url = `https://${this.ipAddress}:${ContentServer.port}/.well-known/stores`;
         return this.fetchJson(url);
     }
     // Method to get the index of all stores
     async getStoresIndex() {
-        const url = `http://${this.ipAddress}:${ContentServer.port}/`;
+        const url = `https://${this.ipAddress}:${ContentServer.port}/`;
         return this.fetchJson(url);
     }
     // Method to get the index of keys in a store
     async getKeysIndex() {
-        const url = `http://${this.ipAddress}:${ContentServer.port}/${this.storeId}`;
+        const url = `https://${this.ipAddress}:${ContentServer.port}/${this.storeId}`;
         return this.fetchJson(url);
     }
     // Method to check if a specific key exists (HEAD request)
     async headKey(key) {
-        const url = `http://${this.ipAddress}:${ContentServer.port}/${this.storeId}/${key}`;
+        const url = `https://${this.ipAddress}:${ContentServer.port}/${this.storeId}/${key}`;
         return this.head(url);
     }
     // Method to check if a specific store exists (HEAD request)
     async headStore(options) {
-        let url = `http://${this.ipAddress}:${ContentServer.port}/${this.storeId}`;
+        let url = `https://${this.ipAddress}:${ContentServer.port}/${this.storeId}`;
         if (options?.hasRootHash) {
             url += `?hasRootHash=${options.hasRootHash}`;
         }
@@ -75,7 +75,7 @@ class ContentServer {
     }
     streamKey(key) {
         return new Promise((resolve, reject) => {
-            const url = `http://${this.ipAddress}:${ContentServer.port}/${this.storeId}/${key}`;
+            const url = `https://${this.ipAddress}:${ContentServer.port}/${this.storeId}/${key}`;
             const urlObj = new url_1.URL(url);
             const requestOptions = {
                 hostname: urlObj.hostname,
@@ -102,7 +102,7 @@ class ContentServer {
                 }
             });
             request.on("error", (error) => {
-                console.error(`Request error for ${url}:`, error);
+                console.error(`GET Request error for ${url}:`, error);
                 reject(error);
             });
             request.end();
@@ -161,7 +161,7 @@ class ContentServer {
                     }
                 });
                 request.on("error", (error) => {
-                    console.error(`Request error for ${url}:`, error);
+                    console.error(`HEAD ${url}:`, error.message);
                     reject({ success: false });
                 });
                 request.end();
@@ -247,7 +247,7 @@ class ContentServer {
                 }
             });
             request.on("error", (error) => {
-                console.error(`Request error for ${url}:`, error);
+                console.error(`GET ${url}:`, error.message);
                 reject(error);
             });
             request.end();

package/dist/DigNetwork/DigNetwork.d.ts

@@ -9,7 +9,7 @@ export declare class DigNetwork {
     uploadStoreHead(digPeer: DigPeer): Promise<void>;
     uploadStore(digPeer: DigPeer): Promise<void>;
     static subscribeToStore(storeId: string): Promise<void>;
-    static findPeerWithStoreKey(storeId: string, rootHash: string, key?: string, intialBlackList?: string[]): Promise<string | null>;
+    static findPeerWithStoreKey(storeId: string, rootHash: string, key?: string, intialBlackList?: string[]): Promise<DigPeer | null>;
     static unsubscribeFromStore(storeId: string): void;
     downloadFiles(forceDownload?: boolean, renderProgressBar?: boolean, skipData?: boolean): Promise<void>;
     private fetchAvailablePeers;

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

@@ -1 +1 @@
-{"version":3,"file":"DigNetwork.d.ts","sourceRoot":"","sources":["../../src/DigNetwork/DigNetwork.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAWpC,qBAAa,UAAU;IACrB,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAA2B;gBAEpC,OAAO,EAAE,MAAM;YAOb,eAAe;IA8ChB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAsDhD,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;WA6BrC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAQhD,oBAAoB,CACtC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,GAAG,CAAC,EAAE,MAAM,EACZ,eAAe,GAAE,MAAM,EAAO,GAC7B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;WAuCX,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAQ5C,aAAa,CACxB,aAAa,GAAE,OAAe,EAC9B,iBAAiB,GAAE,OAAc,EACjC,QAAQ,GAAE,OAAe,GACxB,OAAO,CAAC,IAAI,CAAC;YAsFF,mBAAmB;YAWnB,kBAAkB;YASlB,oBAAoB;YASpB,qBAAqB;YAsFrB,cAAc;CAoB7B"}
+{"version":3,"file":"DigNetwork.d.ts","sourceRoot":"","sources":["../../src/DigNetwork/DigNetwork.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC,qBAAa,UAAU;IACrB,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAA2B;gBAEpC,OAAO,EAAE,MAAM;YAOb,eAAe;IA8ChB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAsDhD,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;WA6BrC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAQhD,oBAAoB,CACtC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,GAAG,CAAC,EAAE,MAAM,EACZ,eAAe,GAAE,MAAM,EAAO,GAC7B,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;WAyDZ,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAQ5C,aAAa,CACxB,aAAa,GAAE,OAAe,EAC9B,iBAAiB,GAAE,OAAc,EACjC,QAAQ,GAAE,OAAe,GACxB,OAAO,CAAC,IAAI,CAAC;YAkJF,mBAAmB;YAWnB,kBAAkB;YASlB,oBAAoB;YASpB,qBAAqB;YAsFrB,cAAc;CAoB7B"}

package/dist/DigNetwork/DigNetwork.js

@@ -33,6 +33,7 @@ const hashUtils_1 = require("../utils/hashUtils");
 const blockchain_1 = require("../blockchain");
 const config_1 = require("../utils/config");
 const util_1 = require("util");
+const DataIntegrityTree_1 = require("../DataIntegrityTree");
 const rename = (0, util_1.promisify)(fs.rename);
 const unlink = (0, util_1.promisify)(fs.unlink);
 class DigNetwork {
@@ -128,31 +129,47 @@ class DigNetwork {
     static async findPeerWithStoreKey(storeId, rootHash, key, intialBlackList = []) {
         const peerBlackList = intialBlackList;
         const serverCoin = new blockchain_1.ServerCoin(storeId);
+        let peerIp = null;
+        // Keep sampling peers until an empty array is returned
         while (true) {
             try {
+                // Sample a peer from the current epoch
                 const digPeers = await serverCoin.sampleCurrentEpoch(1, peerBlackList);
-                if (digPeers.length === 0)
+                // If no peers are returned, break out of the loop
+                if (digPeers.length === 0) {
+                    console.log("No more peers found.");
                     break;
-                const peerIp = digPeers[0];
+                }
+                peerIp = digPeers[0];
                 const digPeer = new DigPeer_1.DigPeer(peerIp, storeId);
-                const storeResponse = await digPeer.propagationServer.headStore({
+                // Try to fetch the head store information
+                const storeResponse = await digPeer.contentServer.headStore({
                     hasRootHash: rootHash,
                 });
-                console.log(peerIp, storeResponse.headers);
+                // If the peer has the correct root hash, check if key is required
                 if (storeResponse.headers?.["x-has-roothash"] === "true") {
                     console.log(`Found Peer at ${peerIp} for storeId: ${storeId}, root hash ${rootHash}`);
+                    // If no key is provided, return the peer
                     if (!key) {
-                        return peerIp;
+                        return digPeer;
                     }
+                    // If key is provided, check if the peer has it
                     const keyResponse = await digPeer.contentServer.headKey(key);
                     if (keyResponse.headers?.["x-key-exists"] === "true") {
-                        return peerIp;
+                        return digPeer;
                     }
                 }
+                // Add peer to blacklist if it doesn't meet criteria
                 peerBlackList.push(peerIp);
             }
-            catch { }
+            catch (error) {
+                console.error(`Error connecting to DIG Peer ${peerIp}. Resampling...`);
+                if (peerIp) {
+                    peerBlackList.push(peerIp); // Add to blacklist if error occurs
+                }
+            }
         }
+        // Return null if no valid peer was found
         return null;
     }
     static unsubscribeFromStore(storeId) {
@@ -163,45 +180,76 @@ class DigNetwork {
     }
     // Downloads files from the network based on the manifest
     async downloadFiles(forceDownload = false, renderProgressBar = true, skipData = false) {
+        console.log("Starting file download process...");
+        let peerBlackList = [];
+        let selectedPeer = null;
         try {
             const rootHistory = await this.dataStore.getRootHistory();
             if (!rootHistory.length) {
                 throw new Error("No roots found in rootHistory. Cannot proceed with file download.");
             }
             await this.downloadHeightFile(true);
-            const rootHistorySorted = rootHistory
+            // Filter out rootInfo entries where the .dat file already exists
+            const rootHistoryFiltered = rootHistory
                 .filter((item) => item.timestamp !== undefined)
-                .sort((a, b) => b.timestamp - a.timestamp);
-            // Process rootHistory sequentially
-            for (const rootInfo of rootHistorySorted) {
-                const peerIp = await DigNetwork.findPeerWithStoreKey(this.dataStore.StoreId, rootInfo.root_hash);
-                if (fs.existsSync(`${this.storeDir}/${rootInfo.root_hash}.dat`)) {
-                    console.log(`Root hash ${rootInfo.root_hash} already exists locally. Skipping download.`);
-                    continue; // Skip to the next rootInfo
-                }
-                if (!peerIp) {
-                    console.error(`No peer found with root hash ${rootInfo.root_hash}. Skipping download.`);
-                    continue; // Skip to the next rootInfo
-                }
-                const digPeer = new DigPeer_1.DigPeer(peerIp, this.dataStore.StoreId);
-                const rootResponse = await digPeer.propagationServer.getStoreData(`${rootInfo.root_hash}.dat`);
-                fs.writeFileSync(`${this.storeDir}/${rootInfo.root_hash}.dat`, rootResponse);
-                const root = JSON.parse(rootResponse);
-                if (!skipData) {
-                    // Sequential file download
-                    for (const [storeKey, file] of Object.entries(root.files)) {
-                        const filePath = (0, hashUtils_1.getFilePathFromSha256)(file.sha256, `${this.storeDir}/data`);
-                        if (!fs.existsSync(filePath) || forceDownload) {
-                            console.log(`Downloading file with sha256: ${file.sha256}...`);
-                            await this.downloadFileFromPeers(`data/${file.sha256.match(/.{1,2}/g).join("/")}`, filePath, forceDownload);
+                .filter((item) => !fs.existsSync(`${this.storeDir}/${item.root_hash}.dat`))
+                // Reverse to download the latest first
+                .reverse();
+            if (!rootHistoryFiltered.length) {
+                console.log("All root hashes already exist locally. No need for download.");
+                return;
+            }
+            // Process filtered rootHistory sequentially
+            for (const rootInfo of rootHistoryFiltered) {
+                while (true) {
+                    try {
+                        selectedPeer = await DigNetwork.findPeerWithStoreKey(this.dataStore.StoreId, rootInfo.root_hash, undefined, peerBlackList);
+                        if (!selectedPeer) {
+                            console.error(`No peer found with root hash ${rootInfo.root_hash}. Skipping download.`);
+                            break; // Exit loop if no more peers are found
+                        }
+                        const rootResponse = await selectedPeer.propagationServer.getStoreData(`${rootInfo.root_hash}.dat`);
+                        const root = JSON.parse(rootResponse);
+                        if (!skipData) {
+                            // Sequential file download
+                            for (const [storeKey, file] of Object.entries(root.files)) {
+                                const filePath = (0, hashUtils_1.getFilePathFromSha256)(file.sha256, `${this.storeDir}/data`);
+                                console.log(`Downloading file with sha256: ${file.sha256}...`);
+                                await selectedPeer.downloadData(this.dataStore.StoreId, `data/${file.sha256.match(/.{1,2}/g).join("/")}`);
+                                const integrityCheck = await DataIntegrityTree_1.DataIntegrityTree.validateKeyIntegrityWithForeignTree(storeKey, file.sha256, root, rootInfo.root_hash, `${this.storeDir}/data`);
+                                if (integrityCheck) {
+                                    console.log(`\x1b[32mIntegrity check passed for file with sha256: ${file.sha256}.\x1b[0m`);
+                                    continue;
+                                }
+                                console.error(`\x1b[31mIntegrity check failed for file with sha256: ${file.sha256}.\x1b[0m`);
+                                await unlink(filePath);
+                                throw new Error(`Store Integrity check failed. Syncing file from another peer.`);
+                            }
+                        }
+                        fs.writeFileSync(`${this.storeDir}/${rootInfo.root_hash}.dat`, rootResponse);
+                        peerBlackList = []; // Clear the blacklist upon successful download
+                        // Break out of the retry loop if the download succeeds
+                        break;
+                    }
+                    catch (error) {
+                        console.error(`Error downloading from peer. Retrying with another peer.`, error);
+                        if (selectedPeer) {
+                            peerBlackList.push(selectedPeer.IpAddress); // Add peer to blacklist and try again
                         }
                     }
                 }
+                // Only process the first root hash so other stores can sync the latest.
+                // This has an effect where the latest roothash will always be synced first, even if new ones come in.
+                // Then it will backfill historical roothashes
+                break;
             }
             await this.downloadManifestFile(true);
             console.log("Syncing store complete.");
         }
         catch (error) {
+            if (selectedPeer) {
+                peerBlackList.push(selectedPeer.IpAddress);
+            }
             console.trace(error);
             throw error;
         }
@@ -229,13 +277,13 @@ class DigNetwork {
                 return;
             const blacklist = this.peerBlacklist.get(dataPath) || new Set();
             for (const digPeer of digPeers) {
-                if (blacklist.has(digPeer.IpAddress))
-                    continue;
-                const response = await digPeer.propagationServer.headStore();
-                if (!response.success) {
-                    continue;
-                }
                 try {
+                    if (blacklist.has(digPeer.IpAddress))
+                        continue;
+                    const response = await digPeer.propagationServer.headStore();
+                    if (!response.success) {
+                        continue;
+                    }
                     // Create directory if it doesn't exist
                     const directory = path.dirname(tempFilePath);
                     if (!fs.existsSync(directory)) {

package/dist/DigNetwork/DigPeer.d.ts

@@ -19,5 +19,6 @@ export declare class DigPeer {
     static sendBulkPayments(walletName: string, outputs: Output[]): Promise<void>;
     sendPayment(walletName: string, amount: bigint, memos?: Buffer[]): Promise<void>;
     static createPaymentHint(storeId: Buffer): Buffer;
+    downloadData(storeId: string, dataPath: string): Promise<void>;
 }
 //# sourceMappingURL=DigPeer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"DigPeer.d.ts","sourceRoot":"","sources":["../../src/DigNetwork/DigPeer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAKL,MAAM,EACP,MAAM,8BAA8B,CAAC;AAKtC,qBAAa,OAAO;IAClB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,kBAAkB,CAAoB;IAC9C,OAAO,CAAC,gBAAgB,CAAkB;gBAE9B,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAS9C,IAAW,aAAa,IAAI,aAAa,CAExC;IAGD,IAAW,iBAAiB,IAAI,iBAAiB,CAEhD;IAGD,IAAW,eAAe,IAAI,eAAe,CAE5C;IAED,IAAW,SAAS,IAAI,MAAM,CAE7B;IAEY,aAAa,CACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EAAE,GACb,OAAO,CAAC,OAAO,CAAC;IAgHN,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;WA2B3B,qBAAqB,CACjC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EAAE,EACnB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,IAAI,CAAC;WAuBI,gBAAgB,CAClC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC;IAwCH,WAAW,CACtB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,KAAK,GAAE,MAAM,EAAO,GACnB,OAAO,CAAC,IAAI,CAAC;WAYF,iBAAiB,CAAC,OAAO,EAAE,MAAM;CAoBhD"}
+{"version":3,"file":"DigPeer.d.ts","sourceRoot":"","sources":["../../src/DigNetwork/DigPeer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAKpD,OAAO,EAKL,MAAM,EACP,MAAM,8BAA8B,CAAC;AAUtC,qBAAa,OAAO;IAClB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,kBAAkB,CAAoB;IAC9C,OAAO,CAAC,gBAAgB,CAAkB;gBAE9B,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAS9C,IAAW,aAAa,IAAI,aAAa,CAExC;IAGD,IAAW,iBAAiB,IAAI,iBAAiB,CAEhD;IAGD,IAAW,eAAe,IAAI,eAAe,CAE5C;IAED,IAAW,SAAS,IAAI,MAAM,CAE7B;IAEY,aAAa,CACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EAAE,GACb,OAAO,CAAC,OAAO,CAAC;IAiHN,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;WA2B3B,qBAAqB,CACjC,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EAAE,EACnB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,IAAI,CAAC;WAuBI,gBAAgB,CAClC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC;IAwCH,WAAW,CACtB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,KAAK,GAAE,MAAM,EAAO,GACnB,OAAO,CAAC,IAAI,CAAC;WAYF,iBAAiB,CAAC,OAAO,EAAE,MAAM;IAqBlC,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CA4C5E"}

package/dist/DigNetwork/DigPeer.js

@@ -4,16 +4,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DigPeer = void 0;
+const path_1 = __importDefault(require("path"));
 const crypto_1 = __importDefault(require("crypto"));
 const ContentServer_1 = require("./ContentServer");
 const PropagationServer_1 = require("./PropagationServer");
 const IncentiveServer_1 = require("./IncentiveServer");
 const blockchain_1 = require("../blockchain");
 const DataIntegrityTree_1 = require("../DataIntegrityTree");
+const config_1 = require("../utils/config");
+const fs_1 = __importDefault(require("fs"));
 const datalayer_driver_1 = require("@dignetwork/datalayer-driver");
 const blockchain_2 = require("../blockchain");
 const blockchain_3 = require("../blockchain");
 const coins_1 = require("../blockchain/coins");
+const config_2 = require("../utils/config");
+const util_1 = require("util");
+const rename = (0, util_1.promisify)(fs_1.default.rename);
+const unlink = (0, util_1.promisify)(fs_1.default.unlink);
 class DigPeer {
     constructor(ipAddress, storeId) {
         this.ipAddress = ipAddress;
@@ -97,7 +104,7 @@ class DigPeer {
                     });
                 });
                 // Perform tree integrity validation using the datFileContent and the root hash
-                const treeCheck = DataIntegrityTree_1.DataIntegrityTree.validateKeyIntegrityWithForeignTree(key, fileData.sha256, datFileContent, rootHash);
+                const treeCheck = DataIntegrityTree_1.DataIntegrityTree.validateKeyIntegrityWithForeignTree(key, fileData.sha256, datFileContent, rootHash, path_1.default.resolve(config_1.DIG_FOLDER_PATH, "stores", this.storeId, 'data'));
                 if (!treeCheck) {
                     console.error(`Tree validation failed for file ${key}.`);
                     filesIntegrityIntact = false;
@@ -195,5 +202,41 @@ class DigPeer {
         // Return the 32-byte hash as a hex string
         return transformedBuffer;
     }
+    async downloadData(storeId, dataPath) {
+        const filePath = path_1.default.join(config_2.STORE_PATH, storeId, dataPath);
+        const tempFilePath = `${filePath}.tmp`;
+        try {
+            const headStoreResponse = await this.propagationServer.headStore();
+            if (!headStoreResponse.success) {
+                throw new Error("Data not accessible from store.");
+            }
+            const directory = path_1.default.dirname(tempFilePath);
+            if (!fs_1.default.existsSync(directory)) {
+                fs_1.default.mkdirSync(directory, { recursive: true });
+            }
+            const fileStream = fs_1.default.createWriteStream(tempFilePath);
+            const dataStream = await this.propagationServer.streamStoreData(dataPath);
+            await new Promise((resolve, reject) => {
+                dataStream.pipe(fileStream);
+                dataStream.on("end", resolve);
+                dataStream.on("error", reject);
+                fileStream.on("error", reject);
+            });
+            await rename(tempFilePath, filePath);
+            console.log(`Downloaded ${dataPath} from ${this.IpAddress}`);
+        }
+        catch (error) {
+            console.error(`Failed to download data: ${error.message}`);
+            if (fs_1.default.existsSync(tempFilePath)) {
+                await unlink(tempFilePath);
+            }
+            // Check if directory is empty and remove it if it is
+            const directory = path_1.default.dirname(tempFilePath);
+            if (fs_1.default.existsSync(directory) && fs_1.default.readdirSync(directory).length === 0) {
+                fs_1.default.rmdirSync(directory);
+                console.log(`Removed empty directory: ${directory}`);
+            }
+        }
+    }
 }
 exports.DigPeer = DigPeer;

package/dist/DigNetwork/PropagationServer.js

@@ -271,7 +271,7 @@ class PropagationServer {
                 }
             });
             request.on("error", (error) => {
-                console.error(`Request error for ${url}:`, error);
+                console.error(`GET Request error for ${url}:`, error);
                 reject(error);
             });
             request.end();
@@ -326,13 +326,13 @@ class PropagationServer {
                     }
                 });
                 request.on("error", (error) => {
-                    console.error(`Request error for ${url}:`, error);
+                    console.error(`HEAD ${url}:`, error.message);
                     reject({ success: false });
                 });
                 request.end();
             }
             catch (err) {
-                console.error(`Invalid URL: ${url}`, err);
+                console.error(`Invalid URL: ${url}`, err.message);
                 reject({ success: false, message: "Invalid URL" });
             }
         });
@@ -432,7 +432,7 @@ class PropagationServer {
                 }
             });
             request.on("error", (error) => {
-                console.error(`Request error for ${url}:`, error);
+                console.error(`GET ${url}:`, error.message);
                 reject(error);
             });
             request.end();

package/dist/blockchain/FullNodePeer.d.ts

@@ -3,6 +3,7 @@ export declare class FullNodePeer {
     private static cachedPeer;
     private static memoizedFetchNewPeerIPs;
     private peer;
+    private static deprioritizedIps;
     private constructor();
     static connect(): Promise<Peer>;
     private static isPortReachable;

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

@@ -1 +1 @@
-{"version":3,"file":"FullNodePeer.d.ts","sourceRoot":"","sources":["../../src/blockchain/FullNodePeer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAmBpD,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAkD;IAC3E,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAA0B;IAChE,OAAO,CAAC,IAAI,CAAO;IAQnB,OAAO;WAIa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5C,OAAO,CAAC,MAAM,CAAC,eAAe;IAiB9B,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAM/B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;mBASZ,eAAe;mBAiDf,UAAU;IAyB/B,OAAO,CAAC,MAAM,CAAC,eAAe;mBAgDT,WAAW;IAgGzB,OAAO,IAAI,IAAI;WAIF,mBAAmB,CACrC,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,OAAO,CAAC;CAwBpB"}
+{"version":3,"file":"FullNodePeer.d.ts","sourceRoot":"","sources":["../../src/blockchain/FullNodePeer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAoBpD,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAkD;IAC3E,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAA0B;IAChE,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAA0B;IAMzD,OAAO;WAIa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5C,OAAO,CAAC,MAAM,CAAC,eAAe;IAiB9B,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAM/B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;mBASZ,eAAe;mBA2Df,UAAU;IA2B/B,OAAO,CAAC,MAAM,CAAC,eAAe;mBAkDT,WAAW;IA+FzB,OAAO,IAAI,IAAI;WAIF,mBAAmB,CACrC,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,OAAO,CAAC;CAwBpB"}

package/dist/blockchain/FullNodePeer.js

@@ -16,6 +16,7 @@ const nanospinner_1 = require("nanospinner");
 const config_1 = require("../utils/config");
 const FULLNODE_PORT = 8444;
 const LOCALHOST = "127.0.0.1";
+const CHIA_NODES_HOST = "chia-nodes";
 const DNS_HOSTS = [
     "dns-introducer.chia.net",
     "chia.ctrlaltdel.ch",
@@ -64,15 +65,22 @@ class FullNodePeer {
     static async fetchNewPeerIPs() {
         const trustedNodeIp = FullNodePeer.getTrustedFullNode();
         const priorityIps = [];
-        // Prioritize trustedNodeIp
+        // Prioritize trustedNodeIp unless it's deprioritized
         if (trustedNodeIp &&
+            !FullNodePeer.deprioritizedIps.has(trustedNodeIp) &&
             (await FullNodePeer.isPortReachable(trustedNodeIp, FULLNODE_PORT))) {
             priorityIps.push(trustedNodeIp);
         }
-        // Prioritize LOCALHOST
-        if (await FullNodePeer.isPortReachable(LOCALHOST, FULLNODE_PORT)) {
+        // Prioritize LOCALHOST unless it's deprioritized
+        if (!FullNodePeer.deprioritizedIps.has(LOCALHOST) &&
+            (await FullNodePeer.isPortReachable(LOCALHOST, FULLNODE_PORT))) {
             priorityIps.push(LOCALHOST);
         }
+        // Prioritize CHIA_NODES_HOST unless it's deprioritized
+        if (!FullNodePeer.deprioritizedIps.has(CHIA_NODES_HOST) &&
+            (await FullNodePeer.isPortReachable(CHIA_NODES_HOST, FULLNODE_PORT))) {
+            priorityIps.push(CHIA_NODES_HOST);
+        }
         if (priorityIps.length > 0) {
             return priorityIps;
         }
@@ -114,6 +122,8 @@ class FullNodePeer {
         }
         // @ts-ignore
         if (FullNodePeer.memoizedFetchNewPeerIPs?.cache?.clear) {
+            // Clear cache and reset deprioritized IPs when cache is cleared
+            FullNodePeer.deprioritizedIps.clear();
             // @ts-ignore
             FullNodePeer.memoizedFetchNewPeerIPs.cache.clear();
         }
@@ -151,6 +161,8 @@ class FullNodePeer {
                                 FullNodePeer.cachedPeer = null;
                                 // @ts-ignore
                                 FullNodePeer.memoizedFetchNewPeerIPs.cache.clear();
+                                FullNodePeer.deprioritizedIps.clear();
+                                console.info(`Fullnode Peer error, reconnecting to a new peer...`);
                                 const newPeer = await FullNodePeer.getBestPeer();
                                 return newPeer[prop](...args);
                             }
@@ -206,10 +218,11 @@ class FullNodePeer {
             throw new Error("No valid peak heights obtained from any peer.");
         }
         const highestPeak = Math.max(...validHeights);
-        // Prioritize LOCALHOST and TRUSTED_NODE_IP if they have the highest peak height
+        // Prioritize LOCALHOST, TRUSTED_NODE_IP, and CHIA_NODES_HOST if they have the highest peak height
         let bestPeerIndex = validHeights.findIndex((height, index) => height === highestPeak &&
-            (peerIPs[index] === LOCALHOST || peerIPs[index] === trustedNodeIp));
-        // If LOCALHOST or TRUSTED_NODE_IP don't have the highest peak, select any peer with the highest peak
+            !FullNodePeer.deprioritizedIps.has(peerIPs[index]) && // Exclude deprioritized IPs
+            (peerIPs[index] === LOCALHOST || peerIPs[index] === trustedNodeIp || peerIPs[index] === CHIA_NODES_HOST));
+        // If LOCALHOST, TRUSTED_NODE_IP, or CHIA_NODES_HOST don't have the highest peak, select any peer with the highest peak
         if (bestPeerIndex === -1) {
             bestPeerIndex = validHeights.findIndex((height) => height === highestPeak);
         }
@@ -242,6 +255,7 @@ class FullNodePeer {
 }
 exports.FullNodePeer = FullNodePeer;
 FullNodePeer.cachedPeer = null;
+FullNodePeer.deprioritizedIps = new Set(); // New set for deprioritized IPs
 (() => {
     FullNodePeer.memoizedFetchNewPeerIPs = (0, lodash_1.memoize)(FullNodePeer.fetchNewPeerIPs);
 })();

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

@@ -1 +1 @@
-{"version":3,"file":"ServerCoin.d.ts","sourceRoot":"","sources":["../../src/blockchain/ServerCoin.ts"],"names":[],"mappings":"AACA,OAAO,EAML,UAAU,IAAI,gBAAgB,EAE/B,MAAM,8BAA8B,CAAC;AAItC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAMrD,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAAS;IACxB,gBAAuB,iBAAiB,eAEtC;gBAEU,OAAO,EAAE,MAAM;IAKd,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2DzD,kBAAkB,CAC7B,UAAU,EAAE,gBAAgB,EAC5B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;IAqBH,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAoDjD,oBAAoB;IAerB,gBAAgB,CAC3B,KAAK,EAAE,MAAM,EACb,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAoCP,mBAAmB,CAC9B,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAMP,kBAAkB,CAC7B,UAAU,GAAE,MAAU,EACtB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAMP,wBAAwB,CACnC,KAAK,EAAE,MAAM,EACb,UAAU,GAAE,MAAU,EACtB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;WAMN,eAAe,IAAI;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAKpD,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDrD,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WA+B1C,uBAAuB;YAkE7B,sBAAsB;IAWvB,uBAAuB,CAClC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC;WAuBL,sBAAsB,CAAC,mBAAmB,EAAE,IAAI,GAAG;QAC/D,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf;CA2BF"}
+{"version":3,"file":"ServerCoin.d.ts","sourceRoot":"","sources":["../../src/blockchain/ServerCoin.ts"],"names":[],"mappings":"AACA,OAAO,EAML,UAAU,IAAI,gBAAgB,EAE/B,MAAM,8BAA8B,CAAC;AAItC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAMrD,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAAS;IACxB,gBAAuB,iBAAiB,eAEtC;gBAEU,OAAO,EAAE,MAAM;IAKd,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2DzD,kBAAkB,CAC7B,UAAU,EAAE,gBAAgB,EAC5B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;IAqBH,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAoDjD,oBAAoB;IAerB,gBAAgB,CAC3B,KAAK,EAAE,MAAM,EACb,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAoCP,mBAAmB,CAC9B,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAMP,kBAAkB,CAC7B,UAAU,GAAE,MAAU,EACtB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAMP,wBAAwB,CACnC,KAAK,EAAE,MAAM,EACb,UAAU,GAAE,MAAU,EACtB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;WASN,eAAe,IAAI;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAKpD,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDrD,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WA+B1C,uBAAuB;YAkE7B,sBAAsB;IAWvB,uBAAuB,CAClC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC;WAuBL,sBAAsB,CAAC,mBAAmB,EAAE,IAAI,GAAG;QAC/D,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf;CA2BF"}

package/dist/blockchain/ServerCoin.js

@@ -126,6 +126,9 @@ class ServerCoin {
     // Sample server coins by epoch
     async sampleServerCoinsByEpoch(epoch, sampleSize = 5, blacklist = []) {
         const serverCoinPeers = await this.getAllEpochPeers(epoch, blacklist);
+        if (process.env.DIG_DEBUG === "1") {
+            console.log("Server Coin Peers: ", serverCoinPeers);
+        }
         return lodash_1.default.sampleSize(serverCoinPeers, sampleSize);
     }
     // Get the current epoch based on the current timestamp

package/dist/utils/FileTransfer.d.ts

@@ -0,0 +1,47 @@
+import { Readable } from "stream";
+export declare class FileTransfer {
+    private static certPath;
+    private static keyPath;
+    constructor();
+    /** ------------------------ UPLOAD FUNCTIONALITY ------------------------ **/
+    /**
+     * Upload a file to the server using a stream.
+     * @param filePath - Local path of the file.
+     * @param uploadUrl - Server URL to upload the file.
+     * @param headers - Additional headers for the request.
+     * @returns Promise<void>
+     */
+    uploadFile(filePath: string, uploadUrl: string, headers: Record<string, string>): Promise<void>;
+    /**
+     * Perform a POST request.
+     * @param url - The URL to POST to.
+     * @param data - Data to send.
+     * @param headers - Headers for the POST request.
+     * @returns Promise<void>
+     */
+    postRequest(url: string, data: string, headers: Record<string, string>): Promise<void>;
+    /** ------------------------ DOWNLOAD FUNCTIONALITY ------------------------ **/
+    /**
+     * Download data from a URL.
+     * @param url - The URL to download data from.
+     * @returns Promise<string>
+     */
+    downloadData(url: string): Promise<string>;
+    /**
+     * Stream data from a URL.
+     * @param url - The URL to stream data from.
+     * @returns Promise<Readable>
+     */
+    streamData(url: string): Promise<Readable>;
+    /** ------------------------ HEAD REQUEST FUNCTIONALITY ------------------------ **/
+    /**
+     * Perform a HEAD request to check if a resource exists on the server.
+     * @param url - The URL to check.
+     * @returns Promise<{ success: boolean; headers?: Record<string, string> }>
+     */
+    headRequest(url: string): Promise<{
+        success: boolean;
+        headers?: Record<string, string>;
+    }>;
+}
+//# sourceMappingURL=FileTransfer.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"FileTransfer.d.ts","sourceRoot":"","sources":["../../src/utils/FileTransfer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAS;IAChC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAS;;IAU/B,8EAA8E;IAE9E;;;;;;OAMG;IACU,UAAU,CACrB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,OAAO,CAAC,IAAI,CAAC;IA0ChB;;;;;;OAMG;IACU,WAAW,CACtB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,OAAO,CAAC,IAAI,CAAC;IAsChB,gFAAgF;IAEhF;;;;OAIG;IACU,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA0CvD;;;;OAIG;IACU,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAuCvD,oFAAoF;IAEpF;;;;OAIG;IACU,WAAW,CACtB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;CA8BnE"}

package/dist/utils/FileTransfer.js

@@ -0,0 +1,209 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileTransfer = void 0;
+const fs_1 = __importDefault(require("fs"));
+const https_1 = __importDefault(require("https"));
+const url_1 = require("url");
+const ssl_1 = require("../utils/ssl");
+class FileTransfer {
+    constructor() {
+        if (!FileTransfer.certPath || !FileTransfer.keyPath) {
+            const { certPath, keyPath } = (0, ssl_1.getOrCreateSSLCerts)();
+            FileTransfer.certPath = certPath;
+            FileTransfer.keyPath = keyPath;
+        }
+    }
+    /** ------------------------ UPLOAD FUNCTIONALITY ------------------------ **/
+    /**
+     * Upload a file to the server using a stream.
+     * @param filePath - Local path of the file.
+     * @param uploadUrl - Server URL to upload the file.
+     * @param headers - Additional headers for the request.
+     * @returns Promise<void>
+     */
+    async uploadFile(filePath, uploadUrl, headers) {
+        const fileStream = fs_1.default.createReadStream(filePath);
+        const fileSize = fs_1.default.statSync(filePath).size;
+        return new Promise((resolve, reject) => {
+            const url = new url_1.URL(uploadUrl);
+            const options = {
+                hostname: url.hostname,
+                port: url.port || 443,
+                path: url.pathname,
+                method: "PUT",
+                headers: {
+                    ...headers,
+                    "Content-Type": "application/octet-stream",
+                    "Content-Length": fileSize,
+                },
+                key: fs_1.default.readFileSync(FileTransfer.keyPath),
+                cert: fs_1.default.readFileSync(FileTransfer.certPath),
+                rejectUnauthorized: false,
+            };
+            const req = https_1.default.request(options, (res) => {
+                if (res.statusCode === 200) {
+                    resolve();
+                }
+                else {
+                    reject(new Error(`Upload failed with status ${res.statusCode}: ${res.statusMessage}`));
+                }
+            });
+            req.on("error", (err) => reject(err));
+            fileStream.pipe(req);
+            fileStream.on("error", (err) => reject(err));
+        });
+    }
+    /**
+     * Perform a POST request.
+     * @param url - The URL to POST to.
+     * @param data - Data to send.
+     * @param headers - Headers for the POST request.
+     * @returns Promise<void>
+     */
+    async postRequest(url, data, headers) {
+        return new Promise((resolve, reject) => {
+            const urlObj = new url_1.URL(url);
+            const options = {
+                hostname: urlObj.hostname,
+                port: urlObj.port || 443,
+                path: urlObj.pathname,
+                method: "POST",
+                headers: {
+                    ...headers,
+                    "Content-Type": "application/json",
+                    "Content-Length": Buffer.byteLength(data),
+                },
+                key: fs_1.default.readFileSync(FileTransfer.keyPath),
+                cert: fs_1.default.readFileSync(FileTransfer.certPath),
+                rejectUnauthorized: false,
+            };
+            const req = https_1.default.request(options, (res) => {
+                if (res.statusCode === 200) {
+                    resolve();
+                }
+                else {
+                    reject(new Error(`POST request failed with status ${res.statusCode}: ${res.statusMessage}`));
+                }
+            });
+            req.on("error", (err) => reject(err));
+            req.write(data);
+            req.end();
+        });
+    }
+    /** ------------------------ DOWNLOAD FUNCTIONALITY ------------------------ **/
+    /**
+     * Download data from a URL.
+     * @param url - The URL to download data from.
+     * @returns Promise<string>
+     */
+    async downloadData(url) {
+        return new Promise((resolve, reject) => {
+            const urlObj = new url_1.URL(url);
+            const options = {
+                hostname: urlObj.hostname,
+                port: urlObj.port || 443,
+                path: urlObj.pathname + urlObj.search,
+                method: "GET",
+                key: fs_1.default.readFileSync(FileTransfer.keyPath),
+                cert: fs_1.default.readFileSync(FileTransfer.certPath),
+                rejectUnauthorized: false,
+            };
+            const req = https_1.default.request(options, (res) => {
+                let data = "";
+                if (res.statusCode === 200) {
+                    res.on("data", (chunk) => (data += chunk));
+                    res.on("end", () => resolve(data));
+                }
+                else if (res.statusCode === 301 || res.statusCode === 302) {
+                    const redirectUrl = res.headers.location;
+                    if (redirectUrl) {
+                        this.downloadData(redirectUrl).then(resolve).catch(reject);
+                    }
+                    else {
+                        reject(new Error("Redirected without a location header"));
+                    }
+                }
+                else {
+                    reject(new Error(`Failed to retrieve data from ${url}. Status code: ${res.statusCode}`));
+                }
+            });
+            req.on("error", (error) => reject(error));
+            req.end();
+        });
+    }
+    /**
+     * Stream data from a URL.
+     * @param url - The URL to stream data from.
+     * @returns Promise<Readable>
+     */
+    async streamData(url) {
+        return new Promise((resolve, reject) => {
+            const urlObj = new url_1.URL(url);
+            const options = {
+                hostname: urlObj.hostname,
+                port: urlObj.port || 443,
+                path: urlObj.pathname + urlObj.search,
+                method: "GET",
+                key: fs_1.default.readFileSync(FileTransfer.keyPath),
+                cert: fs_1.default.readFileSync(FileTransfer.certPath),
+                rejectUnauthorized: false,
+            };
+            const req = https_1.default.request(options, (res) => {
+                if (res.statusCode === 200) {
+                    resolve(res); // Return the readable stream
+                }
+                else if (res.statusCode === 301 || res.statusCode === 302) {
+                    const redirectUrl = res.headers.location;
+                    if (redirectUrl) {
+                        this.streamData(redirectUrl).then(resolve).catch(reject);
+                    }
+                    else {
+                        reject(new Error("Redirected without a location header"));
+                    }
+                }
+                else {
+                    reject(new Error(`Failed to retrieve stream from ${url}. Status code: ${res.statusCode}`));
+                }
+            });
+            req.on("error", (error) => reject(error));
+            req.end();
+        });
+    }
+    /** ------------------------ HEAD REQUEST FUNCTIONALITY ------------------------ **/
+    /**
+     * Perform a HEAD request to check if a resource exists on the server.
+     * @param url - The URL to check.
+     * @returns Promise<{ success: boolean; headers?: Record<string, string> }>
+     */
+    async headRequest(url) {
+        return new Promise((resolve, reject) => {
+            const urlObj = new url_1.URL(url);
+            const options = {
+                hostname: urlObj.hostname,
+                port: urlObj.port || 443,
+                path: urlObj.pathname,
+                method: "HEAD",
+                key: fs_1.default.readFileSync(FileTransfer.keyPath),
+                cert: fs_1.default.readFileSync(FileTransfer.certPath),
+                rejectUnauthorized: false,
+            };
+            const req = https_1.default.request(options, (res) => {
+                if (res.statusCode === 200) {
+                    resolve({
+                        success: true,
+                        headers: res.headers,
+                    });
+                }
+                else {
+                    resolve({ success: false });
+                }
+            });
+            req.on("error", (err) => reject(err));
+            req.end();
+        });
+    }
+}
+exports.FileTransfer = FileTransfer;

package/package.json

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