@prosopo/provider 2.0.2 → 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.
Files changed (148) hide show
  1. package/dist/api/admin.js.map +1 -1
  2. package/dist/api/authMiddleware.js.map +1 -1
  3. package/dist/api/captcha.d.ts.map +1 -1
  4. package/dist/api/captcha.js +10 -17
  5. package/dist/api/captcha.js.map +1 -1
  6. package/dist/api/errorHandler.js.map +1 -1
  7. package/dist/api/verify.d.ts.map +1 -1
  8. package/dist/api/verify.js +3 -5
  9. package/dist/api/verify.js.map +1 -1
  10. package/dist/cjs/api/captcha.cjs +17 -19
  11. package/dist/cjs/api/verify.cjs +3 -4
  12. package/dist/cjs/index.cjs +3 -1
  13. package/dist/cjs/{api → schedulers}/captchaScheduler.cjs +2 -2
  14. package/dist/cjs/schedulers/getClientList.cjs +31 -0
  15. package/dist/cjs/tasks/client/clientTasks.cjs +141 -0
  16. package/dist/cjs/tasks/dataset/datasetTasks.cjs +0 -97
  17. package/dist/cjs/tasks/imgCaptcha/imgCaptchaTasks.cjs +6 -4
  18. package/dist/cjs/tasks/powCaptcha/powTasks.cjs +2 -2
  19. package/dist/cjs/tasks/tasks.cjs +6 -0
  20. package/dist/index.d.ts +2 -1
  21. package/dist/index.d.ts.map +1 -1
  22. package/dist/index.js +2 -1
  23. package/dist/index.js.map +1 -1
  24. package/dist/{api → schedulers}/captchaScheduler.d.ts +1 -1
  25. package/dist/schedulers/captchaScheduler.d.ts.map +1 -0
  26. package/dist/{api → schedulers}/captchaScheduler.js +4 -4
  27. package/dist/schedulers/captchaScheduler.js.map +1 -0
  28. package/dist/schedulers/getClientList.d.ts +4 -0
  29. package/dist/schedulers/getClientList.d.ts.map +1 -0
  30. package/dist/schedulers/getClientList.js +28 -0
  31. package/dist/schedulers/getClientList.js.map +1 -0
  32. package/dist/tasks/client/clientTasks.d.ts +12 -0
  33. package/dist/tasks/client/clientTasks.d.ts.map +1 -0
  34. package/dist/tasks/client/clientTasks.js +80 -0
  35. package/dist/tasks/client/clientTasks.js.map +1 -0
  36. package/dist/tasks/dataset/datasetTasks.d.ts +4 -6
  37. package/dist/tasks/dataset/datasetTasks.d.ts.map +1 -1
  38. package/dist/tasks/dataset/datasetTasks.js +0 -56
  39. package/dist/tasks/dataset/datasetTasks.js.map +1 -1
  40. package/dist/tasks/dataset/datasetTasksUtils.js.map +1 -1
  41. package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts +8 -8
  42. package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts.map +1 -1
  43. package/dist/tasks/imgCaptcha/imgCaptchaTasks.js +4 -3
  44. package/dist/tasks/imgCaptcha/imgCaptchaTasks.js.map +1 -1
  45. package/dist/tasks/imgCaptcha/imgCaptchaTasksUtils.d.ts.map +1 -1
  46. package/dist/tasks/imgCaptcha/imgCaptchaTasksUtils.js.map +1 -1
  47. package/dist/tasks/powCaptcha/powTasks.d.ts +5 -5
  48. package/dist/tasks/powCaptcha/powTasks.d.ts.map +1 -1
  49. package/dist/tasks/powCaptcha/powTasks.js +3 -3
  50. package/dist/tasks/powCaptcha/powTasks.js.map +1 -1
  51. package/dist/tasks/powCaptcha/powTasksUtils.d.ts.map +1 -1
  52. package/dist/tasks/powCaptcha/powTasksUtils.js.map +1 -1
  53. package/dist/tasks/tasks.d.ts +5 -3
  54. package/dist/tasks/tasks.d.ts.map +1 -1
  55. package/dist/tasks/tasks.js +2 -0
  56. package/dist/tasks/tasks.js.map +1 -1
  57. package/dist/tests/integration/imgCaptcha.integration.test.d.ts +2 -0
  58. package/dist/tests/integration/imgCaptcha.integration.test.d.ts.map +1 -0
  59. package/dist/tests/integration/{imgCaptcha.test.js → imgCaptcha.integration.test.js} +1 -1
  60. package/dist/tests/integration/imgCaptcha.integration.test.js.map +1 -0
  61. package/dist/tests/integration/mocks/solvedTestCaptchas.d.ts +8 -12
  62. package/dist/tests/integration/mocks/solvedTestCaptchas.d.ts.map +1 -1
  63. package/dist/tests/integration/mocks/solvedTestCaptchas.js.map +1 -1
  64. package/dist/tests/integration/powCaptcha.integration.test.d.ts +2 -0
  65. package/dist/tests/integration/powCaptcha.integration.test.d.ts.map +1 -0
  66. package/dist/tests/integration/{powCaptcha.test.js → powCaptcha.integration.test.js} +1 -1
  67. package/dist/tests/integration/powCaptcha.integration.test.js.map +1 -0
  68. package/dist/tests/unit/api/authMiddleware.unit.test.d.ts +2 -0
  69. package/dist/tests/unit/api/authMiddleware.unit.test.d.ts.map +1 -0
  70. package/dist/tests/unit/api/{authMiddleware.test.js → authMiddleware.unit.test.js} +1 -1
  71. package/dist/tests/unit/api/authMiddleware.unit.test.js.map +1 -0
  72. package/dist/tests/unit/api/errorHandler.unit.test.d.ts +2 -0
  73. package/dist/tests/unit/api/errorHandler.unit.test.d.ts.map +1 -0
  74. package/dist/tests/unit/api/{errorHandler.test.js → errorHandler.unit.test.js} +1 -1
  75. package/dist/tests/unit/api/errorHandler.unit.test.js.map +1 -0
  76. package/dist/tests/unit/schedulers/captchaScheduler.unit.test.d.ts +2 -0
  77. package/dist/tests/unit/schedulers/captchaScheduler.unit.test.d.ts.map +1 -0
  78. package/dist/tests/unit/{api/captchaScheduler.test.js → schedulers/captchaScheduler.unit.test.js} +7 -5
  79. package/dist/tests/unit/schedulers/captchaScheduler.unit.test.js.map +1 -0
  80. package/dist/tests/unit/tasks/client/clientTasks.unit.test.d.ts +2 -0
  81. package/dist/tests/unit/tasks/client/clientTasks.unit.test.d.ts.map +1 -0
  82. package/dist/tests/unit/tasks/client/clientTasks.unit.test.js +172 -0
  83. package/dist/tests/unit/tasks/client/clientTasks.unit.test.js.map +1 -0
  84. package/dist/tests/unit/tasks/dataset/datasetTasks.unit.test.d.ts +2 -0
  85. package/dist/tests/unit/tasks/dataset/datasetTasks.unit.test.d.ts.map +1 -0
  86. package/dist/tests/unit/tasks/dataset/datasetTasks.unit.test.js +86 -0
  87. package/dist/tests/unit/tasks/dataset/datasetTasks.unit.test.js.map +1 -0
  88. package/dist/tests/unit/tasks/dataset/datasetTasksUtils.unit.test.d.ts +2 -0
  89. package/dist/tests/unit/tasks/dataset/datasetTasksUtils.unit.test.d.ts.map +1 -0
  90. package/dist/tests/unit/tasks/dataset/{datasetTasksUtils.test.js → datasetTasksUtils.unit.test.js} +1 -1
  91. package/dist/tests/unit/tasks/dataset/datasetTasksUtils.unit.test.js.map +1 -0
  92. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.d.ts +2 -0
  93. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.d.ts.map +1 -0
  94. package/dist/tests/unit/tasks/imgCaptcha/{imgCaptchaTasks.test.js → imgCaptchaTasks.unit.test.js} +7 -3
  95. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.js.map +1 -0
  96. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.unit.test.d.ts +2 -0
  97. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.unit.test.d.ts.map +1 -0
  98. package/dist/tests/unit/tasks/imgCaptcha/{imgCaptchaTasksUtils.test.js → imgCaptchaTasksUtils.unit.test.js} +1 -1
  99. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.unit.test.js.map +1 -0
  100. package/dist/tests/unit/tasks/powCaptcha/powTasks.unit.test.d.ts +2 -0
  101. package/dist/tests/unit/tasks/powCaptcha/powTasks.unit.test.d.ts.map +1 -0
  102. package/dist/tests/unit/tasks/powCaptcha/{powTasks.test.js → powTasks.unit.test.js} +8 -3
  103. package/dist/tests/unit/tasks/powCaptcha/powTasks.unit.test.js.map +1 -0
  104. package/dist/tests/unit/tasks/powCaptcha/powTasksUtils.unit.test.d.ts +2 -0
  105. package/dist/tests/unit/tasks/powCaptcha/powTasksUtils.unit.test.d.ts.map +1 -0
  106. package/dist/tests/unit/tasks/powCaptcha/{powTasksUtils.test.js → powTasksUtils.unit.test.js} +1 -1
  107. package/dist/tests/unit/tasks/powCaptcha/powTasksUtils.unit.test.js.map +1 -0
  108. package/dist/util.d.ts +2 -2
  109. package/dist/util.d.ts.map +1 -1
  110. package/dist/util.js.map +1 -1
  111. package/package.json +68 -72
  112. package/vite.test.config.ts +4 -2
  113. package/dist/api/captchaScheduler.d.ts.map +0 -1
  114. package/dist/api/captchaScheduler.js.map +0 -1
  115. package/dist/tests/integration/imgCaptcha.test.d.ts +0 -2
  116. package/dist/tests/integration/imgCaptcha.test.d.ts.map +0 -1
  117. package/dist/tests/integration/imgCaptcha.test.js.map +0 -1
  118. package/dist/tests/integration/powCaptcha.test.d.ts +0 -2
  119. package/dist/tests/integration/powCaptcha.test.d.ts.map +0 -1
  120. package/dist/tests/integration/powCaptcha.test.js.map +0 -1
  121. package/dist/tests/unit/api/authMiddleware.test.d.ts +0 -2
  122. package/dist/tests/unit/api/authMiddleware.test.d.ts.map +0 -1
  123. package/dist/tests/unit/api/authMiddleware.test.js.map +0 -1
  124. package/dist/tests/unit/api/captchaScheduler.test.d.ts +0 -2
  125. package/dist/tests/unit/api/captchaScheduler.test.d.ts.map +0 -1
  126. package/dist/tests/unit/api/captchaScheduler.test.js.map +0 -1
  127. package/dist/tests/unit/api/errorHandler.test.d.ts +0 -2
  128. package/dist/tests/unit/api/errorHandler.test.d.ts.map +0 -1
  129. package/dist/tests/unit/api/errorHandler.test.js.map +0 -1
  130. package/dist/tests/unit/tasks/dataset/datasetTasks.test.d.ts +0 -2
  131. package/dist/tests/unit/tasks/dataset/datasetTasks.test.d.ts.map +0 -1
  132. package/dist/tests/unit/tasks/dataset/datasetTasks.test.js +0 -135
  133. package/dist/tests/unit/tasks/dataset/datasetTasks.test.js.map +0 -1
  134. package/dist/tests/unit/tasks/dataset/datasetTasksUtils.test.d.ts +0 -2
  135. package/dist/tests/unit/tasks/dataset/datasetTasksUtils.test.d.ts.map +0 -1
  136. package/dist/tests/unit/tasks/dataset/datasetTasksUtils.test.js.map +0 -1
  137. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.test.d.ts +0 -2
  138. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.test.d.ts.map +0 -1
  139. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.test.js.map +0 -1
  140. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.test.d.ts +0 -2
  141. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.test.d.ts.map +0 -1
  142. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasksUtils.test.js.map +0 -1
  143. package/dist/tests/unit/tasks/powCaptcha/powTasks.test.d.ts +0 -2
  144. package/dist/tests/unit/tasks/powCaptcha/powTasks.test.d.ts.map +0 -1
  145. package/dist/tests/unit/tasks/powCaptcha/powTasks.test.js.map +0 -1
  146. package/dist/tests/unit/tasks/powCaptcha/powTasksUtils.test.d.ts +0 -2
  147. package/dist/tests/unit/tasks/powCaptcha/powTasksUtils.test.d.ts.map +0 -1
  148. package/dist/tests/unit/tasks/powCaptcha/powTasksUtils.test.js.map +0 -1
@@ -42,7 +42,7 @@ class PowCaptchaManager {
42
42
  * @param {string} userTimestampSignature
43
43
  * @param ipAddress
44
44
  */
45
- async verifyPowCaptchaSolution(challenge, difficulty, providerChallengeSignature, nonce, timeout, userTimestampSignature, ipAddress) {
45
+ async verifyPowCaptchaSolution(challenge, difficulty, providerChallengeSignature, nonce, timeout, userTimestampSignature, ipAddress, headers) {
46
46
  powTasksUtils.checkPowSignature(
47
47
  challenge,
48
48
  providerChallengeSignature,
@@ -50,7 +50,7 @@ class PowCaptchaManager {
50
50
  types.ApiParams.challenge
51
51
  );
52
52
  const challengeSplit = challenge.split(this.POW_SEPARATOR);
53
- const timestamp = parseInt(util$1.at(challengeSplit, 0));
53
+ const timestamp = Number.parseInt(util$1.at(challengeSplit, 0));
54
54
  const userAccount = util$1.at(challengeSplit, 1);
55
55
  powTasksUtils.checkPowSignature(
56
56
  timestamp.toString(),
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
3
  const common = require("@prosopo/common");
4
+ const clientTasks = require("./client/clientTasks.cjs");
4
5
  const datasetTasks = require("./dataset/datasetTasks.cjs");
5
6
  const imgCaptchaTasks = require("./imgCaptcha/imgCaptchaTasks.cjs");
6
7
  const powTasks = require("./powCaptcha/powTasks.cjs");
@@ -29,6 +30,11 @@ class Tasks {
29
30
  this.logger,
30
31
  this.captchaConfig
31
32
  );
33
+ this.clientTaskManager = new clientTasks.ClientTaskManager(
34
+ this.config,
35
+ this.logger,
36
+ this.db
37
+ );
32
38
  }
33
39
  }
34
40
  exports.Tasks = Tasks;
package/dist/index.d.ts CHANGED
@@ -4,5 +4,6 @@ export * from "./api/captcha.js";
4
4
  export * from "./api/verify.js";
5
5
  export * from "./api/admin.js";
6
6
  export * from "./api/errorHandler.js";
7
- export * from "./api/captchaScheduler.js";
7
+ export * from "./schedulers/captchaScheduler.js";
8
+ export * from "./schedulers/getClientList.js";
8
9
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kCAAkC,CAAC;AACjD,cAAc,+BAA+B,CAAC"}
package/dist/index.js CHANGED
@@ -4,5 +4,6 @@ export * from "./api/captcha.js";
4
4
  export * from "./api/verify.js";
5
5
  export * from "./api/admin.js";
6
6
  export * from "./api/errorHandler.js";
7
- export * from "./api/captchaScheduler.js";
7
+ export * from "./schedulers/captchaScheduler.js";
8
+ export * from "./schedulers/getClientList.js";
8
9
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kCAAkC,CAAC;AACjD,cAAc,+BAA+B,CAAC"}
@@ -1,4 +1,4 @@
1
1
  import type { KeyringPair } from "@polkadot/keyring/types";
2
- import { ProsopoConfigOutput } from "@prosopo/types";
2
+ import { type ProsopoConfigOutput } from "@prosopo/types";
3
3
  export declare function storeCaptchasExternally(pair: KeyringPair, config: ProsopoConfigOutput): Promise<void>;
4
4
  //# sourceMappingURL=captchaScheduler.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"captchaScheduler.d.ts","sourceRoot":"","sources":["../../src/schedulers/captchaScheduler.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,KAAK,mBAAmB,EAAsB,MAAM,gBAAgB,CAAC;AAK9E,wBAAsB,uBAAuB,CAC5C,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,mBAAmB,iBAkC3B"}
@@ -8,9 +8,9 @@ export async function storeCaptchasExternally(pair, config) {
8
8
  await env.isReady();
9
9
  const tasks = new Tasks(env);
10
10
  const defaultSchedule = "0 * * * *";
11
- const cronSchedule = config.captchaScheduler
12
- ? config.captchaScheduler.schedule
13
- ? config.captchaScheduler.schedule
11
+ const cronSchedule = config.scheduledTasks?.captchaScheduler
12
+ ? config.scheduledTasks.captchaScheduler.schedule
13
+ ? config.scheduledTasks.captchaScheduler.schedule
14
14
  : defaultSchedule
15
15
  : defaultSchedule;
16
16
  const job = new CronJob(cronSchedule, async () => {
@@ -18,7 +18,7 @@ export async function storeCaptchasExternally(pair, config) {
18
18
  env.logger.info(`${ScheduledTaskNames.StoreCommitmentsExternal} task running: ${taskRunning}`);
19
19
  if (!taskRunning) {
20
20
  env.logger.info(`${ScheduledTaskNames.StoreCommitmentsExternal} task....`);
21
- await tasks.datasetManager.storeCommitmentsExternal().catch((err) => {
21
+ await tasks.clientTaskManager.storeCommitmentsExternal().catch((err) => {
22
22
  env.logger.error(err);
23
23
  });
24
24
  }
@@ -0,0 +1 @@
1
+ {"version":3,"file":"captchaScheduler.js","sourceRoot":"","sources":["../../src/schedulers/captchaScheduler.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAA4B,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC5C,IAAiB,EACjB,MAA2B;IAE3B,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IAEpB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;IAG7B,MAAM,eAAe,GAAG,WAAW,CAAC;IACpC,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,EAAE,gBAAgB;QAC3D,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,QAAQ;YAChD,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,QAAQ;YACjD,CAAC,CAAC,eAAe;QAClB,CAAC,CAAC,eAAe,CAAC;IAEnB,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAC7C,kBAAkB,CAAC,wBAAwB,EAC3C,GAAG,CAAC,KAAK,EAAE,CACX,CAAC;QACF,GAAG,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,kBAAkB,CAAC,wBAAwB,kBAAkB,WAAW,EAAE,CAC7E,CAAC;QACF,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,GAAG,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,kBAAkB,CAAC,wBAAwB,WAAW,CACzD,CAAC;YACF,MAAM,KAAK,CAAC,iBAAiB,CAAC,wBAAwB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACtE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,KAAK,EAAE,CAAC;AACb,CAAC"}
@@ -0,0 +1,4 @@
1
+ import type { KeyringPair } from "@polkadot/keyring/types";
2
+ import { type ProsopoConfigOutput } from "@prosopo/types";
3
+ export declare function getClientList(pair: KeyringPair, config: ProsopoConfigOutput): Promise<void>;
4
+ //# sourceMappingURL=getClientList.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getClientList.d.ts","sourceRoot":"","sources":["../../src/schedulers/getClientList.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,KAAK,mBAAmB,EAAsB,MAAM,gBAAgB,CAAC;AAU9E,wBAAsB,aAAa,CAClC,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,mBAAmB,iBAgC3B"}
@@ -0,0 +1,28 @@
1
+ import { ProviderEnvironment } from "@prosopo/env";
2
+ import { ScheduledTaskNames } from "@prosopo/types";
3
+ import { CronJob } from "cron";
4
+ import { Tasks } from "../tasks/tasks.js";
5
+ import { checkIfTaskIsRunning } from "../util.js";
6
+ export async function getClientList(pair, config) {
7
+ const env = new ProviderEnvironment(config, pair);
8
+ await env.isReady();
9
+ const tasks = new Tasks(env);
10
+ const defaultSchedule = "0 * * * *";
11
+ const cronSchedule = config.scheduledTasks?.clientListScheduler
12
+ ? config.scheduledTasks.clientListScheduler.schedule
13
+ ? config.scheduledTasks.clientListScheduler.schedule
14
+ : defaultSchedule
15
+ : defaultSchedule;
16
+ const job = new CronJob(cronSchedule, async () => {
17
+ const taskRunning = await checkIfTaskIsRunning(ScheduledTaskNames.GetClientList, env.getDb());
18
+ env.logger.info(`${ScheduledTaskNames.GetClientList} task running: ${taskRunning}`);
19
+ if (!taskRunning) {
20
+ env.logger.info(`${ScheduledTaskNames.GetClientList} task....`);
21
+ await tasks.clientTaskManager.getClientList().catch((err) => {
22
+ env.logger.error(err);
23
+ });
24
+ }
25
+ });
26
+ job.start();
27
+ }
28
+ //# sourceMappingURL=getClientList.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getClientList.js","sourceRoot":"","sources":["../../src/schedulers/getClientList.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAA4B,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAOlD,MAAM,CAAC,KAAK,UAAU,aAAa,CAClC,IAAiB,EACjB,MAA2B;IAE3B,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAClD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IAEpB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;IAG7B,MAAM,eAAe,GAAG,WAAW,CAAC;IACpC,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,EAAE,mBAAmB;QAC9D,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,mBAAmB,CAAC,QAAQ;YACnD,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,mBAAmB,CAAC,QAAQ;YACpD,CAAC,CAAC,eAAe;QAClB,CAAC,CAAC,eAAe,CAAC;IAEnB,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAC7C,kBAAkB,CAAC,aAAa,EAChC,GAAG,CAAC,KAAK,EAAE,CACX,CAAC;QACF,GAAG,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,kBAAkB,CAAC,aAAa,kBAAkB,WAAW,EAAE,CAClE,CAAC;QACF,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,aAAa,WAAW,CAAC,CAAC;YAChE,MAAM,KAAK,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC3D,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,KAAK,EAAE,CAAC;AACb,CAAC"}
@@ -0,0 +1,12 @@
1
+ import type { Logger } from "@prosopo/common";
2
+ import { type ProsopoConfigOutput } from "@prosopo/types";
3
+ import type { IProviderDatabase } from "@prosopo/types-database";
4
+ export declare class ClientTaskManager {
5
+ config: ProsopoConfigOutput;
6
+ logger: Logger;
7
+ providerDB: IProviderDatabase;
8
+ constructor(config: ProsopoConfigOutput, logger: Logger, db: IProviderDatabase);
9
+ storeCommitmentsExternal(): Promise<void>;
10
+ getClientList(): Promise<void>;
11
+ }
12
+ //# sourceMappingURL=clientTasks.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"clientTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/client/clientTasks.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EACN,KAAK,mBAAmB,EAGxB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAgB,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE/E,qBAAa,iBAAiB;IAC7B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,iBAAiB,CAAC;gBAE7B,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,iBAAiB;IAWhB,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;IAuGzC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CAqDpC"}
@@ -0,0 +1,80 @@
1
+ import { CaptchaDatabase, ClientDatabase } from "@prosopo/database";
2
+ import { ScheduledTaskNames, ScheduledTaskStatus, } from "@prosopo/types";
3
+ export class ClientTaskManager {
4
+ constructor(config, logger, db) {
5
+ this.config = config;
6
+ this.logger = logger;
7
+ this.providerDB = db;
8
+ }
9
+ async storeCommitmentsExternal() {
10
+ if (!this.config.mongoCaptchaUri) {
11
+ this.logger.info("Mongo env not set");
12
+ return;
13
+ }
14
+ const lastTask = await this.providerDB.getLastScheduledTaskStatus(ScheduledTaskNames.StoreCommitmentsExternal, ScheduledTaskStatus.Completed);
15
+ const taskID = await this.providerDB.createScheduledTaskStatus(ScheduledTaskNames.StoreCommitmentsExternal, ScheduledTaskStatus.Running);
16
+ try {
17
+ let commitments = await this.providerDB.getUnstoredDappUserCommitments();
18
+ let powRecords = await this.providerDB.getUnstoredDappUserPoWCommitments();
19
+ if (lastTask) {
20
+ this.logger.info(`Filtering records to only get updated records: ${JSON.stringify(lastTask)}`);
21
+ this.logger.info("Last task ran at ", new Date(lastTask.updated || 0), "Task ID", taskID);
22
+ commitments = commitments.filter((commitment) => lastTask.updated &&
23
+ commitment.lastUpdatedTimestamp &&
24
+ (commitment.lastUpdatedTimestamp > lastTask.updated ||
25
+ !commitment.lastUpdatedTimestamp));
26
+ powRecords = powRecords.filter((commitment) => {
27
+ return (lastTask.updated &&
28
+ commitment.lastUpdatedTimestamp &&
29
+ (commitment.lastUpdatedTimestamp > lastTask.updated ||
30
+ !commitment.lastUpdatedTimestamp));
31
+ });
32
+ }
33
+ if (commitments.length || powRecords.length) {
34
+ this.logger.info(`Storing ${commitments.length} commitments externally`);
35
+ this.logger.info(`Storing ${powRecords.length} pow challenges externally`);
36
+ const captchaDB = new CaptchaDatabase(this.config.mongoCaptchaUri, undefined, undefined, this.logger);
37
+ await captchaDB.saveCaptchas(commitments, powRecords);
38
+ await this.providerDB.markDappUserCommitmentsStored(commitments.map((commitment) => commitment.id));
39
+ await this.providerDB.markDappUserPoWCommitmentsStored(powRecords.map((powRecords) => powRecords.challenge));
40
+ }
41
+ await this.providerDB.updateScheduledTaskStatus(taskID, ScheduledTaskStatus.Completed, {
42
+ data: {
43
+ commitments: commitments.map((c) => c.id),
44
+ powRecords: powRecords.map((pr) => pr.challenge),
45
+ },
46
+ });
47
+ }
48
+ catch (e) {
49
+ this.logger.error(e);
50
+ await this.providerDB.updateScheduledTaskStatus(taskID, ScheduledTaskStatus.Failed, { error: String(e) });
51
+ }
52
+ }
53
+ async getClientList() {
54
+ if (!this.config.mongoClientUri) {
55
+ this.logger.info("Mongo env not set");
56
+ return;
57
+ }
58
+ const lastTask = await this.providerDB.getLastScheduledTaskStatus(ScheduledTaskNames.GetClientList, ScheduledTaskStatus.Completed);
59
+ const taskID = await this.providerDB.createScheduledTaskStatus(ScheduledTaskNames.GetClientList, ScheduledTaskStatus.Running);
60
+ try {
61
+ const clientDB = new ClientDatabase(this.config.mongoClientUri, undefined, undefined, this.logger);
62
+ const updatedAtTimestamp = lastTask ? lastTask.updated || 0 : 0;
63
+ console.log("updatedAtTimestamp", updatedAtTimestamp);
64
+ const newClientRecords = await clientDB.getUpdatedClients(updatedAtTimestamp);
65
+ if (newClientRecords) {
66
+ await this.providerDB.updateClientRecords(newClientRecords);
67
+ }
68
+ await this.providerDB.updateScheduledTaskStatus(taskID, ScheduledTaskStatus.Completed, {
69
+ data: {
70
+ clientRecords: newClientRecords.map((c) => c.account),
71
+ },
72
+ });
73
+ }
74
+ catch (e) {
75
+ this.logger.error(e);
76
+ await this.providerDB.updateScheduledTaskStatus(taskID, ScheduledTaskStatus.Failed, { error: String(e) });
77
+ }
78
+ }
79
+ }
80
+ //# sourceMappingURL=clientTasks.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"clientTasks.js","sourceRoot":"","sources":["../../../src/tasks/client/clientTasks.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,13 @@
1
1
  import type { Logger } from "@prosopo/common";
2
- import { CaptchaConfig, DatasetRaw, ProsopoConfigOutput, StoredEvents } from "@prosopo/types";
3
- import type { Database } from "@prosopo/types-database";
2
+ import type { CaptchaConfig, DatasetRaw, ProsopoConfigOutput } from "@prosopo/types";
3
+ import type { IProviderDatabase } from "@prosopo/types-database";
4
4
  export declare class DatasetManager {
5
5
  config: ProsopoConfigOutput;
6
6
  logger: Logger;
7
7
  captchaConfig: CaptchaConfig;
8
- db: Database;
9
- constructor(config: ProsopoConfigOutput, logger: Logger, captchaConfig: CaptchaConfig, db: Database);
8
+ db: IProviderDatabase;
9
+ constructor(config: ProsopoConfigOutput, logger: Logger, captchaConfig: CaptchaConfig, db: IProviderDatabase);
10
10
  providerSetDatasetFromFile(file: JSON): Promise<void>;
11
11
  providerSetDataset(datasetRaw: DatasetRaw): Promise<void>;
12
- saveCaptchaEvent(events: StoredEvents, accountId: string): Promise<void>;
13
- storeCommitmentsExternal(): Promise<void>;
14
12
  }
15
13
  //# sourceMappingURL=datasetTasks.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"datasetTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/dataset/datasetTasks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAgB9C,OAAO,EACL,aAAa,EACb,UAAU,EACV,mBAAmB,EAGnB,YAAY,EACb,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGxD,qBAAa,cAAc;IACzB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,aAAa,CAAC;IAC7B,EAAE,EAAE,QAAQ,CAAC;gBAGX,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,EAAE,EAAE,QAAQ;IAaR,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAKrD,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBzD,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM;IAYxD,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;CA+FhD"}
1
+ {"version":3,"file":"datasetTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/dataset/datasetTasks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAe9C,OAAO,KAAK,EACX,aAAa,EACb,UAAU,EACV,mBAAmB,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAGjE,qBAAa,cAAc;IAC1B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,aAAa,CAAC;IAC7B,EAAE,EAAE,iBAAiB,CAAC;gBAGrB,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,EAAE,EAAE,iBAAiB;IAahB,0BAA0B,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAKrD,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAS/D"}
@@ -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 { providerValidateDataset } from "./datasetTasksUtils.js";
5
3
  export class DatasetManager {
6
4
  constructor(config, logger, captchaConfig, db) {
@@ -17,59 +15,5 @@ export class DatasetManager {
17
15
  const dataset = await providerValidateDataset(datasetRaw, this.captchaConfig.solved.count, this.captchaConfig.unsolved.count);
18
16
  await this.db?.storeDataset(dataset);
19
17
  }
20
- async saveCaptchaEvent(events, accountId) {
21
- if (!this.config.devOnlyWatchEvents || !this.config.mongoEventsUri) {
22
- this.logger.info("Dev watch events not set to true, not saving events");
23
- return;
24
- }
25
- await saveCaptchaEvent(events, accountId, this.config.mongoEventsUri);
26
- }
27
- async storeCommitmentsExternal() {
28
- if (!this.config.mongoCaptchaUri) {
29
- this.logger.info("Mongo env not set");
30
- return;
31
- }
32
- const lastTask = await this.db.getLastScheduledTaskStatus(ScheduledTaskNames.StoreCommitmentsExternal, ScheduledTaskStatus.Completed);
33
- const taskID = await this.db.createScheduledTaskStatus(ScheduledTaskNames.StoreCommitmentsExternal, ScheduledTaskStatus.Running);
34
- try {
35
- let commitments = await this.db.getUnstoredDappUserCommitments();
36
- let powRecords = await this.db.getUnstoredDappUserPoWCommitments();
37
- if (lastTask) {
38
- this.logger.info(`Filtering records to only get updated records: ${JSON.stringify(lastTask)}`);
39
- this.logger.info("Last task ran at ", new Date(lastTask.updated || 0));
40
- commitments = commitments.filter((commitment) => lastTask.updated &&
41
- commitment.lastUpdatedTimestamp &&
42
- (commitment.lastUpdatedTimestamp > lastTask.updated ||
43
- !commitment.lastUpdatedTimestamp));
44
- this.logger.info("PoW Records to store: ", powRecords.map((pr) => ({
45
- challenge: pr.challenge,
46
- lastUpdatedTimestamp: new Date(pr.lastUpdatedTimestamp || 0),
47
- })));
48
- powRecords = powRecords.filter((commitment) => {
49
- return (lastTask.updated &&
50
- commitment.lastUpdatedTimestamp &&
51
- (commitment.lastUpdatedTimestamp > lastTask.updated ||
52
- !commitment.lastUpdatedTimestamp));
53
- });
54
- }
55
- if (commitments.length || powRecords.length) {
56
- this.logger.info(`Storing ${commitments.length} commitments externally`);
57
- this.logger.info(`Storing ${powRecords.length} pow challenges externally`);
58
- await saveCaptchas(commitments, powRecords, this.config.mongoCaptchaUri);
59
- await this.db.markDappUserCommitmentsStored(commitments.map((commitment) => commitment.id));
60
- await this.db.markDappUserPoWCommitmentsStored(powRecords.map((powRecords) => powRecords.challenge));
61
- await this.db.updateScheduledTaskStatus(taskID, ScheduledTaskStatus.Completed, {
62
- data: {
63
- commitments: commitments.map((c) => c.id),
64
- powRecords: powRecords.map((pr) => pr.challenge),
65
- },
66
- });
67
- }
68
- }
69
- catch (e) {
70
- this.logger.error(e);
71
- await this.db.updateScheduledTaskStatus(taskID, ScheduledTaskStatus.Failed, { error: e.toString() });
72
- }
73
- }
74
18
  }
75
19
  //# sourceMappingURL=datasetTasks.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"datasetTasks.js","sourceRoot":"","sources":["../../../src/tasks/dataset/datasetTasks.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"datasetTasks.js","sourceRoot":"","sources":["../../../src/tasks/dataset/datasetTasks.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAOxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,MAAM,OAAO,cAAc;IAM1B,YACC,MAA2B,EAC3B,MAAc,EACd,aAA4B,EAC5B,EAAqB;QAErB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACd,CAAC;IAOD,KAAK,CAAC,0BAA0B,CAAC,IAAU;QAC1C,MAAM,UAAU,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7C,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,UAAsB;QAC9C,MAAM,OAAO,GAAG,MAAM,uBAAuB,CAC5C,UAAU,EACV,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,EAC/B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CACjC,CAAC;QAEF,MAAM,IAAI,CAAC,EAAE,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;CACD"}
@@ -1 +1 @@
1
- {"version":3,"file":"datasetTasksUtils.js","sourceRoot":"","sources":["../../../src/tasks/dataset/datasetTasksUtils.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC3C,UAAsB,EACtB,iBAAyB,EACzB,mBAA2B,EAC1B,EAAE;IAEH,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,iBAAiB,GAAG,mBAAmB,EAAE;QACzE,MAAM,IAAI,eAAe,CAAC,6CAA6C,EAAE;YACxE,OAAO,EAAE,EAAE,cAAc,EAAE,uBAAuB,CAAC,IAAI,EAAE;SACzD,CAAC,CAAC;KACH;IAED,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ;SACnC,GAAG,CAAC,CAAC,OAAO,EAAU,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACpD,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAG/C,IAAI,SAAS,GAAG,iBAAiB,EAAE;QAClC,MAAM,IAAI,eAAe,CAAC,8CAA8C,EAAE;YACzE,OAAO,EAAE,EAAE,cAAc,EAAE,uBAAuB,CAAC,IAAI,EAAE;SACzD,CAAC,CAAC;KACH;IAGD,IAAI,SAAS,GAAG,mBAAmB,EAAE;QACpC,MAAM,IAAI,eAAe,CAAC,8CAA8C,EAAE;YACzE,OAAO,EAAE,EAAE,cAAc,EAAE,uBAAuB,CAAC,IAAI,EAAE;SACzD,CAAC,CAAC;KACH;IAED,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,UAAU,CAAC,CAAC;IAG/C,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE;QACpD,MAAM,IAAI,eAAe,CAAC,8BAA8B,EAAE;YACzD,OAAO,EAAE;gBACR,cAAc,EAAE,uBAAuB,CAAC,IAAI;gBAC5C,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC1C;SACD,CAAC,CAAC;KACH;IAED,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC"}
1
+ {"version":3,"file":"datasetTasksUtils.js","sourceRoot":"","sources":["../../../src/tasks/dataset/datasetTasksUtils.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC3C,UAAsB,EACtB,iBAAyB,EACzB,mBAA2B,EAC1B,EAAE;IAEH,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,iBAAiB,GAAG,mBAAmB,EAAE,CAAC;QAC1E,MAAM,IAAI,eAAe,CAAC,6CAA6C,EAAE;YACxE,OAAO,EAAE,EAAE,cAAc,EAAE,uBAAuB,CAAC,IAAI,EAAE;SACzD,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ;SACnC,GAAG,CAAC,CAAC,OAAO,EAAU,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACpD,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAG/C,IAAI,SAAS,GAAG,iBAAiB,EAAE,CAAC;QACnC,MAAM,IAAI,eAAe,CAAC,8CAA8C,EAAE;YACzE,OAAO,EAAE,EAAE,cAAc,EAAE,uBAAuB,CAAC,IAAI,EAAE;SACzD,CAAC,CAAC;IACJ,CAAC;IAGD,IAAI,SAAS,GAAG,mBAAmB,EAAE,CAAC;QACrC,MAAM,IAAI,eAAe,CAAC,8CAA8C,EAAE;YACzE,OAAO,EAAE,EAAE,cAAc,EAAE,uBAAuB,CAAC,IAAI,EAAE;SACzD,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,UAAU,CAAC,CAAC;IAG/C,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACrD,MAAM,IAAI,eAAe,CAAC,8BAA8B,EAAE;YACzD,OAAO,EAAE;gBACR,cAAc,EAAE,uBAAuB,CAAC,IAAI;gBAC5C,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC1C;SACD,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC"}
@@ -1,28 +1,28 @@
1
1
  import type { KeyringPair } from "@polkadot/keyring/types";
2
2
  import { type Logger } from "@prosopo/common";
3
- import { type Captcha, type CaptchaConfig, type CaptchaSolution, type DappUserSolutionResult, type Hash, type PendingCaptchaRequest } from "@prosopo/types";
4
- import { Database, UserCommitmentRecord } from "@prosopo/types-database";
3
+ import { type Captcha, type CaptchaConfig, type CaptchaSolution, type DappUserSolutionResult, type Hash, type PendingCaptchaRequest, type RequestHeaders } from "@prosopo/types";
4
+ import type { IProviderDatabase, UserCommitment } from "@prosopo/types-database";
5
5
  export declare class ImgCaptchaManager {
6
- db: Database;
6
+ db: IProviderDatabase;
7
7
  pair: KeyringPair;
8
8
  logger: Logger;
9
9
  captchaConfig: CaptchaConfig;
10
- constructor(db: Database, pair: KeyringPair, logger: Logger, captchaConfig: CaptchaConfig);
10
+ constructor(db: IProviderDatabase, pair: KeyringPair, logger: Logger, captchaConfig: CaptchaConfig);
11
11
  getCaptchaWithProof(datasetId: Hash, solved: boolean, size: number): Promise<Captcha[]>;
12
- getRandomCaptchasAndRequestHash(datasetId: string, userAccount: string, ipAddress: string): Promise<{
12
+ getRandomCaptchasAndRequestHash(datasetId: string, userAccount: string, ipAddress: string, headers: RequestHeaders): Promise<{
13
13
  captchas: Captcha[];
14
14
  requestHash: string;
15
15
  timestamp: number;
16
16
  signedRequestHash: string;
17
17
  }>;
18
- dappUserSolution(userAccount: string, dappAccount: string, requestHash: string, captchas: CaptchaSolution[], userRequestHashSignature: string, timestamp: number, providerRequestHashSignature: string, ipAddress: string): Promise<DappUserSolutionResult>;
18
+ dappUserSolution(userAccount: string, dappAccount: string, requestHash: string, captchas: CaptchaSolution[], userRequestHashSignature: string, timestamp: number, providerRequestHashSignature: string, ipAddress: string, headers: RequestHeaders): Promise<DappUserSolutionResult>;
19
19
  validateReceivedCaptchasAgainstStoredCaptchas(captchas: CaptchaSolution[]): Promise<{
20
20
  storedCaptchas: Captcha[];
21
21
  receivedCaptchas: CaptchaSolution[];
22
22
  captchaIds: string[];
23
23
  }>;
24
24
  validateDappUserSolutionRequestIsPending(requestHash: string, pendingRecord: PendingCaptchaRequest, userAccount: string, captchaIds: string[]): Promise<boolean>;
25
- getDappUserCommitmentById(commitmentId: string): Promise<UserCommitmentRecord>;
26
- getDappUserCommitmentByAccount(userAccount: string, dappAccount: string): Promise<UserCommitmentRecord | undefined>;
25
+ getDappUserCommitmentById(commitmentId: string): Promise<UserCommitment>;
26
+ getDappUserCommitmentByAccount(userAccount: string, dappAccount: string): Promise<UserCommitment | undefined>;
27
27
  }
28
28
  //# sourceMappingURL=imgCaptchaTasks.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"imgCaptchaTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasks.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,KAAK,MAAM,EAAmB,MAAM,iBAAiB,CAAC;AAM/D,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,eAAe,EAEpB,KAAK,sBAAsB,EAE3B,KAAK,IAAI,EACT,KAAK,qBAAqB,EAC3B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,QAAQ,EAER,oBAAoB,EACrB,MAAM,yBAAyB,CAAC;AAKjC,qBAAa,iBAAiB;IAC5B,EAAE,EAAE,QAAQ,CAAC;IACb,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,aAAa,CAAC;gBAG3B,EAAE,EAAE,QAAQ,EACZ,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa;IAQxB,mBAAmB,CACvB,SAAS,EAAE,IAAI,EACf,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,OAAO,EAAE,CAAC;IAgBf,+BAA+B,CACnC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;QACT,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC;IAgFI,gBAAgB,CACpB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,eAAe,EAAE,EAC3B,wBAAwB,EAAE,MAAM,EAChC,SAAS,EAAE,MAAM,EACjB,4BAA4B,EAAE,MAAM,EACpC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,sBAAsB,CAAC;IAiH5B,6CAA6C,CACjD,QAAQ,EAAE,eAAe,EAAE,GAC1B,OAAO,CAAC;QACT,cAAc,EAAE,OAAO,EAAE,CAAC;QAC1B,gBAAgB,EAAE,eAAe,EAAE,CAAC;QACpC,UAAU,EAAE,MAAM,EAAE,CAAC;KACtB,CAAC;IAqCI,wCAAwC,CAC5C,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,qBAAqB,EACpC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,OAAO,CAAC;IA2Bb,yBAAyB,CAC7B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,oBAAoB,CAAC;IAe1B,8BAA8B,CAClC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;CAc7C"}
1
+ {"version":3,"file":"imgCaptchaTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasks.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,KAAK,MAAM,EAAmB,MAAM,iBAAiB,CAAC;AAM/D,OAAO,EACN,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,eAAe,EAGpB,KAAK,sBAAsB,EAC3B,KAAK,IAAI,EACT,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACX,iBAAiB,EACjB,cAAc,EACd,MAAM,yBAAyB,CAAC;AAKjC,qBAAa,iBAAiB;IAC7B,EAAE,EAAE,iBAAiB,CAAC;IACtB,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,aAAa,CAAC;gBAG5B,EAAE,EAAE,iBAAiB,EACrB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa;IAQvB,mBAAmB,CACxB,SAAS,EAAE,IAAI,EACf,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,GACV,OAAO,CAAC,OAAO,EAAE,CAAC;IAgBf,+BAA+B,CACpC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,cAAc,GACrB,OAAO,CAAC;QACV,QAAQ,EAAE,OAAO,EAAE,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,iBAAiB,EAAE,MAAM,CAAC;KAC1B,CAAC;IAiFI,gBAAgB,CACrB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,eAAe,EAAE,EAC3B,wBAAwB,EAAE,MAAM,EAChC,SAAS,EAAE,MAAM,EACjB,4BAA4B,EAAE,MAAM,EACpC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,cAAc,GACrB,OAAO,CAAC,sBAAsB,CAAC;IAkH5B,6CAA6C,CAClD,QAAQ,EAAE,eAAe,EAAE,GACzB,OAAO,CAAC;QACV,cAAc,EAAE,OAAO,EAAE,CAAC;QAC1B,gBAAgB,EAAE,eAAe,EAAE,CAAC;QACpC,UAAU,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IAqCI,wCAAwC,CAC7C,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,qBAAqB,EACpC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,OAAO,CAAC;IA2Bb,yBAAyB,CAC9B,YAAY,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,CAAC;IAepB,8BAA8B,CACnC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GACjB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;CActC"}
@@ -27,7 +27,7 @@ export class ImgCaptchaManager {
27
27
  }
28
28
  return captchaDocs;
29
29
  }
30
- async getRandomCaptchasAndRequestHash(datasetId, userAccount, ipAddress) {
30
+ async getRandomCaptchasAndRequestHash(datasetId, userAccount, ipAddress, headers) {
31
31
  const dataset = await this.db.getDatasetDetails(datasetId);
32
32
  if (!dataset) {
33
33
  throw new ProsopoEnvError("DATABASE.DATASET_GET_FAILED", {
@@ -58,7 +58,7 @@ export class ImgCaptchaManager {
58
58
  .reduce((a, b) => a + b, 0);
59
59
  const deadlineTs = timeLimit + currentTime;
60
60
  const currentBlockNumber = 0;
61
- await this.db.storeDappUserPending(userAccount, requestHash, salt, deadlineTs, currentTime, ipAddress);
61
+ await this.db.storeDappUserPending(userAccount, requestHash, salt, deadlineTs, currentTime, ipAddress, headers);
62
62
  return {
63
63
  captchas,
64
64
  requestHash,
@@ -66,7 +66,7 @@ export class ImgCaptchaManager {
66
66
  signedRequestHash,
67
67
  };
68
68
  }
69
- async dappUserSolution(userAccount, dappAccount, requestHash, captchas, userRequestHashSignature, timestamp, providerRequestHashSignature, ipAddress) {
69
+ async dappUserSolution(userAccount, dappAccount, requestHash, captchas, userRequestHashSignature, timestamp, providerRequestHashSignature, ipAddress, headers) {
70
70
  const verification = signatureVerify(stringToHex(requestHash), userRequestHashSignature, userAccount);
71
71
  if (!verification.isValid) {
72
72
  this.logger.info("Invalid user requestHash signature");
@@ -114,6 +114,7 @@ export class ImgCaptchaManager {
114
114
  serverChecked: false,
115
115
  requestedAtTimestamp: timestamp,
116
116
  ipAddress,
117
+ headers,
117
118
  };
118
119
  await this.db.storeDappUserSolution(receivedCaptchas, commit);
119
120
  if (compareCaptchaSolutions(receivedCaptchas, storedCaptchas)) {
@@ -1 +1 @@
1
- {"version":3,"file":"imgCaptchaTasks.js","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasks.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"imgCaptchaTasks.js","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasks.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"imgCaptchaTasksUtils.d.ts","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasksUtils.ts"],"names":[],"mappings":"AAcA,OAAO,EACL,iBAAiB,EAElB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAOtD,eAAO,MAAM,2BAA2B,qBACpB,eAAe,EAAE;UAC1B,iBAAiB;kBAAgB,MAAM;CAqBjD,CAAC"}
1
+ {"version":3,"file":"imgCaptchaTasksUtils.d.ts","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasksUtils.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,iBAAiB,EAEjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAOtD,eAAO,MAAM,2BAA2B,qBACrB,eAAe,EAAE,KACjC;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAqBjD,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"imgCaptchaTasksUtils.js","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasksUtils.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EACL,iBAAiB,EACjB,0BAA0B,GAC3B,MAAM,mBAAmB,CAAC;AAQ3B,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,gBAAmC,EACgB,EAAE;IACrD,MAAM,IAAI,GAAG,IAAI,iBAAiB,EAAE,CAAC;IACrC,MAAM,eAAe,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACvD,0BAA0B,CAAC,OAAO,CAAC,CACpC,CAAC;IACF,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAE5B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC;IACrC,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,eAAe,CACvB,qDAAqD,EACrD;YACE,OAAO,EAAE;gBACP,cAAc,EAAE,2BAA2B,CAAC,IAAI;gBAChD,YAAY,EAAE,YAAY;aAC3B;SACF,CACF,CAAC;KACH;IAED,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;AAChC,CAAC,CAAC"}
1
+ {"version":3,"file":"imgCaptchaTasksUtils.js","sourceRoot":"","sources":["../../../src/tasks/imgCaptcha/imgCaptchaTasksUtils.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EACN,iBAAiB,EACjB,0BAA0B,GAC1B,MAAM,mBAAmB,CAAC;AAQ3B,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAC1C,gBAAmC,EACiB,EAAE;IACtD,MAAM,IAAI,GAAG,IAAI,iBAAiB,EAAE,CAAC;IACrC,MAAM,eAAe,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACxD,0BAA0B,CAAC,OAAO,CAAC,CACnC,CAAC;IACF,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAE5B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC;IACrC,IAAI,CAAC,YAAY,EAAE,CAAC;QACnB,MAAM,IAAI,eAAe,CACxB,qDAAqD,EACrD;YACC,OAAO,EAAE;gBACR,cAAc,EAAE,2BAA2B,CAAC,IAAI;gBAChD,YAAY,EAAE,YAAY;aAC1B;SACD,CACD,CAAC;IACH,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;AAC/B,CAAC,CAAC"}
@@ -1,13 +1,13 @@
1
1
  import type { KeyringPair } from "@polkadot/keyring/types";
2
- import { type PoWCaptcha, PoWChallengeId } from "@prosopo/types";
3
- import { Database } from "@prosopo/types-database";
2
+ import { type PoWCaptcha, type PoWChallengeId, type RequestHeaders } from "@prosopo/types";
3
+ import type { IProviderDatabase } from "@prosopo/types-database";
4
4
  export declare class PowCaptchaManager {
5
5
  pair: KeyringPair;
6
- db: Database;
6
+ db: IProviderDatabase;
7
7
  POW_SEPARATOR: string;
8
- constructor(pair: KeyringPair, db: Database);
8
+ constructor(pair: KeyringPair, db: IProviderDatabase);
9
9
  getPowCaptchaChallenge(userAccount: string, dappAccount: string, origin: string): Promise<PoWCaptcha>;
10
- verifyPowCaptchaSolution(challenge: PoWChallengeId, difficulty: number, providerChallengeSignature: string, nonce: number, timeout: number, userTimestampSignature: string, ipAddress: string): Promise<boolean>;
10
+ verifyPowCaptchaSolution(challenge: PoWChallengeId, difficulty: number, providerChallengeSignature: string, nonce: number, timeout: number, userTimestampSignature: string, ipAddress: string, headers: RequestHeaders): Promise<boolean>;
11
11
  serverVerifyPowCaptchaSolution(dappAccount: string, challenge: string, timeout: number): Promise<boolean>;
12
12
  }
13
13
  //# sourceMappingURL=powTasks.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"powTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/powCaptcha/powTasks.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAKL,KAAK,UAAU,EACf,cAAc,EACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAqB,MAAM,yBAAyB,CAAC;AAMtE,qBAAa,iBAAiB;IAC5B,IAAI,EAAE,WAAW,CAAC;IAClB,EAAE,EAAE,QAAQ,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;gBAEV,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ;IAarC,sBAAsB,CAC1B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,CAAC;IA0BhB,wBAAwB,CAC5B,SAAS,EAAE,cAAc,EACzB,UAAU,EAAE,MAAM,EAClB,0BAA0B,EAAE,MAAM,EAClC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,sBAAsB,EAAE,MAAM,EAC9B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC;IAuEb,8BAA8B,CAClC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,OAAO,CAAC;CAkCpB"}
1
+ {"version":3,"file":"powTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/powCaptcha/powTasks.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAKN,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAMjE,qBAAa,iBAAiB;IAC7B,IAAI,EAAE,WAAW,CAAC;IAClB,EAAE,EAAE,iBAAiB,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;gBAEV,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,iBAAiB;IAa9C,sBAAsB,CAC3B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,UAAU,CAAC;IA0BhB,wBAAwB,CAC7B,SAAS,EAAE,cAAc,EACzB,UAAU,EAAE,MAAM,EAClB,0BAA0B,EAAE,MAAM,EAClC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,sBAAsB,EAAE,MAAM,EAC9B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,cAAc,GACrB,OAAO,CAAC,OAAO,CAAC;IAuEb,8BAA8B,CACnC,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC;CAkCnB"}
@@ -1,5 +1,5 @@
1
1
  import { stringToHex, u8aToHex } from "@polkadot/util";
2
- import { getLoggerDefault, ProsopoEnvError } from "@prosopo/common";
2
+ import { ProsopoEnvError, getLoggerDefault } from "@prosopo/common";
3
3
  import { ApiParams, CaptchaStatus, POW_SEPARATOR, } from "@prosopo/types";
4
4
  import { at, verifyRecency } from "@prosopo/util";
5
5
  import { checkPowSignature, validateSolution } from "./powTasksUtils.js";
@@ -22,10 +22,10 @@ export class PowCaptchaManager {
22
22
  requestedAtTimestamp,
23
23
  };
24
24
  }
25
- async verifyPowCaptchaSolution(challenge, difficulty, providerChallengeSignature, nonce, timeout, userTimestampSignature, ipAddress) {
25
+ async verifyPowCaptchaSolution(challenge, difficulty, providerChallengeSignature, nonce, timeout, userTimestampSignature, ipAddress, headers) {
26
26
  checkPowSignature(challenge, providerChallengeSignature, this.pair.address, ApiParams.challenge);
27
27
  const challengeSplit = challenge.split(this.POW_SEPARATOR);
28
- const timestamp = parseInt(at(challengeSplit, 0));
28
+ const timestamp = Number.parseInt(at(challengeSplit, 0));
29
29
  const userAccount = at(challengeSplit, 1);
30
30
  checkPowSignature(timestamp.toString(), userTimestampSignature, userAccount, ApiParams.timestamp);
31
31
  const challengeRecord = await this.db.getPowCaptchaRecordByChallenge(challenge);
@@ -1 +1 @@
1
- {"version":3,"file":"powTasks.js","sourceRoot":"","sources":["../../../src/tasks/powCaptcha/powTasks.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"powTasks.js","sourceRoot":"","sources":["../../../src/tasks/powCaptcha/powTasks.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"powTasksUtils.d.ts","sourceRoot":"","sources":["../../../src/tasks/powCaptcha/powTasksUtils.ts"],"names":[],"mappings":"AAoBA,eAAO,MAAM,gBAAgB,UACpB,MAAM,aACF,MAAM,cACL,MAAM,KACjB,OAIoC,CAAC;AAExC,eAAO,MAAM,iBAAiB,cACjB,MAAM,aACN,MAAM,WACR,MAAM,kBACC,MAAM,KACrB,IAgBF,CAAC"}
1
+ {"version":3,"file":"powTasksUtils.d.ts","sourceRoot":"","sources":["../../../src/tasks/powCaptcha/powTasksUtils.ts"],"names":[],"mappings":"AAoBA,eAAO,MAAM,gBAAgB,UACrB,MAAM,aACF,MAAM,cACL,MAAM,KAChB,OAIkC,CAAC;AAEtC,eAAO,MAAM,iBAAiB,cAClB,MAAM,aACN,MAAM,WACR,MAAM,kBACC,MAAM,KACpB,IAgBF,CAAC"}