@prosopo/provider 2.3.2 → 2.4.1

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 (101) hide show
  1. package/dist/api/admin/apiRegisterSiteKeyEndpoint.d.ts.map +1 -1
  2. package/dist/api/admin/apiRegisterSiteKeyEndpoint.js +4 -4
  3. package/dist/api/admin/apiRegisterSiteKeyEndpoint.js.map +1 -1
  4. package/dist/api/admin/createApiAdminRoutesProvider.d.ts +1 -2
  5. package/dist/api/admin/createApiAdminRoutesProvider.d.ts.map +1 -1
  6. package/dist/api/admin/createApiAdminRoutesProvider.js +1 -2
  7. package/dist/api/admin/createApiAdminRoutesProvider.js.map +1 -1
  8. package/dist/api/authMiddleware.d.ts.map +1 -1
  9. package/dist/api/authMiddleware.js +4 -1
  10. package/dist/api/authMiddleware.js.map +1 -1
  11. package/dist/api/captcha.d.ts.map +1 -1
  12. package/dist/api/captcha.js +81 -83
  13. package/dist/api/captcha.js.map +1 -1
  14. package/dist/api/domainMiddleware.d.ts.map +1 -1
  15. package/dist/api/domainMiddleware.js +7 -6
  16. package/dist/api/domainMiddleware.js.map +1 -1
  17. package/dist/api/headerCheckMiddleware.d.ts.map +1 -1
  18. package/dist/api/headerCheckMiddleware.js +5 -1
  19. package/dist/api/headerCheckMiddleware.js.map +1 -1
  20. package/dist/api/public.d.ts.map +1 -1
  21. package/dist/api/public.js +1 -2
  22. package/dist/api/public.js.map +1 -1
  23. package/dist/api/validateAddress.d.ts +4 -0
  24. package/dist/api/validateAddress.d.ts.map +1 -0
  25. package/dist/api/validateAddress.js +16 -0
  26. package/dist/api/validateAddress.js.map +1 -0
  27. package/dist/api/verify.d.ts.map +1 -1
  28. package/dist/api/verify.js +6 -14
  29. package/dist/api/verify.js.map +1 -1
  30. package/dist/index.d.ts +1 -2
  31. package/dist/index.d.ts.map +1 -1
  32. package/dist/index.js +1 -2
  33. package/dist/index.js.map +1 -1
  34. package/dist/tasks/captchaManager.d.ts +25 -0
  35. package/dist/tasks/captchaManager.d.ts.map +1 -0
  36. package/dist/tasks/captchaManager.js +81 -0
  37. package/dist/tasks/captchaManager.js.map +1 -0
  38. package/dist/tasks/client/clientTasks.d.ts +2 -3
  39. package/dist/tasks/client/clientTasks.d.ts.map +1 -1
  40. package/dist/tasks/client/clientTasks.js +4 -12
  41. package/dist/tasks/client/clientTasks.js.map +1 -1
  42. package/dist/tasks/frictionless/frictionlessTasks.d.ts +13 -7
  43. package/dist/tasks/frictionless/frictionlessTasks.d.ts.map +1 -1
  44. package/dist/tasks/frictionless/frictionlessTasks.js +54 -13
  45. package/dist/tasks/frictionless/frictionlessTasks.js.map +1 -1
  46. package/dist/tasks/frictionless/frictionlessTasksUtils.d.ts +5 -0
  47. package/dist/tasks/frictionless/frictionlessTasksUtils.d.ts.map +1 -0
  48. package/dist/tasks/frictionless/frictionlessTasksUtils.js +6 -0
  49. package/dist/tasks/frictionless/frictionlessTasksUtils.js.map +1 -0
  50. package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts +7 -8
  51. package/dist/tasks/imgCaptcha/imgCaptchaTasks.d.ts.map +1 -1
  52. package/dist/tasks/imgCaptcha/imgCaptchaTasks.js +32 -12
  53. package/dist/tasks/imgCaptcha/imgCaptchaTasks.js.map +1 -1
  54. package/dist/tasks/powCaptcha/powTasks.d.ts +8 -5
  55. package/dist/tasks/powCaptcha/powTasks.d.ts.map +1 -1
  56. package/dist/tasks/powCaptcha/powTasks.js +22 -15
  57. package/dist/tasks/powCaptcha/powTasks.js.map +1 -1
  58. package/dist/tasks/tasks.d.ts.map +1 -1
  59. package/dist/tasks/tasks.js +3 -3
  60. package/dist/tasks/tasks.js.map +1 -1
  61. package/dist/tests/integration/imgCaptcha.integration.test.js +59 -7
  62. package/dist/tests/integration/imgCaptcha.integration.test.js.map +1 -1
  63. package/dist/tests/integration/powCaptcha.integration.test.js +57 -13
  64. package/dist/tests/integration/powCaptcha.integration.test.js.map +1 -1
  65. package/dist/tests/integration/registerSitekey.d.ts +2 -1
  66. package/dist/tests/integration/registerSitekey.d.ts.map +1 -1
  67. package/dist/tests/integration/registerSitekey.js +2 -2
  68. package/dist/tests/integration/registerSitekey.js.map +1 -1
  69. package/dist/tests/unit/api/authMiddleware.unit.test.js +7 -1
  70. package/dist/tests/unit/api/authMiddleware.unit.test.js.map +1 -1
  71. package/dist/tests/unit/tasks/captchaManager.unit.test.d.ts +2 -0
  72. package/dist/tests/unit/tasks/captchaManager.unit.test.d.ts.map +1 -0
  73. package/dist/tests/unit/tasks/captchaManager.unit.test.js +229 -0
  74. package/dist/tests/unit/tasks/captchaManager.unit.test.js.map +1 -0
  75. package/dist/tests/unit/tasks/frictionless/frictionlessTasks.unit.test.js +41 -7
  76. package/dist/tests/unit/tasks/frictionless/frictionlessTasks.unit.test.js.map +1 -1
  77. package/dist/tests/unit/tasks/frictionless/frictionlessTasksUtils.unit.test.d.ts +2 -0
  78. package/dist/tests/unit/tasks/frictionless/frictionlessTasksUtils.unit.test.d.ts.map +1 -0
  79. package/dist/tests/unit/tasks/frictionless/frictionlessTasksUtils.unit.test.js +37 -0
  80. package/dist/tests/unit/tasks/frictionless/frictionlessTasksUtils.unit.test.js.map +1 -0
  81. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.js +4 -4
  82. package/dist/tests/unit/tasks/imgCaptcha/imgCaptchaTasks.unit.test.js.map +1 -1
  83. package/dist/tests/unit/tasks/powCaptcha/powTasks.unit.test.js +5 -10
  84. package/dist/tests/unit/tasks/powCaptcha/powTasks.unit.test.js.map +1 -1
  85. package/package.json +14 -13
  86. package/dist/api/admin/export.d.ts +0 -3
  87. package/dist/api/admin/export.d.ts.map +0 -1
  88. package/dist/api/admin/export.js +0 -3
  89. package/dist/api/admin/export.js.map +0 -1
  90. package/dist/api/errorHandler.d.ts +0 -5
  91. package/dist/api/errorHandler.d.ts.map +0 -1
  92. package/dist/api/errorHandler.js +0 -10
  93. package/dist/api/errorHandler.js.map +0 -1
  94. package/dist/api/export.d.ts +0 -2
  95. package/dist/api/export.d.ts.map +0 -1
  96. package/dist/api/export.js +0 -2
  97. package/dist/api/export.js.map +0 -1
  98. package/dist/tests/unit/api/errorHandler.unit.test.d.ts +0 -2
  99. package/dist/tests/unit/api/errorHandler.unit.test.d.ts.map +0 -1
  100. package/dist/tests/unit/api/errorHandler.unit.test.js +0 -105
  101. package/dist/tests/unit/api/errorHandler.unit.test.js.map +0 -1
@@ -1,10 +1,10 @@
1
1
  import { validateAddress } from "@polkadot/util-crypto/address";
2
+ import { handleErrors } from "@prosopo/api-express-router";
2
3
  import { ProsopoApiError } from "@prosopo/common";
3
4
  import { ApiParams, ApiPaths, ServerPowCaptchaVerifyRequestBody, VerifySolutionBody, decodeProcaptchaOutput, } from "@prosopo/types";
4
5
  import express from "express";
5
6
  import { Tasks } from "../tasks/tasks.js";
6
7
  import { verifySignature } from "./authMiddleware.js";
7
- import { handleErrors } from "./errorHandler.js";
8
8
  export function prosopoVerifyRouter(env) {
9
9
  const router = express.Router();
10
10
  const tasks = new Tasks(env);
@@ -32,13 +32,8 @@ export function prosopoVerifyRouter(env) {
32
32
  const keyPair = env.keyring.addFromAddress(dapp);
33
33
  verifySignature(dappSignature, timestamp.toString(), keyPair);
34
34
  const response = await tasks.imgCaptchaManager.verifyImageCaptchaSolution(user, dapp, commitmentId, parsed.maxVerifiedTime);
35
- const verificationResponse = {
36
- [ApiParams.status]: req.t(response.status),
37
- [ApiParams.verified]: response[ApiParams.verified],
38
- ...(response.commitmentId && {
39
- [ApiParams.commitmentId]: response.commitmentId,
40
- }),
41
- };
35
+ tasks.logger.debug(response);
36
+ const verificationResponse = tasks.imgCaptchaManager.getVerificationResponse(response[ApiParams.verified], clientRecord, req.t, response[ApiParams.score], response[ApiParams.commitmentId]);
42
37
  res.json(verificationResponse);
43
38
  }
44
39
  catch (err) {
@@ -78,17 +73,14 @@ export function prosopoVerifyRouter(env) {
78
73
  }
79
74
  const dappPair = env.keyring.addFromAddress(dapp);
80
75
  verifySignature(dappSignature, timestamp.toString(), dappPair);
81
- const approved = await tasks.powCaptchaManager.serverVerifyPowCaptchaSolution(dapp, challenge, verifiedTimeout);
82
- const verificationResponse = {
83
- status: req.t(approved ? "API.USER_VERIFIED" : "API.USER_NOT_VERIFIED"),
84
- [ApiParams.verified]: approved,
85
- };
76
+ const { verified, score } = await tasks.powCaptchaManager.serverVerifyPowCaptchaSolution(dapp, challenge, verifiedTimeout);
77
+ const verificationResponse = tasks.powCaptchaManager.getVerificationResponse(verified, clientRecord, req.t, score);
86
78
  return res.json(verificationResponse);
87
79
  }
88
80
  catch (err) {
89
81
  tasks.logger.error({ err, body: req.body });
90
82
  return next(new ProsopoApiError("API.BAD_REQUEST", {
91
- context: { code: 500 },
83
+ context: { code: 500, error: err },
92
84
  }));
93
85
  }
94
86
  });
@@ -1 +1 @@
1
- {"version":3,"file":"verify.js","sourceRoot":"","sources":["../../src/api/verify.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"verify.js","sourceRoot":"","sources":["../../src/api/verify.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -3,12 +3,11 @@ export * from "./util.js";
3
3
  export * from "./api/block.js";
4
4
  export * from "./api/captcha.js";
5
5
  export * from "./api/verify.js";
6
- export * from "./api/errorHandler.js";
7
6
  export * from "./api/authMiddleware.js";
8
7
  export * from "./api/public.js";
9
8
  export * from "./api/domainMiddleware.js";
10
9
  export * from "./schedulers/captchaScheduler.js";
11
10
  export * from "./schedulers/getClientList.js";
12
11
  export * from "./api/headerCheckMiddleware.js";
13
- export * as api from "./api/export.js";
12
+ export * from "./api/admin/createApiAdminRoutesProvider.js";
14
13
  //# 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,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kCAAkC,CAAC;AACjD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,OAAO,KAAK,GAAG,MAAM,iBAAiB,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,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kCAAkC,CAAC;AACjD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6CAA6C,CAAC"}
package/dist/index.js CHANGED
@@ -3,12 +3,11 @@ export * from "./util.js";
3
3
  export * from "./api/block.js";
4
4
  export * from "./api/captcha.js";
5
5
  export * from "./api/verify.js";
6
- export * from "./api/errorHandler.js";
7
6
  export * from "./api/authMiddleware.js";
8
7
  export * from "./api/public.js";
9
8
  export * from "./api/domainMiddleware.js";
10
9
  export * from "./schedulers/captchaScheduler.js";
11
10
  export * from "./schedulers/getClientList.js";
12
11
  export * from "./api/headerCheckMiddleware.js";
13
- export * as api from "./api/export.js";
12
+ export * from "./api/admin/createApiAdminRoutesProvider.js";
14
13
  //# 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,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kCAAkC,CAAC;AACjD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,OAAO,KAAK,GAAG,MAAM,iBAAiB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kCAAkC,CAAC;AACjD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6CAA6C,CAAC"}
@@ -0,0 +1,25 @@
1
+ import type { KeyringPair } from "@polkadot/keyring/types";
2
+ import { type Logger } from "@prosopo/common";
3
+ import type { TranslationKey } from "@prosopo/locale";
4
+ import { CaptchaType, Tier } from "@prosopo/types";
5
+ import type { ClientRecord, FrictionlessTokenId, IProviderDatabase, IUserDataSlim, Session } from "@prosopo/types-database";
6
+ export declare class CaptchaManager {
7
+ pair: KeyringPair;
8
+ db: IProviderDatabase;
9
+ logger: Logger;
10
+ constructor(db: IProviderDatabase, pair: KeyringPair, logger?: Logger);
11
+ getFrictionlessTokenIdFromSession(sessionRecord: Session): Promise<import("mongoose").Schema.Types.ObjectId | undefined>;
12
+ isValidRequest(clientSettings: ClientRecord | IUserDataSlim, captchaType: CaptchaType, sessionId?: string): Promise<{
13
+ valid: boolean;
14
+ reason?: TranslationKey;
15
+ frictionlessTokenId?: FrictionlessTokenId;
16
+ type: CaptchaType;
17
+ }>;
18
+ getVerificationResponse(verified: boolean, clientRecord: ClientRecord, translateFn: (key: string) => string, score?: number): {
19
+ score?: number | undefined;
20
+ status: string;
21
+ verified: boolean;
22
+ };
23
+ static canClientSeeScore(tier: Tier, score?: number): boolean | 0 | undefined;
24
+ }
25
+ //# sourceMappingURL=captchaManager.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"captchaManager.d.ts","sourceRoot":"","sources":["../../src/tasks/captchaManager.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,KAAK,MAAM,EAAoB,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAa,WAAW,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,KAAK,EACX,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EACjB,aAAa,EACb,OAAO,EACP,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,cAAc;IAC1B,IAAI,EAAE,WAAW,CAAC;IAClB,EAAE,EAAE,iBAAiB,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;gBAEH,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,MAAM;IAM/D,iCAAiC,CAAC,aAAa,EAAE,OAAO;IAOxD,cAAc,CACnB,cAAc,EAAE,YAAY,GAAG,aAAa,EAC5C,WAAW,EAAE,WAAW,EACxB,SAAS,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;QACV,KAAK,EAAE,OAAO,CAAC;QACf,MAAM,CAAC,EAAE,cAAc,CAAC;QACxB,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,IAAI,EAAE,WAAW,CAAC;KAClB,CAAC;IAuEF,uBAAuB,CACtB,QAAQ,EAAE,OAAO,EACjB,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,EACpC,KAAK,CAAC,EAAE,MAAM;;;;;IAaf,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,MAAM;CAGnD"}
@@ -0,0 +1,81 @@
1
+ import { getLoggerDefault } from "@prosopo/common";
2
+ import { ApiParams, CaptchaType, Tier } from "@prosopo/types";
3
+ export class CaptchaManager {
4
+ constructor(db, pair, logger) {
5
+ this.pair = pair;
6
+ this.db = db;
7
+ this.logger = logger || getLoggerDefault();
8
+ }
9
+ async getFrictionlessTokenIdFromSession(sessionRecord) {
10
+ const tokenRecord = await this.db.getFrictionlessTokenRecordByTokenId(sessionRecord.tokenId);
11
+ return tokenRecord ? tokenRecord._id : undefined;
12
+ }
13
+ async isValidRequest(clientSettings, captchaType, sessionId) {
14
+ this.logger.debug({
15
+ message: "Validating request",
16
+ captchaType,
17
+ sessionId,
18
+ });
19
+ if (sessionId) {
20
+ if (clientSettings?.settings?.captchaType === CaptchaType.frictionless) {
21
+ const sessionRecord = await this.db.checkAndRemoveSession(sessionId);
22
+ if (!sessionRecord) {
23
+ this.logger.warn({
24
+ message: "No frictionless session found",
25
+ account: clientSettings.account,
26
+ sessionId: sessionId,
27
+ });
28
+ return {
29
+ valid: false,
30
+ reason: "CAPTCHA.NO_SESSION_FOUND",
31
+ type: captchaType,
32
+ };
33
+ }
34
+ const frictionlessTokenId = await this.getFrictionlessTokenIdFromSession(sessionRecord);
35
+ return {
36
+ valid: true,
37
+ frictionlessTokenId,
38
+ type: captchaType,
39
+ };
40
+ }
41
+ this.logger.warn({
42
+ message: "Invalid frictionless request",
43
+ account: clientSettings.account,
44
+ sessionId: sessionId,
45
+ settingsCaptchaType: clientSettings?.settings?.captchaType,
46
+ });
47
+ return {
48
+ valid: false,
49
+ reason: "API.INCORRECT_CAPTCHA_TYPE",
50
+ type: captchaType,
51
+ };
52
+ }
53
+ if (clientSettings?.settings?.captchaType !== captchaType) {
54
+ this.logger.warn({
55
+ message: `Invalid ${captchaType} request`,
56
+ account: clientSettings.account,
57
+ requestedCaptchaType: captchaType,
58
+ settingsCaptchaType: clientSettings?.settings?.captchaType,
59
+ });
60
+ return {
61
+ valid: false,
62
+ reason: "API.INCORRECT_CAPTCHA_TYPE",
63
+ type: captchaType,
64
+ };
65
+ }
66
+ return { valid: true, type: captchaType };
67
+ }
68
+ getVerificationResponse(verified, clientRecord, translateFn, score) {
69
+ return {
70
+ status: translateFn(verified ? "API.USER_VERIFIED" : "API.USER_NOT_VERIFIED"),
71
+ [ApiParams.verified]: verified,
72
+ ...(CaptchaManager.canClientSeeScore(clientRecord.tier, score) && {
73
+ [ApiParams.score]: score,
74
+ }),
75
+ };
76
+ }
77
+ static canClientSeeScore(tier, score) {
78
+ return score && tier && tier !== Tier.Free;
79
+ }
80
+ }
81
+ //# sourceMappingURL=captchaManager.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"captchaManager.js","sourceRoot":"","sources":["../../src/tasks/captchaManager.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { type Logger } from "@prosopo/common";
2
- import { type IUserSettings, type ProsopoConfigOutput } from "@prosopo/types";
2
+ import { type IUserSettings, type ProsopoConfigOutput, type Tier } from "@prosopo/types";
3
3
  import type { IProviderDatabase } from "@prosopo/types-database";
4
4
  export declare class ClientTaskManager {
5
5
  config: ProsopoConfigOutput;
@@ -8,10 +8,9 @@ export declare class ClientTaskManager {
8
8
  constructor(config: ProsopoConfigOutput, logger: Logger, db: IProviderDatabase);
9
9
  storeCommitmentsExternal(): Promise<void>;
10
10
  getClientList(): Promise<void>;
11
- registerSiteKey(siteKey: string, settings: IUserSettings): Promise<void>;
11
+ registerSiteKey(siteKey: string, tier: Tier, settings: IUserSettings): Promise<void>;
12
12
  isSubdomainOrExactMatch(referrer: string, clientDomain: string): boolean;
13
13
  private isCommitmentUpdated;
14
14
  private processBatchesWithCursor;
15
- private cleanReferrer;
16
15
  }
17
16
  //# sourceMappingURL=clientTasks.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"clientTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/client/clientTasks.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,MAAM,EAAmB,MAAM,iBAAiB,CAAC;AAE/D,OAAO,EACN,KAAK,aAAa,EAClB,KAAK,mBAAmB,EAGxB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAEX,iBAAiB,EAGjB,MAAM,yBAAyB,CAAC;AAGjC,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;IAkGzC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA4D9B,eAAe,CACpB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,aAAa,GACrB,OAAO,CAAC,IAAI,CAAC;IAShB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO;IAuBxE,OAAO,CAAC,mBAAmB;YAWb,wBAAwB;IActC,OAAO,CAAC,aAAa;CAerB"}
1
+ {"version":3,"file":"clientTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/client/clientTasks.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,MAAM,EAAmB,MAAM,iBAAiB,CAAC;AAE/D,OAAO,EACN,KAAK,aAAa,EAClB,KAAK,mBAAmB,EAGxB,KAAK,IAAI,EACT,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAEX,iBAAiB,EAGjB,MAAM,yBAAyB,CAAC;AAIjC,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;IAkGzC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA4D9B,eAAe,CACpB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,aAAa,GACrB,OAAO,CAAC,IAAI,CAAC;IAWhB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO;IAuBxE,OAAO,CAAC,mBAAmB;YAWb,wBAAwB;CAatC"}
@@ -2,6 +2,7 @@ import { ProsopoApiError } from "@prosopo/common";
2
2
  import { CaptchaDatabase, ClientDatabase } from "@prosopo/database";
3
3
  import { ScheduledTaskNames, ScheduledTaskStatus, } from "@prosopo/types";
4
4
  import { parseUrl } from "@prosopo/util";
5
+ import { validiateSiteKey } from "../../api/validateAddress.js";
5
6
  export class ClientTaskManager {
6
7
  constructor(config, logger, db) {
7
8
  this.config = config;
@@ -86,10 +87,12 @@ export class ClientTaskManager {
86
87
  await this.providerDB.updateScheduledTaskStatus(taskID, ScheduledTaskStatus.Failed, { error: String(e) });
87
88
  }
88
89
  }
89
- async registerSiteKey(siteKey, settings) {
90
+ async registerSiteKey(siteKey, tier, settings) {
91
+ validiateSiteKey(siteKey);
90
92
  await this.providerDB.updateClientRecords([
91
93
  {
92
94
  account: siteKey,
95
+ tier: tier,
93
96
  settings: settings,
94
97
  },
95
98
  ]);
@@ -131,16 +134,5 @@ export class ClientTaskManager {
131
134
  skip += batch.length;
132
135
  }
133
136
  }
134
- cleanReferrer(referrer) {
135
- const lowered = referrer.toLowerCase().trim();
136
- let cleaned = lowered;
137
- const MAX_SLASHES = 10;
138
- let slashCount = 0;
139
- while (cleaned.endsWith("/") && slashCount < MAX_SLASHES) {
140
- cleaned = cleaned.slice(0, -1);
141
- slashCount++;
142
- }
143
- return cleaned;
144
- }
145
137
  }
146
138
  //# sourceMappingURL=clientTasks.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"clientTasks.js","sourceRoot":"","sources":["../../../src/tasks/client/clientTasks.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"clientTasks.js","sourceRoot":"","sources":["../../../src/tasks/client/clientTasks.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,20 @@
1
1
  import type { KeyringPair } from "@polkadot/keyring/types";
2
- import { type GetFrictionlessCaptchaResponse, type ProsopoConfigOutput } from "@prosopo/types";
3
- import type { IProviderDatabase } from "@prosopo/types-database";
2
+ import type { Logger } from "@prosopo/common";
3
+ import { CaptchaType, type ProsopoConfigOutput } from "@prosopo/types";
4
+ import { type GetFrictionlessCaptchaResponse } from "@prosopo/types";
5
+ import type { FrictionlessTokenId, IProviderDatabase, Session } from "@prosopo/types-database";
6
+ import type { Rule } from "@prosopo/user-access-policy";
4
7
  import type { ObjectId } from "mongoose";
5
- export declare class FrictionlessManager {
8
+ import { CaptchaManager } from "../captchaManager.js";
9
+ export declare class FrictionlessManager extends CaptchaManager {
6
10
  config: ProsopoConfigOutput;
7
- pair: KeyringPair;
8
- db: IProviderDatabase;
9
- constructor(config: ProsopoConfigOutput, pair: KeyringPair, db: IProviderDatabase);
11
+ constructor(db: IProviderDatabase, pair: KeyringPair, config: ProsopoConfigOutput, logger?: Logger);
10
12
  checkLangRules(acceptLanguage: string): number;
11
- sendImageCaptcha(): GetFrictionlessCaptchaResponse;
13
+ createSession(tokenId: ObjectId, captchaType: CaptchaType): Promise<Session>;
14
+ sendImageCaptcha(tokenId: ObjectId): Promise<GetFrictionlessCaptchaResponse>;
12
15
  sendPowCaptcha(tokenId: ObjectId): Promise<GetFrictionlessCaptchaResponse>;
16
+ scoreIncreaseAccessPolicy(accessRule: Rule | null, baseBotScore: number, botScore: number, tokenId: FrictionlessTokenId): Promise<number>;
17
+ scoreIncreaseTimestamp(timestamp: number, baseBotScore: number, botScore: number, tokenId: FrictionlessTokenId): Promise<number>;
18
+ static timestampTooOld(timestamp: number): boolean;
13
19
  }
14
20
  //# sourceMappingURL=frictionlessTasks.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"frictionlessTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/frictionless/frictionlessTasks.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAEN,KAAK,8BAA8B,EACnC,KAAK,mBAAmB,EACxB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,iBAAiB,EAAW,MAAM,yBAAyB,CAAC;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAIzC,qBAAa,mBAAmB;IAC/B,MAAM,EAAE,mBAAmB,CAAC;IAC5B,IAAI,EAAE,WAAW,CAAC;IAClB,EAAE,EAAE,iBAAiB,CAAC;gBAGrB,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,WAAW,EACjB,EAAE,EAAE,iBAAiB;IAOtB,cAAc,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM;IAI9C,gBAAgB,IAAI,8BAA8B;IAO5C,cAAc,CACnB,OAAO,EAAE,QAAQ,GACf,OAAO,CAAC,8BAA8B,CAAC;CAe1C"}
1
+ {"version":3,"file":"frictionlessTasks.d.ts","sourceRoot":"","sources":["../../../src/tasks/frictionless/frictionlessTasks.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAa,KAAK,8BAA8B,EAAE,MAAM,gBAAgB,CAAC;AAChF,OAAO,KAAK,EACX,mBAAmB,EACnB,iBAAiB,EACjB,OAAO,EACP,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGzC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAItD,qBAAa,mBAAoB,SAAQ,cAAc;IACtD,MAAM,EAAE,mBAAmB,CAAC;gBAG3B,EAAE,EAAE,iBAAiB,EACrB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,mBAAmB,EAC3B,MAAM,CAAC,EAAE,MAAM;IAMhB,cAAc,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM;IAIxC,aAAa,CAClB,OAAO,EAAE,QAAQ,EACjB,WAAW,EAAE,WAAW,GACtB,OAAO,CAAC,OAAO,CAAC;IAYb,gBAAgB,CACrB,OAAO,EAAE,QAAQ,GACf,OAAO,CAAC,8BAA8B,CAAC;IASpC,cAAc,CACnB,OAAO,EAAE,QAAQ,GACf,OAAO,CAAC,8BAA8B,CAAC;IASpC,yBAAyB,CAC9B,UAAU,EAAE,IAAI,GAAG,IAAI,EACvB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,mBAAmB;IAkBvB,sBAAsB,CAC3B,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,mBAAmB;IAc7B,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;CAKlD"}
@@ -1,33 +1,74 @@
1
- import { ApiParams, } from "@prosopo/types";
1
+ import { CaptchaType } from "@prosopo/types";
2
+ import { ApiParams } from "@prosopo/types";
2
3
  import { v4 as uuidv4 } from "uuid";
3
4
  import { checkLangRules } from "../../rules/lang.js";
4
- export class FrictionlessManager {
5
- constructor(config, pair, db) {
5
+ import { CaptchaManager } from "../captchaManager.js";
6
+ const DEFAULT_MAX_TIMESTAMP_AGE = 60 * 10 * 1000;
7
+ export class FrictionlessManager extends CaptchaManager {
8
+ constructor(db, pair, config, logger) {
9
+ super(db, pair, logger);
6
10
  this.config = config;
7
- this.pair = pair;
8
- this.db = db;
9
11
  }
10
12
  checkLangRules(acceptLanguage) {
11
13
  return checkLangRules(this.config, acceptLanguage);
12
14
  }
13
- sendImageCaptcha() {
14
- return {
15
- [ApiParams.captchaType]: "image",
16
- [ApiParams.status]: "ok",
17
- };
18
- }
19
- async sendPowCaptcha(tokenId) {
15
+ async createSession(tokenId, captchaType) {
20
16
  const sessionRecord = {
21
17
  sessionId: uuidv4(),
22
18
  createdAt: new Date(),
23
19
  tokenId: tokenId,
20
+ captchaType,
24
21
  };
25
22
  await this.db.storeSessionRecord(sessionRecord);
23
+ return sessionRecord;
24
+ }
25
+ async sendImageCaptcha(tokenId) {
26
+ const sessionRecord = await this.createSession(tokenId, CaptchaType.image);
26
27
  return {
27
- [ApiParams.captchaType]: "pow",
28
+ [ApiParams.captchaType]: CaptchaType.image,
28
29
  [ApiParams.sessionId]: sessionRecord.sessionId,
29
30
  [ApiParams.status]: "ok",
30
31
  };
31
32
  }
33
+ async sendPowCaptcha(tokenId) {
34
+ const sessionRecord = await this.createSession(tokenId, CaptchaType.pow);
35
+ return {
36
+ [ApiParams.captchaType]: CaptchaType.pow,
37
+ [ApiParams.sessionId]: sessionRecord.sessionId,
38
+ [ApiParams.status]: "ok",
39
+ };
40
+ }
41
+ async scoreIncreaseAccessPolicy(accessRule, baseBotScore, botScore, tokenId) {
42
+ const accessPolicyPenalty = accessRule?.score || this.config.penalties.PENALTY_ACCESS_RULE;
43
+ botScore += accessPolicyPenalty;
44
+ this.logger.info({
45
+ message: "Address has an image captcha config defined",
46
+ });
47
+ await this.db.updateFrictionlessTokenRecord(tokenId, {
48
+ score: botScore,
49
+ scoreComponents: {
50
+ baseScore: baseBotScore,
51
+ accessPolicy: accessPolicyPenalty,
52
+ },
53
+ });
54
+ return botScore;
55
+ }
56
+ async scoreIncreaseTimestamp(timestamp, baseBotScore, botScore, tokenId) {
57
+ this.logger.info("Timestamp is older than 10 minutes", new Date(timestamp));
58
+ botScore += this.config.penalties.PENALTY_OLD_TIMESTAMP;
59
+ await this.db.updateFrictionlessTokenRecord(tokenId, {
60
+ score: botScore,
61
+ scoreComponents: {
62
+ baseScore: baseBotScore,
63
+ timeout: this.config.penalties.PENALTY_OLD_TIMESTAMP,
64
+ },
65
+ });
66
+ return botScore;
67
+ }
68
+ static timestampTooOld(timestamp) {
69
+ const now = Date.now();
70
+ const diff = now - timestamp;
71
+ return diff > DEFAULT_MAX_TIMESTAMP_AGE;
72
+ }
32
73
  }
33
74
  //# sourceMappingURL=frictionlessTasks.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"frictionlessTasks.js","sourceRoot":"","sources":["../../../src/tasks/frictionless/frictionlessTasks.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,SAAS,GAGT,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,OAAO,mBAAmB;IAK/B,YACC,MAA2B,EAC3B,IAAiB,EACjB,EAAqB;QAErB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACd,CAAC;IAED,cAAc,CAAC,cAAsB;QACpC,OAAO,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACpD,CAAC;IAED,gBAAgB;QACf,OAAO;YACN,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO;YAChC,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI;SACxB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CACnB,OAAiB;QAEjB,MAAM,aAAa,GAAY;YAC9B,SAAS,EAAE,MAAM,EAAE;YACnB,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,OAAO,EAAE,OAAO;SAChB,CAAC;QAEF,MAAM,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;QAEhD,OAAO;YACN,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,KAAK;YAC9B,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,SAAS;YAC9C,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI;SACxB,CAAC;IACH,CAAC;CACD"}
1
+ {"version":3,"file":"frictionlessTasks.js","sourceRoot":"","sources":["../../../src/tasks/frictionless/frictionlessTasks.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,5 @@
1
+ import type { ScoreComponents } from "@prosopo/types-database";
2
+ export declare const computeFrictionlessScore: (scoreComponents: {
3
+ [key: string]: number;
4
+ } | ScoreComponents) => number;
5
+ //# sourceMappingURL=frictionlessTasksUtils.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"frictionlessTasksUtils.d.ts","sourceRoot":"","sources":["../../../src/tasks/frictionless/frictionlessTasksUtils.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAGX,eAAe,EACf,MAAM,yBAAyB,CAAC;AAEjC,eAAO,MAAM,wBAAwB,oBAEjC;IACA,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,GACD,eAAe,KAChB,MASF,CAAC"}
@@ -0,0 +1,6 @@
1
+ export const computeFrictionlessScore = (scoreComponents) => {
2
+ return Number(Math.min(1, Object.values(scoreComponents)
3
+ .filter((x) => x !== undefined)
4
+ .reduce((acc, val) => acc + val, 0)).toFixed(2));
5
+ };
6
+ //# sourceMappingURL=frictionlessTasksUtils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"frictionlessTasksUtils.js","sourceRoot":"","sources":["../../../src/tasks/frictionless/frictionlessTasksUtils.ts"],"names":[],"mappings":"AAmBA,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACvC,eAIkB,EACT,EAAE;IACX,OAAO,MAAM,CACZ,IAAI,CAAC,GAAG,CACP,CAAC,EACD,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;SAC5B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC;SAC9B,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,CAAC,CACpC,CAAC,OAAO,CAAC,CAAC,CAAC,CACZ,CAAC;AACH,CAAC,CAAC"}
@@ -1,15 +1,13 @@
1
1
  import type { KeyringPair } from "@polkadot/keyring/types";
2
2
  import { type Logger } from "@prosopo/common";
3
- import { type Captcha, type CaptchaSolution, type DappUserSolutionResult, type Hash, type IPAddress, type ImageVerificationResponse, type PendingCaptchaRequest, type ProsopoCaptchaCountConfigSchemaOutput, type ProsopoConfigOutput, type RequestHeaders } from "@prosopo/types";
4
- import type { IProviderDatabase, UserCommitment } from "@prosopo/types-database";
5
- export declare class ImgCaptchaManager {
6
- db: IProviderDatabase;
7
- pair: KeyringPair;
8
- logger: Logger;
3
+ import { type Captcha, type CaptchaSolution, type DappUserSolutionResult, type Hash, type IPAddress, type ImageVerificationResponse, type ProsopoCaptchaCountConfigSchemaOutput, type ProsopoConfigOutput, type RequestHeaders } from "@prosopo/types";
4
+ import type { ClientRecord, FrictionlessTokenId, IProviderDatabase, PendingCaptchaRequest, UserCommitment } from "@prosopo/types-database";
5
+ import { CaptchaManager } from "../captchaManager.js";
6
+ export declare class ImgCaptchaManager extends CaptchaManager {
9
7
  config: ProsopoConfigOutput;
10
- constructor(db: IProviderDatabase, pair: KeyringPair, logger: Logger, config: ProsopoConfigOutput);
8
+ constructor(db: IProviderDatabase, pair: KeyringPair, config: ProsopoConfigOutput, logger?: Logger);
11
9
  getCaptchaWithProof(datasetId: Hash, solved: boolean, size: number): Promise<Captcha[]>;
12
- getRandomCaptchasAndRequestHash(datasetId: Hash, userAccount: string, ipAddress: IPAddress, headers: RequestHeaders, captchaConfig: ProsopoCaptchaCountConfigSchemaOutput): Promise<{
10
+ getRandomCaptchasAndRequestHash(datasetId: Hash, userAccount: string, ipAddress: IPAddress, headers: RequestHeaders, captchaConfig: ProsopoCaptchaCountConfigSchemaOutput, frictionlessTokenId?: FrictionlessTokenId): Promise<{
13
11
  captchas: Captcha[];
14
12
  requestHash: string;
15
13
  timestamp: number;
@@ -26,5 +24,6 @@ export declare class ImgCaptchaManager {
26
24
  getDappUserCommitmentByAccount(userAccount: string, dappAccount: string): Promise<UserCommitment | undefined>;
27
25
  verifyImageCaptchaSolution(user: string, dapp: string, commitmentId: string | undefined, maxVerifiedTime?: number): Promise<ImageVerificationResponse>;
28
26
  checkLangRules(acceptLanguage: string): number;
27
+ getVerificationResponse(verified: boolean, clientRecord: ClientRecord, translateFn: (key: string) => string, score?: number, commitmentId?: Hash): ImageVerificationResponse;
29
28
  }
30
29
  //# 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,EACN,KAAK,OAAO,EACZ,KAAK,eAAe,EAGpB,KAAK,sBAAsB,EAC3B,KAAK,IAAI,EACT,KAAK,SAAS,EACd,KAAK,yBAAyB,EAC9B,KAAK,qBAAqB,EAC1B,KAAK,qCAAqC,EAC1C,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACX,iBAAiB,EACjB,cAAc,EACd,MAAM,yBAAyB,CAAC;AAMjC,qBAAa,iBAAiB;IAC7B,EAAE,EAAE,iBAAiB,CAAC;IACtB,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,mBAAmB,CAAC;gBAG3B,EAAE,EAAE,iBAAiB,EACrB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,mBAAmB;IAQtB,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,IAAI,EACf,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,qCAAqC,GAClD,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;IAmFI,gBAAgB,CACrB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,eAAe,EAAE,EAC3B,sBAAsB,EAAE,MAAM,EAC9B,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;IAehC,0BAA0B,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,eAAe,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,yBAAyB,CAAC;IA+CrC,cAAc,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM;CAG9C"}
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,EAEN,KAAK,OAAO,EACZ,KAAK,eAAe,EAGpB,KAAK,sBAAsB,EAC3B,KAAK,IAAI,EACT,KAAK,SAAS,EACd,KAAK,yBAAyB,EAC9B,KAAK,qCAAqC,EAC1C,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACX,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAItD,qBAAa,iBAAkB,SAAQ,cAAc;IACpD,MAAM,EAAE,mBAAmB,CAAC;gBAG3B,EAAE,EAAE,iBAAiB,EACrB,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,mBAAmB,EAC3B,MAAM,CAAC,EAAE,MAAM;IAMV,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,IAAI,EACf,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,qCAAqC,EACpD,mBAAmB,CAAC,EAAE,mBAAmB,GACvC,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;IAmFI,gBAAgB,CACrB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,eAAe,EAAE,EAC3B,sBAAsB,EAAE,MAAM,EAC9B,SAAS,EAAE,MAAM,EACjB,4BAA4B,EAAE,MAAM,EACpC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,cAAc,GACrB,OAAO,CAAC,sBAAsB,CAAC;IAmH5B,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;IAehC,0BAA0B,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,eAAe,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,yBAAyB,CAAC;IA+DrC,cAAc,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM;IAIrC,uBAAuB,CAC/B,QAAQ,EAAE,OAAO,EACjB,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,EACpC,KAAK,CAAC,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,IAAI,GACjB,yBAAyB;CAa5B"}