Merge pull request #25 from lighthouse-web3/staging

Code refactoring
lighthouse-web3 · Jul 16, 2024 · 7ca7d61 · 7ca7d61
2 parents ec3d0d7 + 1d5ed97
commit 7ca7d61
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 24 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lighthouse-web3/kavach",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Encryption SDK: Build your trustless, decentralized and fault resistance Application using distributed key shades with threshold cryptography",
   "author": "xlassix",
   "main": "./dist/methods/index.js",

diff --git a/readme.MD b/readme.MD
@@ -1,4 +1,4 @@
-# Kavach <img src="https://img.shields.io/badge/BETA-v0.1.8-green"/>
+# Kavach <img src="https://img.shields.io/badge/BETA-v0.1.9-green"/>
 
 Kavach is an encryption SDK that allows you to build your trustless, decentralized and fault-tolerant Applications using distributed key shards with threshold cryptography
 

diff --git a/src/methods/accessControl/validator.ts b/src/methods/accessControl/validator.ts
@@ -221,7 +221,7 @@ const updateConditionSchema = Joi.object({
     .allow("", null)
     .empty(["", null])
     .default("EVM")
-    .valid("EVM", "SOLANA")
+    .valid("EVM", "SOLANA", "COREUM")
     .insensitive(),
   conditions: Joi.when("chainType", {
     is: Joi.equal("EVM"),
@@ -254,7 +254,7 @@ const accessConditionSchema = Joi.object({
     .allow("", null)
     .empty(["", null])
     .default("EVM")
-    .valid("EVM", "SOLANA")
+    .valid("EVM", "SOLANA", "COREUM")
     .insensitive(),
   decryptionType: Joi.string()
     .allow("", null)

diff --git a/src/methods/revokeAccess/index.ts b/src/methods/revokeAccess/index.ts
@@ -19,15 +19,32 @@ export const revokeAccess = async (
     const nodeUrl = nodeId.map((elem) => `/api/setSharedKey/${elem}`);
 
     // send encryption key
-    const data = await Promise.all(
-      nodeUrl.map((url) => {
-        return API_NODE_HANDLER(url, "DELETE", auth_token, {
+    const requestData = async (url: any) => {
+      try {
+        const response = await API_NODE_HANDLER(url, "DELETE", auth_token, {
           address,
           cid,
           revokeTo,
         });
-      })
-    );
+        return response;
+      } catch (error: any) {
+        return {
+          error,
+        };
+      }
+    };
+    const data = [];
+    for (const [index, url] of nodeUrl.entries()) {
+      const response = await requestData(url);
+      if (response.error) {
+        return {
+          isSuccess: false,
+          error: JSON.parse(response?.error?.message),
+        };
+      }
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+      data.push(response);
+    }
     const temp = data.map((elem, index) => ({ ...elem, data: null }));
     return {
       isSuccess: isEqual(...temp),
@@ -36,7 +53,7 @@ export const revokeAccess = async (
   } catch (err: any) {
     return {
       isSuccess: false,
-      error: JSON.parse(err?.message),
+      error: err,
     };
   }
 };
diff --git a/src/methods/shareToAddress/index.ts b/src/methods/shareToAddress/index.ts
@@ -18,15 +18,32 @@ export const shareToAddress = async (
     const nodeId = [1, 2, 3, 4, 5];
     const nodeUrl = nodeId.map((elem) => `/api/setSharedKey/${elem}`);
     // send encryption key
-    const data = await Promise.all(
-      nodeUrl.map((url) => {
-        return API_NODE_HANDLER(url, "PUT", auth_token, {
+    const requestData = async (url: any) => {
+      try {
+        const response = await API_NODE_HANDLER(url, "PUT", auth_token, {
           address,
           cid: cid,
           shareTo,
         });
-      })
-    );
+        return response;
+      } catch (error: any) {
+        return {
+          error,
+        };
+      }
+    };
+    const data = [];
+    for (const [index, url] of nodeUrl.entries()) {
+      const response = await requestData(url);
+      if (response.error) {
+        return {
+          isSuccess: false,
+          error: JSON.parse(response?.error?.message),
+        };
+      }
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+      data.push(response);
+    }
     const temp = data.map((elem, index) => ({ ...elem, data: null }));
     return {
       isSuccess: isEqual(...temp) && temp[0]?.message === "success",
@@ -35,7 +52,7 @@ export const shareToAddress = async (
   } catch (err: any) {
     return {
       isSuccess: false,
-      error: JSON.parse(err.message),
+      error: err,
     };
   }
 };
diff --git a/src/methods/transferOwnership/index.ts b/src/methods/transferOwnership/index.ts
@@ -21,24 +21,41 @@ export const transferOwnership = async (
       (elem) => `/api/transferOwnership/${elem}`
     );
     // send encryption key
-    const data = await Promise.all(
-      nodeUrl.map((url) => {
-        return API_NODE_HANDLER(url, "POST", auth_token, {
+    const requestData = async (url: any) => {
+      try {
+        const response = await API_NODE_HANDLER(url, "POST", auth_token, {
           address,
           cid,
           newOwner,
           resetSharedTo,
         });
-      })
-    );
+        return response;
+      } catch (error: any) {
+        return {
+          error,
+        };
+      }
+    };
+    const data = [];
+    for (const [index, url] of nodeUrl.entries()) {
+      const response = await requestData(url);
+      if (response.error) {
+        return {
+          isSuccess: false,
+          error: JSON.parse(response?.error?.message),
+        };
+      }
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+      data.push(response);
+    }
     return {
       isSuccess: isEqual(...data) && data[0]?.message === "success",
       error: null,
     };
   } catch (err: any) {
     return {
       isSuccess: false,
-      error: JSON.parse(err.message),
+      error: err,
     };
   }
 };