@prosopo/provider 1.0.2 → 2.0.1

package/dist/api/captcha.js

@@ -1,42 +1,39 @@
-import { ApiParams, ApiPaths, CaptchaRequestBody, CaptchaSolutionBody, GetPowCaptchaChallengeRequestBody, SubmitPowCaptchaSolutionBody, } from '@prosopo/types';
-import { ProsopoApiError } from '@prosopo/common';
-import { Tasks } from '../tasks/tasks.js';
-import { handleErrors } from './errorHandler.js';
-import { parseBlockNumber } from '../util.js';
-import { parseCaptchaAssets } from '@prosopo/datasets';
-import { validateAddress } from '@polkadot/util-crypto/address';
-import { version } from '@prosopo/util';
-import express from 'express';
+import { validateAddress } from "@polkadot/util-crypto/address";
+import { ProsopoApiError } from "@prosopo/common";
+import { parseCaptchaAssets } from "@prosopo/datasets";
+import { ApiParams, ApiPaths, CaptchaRequestBody, CaptchaSolutionBody, GetPowCaptchaChallengeRequestBody, SubmitPowCaptchaSolutionBody, } from "@prosopo/types";
+import { version } from "@prosopo/util";
+import express from "express";
+import { Tasks } from "../tasks/tasks.js";
+import { handleErrors } from "./errorHandler.js";
 export function prosopoRouter(env) {
     const router = express.Router();
     const tasks = new Tasks(env);
     router.get(`${ApiPaths.GetImageCaptchaChallenge}/:${ApiParams.datasetId}/:${ApiParams.user}/:${ApiParams.dapp}/:${ApiParams.blockNumber}`, async (req, res, next) => {
         try {
-            const { blockNumber, datasetId, user, dapp } = CaptchaRequestBody.parse(req.params);
-            const api = env.api;
-            if (api === undefined) {
-                throw new ProsopoApiError('DEVELOPER.METHOD_NOT_IMPLEMENTED', {
-                    context: { error: 'api not setup', env },
-                });
-            }
-            validateAddress(user, false, api.registry.chainSS58);
-            const blockNumberParsed = parseBlockNumber(blockNumber);
-            const taskData = await tasks.getRandomCaptchasAndRequestHash(datasetId, user);
+            const { datasetId, user } = CaptchaRequestBody.parse(req.params);
+            validateAddress(user, false, 42);
+            const taskData = await tasks.imgCaptchaManager.getRandomCaptchasAndRequestHash(datasetId, user);
             const captchaResponse = {
-                captchas: taskData.captchas.map((cwp) => ({
-                    ...cwp,
-                    captcha: {
-                        ...cwp.captcha,
-                        items: cwp.captcha.items.map((item) => parseCaptchaAssets(item, env.assetsResolver)),
-                    },
+                captchas: taskData.captchas.map((captcha) => ({
+                    ...captcha,
+                    items: captcha.items.map((item) => parseCaptchaAssets(item, env.assetsResolver)),
                 })),
-                requestHash: taskData.requestHash,
+                [ApiParams.requestHash]: taskData.requestHash,
+                [ApiParams.timestamp]: taskData.timestamp.toString(),
+                [ApiParams.signature]: {
+                    [ApiParams.provider]: {
+                        [ApiParams.timestamp]: taskData.signedTimestamp,
+                    },
+                },
             };
             return res.json(captchaResponse);
         }
         catch (err) {
             tasks.logger.error(err);
-            return next(new ProsopoApiError('API.BAD_REQUEST', { context: { error: err, code: 400 } }));
+            return next(new ProsopoApiError("API.BAD_REQUEST", {
+                context: { error: err, code: 400 },
+            }));
         }
     });
     router.post(ApiPaths.SubmitImageCaptchaSolution, async (req, res, next) => {
@@ -45,19 +42,23 @@ export function prosopoRouter(env) {
             parsed = CaptchaSolutionBody.parse(req.body);
         }
         catch (err) {
-            return next(new ProsopoApiError('CAPTCHA.PARSE_ERROR', { context: { code: 400, error: err } }));
+            return next(new ProsopoApiError("CAPTCHA.PARSE_ERROR", {
+                context: { code: 400, error: err },
+            }));
         }
         try {
-            const result = await tasks.dappUserSolution(parsed[ApiParams.user], parsed[ApiParams.dapp], parsed[ApiParams.requestHash], parsed[ApiParams.captchas], parsed[ApiParams.signature]);
+            const result = await tasks.imgCaptchaManager.dappUserSolution(parsed[ApiParams.user], parsed[ApiParams.dapp], parsed[ApiParams.requestHash], parsed[ApiParams.captchas], parsed[ApiParams.signature].user.requestHash, parseInt(parsed[ApiParams.timestamp]), parsed[ApiParams.signature].provider.timestamp);
             const returnValue = {
-                status: req.i18n.t(result.verified ? 'API.CAPTCHA_PASSED' : 'API.CAPTCHA_FAILED'),
+                status: req.i18n.t(result.verified ? "API.CAPTCHA_PASSED" : "API.CAPTCHA_FAILED"),
                 ...result,
             };
             return res.json(returnValue);
         }
         catch (err) {
             tasks.logger.error(err);
-            return next(new ProsopoApiError('API.UNKNOWN', { context: { code: 400, error: err } }));
+            return next(new ProsopoApiError("API.UNKNOWN", {
+                context: { code: 400, error: err },
+            }));
         }
     });
     router.post(ApiPaths.GetPowCaptchaChallenge, async (req, res, next) => {
@@ -65,59 +66,67 @@ export function prosopoRouter(env) {
             const { user, dapp } = GetPowCaptchaChallengeRequestBody.parse(req.body);
             const origin = req.headers.origin;
             if (!origin) {
-                throw new ProsopoApiError('API.BAD_REQUEST', {
-                    context: { code: 400, error: 'origin header not found' },
+                throw new ProsopoApiError("API.BAD_REQUEST", {
+                    context: { code: 400, error: "origin header not found" },
                 });
             }
-            const challenge = await tasks.getPowCaptchaChallenge(user, dapp, origin);
-            return res.json(challenge);
+            const challenge = await tasks.powCaptchaManager.getPowCaptchaChallenge(user, dapp, origin);
+            const getPowCaptchaResponse = {
+                challenge: challenge.challenge,
+                difficulty: challenge.difficulty,
+                timestamp: challenge.timestamp.toString(),
+                signature: {
+                    provider: {
+                        timestamp: challenge.timestampSignature,
+                        challenge: challenge.signature,
+                    },
+                },
+            };
+            return res.json(getPowCaptchaResponse);
         }
         catch (err) {
             tasks.logger.error(err);
-            return next(new ProsopoApiError('API.BAD_REQUEST', { context: { code: 400, error: err } }));
+            return next(new ProsopoApiError("API.BAD_REQUEST", {
+                context: { code: 400, error: err },
+            }));
         }
     });
     router.post(ApiPaths.SubmitPowCaptchaSolution, async (req, res, next) => {
         try {
-            const { blockNumber, challenge, difficulty, signature, nonce, verifiedTimeout } = SubmitPowCaptchaSolutionBody.parse(req.body);
-            const verified = await tasks.verifyPowCaptchaSolution(blockNumber, challenge, difficulty, signature, nonce, verifiedTimeout);
+            const { challenge, difficulty, signature, nonce, verifiedTimeout } = SubmitPowCaptchaSolutionBody.parse(req.body);
+            const verified = await tasks.powCaptchaManager.verifyPowCaptchaSolution(challenge, difficulty, signature.provider.challenge, nonce, verifiedTimeout, signature.user.timestamp);
             const response = { verified };
             return res.json(response);
         }
         catch (err) {
             tasks.logger.error(err);
-            return next(new ProsopoApiError('API.BAD_REQUEST', { context: { code: 400, error: err } }));
+            return next(new ProsopoApiError("API.BAD_REQUEST", {
+                context: { code: 400, error: err },
+            }));
         }
     });
     router.post(ApiPaths.SubmitUserEvents, async (req, res, next) => {
         try {
             const { events, accountId } = req.body;
-            await tasks.saveCaptchaEvent(events, accountId);
-            return res.json({ status: 'success' });
-        }
-        catch (err) {
-            tasks.logger.error(err);
-            return next(new ProsopoApiError('API.BAD_REQUEST', { context: { code: 400, error: err } }));
-        }
-    });
-    router.get(ApiPaths.GetProviderStatus, async (req, res, next) => {
-        try {
-            const status = await tasks.providerStatus();
-            return res.json({ status });
+            await tasks.datasetManager.saveCaptchaEvent(events, accountId);
+            return res.json({ status: "success" });
         }
         catch (err) {
             tasks.logger.error(err);
-            return next(new ProsopoApiError('API.BAD_REQUEST', { context: { code: 400, error: err } }));
+            return next(new ProsopoApiError("API.BAD_REQUEST", {
+                context: { code: 400, error: err },
+            }));
         }
     });
     router.get(ApiPaths.GetProviderDetails, async (req, res, next) => {
         try {
-            const details = await tasks.getProviderDetails();
-            return res.json({ version, ...details });
+            return res.json({ version, ...{ message: "Provider online" } });
         }
         catch (err) {
             tasks.logger.error(err);
-            return next(new ProsopoApiError('API.BAD_REQUEST', { context: { code: 400, error: err } }));
+            return next(new ProsopoApiError("API.BAD_REQUEST", {
+                context: { code: 400, error: err },
+            }));
         }
     });
     router.use(handleErrors);

package/dist/api/captcha.js.map

@@ -1 +1 @@
-{"version":3,"file":"captcha.js","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"captcha.js","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EACL,SAAS,EACT,QAAQ,EAER,kBAAkB,EAElB,mBAAmB,EAInB,iCAAiC,EAGjC,4BAA4B,GAC7B,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,OAAwB,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAQjD,MAAM,UAAU,aAAa,CAAC,GAAwB;IACpD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAChC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;IAS7B,MAAM,CAAC,GAAG,CACR,GAAG,QAAQ,CAAC,wBAAwB,KAAK,SAAS,CAAC,SAAS,KAAK,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,WAAW,EAAE,EAC9H,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACvB,IAAI;YACF,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACjE,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YAEjC,MAAM,QAAQ,GACZ,MAAM,KAAK,CAAC,iBAAiB,CAAC,+BAA+B,CAC3D,SAAS,EACT,IAAI,CACL,CAAC;YACJ,MAAM,eAAe,GAAwB;gBAC3C,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAgB,EAAE,EAAE,CAAC,CAAC;oBACrD,GAAG,OAAO;oBACV,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAChC,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,CAAC,CAC7C;iBACF,CAAC,CAAC;gBACH,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,WAAW;gBAC7C,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE;gBACpD,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE;oBACrB,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;wBACpB,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,eAAe;qBAChD;iBACF;aACF,CAAC;YACF,OAAO,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SAClC;QAAC,OAAO,GAAG,EAAE;YACZ,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACxB,OAAO,IAAI,CACT,IAAI,eAAe,CAAC,iBAAiB,EAAE;gBACrC,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE;aACnC,CAAC,CACH,CAAC;SACH;IACH,CAAC,CACF,CAAC;IAUF,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,0BAA0B,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACxE,IAAI,MAA+B,CAAC;QACpC,IAAI;YACF,MAAM,GAAG,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SAC9C;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,IAAI,CACT,IAAI,eAAe,CAAC,qBAAqB,EAAE;gBACzC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE;aACnC,CAAC,CACH,CAAC;SACH;QAED,IAAI;YAEF,MAAM,MAAM,GACV,MAAM,KAAK,CAAC,iBAAiB,CAAC,gBAAgB,CAC5C,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EACtB,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EACtB,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,EAC7B,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,EAC1B,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,WAAW,EAC5C,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,EACrC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,SAAS,CAC/C,CAAC;YAEJ,MAAM,WAAW,GAA4B;gBAC3C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAChB,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,oBAAoB,CAC9D;gBACD,GAAG,MAAM;aACV,CAAC;YACF,OAAO,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAC9B;QAAC,OAAO,GAAG,EAAE;YACZ,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACxB,OAAO,IAAI,CACT,IAAI,eAAe,CAAC,aAAa,EAAE;gBACjC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE;aACnC,CAAC,CACH,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IAQH,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,sBAAsB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACpE,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,iCAAiC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAEzE,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;YAElC,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,eAAe,CAAC,iBAAiB,EAAE;oBAC3C,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,yBAAyB,EAAE;iBACzD,CAAC,CAAC;aACJ;YAED,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAAC,sBAAsB,CACpE,IAAI,EACJ,IAAI,EACJ,MAAM,CACP,CAAC;YAEF,MAAM,qBAAqB,GAA0B;gBACnD,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,UAAU,EAAE,SAAS,CAAC,UAAU;gBAChC,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE;gBACzC,SAAS,EAAE;oBACT,QAAQ,EAAE;wBACR,SAAS,EAAE,SAAS,CAAC,kBAAkB;wBACvC,SAAS,EAAE,SAAS,CAAC,SAAS;qBAC/B;iBACF;aACF,CAAC;YAEF,OAAO,GAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SACxC;QAAC,OAAO,GAAG,EAAE;YACZ,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACxB,OAAO,IAAI,CACT,IAAI,eAAe,CAAC,iBAAiB,EAAE;gBACrC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE;aACnC,CAAC,CACH,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IAWH,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACtE,IAAI;YACF,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,eAAe,EAAE,GAChE,4BAA4B,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAAC,wBAAwB,CACrE,SAAS,EACT,UAAU,EACV,SAAS,CAAC,QAAQ,CAAC,SAAS,EAC5B,KAAK,EACL,eAAe,EACf,SAAS,CAAC,IAAI,CAAC,SAAS,CACzB,CAAC;YACF,MAAM,QAAQ,GAA+B,EAAE,QAAQ,EAAE,CAAC;YAC1D,OAAO,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC3B;QAAC,OAAO,GAAG,EAAE;YACZ,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACxB,OAAO,IAAI,CACT,IAAI,eAAe,CAAC,iBAAiB,EAAE;gBACrC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE;aACnC,CAAC,CACH,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IAQH,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC9D,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;YACvC,MAAM,KAAK,CAAC,cAAc,CAAC,gBAAgB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAC/D,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;SACxC;QAAC,OAAO,GAAG,EAAE;YACZ,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACxB,OAAO,IAAI,CACT,IAAI,eAAe,CAAC,iBAAiB,EAAE;gBACrC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE;aACnC,CAAC,CACH,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IAKH,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,kBAAkB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC/D,IAAI;YACF,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,CAAC,CAAC;SACjE;QAAC,OAAO,GAAG,EAAE;YACZ,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACxB,OAAO,IAAI,CACT,IAAI,eAAe,CAAC,iBAAiB,EAAE;gBACrC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE;aACnC,CAAC,CACH,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IAKH,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAEzB,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/api/captchaScheduler.d.ts

@@ -1,4 +1,4 @@
-import { KeyringPair } from '@polkadot/keyring/types';
-import { ProsopoConfigOutput } from '@prosopo/types';
+import type { KeyringPair } from "@polkadot/keyring/types";
+import type { ProsopoConfigOutput } from "@prosopo/types";
 export declare function storeCaptchasExternally(pair: KeyringPair, config: ProsopoConfigOutput): Promise<void>;
 //# sourceMappingURL=captchaScheduler.d.ts.map

package/dist/api/captchaScheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"captchaScheduler.d.ts","sourceRoot":"","sources":["../../src/api/captchaScheduler.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAKpD,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,mBAAmB,iBAoB3F"}
+{"version":3,"file":"captchaScheduler.d.ts","sourceRoot":"","sources":["../../src/api/captchaScheduler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAiB1D,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,mBAAmB,iBAuB5B"}

package/dist/api/captchaScheduler.js

@@ -1,18 +1,19 @@
-import { CronJob } from 'cron';
-import { ProsopoEnvError } from '@prosopo/common';
-import { ProviderEnvironment } from '@prosopo/env';
-import { Tasks } from '../tasks/tasks.js';
+import { ProviderEnvironment } from "@prosopo/env";
+import { CronJob } from "cron";
+import { Tasks } from "../tasks/tasks.js";
 export async function storeCaptchasExternally(pair, config) {
     const env = new ProviderEnvironment(config, pair);
     await env.isReady();
-    if (env.db === undefined) {
-        throw new ProsopoEnvError('DATABASE.DATABASE_UNDEFINED');
-    }
     const tasks = new Tasks(env);
-    const cronSchedule = '0 * * * *';
+    const defaultSchedule = "0 * * * *";
+    const cronSchedule = config.captchaScheduler
+        ? config.captchaScheduler.schedule
+            ? config.captchaScheduler.schedule
+            : defaultSchedule
+        : defaultSchedule;
     const job = new CronJob(cronSchedule, async () => {
-        env.logger.log('storeCommitmentsExternal task....');
-        await tasks.storeCommitmentsExternal().catch((err) => {
+        env.logger.log("storeCommitmentsExternal task....");
+        await tasks.datasetManager.storeCommitmentsExternal().catch((err) => {
             env.logger.error(err);
         });
     });

package/dist/api/captchaScheduler.js.map

@@ -1 +1 @@
-{"version":3,"file":"captchaScheduler.js","sourceRoot":"","sources":["../../src/api/captchaScheduler.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAG9B,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzC,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,IAAiB,EAAE,MAA2B;IACxF,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;IACnB,IAAI,GAAG,CAAC,EAAE,KAAK,SAAS,EAAE;QACtB,MAAM,IAAI,eAAe,CAAC,6BAA6B,CAAC,CAAA;KAC3D;IAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;IAG5B,MAAM,YAAY,GAAG,WAAW,CAAA;IAEhC,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAC7C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAA;QACnD,MAAM,KAAK,CAAC,wBAAwB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACjD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACzB,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,GAAG,CAAC,KAAK,EAAE,CAAA;AACf,CAAC"}
+{"version":3,"file":"captchaScheduler.js","sourceRoot":"","sources":["../../src/api/captchaScheduler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAenD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,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,gBAAgB;QAC1C,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ;YAChC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ;YAClC,CAAC,CAAC,eAAe;QACnB,CAAC,CAAC,eAAe,CAAC;IAEpB,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAC/C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;QACpD,MAAM,KAAK,CAAC,cAAc,CAAC,wBAAwB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YAClE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,KAAK,EAAE,CAAC;AACd,CAAC"}

package/dist/api/errorHandler.d.ts

@@ -1,5 +1,5 @@
-import { NextFunction, Request, Response } from 'express';
-import { ProsopoApiError } from '@prosopo/common';
-import { ZodError } from 'zod';
+import { type ProsopoApiError } from "@prosopo/common";
+import type { NextFunction, Request, Response } from "express";
+import type { ZodError } from "zod";
 export declare const handleErrors: (err: ProsopoApiError | SyntaxError | ZodError, request: Request, response: Response, next: NextFunction) => void;
 //# sourceMappingURL=errorHandler.d.ts.map

package/dist/api/errorHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errorHandler.d.ts","sourceRoot":"","sources":["../../src/api/errorHandler.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACzD,OAAO,EAAE,eAAe,EAAoB,MAAM,iBAAiB,CAAA;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAA;AAE9B,eAAO,MAAM,YAAY,QAChB,eAAe,GAAG,WAAW,GAAG,QAAQ,WACpC,OAAO,YACN,QAAQ,QACZ,YAAY,SAUrB,CAAA"}
+{"version":3,"file":"errorHandler.d.ts","sourceRoot":"","sources":["../../src/api/errorHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,iBAAiB,CAAC;AAezE,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAEpC,eAAO,MAAM,YAAY,QACnB,eAAe,GAAG,WAAW,GAAG,QAAQ,WACpC,OAAO,YACN,QAAQ,QACZ,YAAY,SAclB,CAAC"}

package/dist/api/errorHandler.js

@@ -1,10 +1,14 @@
-import { ProsopoBaseError } from '@prosopo/common';
+import { ProsopoBaseError } from "@prosopo/common";
 export const handleErrors = (err, request, response, next) => {
-    const code = 'code' in err ? err.code : 400;
+    const code = "code" in err ? err.code : 400;
     while (err instanceof ProsopoBaseError && err.context && err.context.error) {
         err = err.context.error;
     }
     const message = err.message;
-    response.writeHead(code, JSON.stringify(message), { 'content-type': 'application/json' }).end();
+    response
+        .writeHead(code, JSON.stringify(message), {
+        "content-type": "application/json",
+    })
+        .end();
 };
 //# sourceMappingURL=errorHandler.js.map

package/dist/api/errorHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../src/api/errorHandler.ts"],"names":[],"mappings":"AAeA,OAAO,EAAmB,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAGnE,MAAM,CAAC,MAAM,YAAY,GAAG,CACxB,GAA6C,EAC7C,OAAgB,EAChB,QAAkB,EAClB,IAAkB,EACpB,EAAE;IACA,MAAM,IAAI,GAAG,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAA;IAE3C,OAAO,GAAG,YAAY,gBAAgB,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE;QACxE,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAA;KAC1B;IACD,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAE3B,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC,CAAC,GAAG,EAAE,CAAA;AACnG,CAAC,CAAA"}
+{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../src/api/errorHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAkBzE,MAAM,CAAC,MAAM,YAAY,GAAG,CAC3B,GAA6C,EAC7C,OAAgB,EAChB,QAAkB,EAClB,IAAkB,EACjB,EAAE;IACH,MAAM,IAAI,GAAG,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;IAE5C,OAAO,GAAG,YAAY,gBAAgB,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE;QAC3E,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;KACxB;IACD,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;IAE5B,QAAQ;SACN,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;QACzC,cAAc,EAAE,kBAAkB;KAClC,CAAC;SACD,GAAG,EAAE,CAAC;AACT,CAAC,CAAC"}

package/dist/api/verify.d.ts

@@ -1,4 +1,4 @@
-import { ProviderEnvironment } from '@prosopo/types-env';
-import { Router } from 'express';
+import type { ProviderEnvironment } from "@prosopo/types-env";
+import { type Router } from "express";
 export declare function prosopoVerifyRouter(env: ProviderEnvironment): Router;
 //# sourceMappingURL=verify.d.ts.map

package/dist/api/verify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../src/api/verify.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAMxD,OAAgB,EAAmC,MAAM,EAAE,MAAM,SAAS,CAAA;AAQ1E,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CA6JpE"}
+{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../src/api/verify.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAgB,EAIf,KAAK,MAAM,EACX,MAAM,SAAS,CAAC;AAWjB,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CAqMpE"}

package/dist/api/verify.js

@@ -1,12 +1,10 @@
-import { ApiParams, ApiPaths, ServerPowCaptchaVerifyRequestBody, VerifySolutionBody, } from '@prosopo/types';
-import { CaptchaStatus } from '@prosopo/captcha-contract/types-returns';
-import { ProsopoApiError } from '@prosopo/common';
-import { Tasks } from '../tasks/tasks.js';
-import { decodeProcaptchaOutput } from '@prosopo/types';
-import { getBlockTimeMs, getCurrentBlockNumber } from '@prosopo/contract';
-import { handleErrors } from './errorHandler.js';
-import { verifySignature } from './authMiddleware.js';
-import express from 'express';
+import { ProsopoApiError } from "@prosopo/common";
+import { ApiParams, ApiPaths, CaptchaStatus, ServerPowCaptchaVerifyRequestBody, VerifySolutionBody, } from "@prosopo/types";
+import { decodeProcaptchaOutput } from "@prosopo/types";
+import express from "express";
+import { Tasks } from "../tasks/tasks.js";
+import { verifySignature } from "./authMiddleware.js";
+import { handleErrors } from "./errorHandler.js";
 export function prosopoVerifyRouter(env) {
     const router = express.Router();
     const tasks = new Tasks(env);
@@ -15,42 +13,44 @@ export function prosopoVerifyRouter(env) {
         try {
             const { dappUserSignature, token } = parsed;
             const { user, dapp, blockNumber, commitmentId } = decodeProcaptchaOutput(token);
-            const keyPair = isDapp ? env.keyring.addFromAddress(dapp) : env.keyring.addFromAddress(user);
+            const keyPair = isDapp
+                ? env.keyring.addFromAddress(dapp)
+                : env.keyring.addFromAddress(user);
             verifySignature(dappUserSignature, blockNumber.toString(), keyPair);
             const solution = await (commitmentId
-                ? tasks.getDappUserCommitmentById(commitmentId)
-                : tasks.getDappUserCommitmentByAccount(user));
+                ? tasks.imgCaptchaManager.getDappUserCommitmentById(commitmentId)
+                : tasks.imgCaptchaManager.getDappUserCommitmentByAccount(user));
             if (!solution) {
-                tasks.logger.debug('Not verified - no solution found');
+                tasks.logger.debug("Not verified - no solution found");
                 const noSolutionResponse = {
-                    [ApiParams.status]: req.t('API.USER_NOT_VERIFIED_NO_SOLUTION'),
+                    [ApiParams.status]: req.t("API.USER_NOT_VERIFIED_NO_SOLUTION"),
                     [ApiParams.verified]: false,
                 };
                 return res.json(noSolutionResponse);
             }
             if (solution.status === CaptchaStatus.disapproved) {
                 const disapprovedResponse = {
-                    [ApiParams.status]: req.t('API.USER_NOT_VERIFIED'),
+                    [ApiParams.status]: req.t("API.USER_NOT_VERIFIED"),
                     [ApiParams.verified]: false,
                 };
                 return res.json(disapprovedResponse);
             }
-            if (parsed.maxVerifiedTime) {
-                const currentBlockNumber = await getCurrentBlockNumber(tasks.contract.api);
-                const blockTimeMs = getBlockTimeMs(tasks.contract.api);
-                const timeSinceCompletion = (currentBlockNumber - solution.completedAt) * blockTimeMs;
+            const maxVerifiedTime = parsed.maxVerifiedTime || 60 * 1000;
+            if (maxVerifiedTime) {
+                const currentTime = Date.now();
+                const timeSinceCompletion = currentTime - solution.requestedAtTimestamp;
                 if (timeSinceCompletion > parsed.maxVerifiedTime) {
                     const expiredResponse = {
-                        [ApiParams.status]: req.t('API.USER_NOT_VERIFIED_TIME_EXPIRED'),
+                        [ApiParams.status]: req.t("API.USER_NOT_VERIFIED_TIME_EXPIRED"),
                         [ApiParams.verified]: false,
                     };
-                    tasks.logger.debug('Not verified - time run out');
+                    tasks.logger.debug("Not verified - time run out");
                     return res.json(expiredResponse);
                 }
             }
             const isApproved = solution.status === CaptchaStatus.approved;
             const response = {
-                [ApiParams.status]: req.t(isApproved ? 'API.USER_VERIFIED' : 'API.USER_NOT_VERIFIED'),
+                [ApiParams.status]: req.t(isApproved ? "API.USER_VERIFIED" : "API.USER_NOT_VERIFIED"),
                 [ApiParams.verified]: isApproved,
                 [ApiParams.commitmentId]: solution.id.toString(),
                 [ApiParams.blockNumber]: solution.requestedAt,
@@ -58,7 +58,9 @@ export function prosopoVerifyRouter(env) {
             return res.json(response);
         }
         catch (err) {
-            return next(new ProsopoApiError('API.BAD_REQUEST', { context: { code: 400, error: err } }));
+            return next(new ProsopoApiError("API.BAD_REQUEST", {
+                context: { code: 400, error: err },
+            }));
         }
     }
     router.post(ApiPaths.VerifyImageCaptchaSolutionDapp, async (req, res, next) => {
@@ -66,7 +68,9 @@ export function prosopoVerifyRouter(env) {
             await verifyImageSolution(res, req, next, true);
         }
         catch (err) {
-            return next(new ProsopoApiError('CAPTCHA.PARSE_ERROR', { context: { code: 400, error: err } }));
+            return next(new ProsopoApiError("CAPTCHA.PARSE_ERROR", {
+                context: { code: 400, error: err },
+            }));
         }
     });
     router.post(ApiPaths.VerifyImageCaptchaSolutionUser, async (req, res, next) => {
@@ -74,7 +78,9 @@ export function prosopoVerifyRouter(env) {
             await verifyImageSolution(res, req, next, false);
         }
         catch (err) {
-            return next(new ProsopoApiError('CAPTCHA.PARSE_ERROR', { context: { code: 400, error: err } }));
+            return next(new ProsopoApiError("CAPTCHA.PARSE_ERROR", {
+                context: { code: 400, error: err },
+            }));
         }
     });
     router.post(ApiPaths.VerifyPowCaptchaSolution, async (req, res, next) => {
@@ -83,23 +89,25 @@ export function prosopoVerifyRouter(env) {
             const { dapp, blockNumber, challenge } = decodeProcaptchaOutput(token);
             if (!challenge) {
                 const unverifiedResponse = {
-                    status: req.t('API.USER_NOT_VERIFIED'),
+                    status: req.t("API.USER_NOT_VERIFIED"),
                     [ApiParams.verified]: false,
                 };
                 return res.json(unverifiedResponse);
             }
             const dappPair = env.keyring.addFromAddress(dapp);
             verifySignature(dappSignature, blockNumber.toString(), dappPair);
-            const approved = await tasks.serverVerifyPowCaptchaSolution(dapp, challenge, verifiedTimeout);
+            const approved = await tasks.powCaptchaManager.serverVerifyPowCaptchaSolution(dapp, challenge, verifiedTimeout);
             const verificationResponse = {
-                status: req.t(approved ? 'API.USER_VERIFIED' : 'API.USER_NOT_VERIFIED'),
+                status: req.t(approved ? "API.USER_VERIFIED" : "API.USER_NOT_VERIFIED"),
                 [ApiParams.verified]: approved,
             };
             return res.json(verificationResponse);
         }
         catch (err) {
             tasks.logger.error(err);
-            return next(new ProsopoApiError('API.BAD_REQUEST', { context: { code: 400, error: err } }));
+            return next(new ProsopoApiError("API.BAD_REQUEST", {
+                context: { code: 400, error: err },
+            }));
         }
     });
     router.use(handleErrors);

package/dist/api/verify.js.map

@@ -1 +1 @@
-{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../src/api/verify.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../src/api/verify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAclD,OAAO,EACN,SAAS,EACT,QAAQ,EACR,aAAa,EAEb,iCAAiC,EAEjC,kBAAkB,GAClB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAExD,OAAO,OAKN,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAQjD,MAAM,UAAU,mBAAmB,CAAC,GAAwB;IAC3D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAChC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;IAS7B,KAAK,UAAU,mBAAmB,CACjC,GAAa,EACb,GAAY,EACZ,IAAkB,EAClB,MAAe;QAEf,MAAM,MAAM,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI;YACH,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;YAC5C,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,GAC9C,sBAAsB,CAAC,KAAK,CAAC,CAAC;YAG/B,MAAM,OAAO,GAAG,MAAM;gBACrB,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC;gBAClC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAGpC,eAAe,CAAC,iBAAiB,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;YAEpE,MAAM,QAAQ,GAAG,MAAM,CAAC,YAAY;gBACnC,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,YAAY,CAAC;gBACjE,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC;YAGjE,IAAI,CAAC,QAAQ,EAAE;gBACd,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;gBACvD,MAAM,kBAAkB,GAAyB;oBAChD,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,mCAAmC,CAAC;oBAC9D,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK;iBAC3B,CAAC;gBACF,OAAO,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;aACpC;YAGD,IAAI,QAAQ,CAAC,MAAM,KAAK,aAAa,CAAC,WAAW,EAAE;gBAClD,MAAM,mBAAmB,GAAyB;oBACjD,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,uBAAuB,CAAC;oBAClD,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK;iBAC3B,CAAC;gBACF,OAAO,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;aACrC;YAED,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,EAAE,GAAG,IAAI,CAAC;YAG5D,IAAI,eAAe,EAAE;gBACpB,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC/B,MAAM,mBAAmB,GAAG,WAAW,GAAG,QAAQ,CAAC,oBAAoB,CAAC;gBAGxE,IAAI,mBAAmB,GAAG,MAAM,CAAC,eAAe,EAAE;oBACjD,MAAM,eAAe,GAAyB;wBAC7C,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,oCAAoC,CAAC;wBAC/D,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK;qBAC3B,CAAC;oBACF,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;oBAClD,OAAO,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;iBACjC;aACD;YAED,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,KAAK,aAAa,CAAC,QAAQ,CAAC;YAC9D,MAAM,QAAQ,GAA8B;gBAC3C,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC,CACxB,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,uBAAuB,CAC1D;gBACD,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,UAAU;gBAChC,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE;gBAChD,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,WAAW;aAC7C,CAAC;YACF,OAAO,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC1B;QAAC,OAAO,GAAG,EAAE;YACb,OAAO,IAAI,CACV,IAAI,eAAe,CAAC,iBAAiB,EAAE;gBACtC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE;aAClC,CAAC,CACF,CAAC;SACF;IACF,CAAC;IAYD,MAAM,CAAC,IAAI,CACV,QAAQ,CAAC,8BAA8B,EACvC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACxB,IAAI;YACH,MAAM,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;SAChD;QAAC,OAAO,GAAG,EAAE;YACb,OAAO,IAAI,CACV,IAAI,eAAe,CAAC,qBAAqB,EAAE;gBAC1C,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE;aAClC,CAAC,CACF,CAAC;SACF;IACF,CAAC,CACD,CAAC;IAYF,MAAM,CAAC,IAAI,CACV,QAAQ,CAAC,8BAA8B,EACvC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACxB,IAAI;YACH,MAAM,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;SACjD;QAAC,OAAO,GAAG,EAAE;YACb,OAAO,IAAI,CACV,IAAI,eAAe,CAAC,qBAAqB,EAAE;gBAC1C,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE;aAClC,CAAC,CACF,CAAC;SACF;IACF,CAAC,CACD,CAAC;IASF,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACvE,IAAI;YACH,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,GAC9C,iCAAiC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACnD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;YAEvE,IAAI,CAAC,SAAS,EAAE;gBACf,MAAM,kBAAkB,GAAyB;oBAChD,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,uBAAuB,CAAC;oBACtC,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK;iBAC3B,CAAC;gBACF,OAAO,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;aACpC;YAGD,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAGlD,eAAe,CAAC,aAAa,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;YAEjE,MAAM,QAAQ,GACb,MAAM,KAAK,CAAC,iBAAiB,CAAC,8BAA8B,CAC3D,IAAI,EACJ,SAAS,EACT,eAAe,CACf,CAAC;YAEH,MAAM,oBAAoB,GAAyB;gBAClD,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,uBAAuB,CAAC;gBACvE,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,QAAQ;aAC9B,CAAC;YAEF,OAAO,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;SACtC;QAAC,OAAO,GAAG,EAAE;YACb,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACxB,OAAO,IAAI,CACV,IAAI,eAAe,CAAC,iBAAiB,EAAE;gBACtC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE;aAClC,CAAC,CACF,CAAC;SACF;IACF,CAAC,CAAC,CAAC;IAKH,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAEzB,OAAO,MAAM,CAAC;AACf,CAAC"}