Merge pull request #25 from DIG-Network/release/v0.0.1-alpha.27

Release/v0.0.1 alpha.27

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.0.1-alpha.27](https://github.com/DIG-Network/dig-propagation-server/compare/v0.0.1-alpha.26...v0.0.1-alpha.27) (2024-09-20)
+
 ### [0.0.1-alpha.26](https://github.com/DIG-Network/dig-propagation-server/compare/v0.0.1-alpha.25...v0.0.1-alpha.26) (2024-09-20)
 
 ### [0.0.1-alpha.25](https://github.com/DIG-Network/dig-propagation-server/compare/v0.0.1-alpha.24...v0.0.1-alpha.25) (2024-09-20)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dig-propagation-server",
-  "version": "0.0.1-alpha.26",
+  "version": "0.0.1-alpha.27",
   "description": "",
   "type": "commonjs",
   "main": "./dist/index.js",

src/controllers/merkleTreeController.ts

@@ -4,7 +4,7 @@ import { Request, Response } from "express";
 import NodeCache from "node-cache";
 import { getCredentials } from "../utils/authUtils";
 import { HttpError } from "../utils/HttpError";
-import { generateNonce } from "../utils/nonce";
+import { generateNonce, validateNonce } from "../utils/nonce";
 
 // @ts-ignore
 import { DataStore, Wallet, getStoresList } from "@dignetwork/dig-sdk";
@@ -50,22 +50,13 @@ export const storeStatus = async (
 // Controller to handle HEAD requests for /stores/:storeId
 export const headStore = async (req: Request, res: Response): Promise<void> => {
   try {
-    //  const authHeader = req.headers.authorization || "";
-    //  const [providedUsername, providedPassword] = Buffer.from(
-    //     authHeader.split(" ")[1],
-    //    "base64"
-    //  )
-    //     .toString("utf-8")
-    //    .split(":");
-
-    const { username, password } = await getCredentials();
+    const publicKey = req.headers["x-public-key"] as string;
 
-    // console.log("Provided credentials:", providedUsername, providedPassword);
-    // if (providedUsername !== username || providedPassword !== password) {
-    //   throw new HttpError(401, "Unauthorized");
-    // }
+    if (!publicKey) {
+      throw new HttpError(400, "Missing x-public-key header");
+    }
 
-    const userNonce = await generateNonce(username);
+    const userNonce = await generateNonce(publicKey);
 
     const { storeId } = req.params;
     const hasRootHash = req.query.hasRootHash as string;
@@ -77,11 +68,12 @@ export const headStore = async (req: Request, res: Response): Promise<void> => {
     const dataStore = DataStore.from(storeId);
 
     if (hasRootHash) {
-      const localRootHistory = await dataStore.getLocalRootHistory();
+      const rootHistory = await dataStore.getRootHistory();
       res.setHeader(
         "X-Has-RootHash",
-        localRootHistory?.some(
-          (rootHistory) => rootHistory.root_hash === hasRootHash
+        rootHistory?.some(
+          // @ts-ignore
+          (history) => history.root_hash === hasRootHash && history.synced
         )
           ? "true"
           : "false"
@@ -251,6 +243,13 @@ export const putStore = async (req: Request, res: Response): Promise<void> => {
 
     // Verify key ownership signature
     console.log("Verifying key ownership signature...");
+    const validNonce = validateNonce(publicKey, nonce);
+
+    if (!validNonce) {
+      console.log("Invalid nonce.");
+      throw new HttpError(401, "Invalid nonce.");
+    }
+
     const wallet = await Wallet.load("default");
     const isSignatureValid = await wallet.verifyKeyOwnershipSignature(
       nonce,

src/controllers/storeController.ts

@@ -26,7 +26,7 @@ export const subscribeToStore = async (req: Request, res: Response): Promise<voi
 
     // Create an instance of DigNetwork and pull files from the network
     const digNetwork = new DigNetwork(storeId);
-    await digNetwork.downloadFiles(false, true);
+    await digNetwork.downloadFiles();
 
     res.status(200).json({ message: `Subscribing to store ${storeId}` });
   } catch (error) {

src/tasks/sync_stores.ts

@@ -63,7 +63,7 @@ const syncStoreFromNetwork = async (storeId: string): Promise<void> => {
   try {
     console.log(`Attempting to sync store ${storeId} from the network...`);
     const digNetwork = new DigNetwork(storeId);
-    await digNetwork.downloadFiles(false, false);
+    await digNetwork.downloadFiles();
   } catch (error: any) {
     console.warn(
       `Initial sync attempt failed for ${storeId}: ${error.message}`
@@ -72,9 +72,6 @@ const syncStoreFromNetwork = async (storeId: string): Promise<void> => {
       console.error(`No DIG Peers found for store ${storeId}. Skipping...`);
       return;
     }
-    console.log(`Retrying sync for store ${storeId} with forced download...`);
-    const digNetwork = new DigNetwork(storeId);
-    await digNetwork.downloadFiles(true, false);
   }
 };