@prosopo/provider 2.0.3 → 2.1.0
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/dist/api/admin.js.map +1 -1
- package/dist/api/authMiddleware.js.map +1 -1
- package/dist/api/captcha.d.ts.map +1 -1
- package/dist/api/captcha.js +10 -17
- package/dist/api/captcha.js.map +1 -1
- package/dist/api/errorHandler.js.map +1 -1
- package/dist/api/verify.d.ts.map +1 -1
- package/dist/api/verify.js +3 -5
- package/dist/api/verify.js.map +1 -1
- package/dist/cjs/api/captcha.cjs +17 -19
- package/dist/cjs/api/verify.cjs +3 -4
- package/dist/cjs/index.cjs +3 -1
- package/dist/cjs/{api → schedulers}/captchaScheduler.cjs +2 -2
- package/dist/cjs/schedulers/getClientList.cjs +31 -0
- package/dist/cjs/tasks/client/clientTasks.cjs +141 -0
- package/dist/cjs/tasks/dataset/datasetTasks.cjs +0 -95
- package/dist/cjs/tasks/imgCaptcha/imgCaptchaTasks.cjs +6 -4
- package/dist/cjs/tasks/powCaptcha/powTasks.cjs +2 -2
- package/dist/cjs/tasks/tasks.cjs +6 -0
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/{api → schedulers}/captchaScheduler.d.ts +1 -1
- package/dist/schedulers/captchaScheduler.d.ts.map +1 -0
- package/dist/{api → schedulers}/captchaScheduler.js +4 -4
- package/dist/schedulers/captchaScheduler.js.map +1 -0
- package/dist/schedulers/getClientList.d.ts +4 -0
- package/dist/schedulers/getClientList.d.ts.map +1 -0
- package/dist/schedulers/getClientList.js +28 -0
- package/dist/schedulers/getClientList.js.map +1 -0
- package/dist/tasks/client/clientTasks.d.ts +12 -0
- package/dist/tasks/client/clientTasks.d.ts.map +1 -0
- package/dist/tasks/client/clientTasks.js +80 -0
- package/dist/tasks/client/clientTasks.js.map +1 -0
- package/dist/tasks/dataset/datasetTasks.d.ts +4 -6
- package/dist/tasks/dataset/datasetTasks.d.ts.map +1 -1
- package/dist/tasks/dataset/datasetTasks.js +0 -52
- package/dist/tasks/dataset/datasetTasks.js.map +1 -1
- package/dist/tasks/dataset/datasetTasksUtils.js.map +1 -1
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts +6 -6
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts.map +1 -1
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.js +4 -3
- package/dist/tasks/imgCaptcha/imgCaptchaTasks.js.map +1 -1
- package/dist/tasks/imgCaptcha/imgCaptchaTasksUtils.d.ts.map +1 -1
- package/dist/tasks/imgCaptcha/imgCaptchaTasksUtils.js.map +1 -1
- package/dist/tasks/powCaptcha/powTasks.d.ts +5 -5
- package/dist/tasks/powCaptcha/powTasks.d.ts.map +1 -1
- package/dist/tasks/powCaptcha/powTasks.js +3 -3
- package/dist/tasks/powCaptcha/powTasks.js.map +1 -1
- package/dist/tasks/powCaptcha/powTasksUtils.d.ts.map +1 -1
- package/dist/tasks/powCaptcha/powTasksUtils.js.map +1 -1
- package/dist/tasks/tasks.d.ts +5 -3
- package/dist/tasks/tasks.d.ts.map +1 -1
- package/dist/tasks/tasks.js +2 -0
- package/dist/tasks/tasks.js.map +1 -1
- package/dist/tests/integration/imgCaptcha.integration.test.js.map +1 -1
- package/dist/tests/integration/mocks/solvedTestCaptchas.d.ts +8 -12
- package/dist/tests/integration/mocks/solvedTestCaptchas.d.ts.map +1 -1
- package/dist/tests/integration/mocks/solvedTestCaptchas.js.map +1 -1
- package/dist/tests/integration/powCaptcha.integration.test.js.map +1 -1
- package/dist/tests/unit/schedulers/captchaScheduler.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/{api → schedulers}/captchaScheduler.unit.test.js +6 -4
- package/dist/tests/unit/schedulers/captchaScheduler.unit.test.js.map +1 -0
- package/dist/tests/unit/tasks/client/clientTasks.unit.test.d.ts +2 -0
- package/dist/tests/unit/tasks/client/clientTasks.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/tasks/client/clientTasks.unit.test.js +172 -0
- package/dist/tests/unit/tasks/client/clientTasks.unit.test.js.map +1 -0
- package/dist/tests/unit/tasks/dataset/datasetTasks.unit.test.js +12 -114
- package/dist/tests/unit/tasks/dataset/datasetTasks.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.js +6 -2
- package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/powCaptcha/powTasks.unit.test.js +7 -2
- package/dist/tests/unit/tasks/powCaptcha/powTasks.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/powCaptcha/powTasksUtils.unit.test.js.map +1 -1
- package/dist/util.d.ts +2 -2
- package/dist/util.d.ts.map +1 -1
- package/dist/util.js.map +1 -1
- package/package.json +68 -72
- package/vite.test.config.ts +4 -2
- package/dist/api/captchaScheduler.d.ts.map +0 -1
- package/dist/api/captchaScheduler.js.map +0 -1
- package/dist/tests/unit/api/captchaScheduler.unit.test.d.ts.map +0 -1
- package/dist/tests/unit/api/captchaScheduler.unit.test.js.map +0 -1
- /package/dist/tests/unit/{api → schedulers}/captchaScheduler.unit.test.d.ts +0 -0
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import { saveCaptchaEvent, saveCaptchas } from "@prosopo/database";
|
|
2
1
|
import { parseCaptchaDataset } from "@prosopo/datasets";
|
|
3
|
-
import { ScheduledTaskNames, ScheduledTaskStatus, } from "@prosopo/types";
|
|
4
2
|
import { ScheduledTaskSchema, } from "@prosopo/types-database";
|
|
5
3
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
6
4
|
import { DatasetManager } from "../../../../tasks/dataset/datasetTasks.js";
|
|
@@ -17,9 +15,9 @@ describe("DatasetManager", () => {
|
|
|
17
15
|
let config;
|
|
18
16
|
let logger;
|
|
19
17
|
let captchaConfig;
|
|
20
|
-
let
|
|
18
|
+
let providerDB;
|
|
21
19
|
let datasetManager;
|
|
22
|
-
|
|
20
|
+
const collections = {};
|
|
23
21
|
beforeEach(() => {
|
|
24
22
|
config = {
|
|
25
23
|
devOnlyWatchEvents: true,
|
|
@@ -35,18 +33,18 @@ describe("DatasetManager", () => {
|
|
|
35
33
|
solved: { count: 5 },
|
|
36
34
|
unsolved: { count: 5 },
|
|
37
35
|
};
|
|
38
|
-
collections
|
|
39
|
-
collections
|
|
40
|
-
collections
|
|
41
|
-
collections
|
|
42
|
-
|
|
36
|
+
collections.schedulers = {};
|
|
37
|
+
collections.schedulers.records = {};
|
|
38
|
+
collections.schedulers.nextID = 0;
|
|
39
|
+
collections.schedulers.time = 0;
|
|
40
|
+
providerDB = {
|
|
43
41
|
storeDataset: vi.fn(),
|
|
44
42
|
getUnstoredDappUserCommitments: vi.fn().mockResolvedValue([]),
|
|
45
43
|
markDappUserCommitmentsStored: vi.fn(),
|
|
46
44
|
markDappUserPoWCommitmentsStored: vi.fn(),
|
|
47
45
|
getUnstoredDappUserPoWCommitments: vi.fn().mockResolvedValue([]),
|
|
48
46
|
createScheduledTaskStatus: vi.fn((taskName, status) => {
|
|
49
|
-
const _id = collections
|
|
47
|
+
const _id = collections.schedulers.nextID;
|
|
50
48
|
collections.schedulers.records[_id] = ScheduledTaskSchema.parse({
|
|
51
49
|
_id,
|
|
52
50
|
processName: taskName,
|
|
@@ -65,12 +63,12 @@ describe("DatasetManager", () => {
|
|
|
65
63
|
collections.schedulers.time += 1;
|
|
66
64
|
}),
|
|
67
65
|
getLastScheduledTaskStatus: vi.fn((taskID, status) => {
|
|
68
|
-
return Object.keys(collections.schedulers.records)
|
|
66
|
+
return (Object.keys(collections.schedulers.records)
|
|
69
67
|
.map((key) => collections.schedulers.records[key])
|
|
70
|
-
.find((task) => task.processName === taskID && task.status === status);
|
|
68
|
+
.find((task) => task.processName === taskID && task.status === status));
|
|
71
69
|
}),
|
|
72
70
|
};
|
|
73
|
-
datasetManager = new DatasetManager(config, logger, captchaConfig,
|
|
71
|
+
datasetManager = new DatasetManager(config, logger, captchaConfig, providerDB);
|
|
74
72
|
vi.clearAllMocks();
|
|
75
73
|
});
|
|
76
74
|
it("should set the provider dataset from a file", async () => {
|
|
@@ -82,107 +80,7 @@ describe("DatasetManager", () => {
|
|
|
82
80
|
await datasetManager.providerSetDatasetFromFile(mockFile);
|
|
83
81
|
expect(parseCaptchaDataset).toHaveBeenCalledWith(mockFile);
|
|
84
82
|
expect(datasetTasksUtils.providerValidateDataset).toHaveBeenCalledWith(mockDatasetRaw, captchaConfig.solved.count, captchaConfig.unsolved.count);
|
|
85
|
-
expect(
|
|
86
|
-
});
|
|
87
|
-
it("should not save captcha event if devOnlyWatchEvents is not true", async () => {
|
|
88
|
-
config.devOnlyWatchEvents = false;
|
|
89
|
-
const events = { events: [] };
|
|
90
|
-
const accountId = "account123";
|
|
91
|
-
await datasetManager.saveCaptchaEvent(events, accountId);
|
|
92
|
-
expect(logger.info).toHaveBeenCalledWith("Dev watch events not set to true, not saving events");
|
|
93
|
-
expect(saveCaptchaEvent).not.toHaveBeenCalled();
|
|
94
|
-
});
|
|
95
|
-
it("should save captcha event if devOnlyWatchEvents is true", async () => {
|
|
96
|
-
const events = { events: [] };
|
|
97
|
-
const accountId = "account123";
|
|
98
|
-
await datasetManager.saveCaptchaEvent(events, accountId);
|
|
99
|
-
expect(saveCaptchaEvent).toHaveBeenCalledWith(events, accountId, config.mongoEventsUri);
|
|
100
|
-
});
|
|
101
|
-
it("should not store commitments externally if mongoCaptchaUri is not set", async () => {
|
|
102
|
-
config.mongoCaptchaUri = undefined;
|
|
103
|
-
await datasetManager.storeCommitmentsExternal();
|
|
104
|
-
expect(logger.info).toHaveBeenCalledWith("Mongo env not set");
|
|
105
|
-
expect(db.getUnstoredDappUserCommitments).not.toHaveBeenCalled();
|
|
106
|
-
});
|
|
107
|
-
it("should store commitments externally if mongoCaptchaUri is set", async () => {
|
|
108
|
-
const mockCommitments = [
|
|
109
|
-
{ id: "commitment1" },
|
|
110
|
-
];
|
|
111
|
-
const mockPoWCommitments = [
|
|
112
|
-
{
|
|
113
|
-
challenge: "1234567___userAccount___dappAccount",
|
|
114
|
-
},
|
|
115
|
-
];
|
|
116
|
-
db.getUnstoredDappUserCommitments.mockResolvedValue(mockCommitments);
|
|
117
|
-
db.createScheduledTaskStatus.mockResolvedValue({});
|
|
118
|
-
db.updateScheduledTaskStatus.mockResolvedValue({});
|
|
119
|
-
db.getUnstoredDappUserPoWCommitments.mockResolvedValue(mockPoWCommitments);
|
|
120
|
-
await datasetManager.storeCommitmentsExternal();
|
|
121
|
-
expect(db.getUnstoredDappUserCommitments).toHaveBeenCalled();
|
|
122
|
-
expect(db.getUnstoredDappUserPoWCommitments).toHaveBeenCalled();
|
|
123
|
-
expect(saveCaptchas).toHaveBeenCalledWith(mockCommitments, mockPoWCommitments, config.mongoCaptchaUri);
|
|
124
|
-
expect(db.markDappUserCommitmentsStored).toHaveBeenCalledWith(mockCommitments.map((c) => c.id));
|
|
125
|
-
expect(db.markDappUserPoWCommitmentsStored).toHaveBeenCalledWith(mockPoWCommitments.map((c) => c.challenge));
|
|
126
|
-
});
|
|
127
|
-
it("should not store commitments externally if they have been stored", async () => {
|
|
128
|
-
const mockCommitments = [
|
|
129
|
-
{
|
|
130
|
-
id: "commitment1",
|
|
131
|
-
lastUpdatedTimestamp: 1,
|
|
132
|
-
},
|
|
133
|
-
];
|
|
134
|
-
const mockPoWCommitments = [
|
|
135
|
-
{
|
|
136
|
-
challenge: "1234567___userAccount___dappAccount",
|
|
137
|
-
lastUpdatedTimestamp: 3,
|
|
138
|
-
},
|
|
139
|
-
];
|
|
140
|
-
const mockLastScheduledTask = {
|
|
141
|
-
_id: 0,
|
|
142
|
-
status: ScheduledTaskStatus.Completed,
|
|
143
|
-
processName: ScheduledTaskNames.StoreCommitmentsExternal,
|
|
144
|
-
updated: 1,
|
|
145
|
-
};
|
|
146
|
-
collections.schedulers.records[0] = mockLastScheduledTask;
|
|
147
|
-
collections.schedulers.nextID += 1;
|
|
148
|
-
collections.schedulers.time = 2;
|
|
149
|
-
db.getUnstoredDappUserCommitments.mockResolvedValue(mockCommitments);
|
|
150
|
-
db.getUnstoredDappUserPoWCommitments.mockResolvedValue(mockPoWCommitments);
|
|
151
|
-
await datasetManager.storeCommitmentsExternal();
|
|
152
|
-
expect(db.getUnstoredDappUserCommitments).toHaveBeenCalled();
|
|
153
|
-
expect(db.getUnstoredDappUserPoWCommitments).toHaveBeenCalled();
|
|
154
|
-
expect(db.getLastScheduledTaskStatus).toHaveReturnedWith(mockLastScheduledTask);
|
|
155
|
-
expect(db.createScheduledTaskStatus).toHaveBeenCalledWith(ScheduledTaskNames.StoreCommitmentsExternal, ScheduledTaskStatus.Running);
|
|
156
|
-
expect(saveCaptchas).toHaveBeenCalledWith([], mockPoWCommitments, config.mongoCaptchaUri);
|
|
157
|
-
expect(db.markDappUserCommitmentsStored).toHaveBeenCalledWith([]);
|
|
158
|
-
expect(db.markDappUserPoWCommitmentsStored).toHaveBeenCalledWith(mockPoWCommitments.map((c) => c.challenge));
|
|
159
|
-
expect(db.updateScheduledTaskStatus).toHaveBeenCalledWith(parseInt(mockLastScheduledTask._id) + 1, ScheduledTaskStatus.Completed, {
|
|
160
|
-
data: {
|
|
161
|
-
commitments: [],
|
|
162
|
-
powRecords: mockPoWCommitments.map((c) => c.challenge),
|
|
163
|
-
},
|
|
164
|
-
});
|
|
165
|
-
});
|
|
166
|
-
it("should not call saveCaptchas if there is nothing to save", async () => {
|
|
167
|
-
const mockLastScheduledTask = {
|
|
168
|
-
_id: 0,
|
|
169
|
-
status: ScheduledTaskStatus.Completed,
|
|
170
|
-
processName: ScheduledTaskNames.StoreCommitmentsExternal,
|
|
171
|
-
updated: 1,
|
|
172
|
-
};
|
|
173
|
-
collections.schedulers.records[0] = mockLastScheduledTask;
|
|
174
|
-
collections.schedulers.nextID += 1;
|
|
175
|
-
collections.schedulers.time = 2;
|
|
176
|
-
db.getUnstoredDappUserCommitments.mockResolvedValue([]);
|
|
177
|
-
db.getUnstoredDappUserPoWCommitments.mockResolvedValue([]);
|
|
178
|
-
await datasetManager.storeCommitmentsExternal();
|
|
179
|
-
expect(saveCaptchas).not.toHaveBeenCalled();
|
|
180
|
-
expect(db.updateScheduledTaskStatus).toHaveBeenCalledWith(parseInt(mockLastScheduledTask._id) + 1, ScheduledTaskStatus.Completed, {
|
|
181
|
-
data: {
|
|
182
|
-
commitments: [],
|
|
183
|
-
powRecords: [],
|
|
184
|
-
},
|
|
185
|
-
});
|
|
83
|
+
expect(providerDB.storeDataset).toHaveBeenCalledWith(mockValidatedDataset);
|
|
186
84
|
});
|
|
187
85
|
});
|
|
188
86
|
//# sourceMappingURL=datasetTasks.unit.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datasetTasks.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/dataset/datasetTasks.unit.test.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"datasetTasks.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/dataset/datasetTasks.unit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,6 +99,7 @@ describe("ImgCaptchaManager", () => {
|
|
|
99
99
|
const userAccount = "userAccount";
|
|
100
100
|
const dataset = { datasetId, captchas: [] };
|
|
101
101
|
const ipAddress = "0.0.0.0";
|
|
102
|
+
const headers = { a: "1", b: "2", c: "3" };
|
|
102
103
|
db.getDatasetDetails.mockResolvedValue(dataset);
|
|
103
104
|
db.getRandomCaptcha.mockResolvedValue([]);
|
|
104
105
|
randomAsHex.mockReturnValue("randomSalt");
|
|
@@ -106,7 +107,7 @@ describe("ImgCaptchaManager", () => {
|
|
|
106
107
|
pair.sign.mockReturnValue("hexSignedRequestHash");
|
|
107
108
|
u8aToHex.mockReturnValue("hexSignedRequestHash");
|
|
108
109
|
shuffleArray.mockReturnValue([]);
|
|
109
|
-
const result = await imgCaptchaManager.getRandomCaptchasAndRequestHash(datasetId, userAccount, ipAddress);
|
|
110
|
+
const result = await imgCaptchaManager.getRandomCaptchasAndRequestHash(datasetId, userAccount, ipAddress, headers);
|
|
110
111
|
expect(result).toEqual({
|
|
111
112
|
captchas: [],
|
|
112
113
|
requestHash: "computedHash",
|
|
@@ -118,8 +119,9 @@ describe("ImgCaptchaManager", () => {
|
|
|
118
119
|
const datasetId = "datasetId";
|
|
119
120
|
const userAccount = "userAccount";
|
|
120
121
|
const ipAddress = "0.0.0.0";
|
|
122
|
+
const headers = { a: "1", b: "2", c: "3" };
|
|
121
123
|
db.getDatasetDetails.mockResolvedValue(null);
|
|
122
|
-
await expect(imgCaptchaManager.getRandomCaptchasAndRequestHash(datasetId, userAccount, ipAddress)).rejects.toThrow(new ProsopoEnvError("DATABASE.DATASET_GET_FAILED", {
|
|
124
|
+
await expect(imgCaptchaManager.getRandomCaptchasAndRequestHash(datasetId, userAccount, ipAddress, headers)).rejects.toThrow(new ProsopoEnvError("DATABASE.DATASET_GET_FAILED", {
|
|
123
125
|
context: {
|
|
124
126
|
failedFuncName: "getRandomCaptchasAndRequestHash",
|
|
125
127
|
dataset: null,
|
|
@@ -211,6 +213,7 @@ describe("ImgCaptchaManager", () => {
|
|
|
211
213
|
serverChecked: false,
|
|
212
214
|
requestedAtTimestamp: 0,
|
|
213
215
|
ipAddress: "0.0.0.0",
|
|
216
|
+
headers: { a: "1", b: "2", c: "3" },
|
|
214
217
|
lastUpdatedTimestamp: Date.now(),
|
|
215
218
|
};
|
|
216
219
|
db.getDappUserCommitmentById.mockResolvedValue(dappUserCommitment);
|
|
@@ -243,6 +246,7 @@ describe("ImgCaptchaManager", () => {
|
|
|
243
246
|
serverChecked: false,
|
|
244
247
|
requestedAtTimestamp: 0,
|
|
245
248
|
ipAddress: "0.0.0.0",
|
|
249
|
+
headers: { a: "1", b: "2", c: "3" },
|
|
246
250
|
lastUpdatedTimestamp: Date.now(),
|
|
247
251
|
},
|
|
248
252
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imgCaptchaTasks.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAe,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,
|
|
1
|
+
{"version":3,"file":"imgCaptchaTasks.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imgCaptchaTasksUtils.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.unit.test.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,
|
|
1
|
+
{"version":3,"file":"imgCaptchaTasksUtils.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.unit.test.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EACN,iBAAiB,EACjB,0BAA0B,GAC1B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,2BAA2B,EAAE,MAAM,sDAAsD,CAAC;AAEnG,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC;IACnC,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;QACpD,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;QACd,IAAI,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE;KAChC,CAAC,CAAC;IACH,0BAA0B,EAAE,EAAE,CAAC,EAAE,EAAE;CACnC,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC5C,MAAM,oBAAoB,GAAG;QAC5B,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE;QACjE,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE;KACjC,CAAC;IAElC,UAAU,CAAC,GAAG,EAAE;QACf,EAAE,CAAC,aAAa,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QAEzD,0BAAkC;aACjC,mBAAmB,CAAC,iBAAiB,CAAC;aACtC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;QAEzC,MAAM,MAAM,GAAG,2BAA2B,CAAC,oBAAoB,CAAC,CAAC;QAEjE,MAAM,CAAC,iBAAiB,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC7C,MAAM,CAAC,0BAA0B,CAAC,CAAC,oBAAoB,CACtD,oBAAoB,CAAC,CAAC,CAAC,CACvB,CAAC;QACF,MAAM,CAAC,0BAA0B,CAAC,CAAC,oBAAoB,CACtD,oBAAoB,CAAC,CAAC,CAAC,CACvB,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACtB,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;YACxB,YAAY,EAAE,gBAAgB;SAC9B,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAE9D,iBAAyB,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;YACpD,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;YACd,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;SACpB,CAAC,CAAC,CAAC;QAEJ,MAAM,CAAC,GAAG,EAAE,CAAC,2BAA2B,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CACtE,IAAI,eAAe,CAClB,qDAAqD,EACrD;YACC,OAAO,EAAE;gBACR,cAAc,EAAE,6BAA6B;gBAC7C,YAAY,EAAE,IAAI;aAClB;SACD,CACD,CACD,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { stringToHex, u8aToHex } from "@polkadot/util";
|
|
2
|
-
import { verifyRecency } from "@prosopo/util";
|
|
3
2
|
import { ProsopoEnvError } from "@prosopo/common";
|
|
4
3
|
import { ApiParams, CaptchaStatus, POW_SEPARATOR, } from "@prosopo/types";
|
|
4
|
+
import { verifyRecency } from "@prosopo/util";
|
|
5
5
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
6
6
|
import { PowCaptchaManager } from "../../../../tasks/powCaptcha/powTasks.js";
|
|
7
7
|
import { checkPowSignature, validateSolution, } from "../../../../tasks/powCaptcha/powTasksUtils.js";
|
|
@@ -67,6 +67,7 @@ describe("PowCaptchaManager", () => {
|
|
|
67
67
|
const nonce = 12345;
|
|
68
68
|
const timeout = 1000;
|
|
69
69
|
const ipAddress = "ipAddress";
|
|
70
|
+
const headers = { a: "1", b: "2", c: "3" };
|
|
70
71
|
const challengeRecord = {
|
|
71
72
|
challenge,
|
|
72
73
|
difficulty,
|
|
@@ -77,6 +78,7 @@ describe("PowCaptchaManager", () => {
|
|
|
77
78
|
userSubmitted: false,
|
|
78
79
|
serverChecked: false,
|
|
79
80
|
ipAddress,
|
|
81
|
+
headers,
|
|
80
82
|
providerSignature,
|
|
81
83
|
lastUpdatedTimestamp: Date.now(),
|
|
82
84
|
};
|
|
@@ -94,6 +96,7 @@ describe("PowCaptchaManager", () => {
|
|
|
94
96
|
timeout,
|
|
95
97
|
userSignature,
|
|
96
98
|
ipAddress,
|
|
99
|
+
headers,
|
|
97
100
|
];
|
|
98
101
|
const result = await powCaptchaManager.verifyPowCaptchaSolution(...verifyPowCaptchaSolutionArgs);
|
|
99
102
|
expect(result).toBe(true);
|
|
@@ -139,6 +142,7 @@ describe("PowCaptchaManager", () => {
|
|
|
139
142
|
const timeout = 1000;
|
|
140
143
|
const timestampSignature = "testTimestampSignature";
|
|
141
144
|
const ipAddress = "ipAddress";
|
|
145
|
+
const headers = { a: "1", b: "2", c: "3" };
|
|
142
146
|
const challengeRecord = {
|
|
143
147
|
challenge,
|
|
144
148
|
dappAccount: pair.address,
|
|
@@ -148,6 +152,7 @@ describe("PowCaptchaManager", () => {
|
|
|
148
152
|
userSubmitted: false,
|
|
149
153
|
serverChecked: false,
|
|
150
154
|
ipAddress,
|
|
155
|
+
headers,
|
|
151
156
|
providerSignature: "testSignature",
|
|
152
157
|
difficulty,
|
|
153
158
|
lastUpdatedTimestamp: 0,
|
|
@@ -157,7 +162,7 @@ describe("PowCaptchaManager", () => {
|
|
|
157
162
|
});
|
|
158
163
|
db.getPowCaptchaRecordByChallenge.mockResolvedValue(challengeRecord);
|
|
159
164
|
validateSolution.mockImplementation(() => false);
|
|
160
|
-
expect(await powCaptchaManager.verifyPowCaptchaSolution(challenge, difficulty, signature, nonce, timeout, timestampSignature, ipAddress)).toBe(false);
|
|
165
|
+
expect(await powCaptchaManager.verifyPowCaptchaSolution(challenge, difficulty, signature, nonce, timeout, timestampSignature, ipAddress, headers)).toBe(false);
|
|
161
166
|
expect(verifyRecency).toHaveBeenCalledWith(challenge, timeout);
|
|
162
167
|
});
|
|
163
168
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"powTasks.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/powCaptcha/powTasks.unit.test.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"powTasks.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/powCaptcha/powTasks.unit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"powTasksUtils.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/powCaptcha/powTasksUtils.unit.test.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"powTasksUtils.unit.test.js","sourceRoot":"","sources":["../../../../../src/tests/unit/tasks/powCaptcha/powTasksUtils.unit.test.ts"],"names":[],"mappings":"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"}
|
package/dist/util.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type ScheduledTaskNames } from "@prosopo/types";
|
|
2
|
-
import type {
|
|
2
|
+
import type { IProviderDatabase } from "@prosopo/types-database";
|
|
3
3
|
export declare function encodeStringAddress(address: string): string;
|
|
4
4
|
export declare function shuffleArray<T>(array: T[]): T[];
|
|
5
|
-
export declare function checkIfTaskIsRunning(taskName: ScheduledTaskNames, db:
|
|
5
|
+
export declare function checkIfTaskIsRunning(taskName: ScheduledTaskNames, db: IProviderDatabase): Promise<boolean>;
|
|
6
6
|
//# sourceMappingURL=util.d.ts.map
|
package/dist/util.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,KAAK,kBAAkB,EAAuB,MAAM,gBAAgB,CAAC;AAC9E,OAAO,KAAK,EAAa,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5E,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,UAUlD;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAQ/C;AAQD,wBAAsB,oBAAoB,CACzC,QAAQ,EAAE,kBAAkB,EAC5B,EAAE,EAAE,iBAAiB,GACnB,OAAO,CAAC,OAAO,CAAC,CAalB"}
|
package/dist/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAA2B,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE9E,OAAO,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AAEnC,MAAM,UAAU,mBAAmB,CAAC,OAAe;IAClD,IAAI,CAAC;QACJ,OAAO,aAAa,CACnB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAC3D,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,MAAM,IAAI,oBAAoB,CAAC,0BAA0B,EAAE;YAC1D,OAAO,EAAE,EAAE,OAAO,EAAE;SACpB,CAAC,CAAC;IACJ,CAAC;AACF,CAAC;AAED,MAAM,UAAU,YAAY,CAAI,KAAU;IACzC,KAAK,IAAI,UAAU,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,UAAU,GAAG,CAAC,EAAE,UAAU,EAAE,EAAE,CAAC;QACtE,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC;QAC/D,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACjC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACzC,KAAK,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC;IACzB,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAQD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACzC,QAA4B,EAC5B,EAAqB;IAErB,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,0BAA0B,CACtD,QAAQ,EACR,mBAAmB,CAAC,OAAO,CAC3B,CAAC;IACF,IAAI,WAAW,EAAE,CAAC;QACjB,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC,sBAAsB,CACpD,WAAW,CAAC,EAAE,EACd,mBAAmB,CAAC,SAAS,CAC7B,CAAC;QACF,OAAO,CAAC,aAAa,CAAC;IACvB,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,74 +1,70 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
"url": "https://github.com/prosopo/captcha/issues"
|
|
71
|
-
},
|
|
72
|
-
"homepage": "https://github.com/prosopo/captcha#readme",
|
|
73
|
-
"sideEffects": false
|
|
2
|
+
"name": "@prosopo/provider",
|
|
3
|
+
"version": "2.1.0",
|
|
4
|
+
"author": "PROSOPO LIMITED <info@prosopo.io>",
|
|
5
|
+
"license": "Apache-2.0",
|
|
6
|
+
"main": "./dist/index.js",
|
|
7
|
+
"type": "module",
|
|
8
|
+
"engines": {
|
|
9
|
+
"node": ">=20",
|
|
10
|
+
"npm": ">=9"
|
|
11
|
+
},
|
|
12
|
+
"exports": {
|
|
13
|
+
".": {
|
|
14
|
+
"import": "./dist/index.js",
|
|
15
|
+
"require": "./dist/cjs/index.cjs"
|
|
16
|
+
}
|
|
17
|
+
},
|
|
18
|
+
"scripts": {
|
|
19
|
+
"clean": "tsc --build --clean",
|
|
20
|
+
"build": "tsc --build --verbose",
|
|
21
|
+
"build:cjs": "npx vite --config vite.cjs.config.ts build",
|
|
22
|
+
"test": "NODE_ENV=${NODE_ENV:-test}; npx vitest run --config ./vite.test.config.ts",
|
|
23
|
+
"mnemonic": "tsx ./scripts/generateMnemonic.ts",
|
|
24
|
+
"coverage": "npx c8 npm run test"
|
|
25
|
+
},
|
|
26
|
+
"dependencies": {
|
|
27
|
+
"@noble/hashes": "1.5.0",
|
|
28
|
+
"@polkadot/keyring": "12.6.2",
|
|
29
|
+
"@polkadot/util": "12.6.2",
|
|
30
|
+
"@polkadot/util-crypto": "12.6.2",
|
|
31
|
+
"@prosopo/common": "2.1.0",
|
|
32
|
+
"@prosopo/config": "2.1.0",
|
|
33
|
+
"@prosopo/contract": "2.1.0",
|
|
34
|
+
"@prosopo/database": "2.1.0",
|
|
35
|
+
"@prosopo/datasets": "2.1.0",
|
|
36
|
+
"@prosopo/env": "2.1.0",
|
|
37
|
+
"@prosopo/types": "2.1.0",
|
|
38
|
+
"@prosopo/types-database": "2.1.0",
|
|
39
|
+
"@prosopo/types-env": "2.1.0",
|
|
40
|
+
"@prosopo/util": "2.1.0",
|
|
41
|
+
"cron": "3.1.7",
|
|
42
|
+
"express": "4.21.0",
|
|
43
|
+
"node-fetch": "3.3.2",
|
|
44
|
+
"zod": "3.23.8"
|
|
45
|
+
},
|
|
46
|
+
"devDependencies": {
|
|
47
|
+
"@types/node": "22.5.5",
|
|
48
|
+
"@vitest/coverage-v8": "2.1.1",
|
|
49
|
+
"c8": "10.1.2",
|
|
50
|
+
"concurrently": "9.0.1",
|
|
51
|
+
"dotenv": "16.4.5",
|
|
52
|
+
"npm-run-all": "4.1.5",
|
|
53
|
+
"rimraf": "6.0.1",
|
|
54
|
+
"tslib": "2.7.0",
|
|
55
|
+
"tsx": "4.19.1",
|
|
56
|
+
"typescript": "5.6.2",
|
|
57
|
+
"vite": "5.4.6",
|
|
58
|
+
"vitest": "2.1.1"
|
|
59
|
+
},
|
|
60
|
+
"repository": {
|
|
61
|
+
"type": "git",
|
|
62
|
+
"url": "git+ssh://git@github.com/prosopo/provider.git"
|
|
63
|
+
},
|
|
64
|
+
"description": "The easiest way to deploy the Prosopo contract and run the Provider node is via the [captcha repository](https://github.com/prosopo/captcha/).",
|
|
65
|
+
"bugs": {
|
|
66
|
+
"url": "https://github.com/prosopo/captcha/issues"
|
|
67
|
+
},
|
|
68
|
+
"homepage": "https://github.com/prosopo/captcha#readme",
|
|
69
|
+
"sideEffects": false
|
|
74
70
|
}
|