@prosopo/provider 1.0.1 → 2.0.0

package/README.md

@@ -1,259 +1 @@
 # Prosopo Provider
-
-> NOTE: For a development environment, the easiest way to deploy the Prosopo contract and run the Provider node is via the [integration repository](https://github.com/prosopo/integration/). The following instructions explain how to set up the repositories manually.
-
-## Prerequisites
-
--   nodejs
--   npm
--   A connection to a substrate node
--   A deployed Prosopo Protocol contract
-
-### Development Environment
-
-#### Setup a contract node
-
-If you are setting up a development environment, run a development node. For example, the [Substrate Contracts Node](https://github.com/paritytech/substrate-contracts-node/#installation)
-
-#### Deploy the Prosopo Protocol contract
-
-See [protocol instructions](https://github.com/prosopo/protocol/#prosopo-protocol)
-
-#### Live environment
-
-If you are running in a test or live environment, use a node endpoint of your choice. Make sure you know the contract account of the Prosopo Protocol contract.
-
-## Running a Prosopo Provider Node
-
-The following instructions apply to the `provider` repo.
-
-### Install packages
-
-```bash
-npm install
-```
-
-### Populate the Prosopo Provider Config
-
-Place the required variables in the `prosopo.config.ts` file in the root of the `provider` repo.
-
-| Param                                    | Description                                                                    |
-| ---------------------------------------- | ------------------------------------------------------------------------------ |
-| PROTOCOL_CONTRACT_JSON_ABI_PATH          | The path to the protocol JSON file                                             |
-| SUBSTATE_NODE_ENDPOINT                   | The substrate node endpoint, e.g. ws://localhost:9944                          |
-| PROTOCOL_CONTRACT_ADDRESS                | The protocol contract address                                                  |
-| CAPTCHA_SOLVED_COUNT                     | The number of solved captchas to send to the captcha frontend client           |
-| CAPTCHA_UNSOLVED_COUNT                   | The number of unsolved captchas to send to the captcha frontend client         |
-| CAPTCHA_SOLUTION_REQUIRED_SOLUTION_COUNT | The number of captchas required to calculate a solution to an unsolved captcha |
-| CAPTCHA_SOLUTION_WINNING_PERCENTAGE      | The threshold percentage that determines whether a solution is found           |
-| CAPTCHA_FILE_PATH                        | The path to the captcha dataset                                                |
-| MONGO_USERNAME                           | MongoDB username                                                               |
-| MONGO_PASSWORD                           | MongoDB password                                                               |
-| MONGO_HOST                               | MongoDB host                                                                   |
-| MONGO_PORT                               | MongoDB port                                                                   |
-| DATABASE_NAME                            | Database name                                                                  |
-| API_BASE_URL                             | Base URL for API, e.g. http://localhost:9229                                   |
-
-#### Config
-
-```typescript
-const config = {
-    contract: {
-        abi: '<PROTOCOL_CONTRACT_JSON_ABI_PATH>',
-    },
-    networks: {
-        development: {
-            endpoint: '<SUBSTATE_NODE_ENDPOINT>', // e.g. ws://127.0.0.1:9944
-            contract: {
-                address: '<PROTOCOL_CONTRACT_ADDRESS>',
-                name: 'prosopo',
-            },
-        },
-    },
-    captchas: {
-        solved: {
-            count: '<CAPTCHA_SOLVED_COUNT>',
-        },
-        unsolved: {
-            count: '<CAPTCHA_UNSOLVED_COUNT>',
-        },
-    },
-    captchaSolutions: {
-        requiredNumberOfSolutions: '<CAPTCHA_SOLUTION_REQUIRED_SOLUTION_COUNT>',
-        solutionWinningPercentage: '<CAPTCHA_SOLUTION_WINNING_PERCENTAGE>',
-        captchaFilePath: '<CAPTCHA_FILE_PATH>',
-    },
-    database: {
-        development: {
-            storageType: 'mongo',
-            endpoint: `mongodb://<MONGO_USERNAME>:<MONGO_PASSWORD>@<MONGO_HOST>:<MONGO_PORT>`,
-            dbname: '<DATABASE_NAME>',
-        },
-    },
-    assets: {
-        absolutePath: '',
-        basePath: '',
-    },
-    server: {
-        baseURL: '<API_BASE_URL>',
-    },
-}
-```
-
-## Run the Provider server
-
-### Set a provider mnemonic in prosopo.config.js
-
-> Please note your `PROVIDER_MNEMONIC` environment variable must be set. You can check this with `echo $PROVIDER_MNEMONIC`
-
-In a **development environment**, it's easiest to use a development mnemonic as they already have funds. So choose one of //Alice, //Bob, //Ferdie, etc.
-
-```bash
-    export PROVIDER_MNEMONIC=//Ferdie
-```
-
-You can now register as a Provider in the protocol contract either via the command line.
-
-### Register using the Command Line
-
-Try registering a provider on the command line.
-
-```bash
-npm run cli provider_register -- \
---fee 10 \
---origin https://localhost:9229 \
---payee Provider \
---address YOUR_PROVIDER_ADDRESS
-```
-
-Send a stake (`value`) and/or update one of the values previously set when registering (`fee`, `origin`. `payee`).
-
-```bash
-npm run cli provider_update -- \
---fee 10 \
---origin https://localhost:9229 \
---payee Provider \
---address YOUR_PROVIDER_ADDRESS \
---value 10
-```
-
-Verify that your provider was registered by calling the `/v1/prosopo/providers/` endpoint or by checking in Polkadot Apps local node.
-
-### Curl
-
-```
-curl --location --request GET '127.0.0.1:3000/v1/prosopo/providers/'
-{"accounts":["YOUR PROVIDER ADDRESS"]}
-```
-
-### Polkadot Apps
-
-Using [Polkadot apps](https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A9944#/contracts)
-
-1. Click Add an existing contract
-2. Enter the contract address and click to select the `prosopo.json` file in the artifacts folder as the `contract ABI`
-3. Expand the contract to see the current value of `getProviders`. It should be `["YOUR PROVIDER ADDRESS"]`.
-
-## Command Line Interface
-
-> Please note your `PROVIDER_MNEMONIC` environment variable must be set. You can check this with `echo $PROVIDER_MNEMONIC`
-
-### Register a provider
-
-```bash
-npm run cli -- provider_register --fee=10 --origin=https://localhost:9229 --payee=Provider --address ADDRESS
-```
-
-| Param   | Description                                                                |
-| ------- | -------------------------------------------------------------------------- |
-| fee     | The amount the Provider charges or pays per captcha approval / disapproval |
-| origin  | The location of the Provider's service                                     |
-| payee   | Who is paid on successful captcha completion (`Provider` or `Dapp`)        |
-| address | Address of the Provider                                                    |
-
-### Update a provider and optionally stake
-
-```bash
-npm run cli -- provider_update --fee=10 --origin=https://localhost:9229 --payee=Provider --address ADDRESS --value STAKE_VALUE
-```
-
-Params are the same as `provider_register` with the addition of `value`
-
-| Param | Description                                  |
-| ----- | -------------------------------------------- |
-| value | The amount of funds to stake in the contract |
-
-### Add a dataset for a Provider
-
-```bash
-npm run cli -- provider_add_data_set --file /usr/src/data/captchas.json
-```
-
-| Param | Description                   |
-| ----- | ----------------------------- |
-| file  | JSON file containing captchas |
-
-File format can be viewed [here](https://github.com/prosopo/provider/blob/master/tests/mocks/data/captchas.json).
-
-### De-register a Provider
-
-```bash
-npm run cli -- provider_deregister --address ADDRESS
-```
-
-| Param   | Description             |
-| ------- | ----------------------- |
-| address | Address of the Provider |
-
-### Unstake funds
-
-```bash
-npm run cli -- provider_unstake --value VALUE
-```
-
-| Param | Description                                      |
-| ----- | ------------------------------------------------ |
-| value | The amount of funds to unstake from the contract |
-
-### List Provider accounts in contract
-
-```bash
-npm run cli -- provider_accounts
-```
-
-### Other commands
-
-A full list of CLI commands can be viewed by running
-
-```bash
-npm run cli -- --help
-```
-
-## API
-
-Run the Provider API server and image server
-
-```bash
-npm run start
-```
-
-The API contains methods required by the frontend captcha interface.
-
-| API Resource                                                                             | Function                                   | Type | Parameters                                                         |
-| ---------------------------------------------------------------------------------------- | ------------------------------------------ | ---- | ------------------------------------------------------------------ |
-| `/v1/prosopo/random_provider/:userAccount/:dappContractAccount`                          | Get a random provider based on AccountId   | GET  | userAccount, dappContractAccount                                   |
-| `/v1/prosopo/providers/`                                                                 | Get list of all provider IDs               | GET  |                                                                    |
-| `/v1/prosopo/dapps/`                                                                     | Get list of all dapp IDs                   | GET  |                                                                    |
-| `/v1/prosopo/provider/:providerAccount`                                                  | Get details of a specific Provider account | GET  | providerAccount                                                    |
-| `/v1/prosopo/provider/captcha/:datasetId/:userAccount/:dappContractAccount/:blockNumber` | Get captchas to solve                      | GET  | datasetId, userAccount, dappContractAccount, blockNumber           |
-| `/v1/prosopo/provider/solution`                                                          | Submit captcha solutions                   | POST | userAccount, dappAccount, requestHash, captchas, blockHash, txHash |
-
-## Tests
-
-You can run the Provider integration tests using the command `npm run test`. This will start a substrate container containing a predeployed [prosopo protocol contract](https://github.com/prosopo/protocol/#prosopo-protocol) and [dapp-example contract](https://github.com/prosopo/dapp-example#dapp-example). An in-memory mongo database will be used.
-
-To run the tests with coverage stats use:
-
-```bash
-npx c8 npm run test
-```

package/dist/api/admin.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../src/api/admin.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAUhC,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CA4FnE"}
+{"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../src/api/admin.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAUjC,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CAoBnE"}

package/dist/api/admin.js

@@ -1,11 +1,7 @@
-import * as z from 'zod';
-import { AdminApiPaths } from '@prosopo/types';
-import { BatchCommitmentsTask, Tasks } from '../index.js';
-import { Payee } from '@prosopo/captcha-contract/types-returns';
-import { ProsopoEnvError, UrlConverter } from '@prosopo/common';
-import { Router } from 'express';
-import { authMiddleware } from './authMiddleware.js';
-import { wrapQuery } from '@prosopo/contract';
+import { AdminApiPaths } from "@prosopo/types";
+import { Router } from "express";
+import { Tasks } from "../index.js";
+import { authMiddleware } from "./authMiddleware.js";
 const apiBatchCommitConfig = {
     interval: 0,
     maxBatchExtrinsicPercentage: 59,
@@ -14,27 +10,9 @@ export function prosopoAdminRouter(env) {
     const router = Router();
     const tasks = new Tasks(env);
     router.use(authMiddleware(tasks, env));
-    router.post(AdminApiPaths.BatchCommit, async (req, res, next) => {
-        if (env.db) {
-            try {
-                const batchCommitter = new BatchCommitmentsTask(apiBatchCommitConfig, env.getContractInterface(), env.db, 0n, env.logger);
-                const result = await batchCommitter.run();
-                console.info(`Batch commit complete: ${result}`);
-                res.status(200).send(result);
-            }
-            catch (err) {
-                console.error(err);
-                res.status(500).send(err);
-            }
-        }
-        else {
-            console.error('No database configured');
-            res.status(500).send('No database configured');
-        }
-    });
     router.post(AdminApiPaths.UpdateDataset, async (req, res, next) => {
         try {
-            const result = await tasks.providerSetDataset(req.body);
+            const result = await tasks.datasetManager.providerSetDataset(req.body);
             console.info(`Dataset update complete: ${result}`);
             res.status(200).send(result);
         }
@@ -43,43 +21,6 @@ export function prosopoAdminRouter(env) {
             res.status(500).send(err);
         }
     });
-    router.post(AdminApiPaths.ProviderDeregister, async (req, res, next) => {
-        try {
-            const address = env.pair?.address;
-            if (!address) {
-                throw new ProsopoEnvError('DEVELOPER.MISSING_ENV_VARIABLE', { context: { error: 'No address' } });
-            }
-            await tasks.contract.tx.providerDeregister();
-        }
-        catch (err) {
-            console.error(err);
-            res.status(500).send(err);
-        }
-    });
-    router.post(AdminApiPaths.ProviderUpdate, async (req, res, next) => {
-        try {
-            const { url, fee, payee, value, address } = z
-                .object({
-                url: z.string(),
-                fee: z.number().optional(),
-                payee: z.nativeEnum(Payee).optional(),
-                value: z.number().optional(),
-                address: z.string(),
-            })
-                .parse(req.body);
-            const provider = (await tasks.contract.query.getProvider(address, {})).value.unwrap().unwrap();
-            if (provider && (url || fee || payee || value)) {
-                const urlConverted = url ? Array.from(new UrlConverter().encode(url.toString())) : provider.url;
-                await wrapQuery(tasks.contract.query.providerUpdate, tasks.contract.query)(urlConverted, fee || provider.fee, payee || provider.payee, { value: value || 0 });
-                const result = await tasks.contract.tx.providerUpdate(urlConverted, fee || provider.fee, payee || provider.payee, { value: value || 0 });
-                console.info(JSON.stringify(result, null, 2));
-            }
-        }
-        catch (err) {
-            console.error(err);
-            res.status(500).send(err);
-        }
-    });
     return router;
 }
 //# sourceMappingURL=admin.js.map

package/dist/api/admin.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/api/admin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/api/admin.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGrD,MAAM,oBAAoB,GAAG;IAC5B,QAAQ,EAAE,CAAC;IACX,2BAA2B,EAAE,EAAE;CAC/B,CAAC;AAEF,MAAM,UAAU,kBAAkB,CAAC,GAAwB;IAC1D,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;IAG7B,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAEvC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACjE,IAAI;YACH,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAEvE,OAAO,CAAC,IAAI,CAAC,4BAA4B,MAAM,EAAE,CAAC,CAAC;YACnD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC7B;QAAC,OAAO,GAAG,EAAE;YACb,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC1B;IACF,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AACf,CAAC"}

package/dist/api/authMiddleware.d.ts

@@ -1,7 +1,7 @@
-import { KeyringPair } from '@polkadot/keyring/types';
-import { NextFunction, Request, Response } from 'express';
-import { ProviderEnvironment } from '@prosopo/types-env';
-import { Tasks } from '../index.js';
+import type { KeyringPair } from "@polkadot/keyring/types";
+import type { ProviderEnvironment } from "@prosopo/types-env";
+import type { NextFunction, Request, Response } from "express";
+import type { Tasks } from "../index.js";
 export declare const authMiddleware: (tasks: Tasks, env: ProviderEnvironment) => (req: Request, res: Response, next: NextFunction) => Promise<void>;
 export declare const verifySignature: (signature: string, blockNumber: string, pair: KeyringPair) => void;
 //# sourceMappingURL=authMiddleware.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"authMiddleware.d.ts","sourceRoot":"","sources":["../../src/api/authMiddleware.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAEzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAInC,eAAO,MAAM,cAAc,UAAW,KAAK,OAAO,mBAAmB,WAC9C,OAAO,OAAO,QAAQ,QAAQ,YAAY,kBAkBhE,CAAA;AA6CD,eAAO,MAAM,eAAe,cAAe,MAAM,eAAe,MAAM,QAAQ,WAAW,SAQxF,CAAA"}
+{"version":3,"file":"authMiddleware.d.ts","sourceRoot":"","sources":["../../src/api/authMiddleware.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,eAAO,MAAM,cAAc,UAAW,KAAK,OAAO,mBAAmB,WACjD,OAAO,OAAO,QAAQ,QAAQ,YAAY,kBAiB7D,CAAC;AA+BF,eAAO,MAAM,eAAe,cAChB,MAAM,eACJ,MAAM,QACb,WAAW,SASjB,CAAC"}

package/dist/api/authMiddleware.js

@@ -1,21 +1,19 @@
-import { ProsopoApiError, ProsopoEnvError } from '@prosopo/common';
-import { getCurrentBlockNumber } from '@prosopo/contract';
-import { hexToU8a, isHex } from '@polkadot/util';
+import { hexToU8a, isHex } from "@polkadot/util";
+import { ProsopoApiError, ProsopoEnvError } from "@prosopo/common";
 export const authMiddleware = (tasks, env) => {
     return async (req, res, next) => {
         try {
             const { signature, blocknumber } = extractHeaders(req);
             if (!env.pair) {
-                throw new ProsopoEnvError('CONTRACT.CANNOT_FIND_KEYPAIR');
+                throw new ProsopoEnvError("CONTRACT.CANNOT_FIND_KEYPAIR");
             }
             verifyEnvironmentKeyPair(env);
-            await verifyBlockNumber(blocknumber, tasks);
             verifySignature(signature, blocknumber, env.pair);
             next();
         }
         catch (err) {
-            console.error('Auth Middleware Error:', err);
-            res.status(401).json({ error: 'Unauthorized', message: err });
+            console.error("Auth Middleware Error:", err);
+            res.status(401).json({ error: "Unauthorized", message: err });
         }
     };
 };
@@ -23,41 +21,29 @@ const extractHeaders = (req) => {
     const signature = req.headers.signature;
     const blocknumber = req.headers.blocknumber;
     if (!signature || !blocknumber) {
-        throw new ProsopoApiError('CONTRACT.INVALID_DATA_FORMAT', {
-            context: { error: 'Missing signature or block number', code: 400 },
+        throw new ProsopoApiError("CONTRACT.INVALID_DATA_FORMAT", {
+            context: { error: "Missing signature or block number", code: 400 },
         });
     }
-    if (Array.isArray(signature) || Array.isArray(blocknumber) || !isHex(signature)) {
-        throw new ProsopoApiError('CONTRACT.INVALID_DATA_FORMAT', {
-            context: { error: 'Invalid header format', code: 400 },
+    if (Array.isArray(signature) ||
+        Array.isArray(blocknumber) ||
+        !isHex(signature)) {
+        throw new ProsopoApiError("CONTRACT.INVALID_DATA_FORMAT", {
+            context: { error: "Invalid header format", code: 400 },
         });
     }
     return { signature, blocknumber };
 };
 const verifyEnvironmentKeyPair = (env) => {
     if (!env.pair) {
-        throw new ProsopoEnvError('CONTRACT.CANNOT_FIND_KEYPAIR');
-    }
-};
-const verifyBlockNumber = async (blockNumber, tasks) => {
-    const parsedBlockNumber = parseInt(blockNumber);
-    const currentBlockNumber = await getCurrentBlockNumber(tasks.contract.api);
-    if (isNaN(parsedBlockNumber) ||
-        parsedBlockNumber < currentBlockNumber - 500 ||
-        parsedBlockNumber > currentBlockNumber) {
-        throw new ProsopoApiError('API.BAD_REQUEST', {
-            context: {
-                error: `Invalid block number ${parsedBlockNumber}, current block number is ${currentBlockNumber}`,
-                code: 400,
-            },
-        });
+        throw new ProsopoEnvError("CONTRACT.CANNOT_FIND_KEYPAIR");
     }
 };
 export const verifySignature = (signature, blockNumber, pair) => {
     const u8Sig = hexToU8a(signature);
     if (!pair.verify(blockNumber, u8Sig, pair.publicKey)) {
-        throw new ProsopoApiError('GENERAL.INVALID_SIGNATURE', {
-            context: { error: 'Signature verification failed', code: 401 },
+        throw new ProsopoApiError("GENERAL.INVALID_SIGNATURE", {
+            context: { error: "Signature verification failed", code: 401 },
         });
     }
 };

package/dist/api/authMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"authMiddleware.js","sourceRoot":"","sources":["../../src/api/authMiddleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"authMiddleware.js","sourceRoot":"","sources":["../../src/api/authMiddleware.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAKnE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAY,EAAE,GAAwB,EAAE,EAAE;IACxE,OAAO,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAChE,IAAI;YACH,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;YAEvD,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;gBACd,MAAM,IAAI,eAAe,CAAC,8BAA8B,CAAC,CAAC;aAC1D;YAED,wBAAwB,CAAC,GAAG,CAAC,CAAC;YAC9B,eAAe,CAAC,SAAS,EAAE,WAAW,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YAElD,IAAI,EAAE,CAAC;SACP;QAAC,OAAO,GAAG,EAAE;YACb,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;YAC7C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;SAC9D;IACF,CAAC,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,GAAY,EAAE,EAAE;IACvC,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,SAAmB,CAAC;IAClD,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,WAAqB,CAAC;IAEtD,IAAI,CAAC,SAAS,IAAI,CAAC,WAAW,EAAE;QAC/B,MAAM,IAAI,eAAe,CAAC,8BAA8B,EAAE;YACzD,OAAO,EAAE,EAAE,KAAK,EAAE,mCAAmC,EAAE,IAAI,EAAE,GAAG,EAAE;SAClE,CAAC,CAAC;KACH;IAED,IACC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;QACxB,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;QAC1B,CAAC,KAAK,CAAC,SAAS,CAAC,EAChB;QACD,MAAM,IAAI,eAAe,CAAC,8BAA8B,EAAE;YACzD,OAAO,EAAE,EAAE,KAAK,EAAE,uBAAuB,EAAE,IAAI,EAAE,GAAG,EAAE;SACtD,CAAC,CAAC;KACH;IAED,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,GAAwB,EAAE,EAAE;IAC7D,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;QACd,MAAM,IAAI,eAAe,CAAC,8BAA8B,CAAC,CAAC;KAC1D;AACF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAC9B,SAAiB,EACjB,WAAmB,EACnB,IAAiB,EAChB,EAAE;IACH,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;IAElC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE;QACrD,MAAM,IAAI,eAAe,CAAC,2BAA2B,EAAE;YACtD,OAAO,EAAE,EAAE,KAAK,EAAE,+BAA+B,EAAE,IAAI,EAAE,GAAG,EAAE;SAC9D,CAAC,CAAC;KACH;AACF,CAAC,CAAC"}

package/dist/api/captcha.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 prosopoRouter(env: ProviderEnvironment): Router;
 //# sourceMappingURL=captcha.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"AA4BA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAOxD,OAAgB,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAQzC,wBAAgB,aAAa,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CA0L9D"}
+{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/api/captcha.ts"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAgB,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAU/C,wBAAgB,aAAa,CAAC,GAAG,EAAE,mBAAmB,GAAG,MAAM,CA+N9D"}