@prosopo/datasets 1.0.2 → 2.0.1

package/dist/cjs/captcha/captcha.cjs

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const types = require("@prosopo/types");
+const util$2 = require("@polkadot/util");
 const common = require("@prosopo/common");
+const types = require("@prosopo/types");
 const util = require("@prosopo/util");
 const util$1 = require("./util.cjs");
-const util$2 = require("@polkadot/util");
 const NO_SOLUTION_VALUE = "NO_SOLUTION";
 function parseCaptchaDataset(datasetJSON) {
   try {
@@ -19,8 +19,7 @@ function parseCaptchaDataset(datasetJSON) {
         };
       })
     };
-    if (result.datasetId !== void 0)
-      result2.datasetId = result.datasetId;
+    if (result.datasetId !== void 0) result2.datasetId = result.datasetId;
     if (result.contentTree !== void 0)
       result2.contentTree = result.contentTree;
     if (result.datasetContentId !== void 0)
@@ -29,7 +28,9 @@ function parseCaptchaDataset(datasetJSON) {
       result2.solutionTree = result.solutionTree;
     return result2;
   } catch (err) {
-    throw new common.ProsopoDatasetError("DATASET.DATASET_PARSE_ERROR", { context: { error: err } });
+    throw new common.ProsopoDatasetError("DATASET.DATASET_PARSE_ERROR", {
+      context: { error: err }
+    });
   }
 }
 function parseAndSortCaptchaSolutions(captchaJSON) {
@@ -39,7 +40,9 @@ function parseAndSortCaptchaSolutions(captchaJSON) {
       solution: captcha.solution.sort()
     }));
   } catch (err) {
-    throw new common.ProsopoDatasetError("DATASET.SOLUTION_PARSE_ERROR", { context: { error: err } });
+    throw new common.ProsopoDatasetError("DATASET.SOLUTION_PARSE_ERROR", {
+      context: { error: err }
+    });
   }
 }
 function captchaSort(a, b) {
@@ -48,26 +51,28 @@ function captchaSort(a, b) {
 function sortAndComputeHashes(received, stored) {
   received.sort(captchaSort);
   stored.sort(captchaSort);
-  return stored.map(({ salt, items = [], target = "", captchaId, solved }, index) => {
-    const item = util.at(received, index);
-    if (captchaId != item.captchaId) {
-      throw new common.ProsopoEnvError("CAPTCHA.ID_MISMATCH");
+  return stored.map(
+    ({ salt, items = [], target = "", captchaId, solved }, index) => {
+      const item = util.at(received, index);
+      if (captchaId !== item.captchaId) {
+        throw new common.ProsopoEnvError("CAPTCHA.ID_MISMATCH");
+      }
+      return {
+        hash: computeCaptchaHash(
+          {
+            solution: solved ? item.solution : [],
+            salt,
+            items,
+            target
+          },
+          true,
+          true,
+          false
+        ),
+        captchaId
+      };
     }
-    return {
-      hash: computeCaptchaHash(
-        {
-          solution: solved ? item.solution : [],
-          salt,
-          items,
-          target
-        },
-        true,
-        true,
-        false
-      ),
-      captchaId
-    };
-  });
+  );
 }
 function compareCaptchaSolutions(received, stored) {
   if (received.length && stored.length && received.length === stored.length) {
@@ -76,19 +81,18 @@ function compareCaptchaSolutions(received, stored) {
   }
   return false;
 }
-function computeCaptchaHash(captcha, includeSolution = false, includeSalt = false, sortItemHashes) {
+function computeCaptchaHash(captcha, includeSolution, includeSalt, sortItemHashes) {
   try {
     const itemHashes = captcha.items.map((item, index) => {
       if (item.hash) {
         return item.hash;
-      } else {
-        throw new common.ProsopoDatasetError("CAPTCHA.MISSING_ITEM_HASH", {
-          context: {
-            computeCaptchaHashName: computeCaptchaHash.name,
-            index
-          }
-        });
       }
+      throw new common.ProsopoDatasetError("CAPTCHA.MISSING_ITEM_HASH", {
+        context: {
+          computeCaptchaHashName: computeCaptchaHash.name,
+          index
+        }
+      });
     });
     return common.hexHashArray([
       captcha.target,
@@ -99,7 +103,9 @@ function computeCaptchaHash(captcha, includeSolution = false, includeSalt = fals
       sortItemHashes ? itemHashes.sort() : itemHashes
     ]);
   } catch (err) {
-    throw new common.ProsopoDatasetError("DATASET.HASH_ERROR", { context: { error: err } });
+    throw new common.ProsopoDatasetError("DATASET.HASH_ERROR", {
+      context: { error: err }
+    });
   }
 }
 function getSolutionValueToHash(solution) {
@@ -108,11 +114,11 @@ function getSolutionValueToHash(solution) {
 async function computeItemHash(item) {
   if (item.type === "text") {
     return { ...item, hash: common.hexHash(item.data) };
-  } else if (item.type === "image") {
+  }
+  if (item.type === "image") {
     return { ...item, hash: common.hexHash(await util$1.downloadImage(item.data)) };
-  } else {
-    throw new common.ProsopoDatasetError("CAPTCHA.INVALID_ITEM_FORMAT");
   }
+  throw new common.ProsopoDatasetError("CAPTCHA.INVALID_ITEM_FORMAT");
 }
 function matchItemsToSolutions(solutions, items) {
   if (!items) {
@@ -124,22 +130,30 @@ function matchItemsToSolutions(solutions, items) {
         throw new common.ProsopoDatasetError("CAPTCHA.INVALID_ITEM_HASH");
       }
       return solution;
-    } else if (typeof solution === "number") {
+    }
+    if (typeof solution === "number") {
       const item = util.at(items, solution);
       return item.hash;
-    } else {
-      throw new common.ProsopoDatasetError("CAPTCHA.INVALID_SOLUTION_TYPE");
     }
+    throw new common.ProsopoDatasetError("CAPTCHA.INVALID_SOLUTION_TYPE");
   });
 }
 function computeCaptchaSolutionHash(captcha) {
-  return common.hexHashArray([captcha.captchaId, captcha.captchaContentId, [...captcha.solution].sort(), captcha.salt]);
+  return common.hexHashArray([
+    captcha.captchaId,
+    captcha.captchaContentId,
+    [...captcha.solution].sort(),
+    captcha.salt
+  ]);
 }
 function computePendingRequestHash(captchaIds, userAccount, salt) {
   return common.hexHashArray([...captchaIds.sort(), userAccount, salt]);
 }
 function parseCaptchaAssets(item, assetsResolver) {
-  return { ...item, data: assetsResolver?.resolveAsset(item.data).getURL() || item.data };
+  return {
+    ...item,
+    data: assetsResolver?.resolveAsset(item.data).getURL() || item.data
+  };
 }
 exports.NO_SOLUTION_VALUE = NO_SOLUTION_VALUE;
 exports.captchaSort = captchaSort;

package/dist/cjs/captcha/dataset.cjs

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const merkle = require("./merkle.cjs");
 const common = require("@prosopo/common");
 const util = require("@prosopo/util");
 const captcha = require("./captcha.cjs");
-const logger = common.getLogger(`Info`, `dataset.ts`);
+const merkle = require("./merkle.cjs");
+const logger = common.getLogger("Info", "dataset.ts");
 async function hashDatasetItems(datasetRaw) {
   return datasetRaw.captchas.map(async (captcha$1) => {
-    const items = await Promise.all(captcha$1.items.map(async (item) => captcha.computeItemHash(item)));
+    const items = await Promise.all(
+      captcha$1.items.map(async (item) => captcha.computeItemHash(item))
+    );
     return {
       ...captcha$1,
       items
@@ -26,17 +28,18 @@ async function validateDatasetContent(datasetOriginal) {
       (captchaRaw2) => "captchaId" in captchaRaw2 ? captchaRaw2.captchaId === captcha2.captchaId : false
     );
     if (captchaRaw) {
-      return captcha2.items.every((item, index) => item.hash === util.at(captchaRaw.items, index).hash);
-    } else {
-      return false;
+      return captcha2.items.every(
+        (item, index) => item.hash === util.at(captchaRaw.items, index).hash
+      );
     }
+    return false;
   });
   return hashes.every((hash) => hash);
 }
 async function buildDataset(datasetRaw) {
-  logger.debug(`Adding solution hashes to dataset`);
+  logger.debug("Adding solution hashes to dataset");
   const dataset = await addSolutionHashesToDataset(datasetRaw);
-  logger.debug(`Building dataset merkle trees`);
+  logger.debug("Building dataset merkle trees");
   const contentTree = await buildCaptchaTree(dataset, false, false, true);
   const solutionTree = await buildCaptchaTree(dataset, true, true, false);
   dataset.captchas = dataset.captchas.map(
@@ -73,7 +76,9 @@ function addSolutionHashesToDataset(datasetRaw) {
       ...captcha$1,
       items: captcha$1.items,
       // some captcha challenges will not have a solution
-      ...captcha$1.solution !== void 0 && { solution: captcha.matchItemsToSolutions(captcha$1.solution, captcha$1.items) }
+      ...captcha$1.solution !== void 0 && {
+        solution: captcha.matchItemsToSolutions(captcha$1.solution, captcha$1.items)
+      }
     };
   });
   return {

package/dist/cjs/captcha/merkle.cjs

@@ -13,6 +13,17 @@ class CaptchaMerkleTree {
     this.leaves = [];
     this.layers = [];
   }
+  getRoot() {
+    if (this.root === void 0) {
+      throw new common.ProsopoError("DATASET.MERKLE_ERROR", {
+        context: {
+          error: "root undefined",
+          failedFuncName: this.getRoot.name
+        }
+      });
+    }
+    return this.root;
+  }
   build(leaves) {
     if (this.layers.length) {
       this.layers = [];
@@ -37,7 +48,9 @@ class CaptchaMerkleTree {
     while (leafIndex < numLeaves) {
       const leftChild = leaves[leafIndex];
       if (leftChild === void 0) {
-        throw new common.ProsopoError("DEVELOPER.GENERAL", { context: { error: "leftChild undefined" } });
+        throw new common.ProsopoError("DEVELOPER.GENERAL", {
+          context: { error: "leftChild undefined" }
+        });
       }
       const rightChild = leafIndex + 1 < numLeaves ? util.at(leaves, leafIndex + 1) : leftChild;
       const parentNode = this.createParent(leftChild, rightChild);
@@ -49,7 +62,9 @@ class CaptchaMerkleTree {
     return this.buildMerkleTree(parents);
   }
   createParent(leftChild, rightChild) {
-    const parent = new MerkleNode(common.hexHashArray([leftChild.hash, rightChild.hash]));
+    const parent = new MerkleNode(
+      common.hexHashArray([leftChild.hash, rightChild.hash])
+    );
     leftChild.parent = parent.hash;
     rightChild.parent = parent.hash;
     return parent;
@@ -61,7 +76,11 @@ class CaptchaMerkleTree {
       const layer = this.layers[layerNum];
       if (layer === void 0) {
         throw new common.ProsopoError("DATASET.MERKLE_ERROR", {
-          context: { error: "layer undefined", failedFuncName: this.proof.name, layerNum }
+          context: {
+            error: "layer undefined",
+            failedFuncName: this.proof.name,
+            layerNum
+          }
         });
       }
       const leafIndex = layer.indexOf(leafHash);

package/dist/cjs/captcha/util.cjs

@@ -6,13 +6,18 @@ async function downloadImage(url) {
     const response = await fetch(url);
     if (!response.ok) {
       throw new common.ProsopoDatasetError("API.BAD_REQUEST", {
-        context: { error: `Network response was not ok, status: ${response.status}`, url }
+        context: {
+          error: `Network response was not ok, status: ${response.status}`,
+          url
+        }
       });
     }
     const buffer = await response.arrayBuffer();
     return new Uint8Array(buffer);
   } catch (err) {
-    throw new common.ProsopoEnvError("DATABASE.IMAGE_GET_FAILED", { context: { error: err } });
+    throw new common.ProsopoEnvError("DATABASE.IMAGE_GET_FAILED", {
+      context: { error: err }
+    });
   }
 }
 exports.downloadImage = downloadImage;

package/dist/cjs/tests/mocks/data/captchas.cjs

@@ -670,7 +670,9 @@ const datasetWithSolutionHashes = {
         }
       ],
       target: "bird",
-      solution: ["0x15671b7ab4c6d575d51bb0c6c2a5dd05427a2938e9cbcaca1de07c23eaced17f"]
+      solution: [
+        "0x15671b7ab4c6d575d51bb0c6c2a5dd05427a2938e9cbcaca1de07c23eaced17f"
+      ]
     },
     {
       captchaId: "0xc9d80c281e124d55441b394bec7d6a64e35c4409d57e37bcb9b9748066b095d6",
@@ -1033,7 +1035,9 @@ const datasetWithIndexSolutions = {
   captchas: datasetWithSolutionHashes.captchas.map((captcha, index) => ({
     ...captcha,
     //for solution in captcha.solution, find the index of captcha.item with item.hash == solution
-    solution: captcha.solution?.map((solution) => captcha.items.findIndex((item) => item.hash === solution))
+    solution: captcha.solution?.map(
+      (solution) => captcha.items.findIndex((item) => item.hash === solution)
+    )
   }))
 };
 exports.datasetWithIndexSolutions = datasetWithIndexSolutions;

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export * from './captcha/index.js';
-export { datasetWithSolutionHashes, datasetWithIndexSolutions } from './tests/mocks/data/captchas.js';
+export * from "./captcha/index.js";
+export { datasetWithSolutionHashes, datasetWithIndexSolutions, } from "./tests/mocks/data/captchas.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,oBAAoB,CAAA;AAClC,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,oBAAoB,CAAC;AACnC,OAAO,EACN,yBAAyB,EACzB,yBAAyB,GACzB,MAAM,gCAAgC,CAAC"}

package/dist/index.js

@@ -1,3 +1,3 @@
-export * from './captcha/index.js';
-export { datasetWithSolutionHashes, datasetWithIndexSolutions } from './tests/mocks/data/captchas.js';
+export * from "./captcha/index.js";
+export { datasetWithSolutionHashes, datasetWithIndexSolutions, } from "./tests/mocks/data/captchas.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,oBAAoB,CAAA;AAClC,OAAO,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,oBAAoB,CAAC;AACnC,OAAO,EACN,yBAAyB,EACzB,yBAAyB,GACzB,MAAM,gCAAgC,CAAC"}