@prosopo/datasets 2.6.11 → 3.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +92 -0
- package/dist/captcha/captcha.js.map +1 -1
- package/dist/captcha/dataset.js +3 -3
- package/dist/captcha/dataset.js.map +1 -1
- package/dist/cjs/captcha/dataset.cjs +3 -3
- package/package.json +16 -10
- package/vite.test.config.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,97 @@
|
|
|
1
1
|
# @prosopo/datasets
|
|
2
2
|
|
|
3
|
+
## 3.0.5
|
|
4
|
+
### Patch Changes
|
|
5
|
+
|
|
6
|
+
- @prosopo/types-database@3.0.5
|
|
7
|
+
- @prosopo/util@3.0.2
|
|
8
|
+
|
|
9
|
+
## 3.0.4
|
|
10
|
+
### Patch Changes
|
|
11
|
+
|
|
12
|
+
- @prosopo/types-database@3.0.4
|
|
13
|
+
- @prosopo/util@3.0.1
|
|
14
|
+
|
|
15
|
+
## 3.0.3
|
|
16
|
+
### Patch Changes
|
|
17
|
+
|
|
18
|
+
- Updated dependencies [f682f0c]
|
|
19
|
+
- @prosopo/types-database@3.0.3
|
|
20
|
+
- @prosopo/types@3.0.2
|
|
21
|
+
- @prosopo/common@3.0.2
|
|
22
|
+
|
|
23
|
+
## 3.0.2
|
|
24
|
+
### Patch Changes
|
|
25
|
+
|
|
26
|
+
- @prosopo/common@3.0.1
|
|
27
|
+
- @prosopo/types@3.0.1
|
|
28
|
+
- @prosopo/types-database@3.0.2
|
|
29
|
+
|
|
30
|
+
## 3.0.1
|
|
31
|
+
### Patch Changes
|
|
32
|
+
|
|
33
|
+
- Updated dependencies [913f2a6]
|
|
34
|
+
- @prosopo/types-database@3.0.1
|
|
35
|
+
|
|
36
|
+
## 3.0.0
|
|
37
|
+
### Major Changes
|
|
38
|
+
|
|
39
|
+
- 64b5bcd: Access Controls
|
|
40
|
+
|
|
41
|
+
### Patch Changes
|
|
42
|
+
|
|
43
|
+
- Updated dependencies [64b5bcd]
|
|
44
|
+
- @prosopo/types-database@3.0.0
|
|
45
|
+
- @prosopo/common@3.0.0
|
|
46
|
+
- @prosopo/types@3.0.0
|
|
47
|
+
- @prosopo/util@3.0.0
|
|
48
|
+
|
|
49
|
+
## 2.7.3
|
|
50
|
+
### Patch Changes
|
|
51
|
+
|
|
52
|
+
- Updated dependencies [aee3efe]
|
|
53
|
+
- @prosopo/types@2.10.0
|
|
54
|
+
- @prosopo/types-database@2.7.6
|
|
55
|
+
|
|
56
|
+
## 2.7.2
|
|
57
|
+
### Patch Changes
|
|
58
|
+
|
|
59
|
+
- 86c22b8: structured logging
|
|
60
|
+
- Updated dependencies [86c22b8]
|
|
61
|
+
- @prosopo/types-database@2.7.5
|
|
62
|
+
- @prosopo/util-crypto@13.5.1
|
|
63
|
+
- @prosopo/common@2.7.2
|
|
64
|
+
- @prosopo/types@2.9.1
|
|
65
|
+
- @prosopo/util@2.6.1
|
|
66
|
+
|
|
67
|
+
## 2.7.1
|
|
68
|
+
### Patch Changes
|
|
69
|
+
|
|
70
|
+
- Updated dependencies [30bb383]
|
|
71
|
+
- @prosopo/util-crypto@13.5.0
|
|
72
|
+
- @prosopo/types@2.9.0
|
|
73
|
+
- @prosopo/common@2.7.1
|
|
74
|
+
- @prosopo/types-database@2.7.4
|
|
75
|
+
|
|
76
|
+
## 2.7.0
|
|
77
|
+
### Minor Changes
|
|
78
|
+
|
|
79
|
+
- 8f0644a: Taking required functions from polkadot/keyring and polkadot/util-crypto in-house and removing WASM dependencies. Adding @scure JS-based sr25519 function instead.
|
|
80
|
+
|
|
81
|
+
### Patch Changes
|
|
82
|
+
|
|
83
|
+
- Updated dependencies [8f0644a]
|
|
84
|
+
- @prosopo/util-crypto@13.4.0
|
|
85
|
+
- @prosopo/common@2.7.0
|
|
86
|
+
- @prosopo/types@2.8.0
|
|
87
|
+
- @prosopo/types-database@2.7.3
|
|
88
|
+
|
|
89
|
+
## 2.6.12
|
|
90
|
+
|
|
91
|
+
### Patch Changes
|
|
92
|
+
|
|
93
|
+
- ea38a1c: lint
|
|
94
|
+
|
|
3
95
|
## 2.6.11
|
|
4
96
|
|
|
5
97
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captcha.js","sourceRoot":"","sources":["../../src/captcha/captcha.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACN,mBAAmB,EACnB,eAAe,EACf,OAAO,EACP,YAAY,GACZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAIN,0BAA0B,EAG1B,gCAAgC,GAKhC,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"captcha.js","sourceRoot":"","sources":["../../src/captcha/captcha.ts"],"names":[],"mappings":"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"}
|
package/dist/captcha/dataset.js
CHANGED
|
@@ -2,7 +2,7 @@ import { ProsopoEnvError, getLogger } from "@prosopo/common";
|
|
|
2
2
|
import { at } from "@prosopo/util";
|
|
3
3
|
import { computeCaptchaHash, computeItemHash, matchItemsToSolutions, } from "./captcha.js";
|
|
4
4
|
import { CaptchaMerkleTree } from "./merkle.js";
|
|
5
|
-
const logger = getLogger("
|
|
5
|
+
const logger = getLogger("info", import.meta.url);
|
|
6
6
|
export async function hashDatasetItems(datasetRaw) {
|
|
7
7
|
return datasetRaw.captchas.map(async (captcha) => {
|
|
8
8
|
const items = await Promise.all(captcha.items.map(async (item) => computeItemHash(item)));
|
|
@@ -31,9 +31,9 @@ export async function validateDatasetContent(datasetOriginal) {
|
|
|
31
31
|
return hashes.every((hash) => hash);
|
|
32
32
|
}
|
|
33
33
|
export async function buildDataset(datasetRaw) {
|
|
34
|
-
logger.debug("Adding solution hashes to dataset");
|
|
34
|
+
logger.debug(() => ({ msg: "Adding solution hashes to dataset" }));
|
|
35
35
|
const dataset = await addSolutionHashesToDataset(datasetRaw);
|
|
36
|
-
logger.debug("Building dataset merkle trees");
|
|
36
|
+
logger.debug(() => ({ msg: "Building dataset merkle trees" }));
|
|
37
37
|
const contentTree = await buildCaptchaTree(dataset, false, false, true);
|
|
38
38
|
const solutionTree = await buildCaptchaTree(dataset, true, true, false);
|
|
39
39
|
dataset.captchas = dataset.captchas.map((captcha, index) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataset.js","sourceRoot":"","sources":["../../src/captcha/dataset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAoB7D,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AACnC,OAAO,EACN,kBAAkB,EAClB,eAAe,EACf,qBAAqB,GACrB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"dataset.js","sourceRoot":"","sources":["../../src/captcha/dataset.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ const common = require("@prosopo/common");
|
|
|
4
4
|
const util = require("@prosopo/util");
|
|
5
5
|
const captcha = require("./captcha.cjs");
|
|
6
6
|
const merkle = require("./merkle.cjs");
|
|
7
|
-
const logger = common.getLogger("
|
|
7
|
+
const logger = common.getLogger("info", module);
|
|
8
8
|
async function hashDatasetItems(datasetRaw) {
|
|
9
9
|
return datasetRaw.captchas.map(async (captcha$1) => {
|
|
10
10
|
const items = await Promise.all(
|
|
@@ -37,9 +37,9 @@ async function validateDatasetContent(datasetOriginal) {
|
|
|
37
37
|
return hashes.every((hash) => hash);
|
|
38
38
|
}
|
|
39
39
|
async function buildDataset(datasetRaw) {
|
|
40
|
-
logger.debug("Adding solution hashes to dataset");
|
|
40
|
+
logger.debug(() => ({ msg: "Adding solution hashes to dataset" }));
|
|
41
41
|
const dataset = await addSolutionHashesToDataset(datasetRaw);
|
|
42
|
-
logger.debug("Building dataset merkle trees");
|
|
42
|
+
logger.debug(() => ({ msg: "Building dataset merkle trees" }));
|
|
43
43
|
const contentTree = await buildCaptchaTree(dataset, false, false, true);
|
|
44
44
|
const solutionTree = await buildCaptchaTree(dataset, true, true, false);
|
|
45
45
|
dataset.captchas = dataset.captchas.map(
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/datasets",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.5",
|
|
4
4
|
"author": "PROSOPO LIMITED <info@prosopo.io>",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"private": false,
|
|
@@ -38,23 +38,29 @@
|
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
40
|
"@polkadot/util": "12.6.2",
|
|
41
|
-
"@prosopo/common": "
|
|
42
|
-
"@prosopo/types": "
|
|
43
|
-
"@prosopo/types-database": "
|
|
44
|
-
"@prosopo/util": "
|
|
45
|
-
"
|
|
41
|
+
"@prosopo/common": "3.0.2",
|
|
42
|
+
"@prosopo/types": "3.0.2",
|
|
43
|
+
"@prosopo/types-database": "3.0.5",
|
|
44
|
+
"@prosopo/util": "3.0.2",
|
|
45
|
+
"@prosopo/util-crypto": "13.5.1",
|
|
46
|
+
"@typegoose/auto-increment": "4.13.0",
|
|
47
|
+
"axios": "1.10.0",
|
|
48
|
+
"esbuild": "0.25.6",
|
|
49
|
+
"express": "4.21.2",
|
|
50
|
+
"openpgp": "5.11.3",
|
|
51
|
+
"webpack-dev-server": "5.2.2"
|
|
46
52
|
},
|
|
47
53
|
"devDependencies": {
|
|
48
|
-
"@prosopo/config": "
|
|
54
|
+
"@prosopo/config": "3.1.0",
|
|
49
55
|
"@vitest/coverage-v8": "3.0.9",
|
|
50
56
|
"concurrently": "9.0.1",
|
|
51
57
|
"del-cli": "6.0.0",
|
|
52
58
|
"dotenv": "16.4.5",
|
|
53
|
-
"npm-run-all": "
|
|
59
|
+
"npm-run-all": "4.1.5",
|
|
54
60
|
"tslib": "2.7.0",
|
|
55
|
-
"tsx": "4.
|
|
61
|
+
"tsx": "4.20.3",
|
|
56
62
|
"typescript": "5.6.2",
|
|
57
|
-
"vite": "6.
|
|
63
|
+
"vite": "6.3.5",
|
|
58
64
|
"vitest": "3.0.9"
|
|
59
65
|
},
|
|
60
66
|
"repository": {
|
package/vite.test.config.ts
CHANGED