@dignetwork/dig-sdk 0.0.1-alpha.30 → 0.0.1-alpha.33

package/dist/DigNetwork/ContentServer.js

@@ -69,7 +69,7 @@ class ContentServer {
     async headStore(options) {
         let url = `https://${this.ipAddress}/${this.storeId}`;
         if (options?.hasRootHash) {
-            url += `hasRootHash=${options.hasRootHash}`;
+            url += `?hasRootHash=${options.hasRootHash}`;
         }
         return this.head(url); // Return the object from head method
     }

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): Promise<string | null>;
+    static findPeerWithStoreKey(storeId: string, rootHash: string, key?: string, intialBlackList?: string[]): Promise<string | 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;AAMpC,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,GACX,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;WA2CX,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;YAqFF,mBAAmB;YAWnB,kBAAkB;YASlB,oBAAoB;YASpB,qBAAqB;YAuErB,cAAc;CAoB7B"}
+{"version":3,"file":"DigNetwork.d.ts","sourceRoot":"","sources":["../../src/DigNetwork/DigNetwork.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,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;WA6CX,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;YAiEF,mBAAmB;YAWnB,kBAAkB;YASlB,oBAAoB;YASpB,qBAAqB;YAuErB,cAAc;CAoB7B"}

package/dist/DigNetwork/DigNetwork.js

@@ -122,8 +122,8 @@ class DigNetwork {
         const digNetwork = new DigNetwork(storeId);
         await digNetwork.downloadFiles(true);
     }
-    static async findPeerWithStoreKey(storeId, rootHash, key) {
-        const peerBlackList = [];
+    static async findPeerWithStoreKey(storeId, rootHash, key, intialBlackList = []) {
+        const peerBlackList = intialBlackList;
         const serverCoin = new blockchain_1.ServerCoin(storeId);
         while (true) {
             try {
@@ -135,6 +135,7 @@ class DigNetwork {
                 const storeResponse = await digPeer.contentServer.headStore({
                     hasRootHash: rootHash,
                 });
+                console.log(peerIp, storeResponse.headers);
                 if (storeResponse.success &&
                     storeResponse.headers?.["x-has-rootHash"] === "true") {
                     if (!key)
@@ -167,44 +168,30 @@ class DigNetwork {
             if (!rootHistory.length)
                 throw new Error("No roots found in rootHistory. Cannot proceed with file download.");
             await this.downloadHeightFile(forceDownload);
-            const localManifestPath = path.join(this.storeDir, "manifest.dat");
-            const localManifestHashes = fs.existsSync(localManifestPath)
-                ? fs.readFileSync(localManifestPath, "utf-8").trim().split("\n")
-                : [];
-            const progressBar = renderProgressBar
-                ? new cli_progress_1.MultiBar({
-                    clearOnComplete: false,
-                    hideCursor: true,
-                    format: "Syncing Store | {bar} | {percentage}%",
-                    noTTYOutput: true,
-                }, cli_progress_1.Presets.shades_classic)
-                : null;
-            const progress = progressBar
-                ? progressBar.create(rootHistory.length, 0)
-                : null;
-            const newRootHashes = [];
-            for (let i = 0; i < rootHistory.length; i++) {
-                const { root_hash: rootHash } = rootHistory[i];
-                const datFilePath = path.join(this.storeDir, `${rootHash}.dat`);
-                await this.downloadFileFromPeers(`${rootHash}.dat`, datFilePath, forceDownload);
-                const datFileContent = JSON.parse(fs.readFileSync(datFilePath, "utf-8"));
-                if (datFileContent.root !== rootHash)
-                    throw new Error("Root hash mismatch");
+            const rootHistorySorted = 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 (!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`);
+                const root = JSON.parse(rootResponse);
                 if (!skipData) {
-                    for (const file of Object.keys(datFileContent.files)) {
-                        const filePath = (0, hashUtils_1.getFilePathFromSha256)(datFileContent.files[file].sha256, path.join(this.storeDir, "data"));
-                        const isInDataDir = filePath.startsWith(path.join(this.storeDir, "data"));
-                        await this.downloadFileFromPeers((0, hashUtils_1.getFilePathFromSha256)(datFileContent.files[file].sha256, "data"), filePath, forceDownload || !isInDataDir);
-                    }
+                    await Promise.all(root.files.map(async (file) => {
+                        const filePath = (0, hashUtils_1.getFilePathFromSha256)(file.sha256, this.storeDir);
+                        if (!fs.existsSync(filePath) || forceDownload) {
+                            console.log(`Downloading ${file.sha256}...`);
+                            await this.downloadFileFromPeers(file.sha256.match(/.{1,2}/g).join("/"), filePath, forceDownload);
+                        }
+                    }));
                 }
-                if (localManifestHashes[i] !== rootHash)
-                    newRootHashes.push(rootHash);
-                progress?.increment();
             }
-            if (newRootHashes.length)
-                fs.appendFileSync(localManifestPath, newRootHashes.join("\n") + "\n");
-            await this.downloadManifestFile(forceDownload);
-            progressBar?.stop();
+            await this.downloadManifestFile(true);
             console.log("Syncing store complete.");
         }
         catch (error) {

package/dist/DigNetwork/DigPeer.js

@@ -185,7 +185,7 @@ class DigPeer {
             throw new Error("Invalid input. Must be a 32-byte buffer.");
         }
         // Define the seed
-        const seed = "dig";
+        const seed = "digpayment";
         // Combine the seed and the original buffer
         const combinedBuffer = Buffer.concat([Buffer.from(seed), storeId]);
         // Apply SHA-256 hash to the combined buffer

package/package.json

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