@prosopo/provider 5.2.1 → 5.3.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.
- package/.turbo/turbo-build$colon$cjs.log +17 -13
- package/.turbo/turbo-build$colon$tsc.log +27 -24
- package/.turbo/turbo-build.log +18 -14
- package/CHANGELOG.md +55 -0
- package/dist/api/captcha/getPuzzleCaptchaChallenge.d.ts.map +1 -1
- package/dist/api/captcha/getPuzzleCaptchaChallenge.js +11 -4
- package/dist/api/captcha/getPuzzleCaptchaChallenge.js.map +1 -1
- package/dist/api/captcha/maintenanceModeResponses.d.ts +1 -1
- package/dist/api/captcha/maintenanceModeResponses.d.ts.map +1 -1
- package/dist/api/captcha/maintenanceModeResponses.js +11 -6
- package/dist/api/captcha/maintenanceModeResponses.js.map +1 -1
- package/dist/api/captcha/submitPoWCaptchaSolution.d.ts.map +1 -1
- package/dist/api/captcha/submitPoWCaptchaSolution.js +4 -2
- package/dist/api/captcha/submitPoWCaptchaSolution.js.map +1 -1
- package/dist/api/captcha/trafficFilterRequestTime.d.ts +2 -1
- package/dist/api/captcha/trafficFilterRequestTime.d.ts.map +1 -1
- package/dist/api/captcha/trafficFilterRequestTime.js +1 -0
- package/dist/api/captcha/trafficFilterRequestTime.js.map +1 -1
- package/dist/api/ja4.d.ts.map +1 -1
- package/dist/api/ja4.js +14 -147
- package/dist/api/ja4.js.map +1 -1
- package/dist/cjs/api/captcha/getPuzzleCaptchaChallenge.cjs +11 -4
- package/dist/cjs/api/captcha/maintenanceModeResponses.cjs +11 -6
- package/dist/cjs/api/captcha/submitPoWCaptchaSolution.cjs +4 -2
- package/dist/cjs/api/captcha/trafficFilterRequestTime.cjs +1 -0
- package/dist/cjs/api/ja4.cjs +13 -147
- package/dist/cjs/tasks/dnsEvent/enrichDnsEvent.cjs +17 -11
- package/dist/cjs/tasks/frictionless/frictionlessTasks.cjs +2 -1
- package/dist/cjs/tasks/puzzle/backgroundBuffer.cjs +39 -0
- package/dist/cjs/tasks/puzzle/puzzleRenderer.cjs +78 -0
- package/dist/cjs/tasks/spam/checkTrafficFilter.cjs +62 -31
- package/dist/tasks/dnsEvent/enrichDnsEvent.d.ts.map +1 -1
- package/dist/tasks/dnsEvent/enrichDnsEvent.js +17 -11
- package/dist/tasks/dnsEvent/enrichDnsEvent.js.map +1 -1
- package/dist/tasks/frictionless/frictionlessTasks.d.ts.map +1 -1
- package/dist/tasks/frictionless/frictionlessTasks.js +2 -1
- package/dist/tasks/frictionless/frictionlessTasks.js.map +1 -1
- package/dist/tasks/puzzle/backgroundBuffer.d.ts +21 -0
- package/dist/tasks/puzzle/backgroundBuffer.d.ts.map +1 -0
- package/dist/tasks/puzzle/backgroundBuffer.js +37 -0
- package/dist/tasks/puzzle/backgroundBuffer.js.map +1 -0
- package/dist/tasks/puzzle/puzzleRenderer.d.ts +13 -0
- package/dist/tasks/puzzle/puzzleRenderer.d.ts.map +1 -0
- package/dist/tasks/puzzle/puzzleRenderer.js +75 -0
- package/dist/tasks/puzzle/puzzleRenderer.js.map +1 -0
- package/dist/tasks/spam/checkTrafficFilter.d.ts +3 -1
- package/dist/tasks/spam/checkTrafficFilter.d.ts.map +1 -1
- package/dist/tasks/spam/checkTrafficFilter.js +62 -32
- package/dist/tasks/spam/checkTrafficFilter.js.map +1 -1
- package/dist/tests/unit/api/captcha/maintenanceModeResponses.unit.test.js +8 -7
- package/dist/tests/unit/api/captcha/maintenanceModeResponses.unit.test.js.map +1 -1
- package/dist/tests/unit/api/captcha/maintenanceModeShortCircuit.unit.test.js +1 -1
- package/dist/tests/unit/api/captcha/maintenanceModeShortCircuit.unit.test.js.map +1 -1
- package/dist/tests/unit/api/captcha/trafficFilterRequestTime.unit.test.js +2 -1
- package/dist/tests/unit/api/captcha/trafficFilterRequestTime.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/dnsEvent/enrichDnsEvent.unit.test.js.map +1 -1
- package/dist/tests/unit/tasks/puzzle/backgroundBuffer.unit.test.d.ts +2 -0
- package/dist/tests/unit/tasks/puzzle/backgroundBuffer.unit.test.d.ts.map +1 -0
- package/dist/tests/unit/tasks/puzzle/backgroundBuffer.unit.test.js +84 -0
- package/dist/tests/unit/tasks/puzzle/backgroundBuffer.unit.test.js.map +1 -0
- package/dist/tests/unit/tasks/spam/checkTrafficFilter.unit.test.js +66 -4
- package/dist/tests/unit/tasks/spam/checkTrafficFilter.unit.test.js.map +1 -1
- package/package.json +16 -14
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
|
|
2
|
-
> @prosopo/provider@5.
|
|
2
|
+
> @prosopo/provider@5.3.1 build:cjs
|
|
3
3
|
> NODE_ENV=${NODE_ENV:-development}; vite build --config vite.cjs.config.ts --mode $NODE_ENV
|
|
4
4
|
|
|
5
5
|
ViteCommonJSConfig: .
|
|
@@ -23,7 +23,8 @@ ViteCommonJSConfig: .
|
|
|
23
23
|
'/home/runner/work/captcha/captcha/packages/types-env/tsconfig.json',
|
|
24
24
|
'/home/runner/work/captcha/captcha/packages/keyring/tsconfig.json',
|
|
25
25
|
'/home/runner/work/captcha/captcha/packages/datasets/tsconfig.json',
|
|
26
|
-
'/home/runner/work/captcha/captcha/packages/load-balancer/tsconfig.json'
|
|
26
|
+
'/home/runner/work/captcha/captcha/packages/load-balancer/tsconfig.json',
|
|
27
|
+
'/home/runner/work/captcha/captcha/packages/puzzle-assets/tsconfig.json'
|
|
27
28
|
]
|
|
28
29
|
}
|
|
29
30
|
{
|
|
@@ -46,14 +47,15 @@ ViteCommonJSConfig: .
|
|
|
46
47
|
'@prosopo/types-env',
|
|
47
48
|
'@prosopo/keyring',
|
|
48
49
|
'@prosopo/datasets',
|
|
49
|
-
'@prosopo/load-balancer'
|
|
50
|
+
'@prosopo/load-balancer',
|
|
51
|
+
'@prosopo/puzzle-assets'
|
|
50
52
|
]
|
|
51
53
|
}
|
|
52
54
|
[33mThe plugin "vite-tsconfig-paths" is detected. Vite now supports tsconfig paths resolution natively via the [1mresolve.tsconfigPaths[22m option. You can remove the plugin and set [1mresolve.tsconfigPaths: true[22m in your Vite config instead.[39m
|
|
53
55
|
[36mvite v8.1.5 [32mbuilding ssr environment for production...[36m[39m
|
|
54
56
|
Bundle build started
|
|
55
57
|
[2K
|
|
56
|
-
✓
|
|
58
|
+
✓ 103 modules transformed.
|
|
57
59
|
rendering chunks...
|
|
58
60
|
computing gzip size...
|
|
59
61
|
dist/cjs/tasks/index.cjs 0.08 kB │ gzip: 0.07 kB
|
|
@@ -72,6 +74,7 @@ dist/cjs/utils/hashUserAgent.cjs 0
|
|
|
72
74
|
dist/cjs/utils/devicePlatform.cjs 0.76 kB │ gzip: 0.46 kB
|
|
73
75
|
dist/cjs/api/validateAddress.cjs 0.80 kB │ gzip: 0.36 kB
|
|
74
76
|
dist/cjs/tasks/frictionless/frictionlessTasksUtils.cjs 0.85 kB │ gzip: 0.43 kB
|
|
77
|
+
dist/cjs/api/ja4.cjs 0.85 kB │ gzip: 0.48 kB
|
|
75
78
|
dist/cjs/api/dnsEventUrl.cjs 0.85 kB │ gzip: 0.46 kB
|
|
76
79
|
dist/cjs/tasks/dataset/datasetTasks.cjs 0.92 kB │ gzip: 0.41 kB
|
|
77
80
|
dist/cjs/api/block.cjs 0.98 kB │ gzip: 0.38 kB
|
|
@@ -93,6 +96,7 @@ dist/cjs/schedulers/setClientEntropy.cjs 1
|
|
|
93
96
|
dist/cjs/api/admin/apiGetDecisionMachineEndpoint.cjs 1.33 kB │ gzip: 0.52 kB
|
|
94
97
|
dist/cjs/api/admin/apiRemoveDecisionMachineEndpoint.cjs 1.36 kB │ gzip: 0.52 kB
|
|
95
98
|
dist/cjs/api/admin/apiRemoveAllDecisionMachinesEndpoint.cjs 1.36 kB │ gzip: 0.54 kB
|
|
99
|
+
dist/cjs/tasks/puzzle/backgroundBuffer.cjs 1.37 kB │ gzip: 0.52 kB
|
|
96
100
|
dist/cjs/pairs.cjs 1.39 kB │ gzip: 0.60 kB
|
|
97
101
|
dist/cjs/tasks/dataset/datasetTasksUtils.cjs 1.42 kB │ gzip: 0.49 kB
|
|
98
102
|
dist/cjs/compositeIpAddress.cjs 1.55 kB │ gzip: 0.57 kB
|
|
@@ -115,31 +119,31 @@ dist/cjs/api/public.cjs 2
|
|
|
115
119
|
dist/cjs/api/admin/apiDnsEventEndpoint.cjs 2.59 kB │ gzip: 1.00 kB
|
|
116
120
|
dist/cjs/utils/dns.cjs 2.66 kB │ gzip: 1.02 kB
|
|
117
121
|
dist/cjs/api/forwardVerify.cjs 2.66 kB │ gzip: 1.12 kB
|
|
118
|
-
dist/cjs/api/captcha/maintenanceModeResponses.cjs 2.68 kB │ gzip: 0.67 kB
|
|
119
122
|
dist/cjs/api/captcha/checkSpamEmail.cjs 2.73 kB │ gzip: 0.95 kB
|
|
120
123
|
dist/cjs/api/captcha/submitPuzzleCaptchaSolution.cjs 2.77 kB │ gzip: 0.99 kB
|
|
124
|
+
dist/cjs/api/captcha/maintenanceModeResponses.cjs 2.91 kB │ gzip: 0.77 kB
|
|
121
125
|
dist/cjs/api/captcha/submitImageCaptchaSolution.cjs 2.93 kB │ gzip: 1.03 kB
|
|
126
|
+
dist/cjs/tasks/puzzle/puzzleRenderer.cjs 3.30 kB │ gzip: 1.26 kB
|
|
122
127
|
dist/cjs/api/captcha/getFrictionlessCaptchaChallenge/shortCircuit.cjs 3.57 kB │ gzip: 1.33 kB
|
|
123
128
|
dist/cjs/api/admin/apiAdminRoutesProvider.cjs 3.67 kB │ gzip: 0.62 kB
|
|
124
129
|
dist/cjs/api/domainMiddleware.cjs 3.85 kB │ gzip: 1.26 kB
|
|
125
130
|
dist/cjs/services/ipComparison.cjs 3.98 kB │ gzip: 1.20 kB
|
|
126
131
|
dist/cjs/tasks/spam/evaluateEmailSpamRules.cjs 4.03 kB │ gzip: 1.60 kB
|
|
127
|
-
dist/cjs/api/captcha/trafficFilterRequestTime.cjs 4.
|
|
132
|
+
dist/cjs/api/captcha/trafficFilterRequestTime.cjs 4.12 kB │ gzip: 1.52 kB
|
|
128
133
|
dist/cjs/tasks/spam/checkSpamEmail.cjs 4.14 kB │ gzip: 1.14 kB
|
|
129
134
|
dist/cjs/api/hardBlockVerdictCache.cjs 4.21 kB │ gzip: 1.67 kB
|
|
130
135
|
dist/cjs/api/captcha/getFrictionlessCaptchaChallenge/accessPolicy.cjs 4.31 kB │ gzip: 1.03 kB
|
|
131
|
-
dist/cjs/tasks/dnsEvent/enrichDnsEvent.cjs 4.47 kB │ gzip: 1.57 kB
|
|
132
136
|
dist/cjs/api/captcha.cjs 4.51 kB │ gzip: 1.40 kB
|
|
133
137
|
dist/cjs/index.cjs 4.72 kB │ gzip: 0.98 kB
|
|
138
|
+
dist/cjs/tasks/dnsEvent/enrichDnsEvent.cjs 4.84 kB │ gzip: 1.74 kB
|
|
134
139
|
dist/cjs/tasks/tasks.cjs 5.07 kB │ gzip: 1.56 kB
|
|
135
140
|
dist/cjs/util/usageCounters.cjs 5.72 kB │ gzip: 2.03 kB
|
|
136
141
|
dist/cjs/api/captcha/getPoWCaptchaChallenge.cjs 6.13 kB │ gzip: 1.79 kB
|
|
137
|
-
dist/cjs/api/captcha/getPuzzleCaptchaChallenge.cjs 6.40 kB │ gzip: 1.82 kB
|
|
138
142
|
dist/cjs/api/captcha/getImageCaptchaChallenge.cjs 6.44 kB │ gzip: 1.91 kB
|
|
139
|
-
dist/cjs/api/captcha/submitPoWCaptchaSolution.cjs 6.
|
|
140
|
-
dist/cjs/api/
|
|
143
|
+
dist/cjs/api/captcha/submitPoWCaptchaSolution.cjs 6.80 kB │ gzip: 2.19 kB
|
|
144
|
+
dist/cjs/api/captcha/getPuzzleCaptchaChallenge.cjs 6.90 kB │ gzip: 1.93 kB
|
|
141
145
|
dist/cjs/api/metrics.cjs 7.51 kB │ gzip: 2.12 kB
|
|
142
|
-
dist/cjs/tasks/spam/checkTrafficFilter.cjs 7.
|
|
146
|
+
dist/cjs/tasks/spam/checkTrafficFilter.cjs 7.65 kB │ gzip: 2.55 kB
|
|
143
147
|
dist/cjs/tasks/detection/bundlePool.cjs 8.72 kB │ gzip: 3.26 kB
|
|
144
148
|
dist/cjs/tasks/decisionMachine/decisionMachineRunner.cjs 9.67 kB │ gzip: 2.91 kB
|
|
145
149
|
dist/cjs/api/captcha/getFrictionlessCaptchaChallenge/decisionMachine.cjs 11.45 kB │ gzip: 2.16 kB
|
|
@@ -149,7 +153,7 @@ dist/cjs/tasks/client/clientTasks.cjs 12
|
|
|
149
153
|
dist/cjs/util.cjs 13.25 kB │ gzip: 3.22 kB
|
|
150
154
|
dist/cjs/api/verify.cjs 13.66 kB │ gzip: 2.57 kB
|
|
151
155
|
dist/cjs/api/captcha/getFrictionlessCaptchaChallenge/handler.cjs 17.00 kB │ gzip: 4.09 kB
|
|
152
|
-
dist/cjs/tasks/frictionless/frictionlessTasks.cjs 17.
|
|
156
|
+
dist/cjs/tasks/frictionless/frictionlessTasks.cjs 17.82 kB │ gzip: 4.88 kB
|
|
153
157
|
dist/cjs/tasks/puzzleCaptcha/puzzleTasks.cjs 21.96 kB │ gzip: 4.76 kB
|
|
154
158
|
dist/cjs/tasks/captchaManager.cjs 22.21 kB │ gzip: 6.33 kB
|
|
155
159
|
dist/cjs/tasks/powCaptcha/powTasks.cjs 23.18 kB │ gzip: 5.61 kB
|
|
@@ -158,7 +162,7 @@ dist/cjs/tasks/detection/decodeBehavior.cjs 32
|
|
|
158
162
|
dist/cjs/tasks/detection/decodeSimd.cjs 36.03 kB │ gzip: 11.96 kB
|
|
159
163
|
dist/cjs/tasks/detection/decodePayload.cjs 55.69 kB │ gzip: 18.47 kB
|
|
160
164
|
|
|
161
|
-
[32m✓ built in
|
|
165
|
+
[32m✓ built in 160ms[39m
|
|
162
166
|
[copy-plugin] copying /home/runner/work/captcha/captcha/packages/provider/src/tasks/detection/decodeBehavior.js to /home/runner/work/captcha/captcha/packages/provider/dist/cjs/tasks/detection/decodeBehavior.js
|
|
163
167
|
[copy-plugin] copying /home/runner/work/captcha/captcha/packages/provider/src/tasks/detection/decodePayload.js to /home/runner/work/captcha/captcha/packages/provider/dist/cjs/tasks/detection/decodePayload.js
|
|
164
168
|
[copy-plugin] copying /home/runner/work/captcha/captcha/packages/provider/src/tasks/detection/decodeSimd.js to /home/runner/work/captcha/captcha/packages/provider/dist/cjs/tasks/detection/decodeSimd.js
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
|
|
2
|
-
> @prosopo/provider@5.
|
|
2
|
+
> @prosopo/provider@5.3.1 build:tsc
|
|
3
3
|
> tsc --build --verbose
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
10:19:10 AM - Projects in this build:
|
|
6
6
|
* ../../dev/config/tsconfig.json
|
|
7
7
|
* ../util/tsconfig.json
|
|
8
8
|
* ../logger/tsconfig.json
|
|
@@ -23,49 +23,52 @@
|
|
|
23
23
|
* ../api-express-router/tsconfig.json
|
|
24
24
|
* ../datasets/tsconfig.json
|
|
25
25
|
* ../load-balancer/tsconfig.json
|
|
26
|
+
* ../puzzle-assets/tsconfig.json
|
|
26
27
|
* tsconfig.json
|
|
27
28
|
|
|
28
|
-
|
|
29
|
+
10:19:10 AM - Project '../../dev/config/tsconfig.json' is up to date because newest input '../../dev/config/src/webpack/webpack.config.ts' is older than output '../../dev/config/tsconfig.tsbuildinfo'
|
|
29
30
|
|
|
30
|
-
|
|
31
|
+
10:19:10 AM - Project '../util/tsconfig.json' is up to date because newest input '../util/src/url.ts' is older than output '../util/tsconfig.tsbuildinfo'
|
|
31
32
|
|
|
32
|
-
|
|
33
|
+
10:19:10 AM - Project '../logger/tsconfig.json' is up to date because newest input '../logger/src/tests/loggerBrowser.unit.test.ts' is older than output '../logger/tsconfig.tsbuildinfo'
|
|
33
34
|
|
|
34
|
-
|
|
35
|
+
10:19:10 AM - Project '../api-route/tsconfig.json' is up to date because newest input '../api-route/src/apiRoutes.ts' is older than output '../api-route/tsconfig.tsbuildinfo'
|
|
35
36
|
|
|
36
|
-
|
|
37
|
+
10:19:10 AM - Project '../locale/tsconfig.json' is up to date because newest input '../locale/src/translationKey.ts' is older than output '../locale/tsconfig.tsbuildinfo'
|
|
37
38
|
|
|
38
|
-
|
|
39
|
+
10:19:10 AM - Project '../util-crypto/tsconfig.json' is up to date because newest input '../util-crypto/src/types.ts' is older than output '../util-crypto/tsconfig.tsbuildinfo'
|
|
39
40
|
|
|
40
|
-
|
|
41
|
+
10:19:10 AM - Project '../types/tsconfig.json' is up to date because newest input '../types/src/types.test-d.ts' is older than output '../types/tsconfig.tsbuildinfo'
|
|
41
42
|
|
|
42
|
-
|
|
43
|
+
10:19:10 AM - Project '../common/tsconfig.json' is up to date because newest input '../common/src/index.ts' is older than output '../common/tsconfig.tsbuildinfo'
|
|
43
44
|
|
|
44
|
-
|
|
45
|
+
10:19:10 AM - Project '../ipinfo/tsconfig.json' is up to date because newest input '../ipinfo/src/IpInfoService.ts' is older than output '../ipinfo/tsconfig.tsbuildinfo'
|
|
45
46
|
|
|
46
|
-
|
|
47
|
+
10:19:10 AM - Project '../redis-client/tsconfig.json' is up to date because newest input '../redis-client/src/index.ts' is older than output '../redis-client/tsconfig.tsbuildinfo'
|
|
47
48
|
|
|
48
|
-
|
|
49
|
+
10:19:10 AM - Project '../api/tsconfig.json' is up to date because newest input '../api/src/tests/apiHarness.ts' is older than output '../api/tsconfig.tsbuildinfo'
|
|
49
50
|
|
|
50
|
-
|
|
51
|
+
10:19:10 AM - Project '../user-access-policy/tsconfig.json' is up to date because newest input '../user-access-policy/src/ruleRecord.ts' is older than output '../user-access-policy/tsconfig.tsbuildinfo'
|
|
51
52
|
|
|
52
|
-
|
|
53
|
+
10:19:10 AM - Project '../types-database/tsconfig.json' is up to date because newest input '../types-database/src/index.ts' is older than output '../types-database/tsconfig.tsbuildinfo'
|
|
53
54
|
|
|
54
|
-
|
|
55
|
+
10:19:10 AM - Project '../database/tsconfig.json' is up to date because newest input '../database/src/tests/unit/redisCacheEscalation.unit.test.ts' is older than output '../database/tsconfig.tsbuildinfo'
|
|
55
56
|
|
|
56
|
-
|
|
57
|
+
10:19:10 AM - Project '../keyring/tsconfig.json' is up to date because newest input '../keyring/src/keyring/keyring.test.ts' is older than output '../keyring/tsconfig.tsbuildinfo'
|
|
57
58
|
|
|
58
|
-
|
|
59
|
+
10:19:10 AM - Project '../types-env/tsconfig.json' is up to date because newest input '../types-env/src/tests/typesEnv.test-d.ts' is older than output '../types-env/tsconfig.tsbuildinfo'
|
|
59
60
|
|
|
60
|
-
|
|
61
|
+
10:19:10 AM - Project '../env/tsconfig.json' is up to date because newest input '../env/src/index.ts' is older than output '../env/tsconfig.tsbuildinfo'
|
|
61
62
|
|
|
62
|
-
|
|
63
|
+
10:19:10 AM - Project '../api-express-router/tsconfig.json' is up to date because newest input '../api-express-router/src/tests/unit/apiExpressRouterFactory.unit.test.ts' is older than output '../api-express-router/tsconfig.tsbuildinfo'
|
|
63
64
|
|
|
64
|
-
|
|
65
|
+
10:19:10 AM - Project '../datasets/tsconfig.json' is up to date because newest input '../datasets/src/tests/mocks/data/captchas.ts' is older than output '../datasets/tsconfig.tsbuildinfo'
|
|
65
66
|
|
|
66
|
-
|
|
67
|
+
10:19:10 AM - Project '../load-balancer/tsconfig.json' is up to date because newest input '../load-balancer/src/balancer.ts' is older than output '../load-balancer/tsconfig.tsbuildinfo'
|
|
67
68
|
|
|
68
|
-
|
|
69
|
+
10:19:10 AM - Project '../puzzle-assets/tsconfig.json' is up to date because newest input '../puzzle-assets/src/background.ts' is older than output '../puzzle-assets/tsconfig.tsbuildinfo'
|
|
69
70
|
|
|
70
|
-
|
|
71
|
+
10:19:10 AM - Project 'tsconfig.json' is out of date because output file 'tsconfig.tsbuildinfo' does not exist
|
|
72
|
+
|
|
73
|
+
10:19:10 AM - Building project '/home/runner/work/captcha/captcha/packages/provider/tsconfig.json'...
|
|
71
74
|
|
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
|
|
2
|
-
> @prosopo/provider@5.
|
|
2
|
+
> @prosopo/provider@5.3.1 build
|
|
3
3
|
> npm run build:cross-env -- --mode ${NODE_ENV:-development}
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
> @prosopo/provider@5.
|
|
6
|
+
> @prosopo/provider@5.3.1 build:cross-env
|
|
7
7
|
> vite build --config vite.esm.config.ts --mode production
|
|
8
8
|
|
|
9
9
|
ViteEsmConfig: .
|
|
@@ -27,7 +27,8 @@ ViteEsmConfig: .
|
|
|
27
27
|
'/home/runner/work/captcha/captcha/packages/types-env/tsconfig.json',
|
|
28
28
|
'/home/runner/work/captcha/captcha/packages/keyring/tsconfig.json',
|
|
29
29
|
'/home/runner/work/captcha/captcha/packages/datasets/tsconfig.json',
|
|
30
|
-
'/home/runner/work/captcha/captcha/packages/load-balancer/tsconfig.json'
|
|
30
|
+
'/home/runner/work/captcha/captcha/packages/load-balancer/tsconfig.json',
|
|
31
|
+
'/home/runner/work/captcha/captcha/packages/puzzle-assets/tsconfig.json'
|
|
31
32
|
]
|
|
32
33
|
}
|
|
33
34
|
{
|
|
@@ -50,14 +51,15 @@ ViteEsmConfig: .
|
|
|
50
51
|
'@prosopo/types-env',
|
|
51
52
|
'@prosopo/keyring',
|
|
52
53
|
'@prosopo/datasets',
|
|
53
|
-
'@prosopo/load-balancer'
|
|
54
|
+
'@prosopo/load-balancer',
|
|
55
|
+
'@prosopo/puzzle-assets'
|
|
54
56
|
]
|
|
55
57
|
}
|
|
56
58
|
[33mThe plugin "vite-tsconfig-paths" is detected. Vite now supports tsconfig paths resolution natively via the [1mresolve.tsconfigPaths[22m option. You can remove the plugin and set [1mresolve.tsconfigPaths: true[22m in your Vite config instead.[39m
|
|
57
59
|
[36mvite v8.1.5 [32mbuilding ssr environment for production...[36m[39m
|
|
58
60
|
Bundle build started
|
|
59
61
|
[2K
|
|
60
|
-
✓
|
|
62
|
+
✓ 103 modules transformed.
|
|
61
63
|
rendering chunks...
|
|
62
64
|
computing gzip size...
|
|
63
65
|
dist/_virtual/_rolldown/runtime.js 0.04 kB │ gzip: 0.06 kB
|
|
@@ -79,6 +81,7 @@ dist/utils/devicePlatform.js 0.74 k
|
|
|
79
81
|
dist/tasks/frictionless/frictionlessTasksUtils.js 0.79 kB │ gzip: 0.42 kB
|
|
80
82
|
dist/api/block.js 0.80 kB │ gzip: 0.36 kB
|
|
81
83
|
dist/api/dnsEventUrl.js 0.80 kB │ gzip: 0.44 kB
|
|
84
|
+
dist/api/ja4.js 0.80 kB │ gzip: 0.45 kB
|
|
82
85
|
dist/tasks/dataset/datasetTasks.js 0.85 kB │ gzip: 0.39 kB
|
|
83
86
|
dist/tasks/powCaptcha/powTasksUtils.js 0.89 kB │ gzip: 0.46 kB
|
|
84
87
|
dist/api/headerCheckMiddleware.js 0.91 kB │ gzip: 0.43 kB
|
|
@@ -95,6 +98,7 @@ dist/utils/normalizeRequestIp.js 1.14 k
|
|
|
95
98
|
dist/pairs.js 1.19 kB │ gzip: 0.58 kB
|
|
96
99
|
dist/schedulers/getClientList.js 1.19 kB │ gzip: 0.53 kB
|
|
97
100
|
dist/schedulers/setClientEntropy.js 1.20 kB │ gzip: 0.52 kB
|
|
101
|
+
dist/tasks/puzzle/backgroundBuffer.js 1.20 kB │ gzip: 0.50 kB
|
|
98
102
|
dist/api/admin/apiGetDecisionMachineEndpoint.js 1.26 kB │ gzip: 0.50 kB
|
|
99
103
|
dist/api/admin/apiRemoveAllDecisionMachinesEndpoint.js 1.27 kB │ gzip: 0.51 kB
|
|
100
104
|
dist/api/admin/apiRemoveDecisionMachineEndpoint.js 1.29 kB │ gzip: 0.51 kB
|
|
@@ -115,8 +119,8 @@ dist/tasks/spam/updateSpamEmailDomains.js 1.87 k
|
|
|
115
119
|
dist/api/admin/apiClearAllCountersEndpoint.js 1.89 kB │ gzip: 0.76 kB
|
|
116
120
|
dist/api/public.js 1.90 kB │ gzip: 0.83 kB
|
|
117
121
|
dist/api/captcha/assignDetectorBundle.js 1.90 kB │ gzip: 0.84 kB
|
|
118
|
-
dist/api/captcha/maintenanceModeResponses.js 1.96 kB │ gzip: 0.64 kB
|
|
119
122
|
dist/tasks/frictionless/routingMachine.js 2.16 kB │ gzip: 0.91 kB
|
|
123
|
+
dist/api/captcha/maintenanceModeResponses.js 2.16 kB │ gzip: 0.73 kB
|
|
120
124
|
dist/utils/dns.js 2.36 kB │ gzip: 0.95 kB
|
|
121
125
|
dist/api/admin/apiDnsEventEndpoint.js 2.43 kB │ gzip: 0.96 kB
|
|
122
126
|
dist/api/captcha/checkSpamEmail.js 2.47 kB │ gzip: 0.91 kB
|
|
@@ -125,25 +129,25 @@ dist/api/forwardVerify.js 2.59 k
|
|
|
125
129
|
dist/api/captcha/submitImageCaptchaSolution.js 2.59 kB │ gzip: 1.00 kB
|
|
126
130
|
dist/index.js 2.78 kB │ gzip: 0.76 kB
|
|
127
131
|
dist/api/admin/apiAdminRoutesProvider.js 2.78 kB │ gzip: 0.55 kB
|
|
132
|
+
dist/tasks/puzzle/puzzleRenderer.js 3.00 kB │ gzip: 1.24 kB
|
|
128
133
|
dist/api/captcha/getFrictionlessCaptchaChallenge/shortCircuit.js 3.32 kB │ gzip: 1.30 kB
|
|
129
134
|
dist/api/domainMiddleware.js 3.52 kB │ gzip: 1.22 kB
|
|
130
135
|
dist/tasks/spam/evaluateEmailSpamRules.js 3.84 kB │ gzip: 1.59 kB
|
|
131
|
-
dist/api/captcha/trafficFilterRequestTime.js 3.
|
|
136
|
+
dist/api/captcha/trafficFilterRequestTime.js 3.89 kB │ gzip: 1.49 kB
|
|
132
137
|
dist/services/ipComparison.js 3.96 kB │ gzip: 1.19 kB
|
|
133
138
|
dist/api/captcha.js 4.05 kB │ gzip: 1.31 kB
|
|
134
139
|
dist/api/hardBlockVerdictCache.js 4.08 kB │ gzip: 1.66 kB
|
|
135
140
|
dist/tasks/spam/checkSpamEmail.js 4.12 kB │ gzip: 1.12 kB
|
|
136
141
|
dist/api/captcha/getFrictionlessCaptchaChallenge/accessPolicy.js 4.13 kB │ gzip: 1.03 kB
|
|
137
|
-
dist/tasks/dnsEvent/enrichDnsEvent.js 4.33 kB │ gzip: 1.55 kB
|
|
138
142
|
dist/tasks/tasks.js 4.69 kB │ gzip: 1.51 kB
|
|
143
|
+
dist/tasks/dnsEvent/enrichDnsEvent.js 4.71 kB │ gzip: 1.72 kB
|
|
139
144
|
dist/api/captcha/getPoWCaptchaChallenge.js 5.54 kB │ gzip: 1.74 kB
|
|
140
145
|
dist/util/usageCounters.js 5.65 kB │ gzip: 2.01 kB
|
|
141
|
-
dist/api/captcha/getPuzzleCaptchaChallenge.js 5.76 kB │ gzip: 1.77 kB
|
|
142
146
|
dist/api/captcha/getImageCaptchaChallenge.js 5.86 kB │ gzip: 1.87 kB
|
|
143
|
-
dist/api/captcha/
|
|
147
|
+
dist/api/captcha/getPuzzleCaptchaChallenge.js 6.23 kB │ gzip: 1.87 kB
|
|
148
|
+
dist/api/captcha/submitPoWCaptchaSolution.js 6.47 kB │ gzip: 2.16 kB
|
|
144
149
|
dist/api/metrics.js 6.96 kB │ gzip: 2.09 kB
|
|
145
|
-
dist/
|
|
146
|
-
dist/tasks/spam/checkTrafficFilter.js 7.25 kB │ gzip: 2.46 kB
|
|
150
|
+
dist/tasks/spam/checkTrafficFilter.js 7.32 kB │ gzip: 2.53 kB
|
|
147
151
|
dist/tasks/detection/bundlePool.js 8.30 kB │ gzip: 3.21 kB
|
|
148
152
|
dist/tasks/decisionMachine/decisionMachineRunner.js 9.40 kB │ gzip: 2.86 kB
|
|
149
153
|
dist/api/startProviderApi.js 9.82 kB │ gzip: 3.40 kB
|
|
@@ -153,7 +157,7 @@ dist/tasks/client/clientTasks.js 12.33 k
|
|
|
153
157
|
dist/api/verify.js 12.34 kB │ gzip: 2.47 kB
|
|
154
158
|
dist/util.js 12.57 kB │ gzip: 3.17 kB
|
|
155
159
|
dist/api/captcha/getFrictionlessCaptchaChallenge/handler.js 16.01 kB │ gzip: 4.01 kB
|
|
156
|
-
dist/tasks/frictionless/frictionlessTasks.js 17.
|
|
160
|
+
dist/tasks/frictionless/frictionlessTasks.js 17.41 kB │ gzip: 4.85 kB
|
|
157
161
|
dist/tasks/puzzleCaptcha/puzzleTasks.js 20.67 kB │ gzip: 4.71 kB
|
|
158
162
|
dist/tasks/captchaManager.js 21.73 kB │ gzip: 6.27 kB
|
|
159
163
|
dist/tasks/powCaptcha/powTasks.js 21.89 kB │ gzip: 5.56 kB
|
|
@@ -162,7 +166,7 @@ dist/tasks/detection/decodeBehavior.js 32.26 k
|
|
|
162
166
|
dist/tasks/detection/decodeSimd.js 36.06 kB │ gzip: 12.00 kB
|
|
163
167
|
dist/tasks/detection/decodePayload.js 55.60 kB │ gzip: 18.45 kB
|
|
164
168
|
|
|
165
|
-
[32m✓ built in
|
|
169
|
+
[32m✓ built in 130ms[39m
|
|
166
170
|
[copy-plugin] copying /home/runner/work/captcha/captcha/packages/provider/src/tasks/detection/decodeBehavior.js to /home/runner/work/captcha/captcha/packages/provider/dist/tasks/detection/decodeBehavior.js
|
|
167
171
|
[copy-plugin] copying /home/runner/work/captcha/captcha/packages/provider/src/tasks/detection/decodePayload.js to /home/runner/work/captcha/captcha/packages/provider/dist/tasks/detection/decodePayload.js
|
|
168
172
|
[copy-plugin] copying /home/runner/work/captcha/captcha/packages/provider/src/tasks/detection/decodeSimd.js to /home/runner/work/captcha/captcha/packages/provider/dist/tasks/detection/decodeSimd.js
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,60 @@
|
|
|
1
1
|
# @prosopo/provider
|
|
2
2
|
|
|
3
|
+
## 5.3.1
|
|
4
|
+
### Patch Changes
|
|
5
|
+
|
|
6
|
+
- 721c5ba: Move JA4 TLS fingerprint computation to a Rust napi module (@prosopo/native-ja4). Provider-side JA4 middleware is ~2.7× faster on realistic ClientHellos. The cli bundle plugin now copies the .node binary next to the bundle so it works in the container.
|
|
7
|
+
- Updated dependencies [721c5ba]
|
|
8
|
+
- @prosopo/native-ja4@0.0.2
|
|
9
|
+
|
|
10
|
+
## 5.3.0
|
|
11
|
+
### Minor Changes
|
|
12
|
+
|
|
13
|
+
- 9e53a48: Rework the traffic-filter evaluation so that on a single IP the
|
|
14
|
+
highest-precedence set flag decides the outcome — only that category's
|
|
15
|
+
policy is consulted, and lower-precedence flags on the same IP are
|
|
16
|
+
ignored. Precedence (highest first): tor > vpn > proxy > datacenter >
|
|
17
|
+
abuser > crawler > satellite > mobile.
|
|
18
|
+
|
|
19
|
+
Example: an IP flagged as VPN and proxy is treated as VPN. If the
|
|
20
|
+
operator has left the VPN policy unconfigured (allowing VPNs), the IP
|
|
21
|
+
passes even when the proxy policy is set to block — the "specific"
|
|
22
|
+
category owns the IP and its policy is the only one that fires.
|
|
23
|
+
|
|
24
|
+
Behaviour change to flag: because datacenter now outranks crawler, a
|
|
25
|
+
crawler+datacenter IP is acted on by the datacenter policy regardless
|
|
26
|
+
of the crawler policy state. Operators who want to allow named crawlers
|
|
27
|
+
through can still use `datacenterNameAllowlist`.
|
|
28
|
+
|
|
29
|
+
`computeDnsAsymmetry` (DNS resolver / peer IP scoring) keeps its
|
|
30
|
+
existing operator-policy-aware shielding rather than mirroring
|
|
31
|
+
precedence, because DNS resolvers are legitimately often on datacenter
|
|
32
|
+
ranges (Google/Cloudflare/consumer-VPN DNS) — the DC signal there only
|
|
33
|
+
counts when the operator would have acted on the underlying category
|
|
34
|
+
too.
|
|
35
|
+
|
|
36
|
+
### Patch Changes
|
|
37
|
+
|
|
38
|
+
- 35f640f: Render puzzle captcha imagery on the provider instead of sending the answer to the client.
|
|
39
|
+
|
|
40
|
+
The challenge used to carry `targetX`/`targetY` and the widget drew the target box straight from them, so any HTTP client could echo the coordinates back as its solution and pass without a browser. The provider now synthesises a background procedurally, cuts the notch into the pixels, and returns the background and piece as data URIs; the target and the tolerance never leave the server.
|
|
41
|
+
|
|
42
|
+
Backgrounds come from the new `@prosopo/puzzle-assets` package and are single-use — reusing one across two challenges would let an attacker diff the composites and recover both notch positions.
|
|
43
|
+
- Updated dependencies [35f640f]
|
|
44
|
+
- @prosopo/puzzle-assets@0.1.1
|
|
45
|
+
- @prosopo/types@5.2.1
|
|
46
|
+
- @prosopo/api@4.0.9
|
|
47
|
+
- @prosopo/api-express-router@3.1.64
|
|
48
|
+
- @prosopo/database@4.0.10
|
|
49
|
+
- @prosopo/datasets@3.1.65
|
|
50
|
+
- @prosopo/env@3.6.33
|
|
51
|
+
- @prosopo/ipinfo@0.3.10
|
|
52
|
+
- @prosopo/keyring@2.9.72
|
|
53
|
+
- @prosopo/load-balancer@2.10.26
|
|
54
|
+
- @prosopo/types-database@5.1.4
|
|
55
|
+
- @prosopo/types-env@2.10.29
|
|
56
|
+
- @prosopo/user-access-policy@3.12.20
|
|
57
|
+
|
|
3
58
|
## 5.2.1
|
|
4
59
|
### Patch Changes
|
|
5
60
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPuzzleCaptchaChallenge.d.ts","sourceRoot":"","sources":["../../../src/api/captcha/getPuzzleCaptchaChallenge.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"getPuzzleCaptchaChallenge.d.ts","sourceRoot":"","sources":["../../../src/api/captcha/getPuzzleCaptchaChallenge.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;8BAenD,mBAAmB,0BACA,kBAAkB,WAGpC,OAAO,GAAG,gBAAgB,OAC1B,QAAQ,QACP,YAAY;AAPpB,wBAuRG"}
|
|
@@ -2,6 +2,7 @@ import { validateAddr, validateSiteKey } from "../validateAddress.js";
|
|
|
2
2
|
import { getCompositeIpAddress } from "../../compositeIpAddress.js";
|
|
3
3
|
import { recordCaptchaIssueError, recordCaptchaIssued } from "../metrics.js";
|
|
4
4
|
import { getRequestUserScope } from "../blacklistRequestInspector.js";
|
|
5
|
+
import { renderPuzzleImages, resolvePuzzleRenderSettings } from "../../tasks/puzzle/puzzleRenderer.js";
|
|
5
6
|
import { Tasks } from "../../tasks/tasks.js";
|
|
6
7
|
import { getMaintenanceMode } from "../admin/apiToggleMaintenanceModeEndpoint.js";
|
|
7
8
|
import { normalizeRequestIp } from "../../utils/normalizeRequestIp.js";
|
|
@@ -37,7 +38,7 @@ var getPuzzleCaptchaChallenge_default = (env, userAccessRulesStorage) => async (
|
|
|
37
38
|
sessionId
|
|
38
39
|
}
|
|
39
40
|
}));
|
|
40
|
-
return res.json(buildPuzzleMaintenanceResponse(user, dapp));
|
|
41
|
+
return res.json(await buildPuzzleMaintenanceResponse(user, dapp));
|
|
41
42
|
}
|
|
42
43
|
const tasks = new Tasks(env, req.logger);
|
|
43
44
|
try {
|
|
@@ -80,6 +81,8 @@ var getPuzzleCaptchaChallenge_default = (env, userAccessRulesStorage) => async (
|
|
|
80
81
|
}));
|
|
81
82
|
const trafficVerdict = applyTrafficFilterAtRequestTime(req.ipInfo, clientSettings.settings?.trafficFilter, req.logger);
|
|
82
83
|
const tolerance = (trafficVerdict.kind === "challenge" ? trafficVerdict.puzzleTolerance : void 0) ?? clientSettings?.settings?.puzzleTolerance;
|
|
84
|
+
const trafficPuzzleSettings = trafficVerdict.kind === "challenge" ? trafficVerdict.puzzleSettings : void 0;
|
|
85
|
+
const effectivePuzzleSettings = resolvePuzzleRenderSettings(clientSettings?.settings?.puzzle, trafficPuzzleSettings);
|
|
83
86
|
const challenge = await tasks.puzzleCaptchaManager.getPuzzleCaptchaChallenge(user, dapp, origin, tolerance);
|
|
84
87
|
if (validSessionId && simdReadings) await tasks.frictionlessManager.decryptAndAttachSimdReadingsIfAbsent(validSessionId, simdReadings, SimdReadingsStage.challenge).catch((updateErr) => {
|
|
85
88
|
req.logger.warn(() => ({
|
|
@@ -92,14 +95,18 @@ var getPuzzleCaptchaChallenge_default = (env, userAccessRulesStorage) => async (
|
|
|
92
95
|
userAccount: user,
|
|
93
96
|
dappAccount: dapp
|
|
94
97
|
}, challenge.targetX, challenge.targetY, challenge.originX, challenge.originY, challenge.tolerance, challenge.providerSignature, getCompositeIpAddress(normalizedIp), flatten(req.headers), req.ja4, validSessionId, req.ipInfo);
|
|
98
|
+
const images = await renderPuzzleImages({
|
|
99
|
+
targetX: challenge.targetX,
|
|
100
|
+
targetY: challenge.targetY
|
|
101
|
+
}, effectivePuzzleSettings);
|
|
95
102
|
const getPuzzleCaptchaResponse = {
|
|
96
103
|
[ApiParams.status]: "ok",
|
|
97
104
|
[ApiParams.challenge]: challenge.challenge,
|
|
98
|
-
[ApiParams.
|
|
99
|
-
[ApiParams.
|
|
105
|
+
[ApiParams.background]: images.background,
|
|
106
|
+
[ApiParams.piece]: images.piece,
|
|
107
|
+
[ApiParams.pieceSize]: images.pieceSize,
|
|
100
108
|
[ApiParams.originX]: challenge.originX,
|
|
101
109
|
[ApiParams.originY]: challenge.originY,
|
|
102
|
-
[ApiParams.tolerance]: challenge.tolerance,
|
|
103
110
|
[ApiParams.timestamp]: challenge.requestedAtTimestamp.toString(),
|
|
104
111
|
[ApiParams.signature]: { [ApiParams.provider]: { [ApiParams.challenge]: challenge.providerSignature } }
|
|
105
112
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPuzzleCaptchaChallenge.js","sourceRoot":"","sources":["../../../src/api/captcha/getPuzzleCaptchaChallenge.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EACN,SAAS,EACT,WAAW,EACX,oCAAoC,EAGpC,iBAAiB,GACjB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAE,+BAA+B,EAAE,MAAM,+BAA+B,CAAC;AAEhF,eAAe,CACd,GAAwB,EACxB,sBAA0C,EACzC,EAAE,CACH,KAAK,EACJ,GAA+B,EAC/B,GAAa,EACb,IAAkB,EACjB,EAAE;IACH,IAAI,MAAsD,CAAC;IAE3D,IAAI,CAAC;QACJ,MAAM,GAAG,oCAAoC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,OAAO,IAAI,CACV,IAAI,eAAe,CAAC,qBAAqB,EAAE;YAC1C,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE;YAClC,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,MAAM,EAAE,GAAG,CAAC,MAAM;SAClB,CAAC,CACF,CAAC;IACH,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAEvD,eAAe,CAAC,IAAI,CAAC,CAAC;IACtB,YAAY,CAAC,IAAI,CAAC,CAAC;IAKnB,IAAI,kBAAkB,EAAE,EAAE,CAAC;QAC1B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YACtB,GAAG,EAAE,4DAA4D;YACjE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;SAC/B,CAAC,CAAC,CAAC;QACJ,OAAO,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"getPuzzleCaptchaChallenge.js","sourceRoot":"","sources":["../../../src/api/captcha/getPuzzleCaptchaChallenge.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,5 +4,5 @@ export declare const buildMaintenanceVerificationResponse: (translate: (key: str
|
|
|
4
4
|
export declare const buildFrictionlessMaintenanceResponse: (captchaType: CaptchaType.pow | CaptchaType.image | CaptchaType.puzzle, host: string | undefined) => GetFrictionlessCaptchaResponse;
|
|
5
5
|
export declare const buildPowMaintenanceResponse: (user: string, dapp: string) => GetPowCaptchaResponse;
|
|
6
6
|
export declare const buildImageMaintenanceResponse: () => CaptchaResponseBody;
|
|
7
|
-
export declare const buildPuzzleMaintenanceResponse: (user: string, dapp: string) => GetPuzzleCaptchaResponse
|
|
7
|
+
export declare const buildPuzzleMaintenanceResponse: (user: string, dapp: string) => Promise<GetPuzzleCaptchaResponse>;
|
|
8
8
|
//# sourceMappingURL=maintenanceModeResponses.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maintenanceModeResponses.d.ts","sourceRoot":"","sources":["../../../src/api/captcha/maintenanceModeResponses.ts"],"names":[],"mappings":"AAeA,OAAO,EAEN,KAAK,mBAAmB,EACxB,KAAK,WAAW,EAChB,KAAK,8BAA8B,EACnC,KAAK,qBAAqB,EAC1B,KAAK,wBAAwB,EAG7B,KAAK,oBAAoB,EACzB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"maintenanceModeResponses.d.ts","sourceRoot":"","sources":["../../../src/api/captcha/maintenanceModeResponses.ts"],"names":[],"mappings":"AAeA,OAAO,EAEN,KAAK,mBAAmB,EACxB,KAAK,WAAW,EAChB,KAAK,8BAA8B,EACnC,KAAK,qBAAqB,EAC1B,KAAK,wBAAwB,EAG7B,KAAK,oBAAoB,EACzB,MAAM,gBAAgB,CAAC;AAoBxB,eAAO,MAAM,wBAAwB,IAAI,CAAC;AAiB1C,eAAO,MAAM,oCAAoC,cACrC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,KAChC,oBAID,CAAC;AAEH,eAAO,MAAM,oCAAoC,gBACnC,WAAW,CAAC,GAAG,GAAG,WAAW,CAAC,KAAK,GAAG,WAAW,CAAC,MAAM,QAC/D,MAAM,GAAG,SAAS,KACtB,8BAID,CAAC;AAEH,eAAO,MAAM,2BAA2B,SACjC,MAAM,QACN,MAAM,KACV,qBAWF,CAAC;AAOF,eAAO,MAAM,6BAA6B,QAAO,mBAQ/C,CAAC;AAMH,eAAO,MAAM,8BAA8B,SACpC,MAAM,QACN,MAAM,KACV,OAAO,CAAC,wBAAwB,CAgBlC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { renderPuzzleImages } from "../../tasks/puzzle/puzzleRenderer.js";
|
|
1
2
|
import { ApiParams, POW_SEPARATOR } from "@prosopo/types";
|
|
2
3
|
import { randomUUID } from "node:crypto";
|
|
3
4
|
//#region src/api/captcha/maintenanceModeResponses.ts
|
|
@@ -30,16 +31,20 @@ var buildImageMaintenanceResponse = () => ({
|
|
|
30
31
|
[ApiParams.timestamp]: Date.now().toString(),
|
|
31
32
|
[ApiParams.signature]: { [ApiParams.provider]: { [ApiParams.requestHash]: "" } }
|
|
32
33
|
});
|
|
33
|
-
var buildPuzzleMaintenanceResponse = (user, dapp) => {
|
|
34
|
+
var buildPuzzleMaintenanceResponse = async (user, dapp) => {
|
|
34
35
|
const timestamp = Date.now();
|
|
36
|
+
const images = await renderPuzzleImages({
|
|
37
|
+
targetX: 200,
|
|
38
|
+
targetY: 100
|
|
39
|
+
});
|
|
35
40
|
return {
|
|
36
41
|
[ApiParams.status]: "ok",
|
|
37
42
|
[ApiParams.challenge]: buildChallenge(user, dapp),
|
|
38
|
-
[ApiParams.
|
|
39
|
-
[ApiParams.
|
|
40
|
-
[ApiParams.
|
|
41
|
-
[ApiParams.
|
|
42
|
-
[ApiParams.
|
|
43
|
+
[ApiParams.background]: images.background,
|
|
44
|
+
[ApiParams.piece]: images.piece,
|
|
45
|
+
[ApiParams.pieceSize]: images.pieceSize,
|
|
46
|
+
[ApiParams.originX]: 60,
|
|
47
|
+
[ApiParams.originY]: 100,
|
|
43
48
|
[ApiParams.timestamp]: timestamp.toString(),
|
|
44
49
|
[ApiParams.signature]: { [ApiParams.provider]: { [ApiParams.challenge]: "" } }
|
|
45
50
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maintenanceModeResponses.js","sourceRoot":"","sources":["../../../src/api/captcha/maintenanceModeResponses.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EACN,SAAS,EAMT,aAAa,GAGb,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"maintenanceModeResponses.js","sourceRoot":"","sources":["../../../src/api/captcha/maintenanceModeResponses.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EACN,SAAS,EAMT,aAAa,GAGb,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAO1E,MAAM,aAAa,GAAG,CAAC,IAAwB,EAAU,EAAE,CAC1D,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;AAKlD,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,IAAY,EAAkB,EAAE,CACrE,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,aAAa,GAAG,IAAI,GAAG,aAAa,GAAG,IAAI,GAAG,aAAa,GAAqB,CAAC;AAKlG,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC;AAiB1C,MAAM,CAAC,MAAM,oCAAoC,GAAG,CACnD,SAAkC,EACX,EAAE,CAAC,CAAC;IAC3B,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,mBAAmB,CAAC;IAClD,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,IAAI;IAC1B,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,wBAAwB;CAC3C,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,oCAAoC,GAAG,CACnD,WAAqE,EACrE,IAAwB,EACS,EAAE,CAAC,CAAC;IACrC,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,WAAW;IACpC,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,UAAU,EAAE,EAAE;IAC/D,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI;CACxB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAC1C,IAAY,EACZ,IAAY,EACY,EAAE;IAC1B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,OAAO;QACN,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI;QACxB,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC;QACjD,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;QACzB,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,QAAQ,EAAE;QAC3C,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE;YACtB,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE;SACnD;KACD,CAAC;AACH,CAAC,CAAC;AAOF,MAAM,CAAC,MAAM,6BAA6B,GAAG,GAAwB,EAAE,CAAC,CAAC;IACxE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI;IACxB,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE;IACxB,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,EAAE;IAC3B,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;IAC5C,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE;QACtB,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE;KACrD;CACD,CAAC,CAAC;AAMH,MAAM,CAAC,MAAM,8BAA8B,GAAG,KAAK,EAClD,IAAY,EACZ,IAAY,EACwB,EAAE;IACtC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;IACxE,OAAO;QACN,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI;QACxB,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC;QACjD,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,UAAU;QACzC,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,KAAK;QAC/B,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,SAAS;QACvC,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE;QACvB,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,GAAG;QACxB,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,QAAQ,EAAE;QAC3C,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE;YACtB,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE;SACnD;KACD,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"submitPoWCaptchaSolution.d.ts","sourceRoot":"","sources":["../../../src/api/captcha/submitPoWCaptchaSolution.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,WAAW,EAEX,KAAK,4BAA4B,EAIjC,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"submitPoWCaptchaSolution.d.ts","sourceRoot":"","sources":["../../../src/api/captcha/submitPoWCaptchaSolution.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,WAAW,EAEX,KAAK,4BAA4B,EAIjC,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;8BAMxB,mBAAmB,WAEjC,OAAO,GAAG,gBAAgB,OAC1B,QAAQ,QACP,YAAY;AAJpB,wBA2LG;AAWH,eAAO,MAAM,eAAe,UACpB,KAAK,UACJ;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,aAAa,CAAC,EAAE;QAAE,WAAW,EAAE,WAAW,CAAA;KAAE,CAAA;CAAE,aAChE,MAAM,oBAKC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC7B,KACC,OAAO,CAAC,4BAA4B,GAAG,SAAS,CAsGlD,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { validateAddr, validateSiteKey } from "../validateAddress.js";
|
|
2
|
+
import { downgradePuzzleIfUnavailable } from "../../tasks/puzzle/puzzleRenderer.js";
|
|
2
3
|
import { Tasks } from "../../tasks/tasks.js";
|
|
3
4
|
import { getMaintenanceMode } from "../admin/apiToggleMaintenanceModeEndpoint.js";
|
|
4
5
|
import { derivePlatform } from "../../utils/devicePlatform.js";
|
|
@@ -130,11 +131,12 @@ var buildEscalation = async (tasks, result, challenge, handshakeTiming) => {
|
|
|
130
131
|
const originSession = await tasks.db.getSessionRecordBySessionId(powRecord.sessionId);
|
|
131
132
|
if (!originSession) return void 0;
|
|
132
133
|
const routed = result.routingOutput;
|
|
134
|
+
const escalatedType = downgradePuzzleIfUnavailable(routed.captchaType);
|
|
133
135
|
const selectionReason = routed.reason ?? originSession.reason;
|
|
134
|
-
const newSession = await tasks.frictionlessManager.createSession(originSession.token, originSession.score, originSession.threshold, originSession.scoreComponents, originSession.ipAddress,
|
|
136
|
+
const newSession = await tasks.frictionlessManager.createSession(originSession.token, originSession.score, originSession.threshold, originSession.scoreComponents, originSession.ipAddress, escalatedType, originSession.siteKey ?? powRecord.dappAccount, escalatedType === CaptchaType.image ? routed.solvedImagesCount ?? originSession.solvedImagesCount : void 0, void 0, originSession.userSitekeyIpHash, originSession.webView, originSession.iFrame, originSession.decryptedHeadHash, selectionReason, void 0, void 0, originSession.ipInfo, originSession.headers, originSession.mode, originSession.simdReadings, originSession.entropyMathRandomFingerprint, originSession.entropyCryptoFingerprint, originSession.entropyWallClockOffsetMs, originSession.entropyMathRandomFirst, originSession.bundleId, originSession.currentUrl, handshakeTiming?.tcpToChelloUs, handshakeTiming?.chelloToHandshakeUs, true, originSession.iframeUrl, originSession.isProtect, originSession.sessionId, originSession.g, void 0, originSession.i, originSession.sw, originSession.md, originSession.bn, originSession.fs);
|
|
135
137
|
if (tasks.writeQueue) await tasks.writeQueue.cacheSessionEscalation(powRecord.sessionId, newSession.sessionId);
|
|
136
138
|
return {
|
|
137
|
-
captchaType:
|
|
139
|
+
captchaType: escalatedType,
|
|
138
140
|
sessionId: newSession.sessionId
|
|
139
141
|
};
|
|
140
142
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"submitPoWCaptchaSolution.js","sourceRoot":"","sources":["../../../src/api/captcha/submitPoWCaptchaSolution.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"submitPoWCaptchaSolution.js","sourceRoot":"","sources":["../../../src/api/captcha/submitPoWCaptchaSolution.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EACN,WAAW,EAIX,4BAA4B,GAE5B,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAGtD,OAAO,EAAE,4BAA4B,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAClF,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAEtE,eAAe,CAAC,GAAwB,EAAE,EAAE,CAC3C,KAAK,EACJ,GAA+B,EAC/B,GAAa,EACb,IAAkB,EACjB,EAAE;IAIH,IAAI,kBAAkB,EAAE,EAAE,CAAC;QAC1B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YACtB,GAAG,EAAE,8CAA8C;SACnD,CAAC,CAAC,CAAC;QACJ,MAAM,QAAQ,GAA+B;YAC5C,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,IAAI;SACd,CAAC;QACF,OAAO,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IAED,IAAI,MAA8C,CAAC;IACnD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAEzC,IAAI,CAAC;QACJ,MAAM,GAAG,4BAA4B,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,OAAO,IAAI,CACV,IAAI,eAAe,CAAC,qBAAqB,EAAE;YAC1C,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE;YAClD,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,MAAM,EAAE,GAAG,CAAC,MAAM;SAClB,CAAC,CACF,CAAC;IACH,CAAC;IAED,MAAM,EACL,SAAS,EACT,SAAS,EACT,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,cAAc,EACd,IAAI,EACJ,YAAY,EACZ,cAAc,EACd,gBAAgB,GAChB,GAAG,MAAM,CAAC;IAEX,eAAe,CAAC,IAAI,CAAC,CAAC;IACtB,YAAY,CAAC,IAAI,CAAC,CAAC;IAInB,MAAM,WAAW,GAAG,yBAAyB,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAChE,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAA+B;YAC5C,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,WAAW;SACrB,CAAC;QACF,OAAO,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IAED,IAAI,CAAC;QACJ,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAE1D,IAAI,CAAC,YAAY,EAAE,CAAC;YACnB,OAAO,IAAI,CACV,IAAI,eAAe,CAAC,6BAA6B,EAAE;gBAClD,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE;gBACrC,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,MAAM,EAAE,GAAG,CAAC,MAAM;aAClB,CAAC,CACF,CAAC;QACH,CAAC;QAMD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QAClD,MAAM,WAAW,GAChB,GAAG,CAAC,MAAM,IAAI,SAAS,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO;YAC1D,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW;YACxB,CAAC,CAAC,SAAS,CAAC;QAId,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YACtB,GAAG,EAAE,gBAAgB;gBACpB,CAAC,CAAC,2BAA2B;gBAC7B,CAAC,CAAC,uCAAuC;YAC1C,IAAI,EAAE;gBACL,uBAAuB,EAAE,gBAAgB,KAAK,SAAS;gBACvD,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,IAAI,CAAC;gBACpD,SAAS;aACT;SACD,CAAC,CAAC,CAAC;QAEJ,KAAK,CAAC,iBAAiB,CAAC,iBAAiB,CAAC;YACzC,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE;YAChB,WAAW;YAGX,QAAQ,EAAE,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC;YAC1C,GAAG,EAAE;gBACJ,OAAO,EAAE,WAAW;gBACpB,SAAS;gBACT,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;gBAChC,GAAG,CAAC,gBAAgB,IAAI,EAAE,gBAAgB,EAAE,CAAC;gBAC7C,GAAG,CAAC,GAAG,CAAC,aAAa,KAAK,SAAS,IAAI;oBACtC,aAAa,EAAE,GAAG,CAAC,aAAa;iBAChC,CAAC;gBACF,GAAG,CAAC,GAAG,CAAC,mBAAmB,KAAK,SAAS,IAAI;oBAC5C,mBAAmB,EAAE,GAAG,CAAC,mBAAmB;iBAC5C,CAAC;aACF;SACD,CAAC,CAAC;QAOH,MAAM,wBAAwB,GAAG,YAAY,CAAC,QAAQ,CAAC,eAE3C,CAAC;QACb,MAAM,cAAc,GACnB,wBAAwB,IAAI,YAAY,CAAC,QAAQ,CAAC,eAAe,CAAC;QACnE,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAAC,wBAAwB,CACpE,SAAS,EACT,SAAS,CAAC,QAAQ,CAAC,SAAS,EAC5B,KAAK,EACL,cAAc,EACd,SAAS,CAAC,IAAI,CAAC,SAAS,EACxB,YAAY,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,EAC1B,WAAW,EACX,cAAc,EACd,IAAI,EACJ,YAAY,EACZ,cAAc,CACd,CAAC;QAKF,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YAC1B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;gBACtB,GAAG,EAAE,2BAA2B;gBAChC,IAAI,EAAE;oBACL,iBAAiB,EAAE,MAAM,CAAC,aAAa,EAAE,WAAW;oBACpD,aAAa,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM;oBAC3C,SAAS;iBACT;aACD,CAAC,CAAC,CAAC;QACL,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE;YAClE,aAAa,EAAE,GAAG,CAAC,aAAa;YAChC,mBAAmB,EAAE,GAAG,CAAC,mBAAmB;SAC5C,CAAC,CAAC;QACH,MAAM,QAAQ,GAA+B;YAC5C,MAAM,EAAE,IAAI;YAGZ,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ;YAC9C,GAAG,CAAC,UAAU,IAAI,EAAE,UAAU,EAAE,CAAC;SACjC,CAAC;QACF,OAAO,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;YACvB,GAAG;YACH,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,GAAG,EAAE,0CAA0C;SAC/C,CAAC,CAAC,CAAC;QACJ,OAAO,IAAI,CACV,IAAI,eAAe,CAAC,iBAAiB,EAAE;YACtC,OAAO,EAAE;gBACR,IAAI,EAAE,GAAG;gBACT,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI;gBACtB,KAAK,EAAE,GAAG;aACV;YACD,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,MAAM,EAAE,GAAG,CAAC,MAAM;SAClB,CAAC,CACF,CAAC;IACH,CAAC;AACF,CAAC,CAAC;AAWH,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EACnC,KAAY,EACZ,MAA2E,EAC3E,SAAiB,EAKjB,eAGC,EACmD,EAAE;IACtD,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,aAAa;QAAE,OAAO,SAAS,CAAC;IAChE,MAAM,UAAU,GAAG,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC;IACpD,IAAI,UAAU,KAAK,WAAW,CAAC,KAAK,IAAI,UAAU,KAAK,WAAW,CAAC,MAAM,EAAE,CAAC;QAC3E,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,EAAE,CAAC,8BAA8B,CAAC,SAAS,CAAC,CAAC;IAC3E,IAAI,CAAC,SAAS,EAAE,SAAS;QAAE,OAAO,SAAS,CAAC;IAE5C,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,EAAE,CAAC,2BAA2B,CAC/D,SAAS,CAAC,SAAS,CACnB,CAAC;IACF,IAAI,CAAC,aAAa;QAAE,OAAO,SAAS,CAAC;IAErC,MAAM,MAAM,GAAG,MAAM,CAAC,aAKrB,CAAC;IAKF,MAAM,aAAa,GAAG,4BAA4B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAKvE,MAAM,eAAe,GACnB,MAAM,CAAC,MAAyC,IAAI,aAAa,CAAC,MAAM,CAAC;IAE3E,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,mBAAmB,CAAC,aAAa,CAC/D,aAAa,CAAC,KAAK,EACnB,aAAa,CAAC,KAAK,EACnB,aAAa,CAAC,SAAS,EACvB,aAAa,CAAC,eAAe,EAC7B,aAAa,CAAC,SAAS,EACvB,aAAa,EACb,aAAa,CAAC,OAAO,IAAI,SAAS,CAAC,WAAW,EAC9C,aAAa,KAAK,WAAW,CAAC,KAAK;QAClC,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,IAAI,aAAa,CAAC,iBAAiB,CAAC;QAC/D,CAAC,CAAC,SAAS,EACZ,SAAS,EACT,aAAa,CAAC,iBAAiB,EAC/B,aAAa,CAAC,OAAO,EACrB,aAAa,CAAC,MAAM,EACpB,aAAa,CAAC,iBAAiB,EAC/B,eAAe,EACf,SAAS,EACT,SAAS,EACT,aAAa,CAAC,MAAM,EACpB,aAAa,CAAC,OAAO,EACrB,aAAa,CAAC,IAAI,EAClB,aAAa,CAAC,YAAY,EAC1B,aAAa,CAAC,4BAA4B,EAC1C,aAAa,CAAC,wBAAwB,EACtC,aAAa,CAAC,wBAAwB,EACtC,aAAa,CAAC,sBAAsB,EAGpC,aAAa,CAAC,QAAQ,EACtB,aAAa,CAAC,UAAU,EACxB,eAAe,EAAE,aAAa,EAC9B,eAAe,EAAE,mBAAmB,EACpC,IAAI,EACJ,aAAa,CAAC,SAAS,EACvB,aAAa,CAAC,SAAS,EAOvB,aAAa,CAAC,SAAS,EACvB,aAAa,CAAC,CAAC,EACf,SAAS,EACT,aAAa,CAAC,CAAC,EACf,aAAa,CAAC,EAAE,EAChB,aAAa,CAAC,EAAE,EAChB,aAAa,CAAC,EAAE,EAChB,aAAa,CAAC,EAAE,CAChB,CAAC;IAQF,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACtB,MAAM,KAAK,CAAC,UAAU,CAAC,sBAAsB,CAC5C,SAAS,CAAC,SAAS,EACnB,UAAU,CAAC,SAAS,CACpB,CAAC;IACH,CAAC;IAED,OAAO;QACN,WAAW,EAAE,aAAa;QAC1B,SAAS,EAAE,UAAU,CAAC,SAAS;KAC/B,CAAC;AACH,CAAC,CAAC"}
|