@prosopo/procaptcha 0.2.7 → 0.2.8

package/dist/cjs/modules/Manager.cjs

@@ -2,15 +2,16 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const errors = require("../api/errors.cjs");
 const api$1 = require("@polkadot/api");
+const types = require("@prosopo/types");
 const api = require("@prosopo/api");
 const contract = require("@prosopo/contract");
+const common = require("@prosopo/common");
 require("../contracts/captcha/dist/index.cjs");
 const rpcProvider = require("@polkadot/rpc-provider");
 const util$1 = require("@prosopo/util");
 const utilCrypto = require("@polkadot/util-crypto");
 const utils = require("../utils/utils.cjs");
 const util = require("@polkadot/util");
-const common = require("@prosopo/common");
 const ExtensionWeb2 = require("../api/ExtensionWeb2.cjs");
 const ExtensionWeb3 = require("../api/ExtensionWeb3.cjs");
 const ProsopoCaptchaApi = require("./ProsopoCaptchaApi.cjs");
@@ -39,7 +40,7 @@ const buildUpdateState = (state, onStateUpdate) => {
   return updateCurrentState;
 };
 const getNetwork = (config) => {
-  const network = config.networks[config.defaultEnvironment];
+  const network = config.networks[config.defaultNetwork];
   if (!network) {
     throw new Error(`No network found for environment ${config.defaultEnvironment}`);
   }
@@ -60,11 +61,20 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
       onExtensionNotFound: () => {
         alert("No extension found");
       },
-      onExpired: () => {
-        alert("Challenge has expired, please try again");
-      },
       onFailed: () => {
         alert("Captcha challenge failed. Please try again");
+      },
+      onExpired: () => {
+        alert("Completed challenge has expired, please try again");
+      },
+      onChallengeExpired: () => {
+        alert("Uncompleted challenge has expired, please try again");
+      },
+      onOpen: () => {
+        console.log("onOpen event triggered");
+      },
+      onClose: () => {
+        console.log("onClose event triggered");
       }
     },
     callbacks
@@ -86,7 +96,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
     if (state.account) {
       config.userAccountAddress = state.account.account.address;
     }
-    return config;
+    return types.ProcaptchaConfigSchema.parse(config);
   };
   const fallable = async (fn) => {
     try {
@@ -99,6 +109,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
   };
   const start = async () => {
     console.log("Starting procaptcha");
+    events.onOpen();
     await fallable(async () => {
       if (state.loading) {
         console.log("Procaptcha already loading");
@@ -125,8 +136,9 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
         updateState({ isHuman: true, loading: false });
         events.onHuman({
           user: account.account.address,
-          dapp: config.account.address
+          dapp: getDappAccount()
         });
+        setValidChallengeTimeout();
         return;
       }
       const providerUrlFromStorage = storage.getProviderUrl();
@@ -140,9 +152,10 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
             events.onHuman({
               providerUrl: providerUrlFromStorage,
               user: account.account.address,
-              dapp: config.account.address,
+              dapp: getDappAccount(),
               commitmentId: verifyDappUserResponse.commitmentId
             });
+            setValidChallengeTimeout();
             return;
           }
         } catch (err) {
@@ -159,7 +172,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
       const getRandomProviderResponse = await contract.wrapQuery(
         contract$1.query.getRandomActiveProvider,
         contract$1.query
-      )(account.account.address, config.account.address);
+      )(account.account.address, getDappAccount());
       const blockNumber = parseInt(getRandomProviderResponse.blockNumber.toString());
       console.log("provider", getRandomProviderResponse);
       const providerUrl = common.trimProviderUrl(getRandomProviderResponse.provider.url.toString());
@@ -175,7 +188,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
       const timeMillis = challenge.captchas.map((captcha2) => captcha2.captcha.timeLimitMs || 30 * 1e3).reduce((a, b) => a + b);
       const timeout = setTimeout(() => {
         console.log("challenge expired after " + timeMillis + "ms");
-        events.onExpired();
+        events.onChallengeExpired();
         updateState({ isHuman: false, showModal: false, loading: false });
       }, timeMillis);
       updateState({
@@ -241,6 +254,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
           commitmentId: submission[1],
           blockNumber
         });
+        setValidChallengeTimeout();
       }
     });
   };
@@ -248,6 +262,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
     console.log("cancel");
     clearTimeout();
     resetState();
+    events.onClose();
   };
   const select = (hash) => {
     if (!state.challenge) {
@@ -286,7 +301,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
       provider,
       providerApi,
       config.web2,
-      config.account.address
+      getDappAccount()
     );
     updateState({ captchaApi });
     return getCaptchaApi();
@@ -294,12 +309,25 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
   const loadProviderApi = async (providerUrl) => {
     const config = getConfig();
     const network = getNetwork(config);
+    if (!config.account.address) {
+      throw new common.ProsopoEnvError("GENERAL.SITE_KEY_MISSING");
+    }
     return new api.ProviderApi(network, providerUrl, config.account.address);
   };
   const clearTimeout = () => {
     window.clearTimeout(state.timeout);
     updateState({ timeout: void 0 });
   };
+  const setValidChallengeTimeout = () => {
+    console.log("setting valid challenge timeout");
+    const timeMillis = configOptional.challengeValidLength || 120 * 1e3;
+    const successfullChallengeTimeout = setTimeout(() => {
+      console.log("valid challenge expired after " + timeMillis + "ms");
+      updateState({ isHuman: false });
+      events.onExpired();
+    }, timeMillis);
+    updateState({ successfullChallengeTimeout });
+  };
   const resetState = () => {
     clearTimeout();
     updateState(defaultState());
@@ -331,7 +359,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
   };
   const getDappAccount = () => {
     if (!state.dappAccount) {
-      throw new Error("Dapp account not loaded");
+      throw new common.ProsopoEnvError("GENERAL.SITE_KEY_MISSING");
     }
     const dappAccount = state.dappAccount;
     return dappAccount;
@@ -353,9 +381,9 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
       api2,
       JSON.parse(captcha.ContractAbi),
       network.contract.address,
-      keyring.addFromAddress(getAccount().account.address),
       "prosopo",
-      0
+      0,
+      keyring.addFromAddress(getAccount().account.address)
     );
   };
   return {

package/dist/cjs/packages/datasets/dist/captcha/captcha.cjs

@@ -4,18 +4,17 @@ const types = require("@prosopo/types");
 const common = require("@prosopo/common");
 const util = require("@prosopo/util");
 const util$1 = require("./util.cjs");
-const util$2 = require("@polkadot/util");
 const NO_SOLUTION_VALUE = "NO_SOLUTION";
 function parseCaptchaDataset(datasetJSON) {
   try {
-    const result = types.DatasetSchema.parse(datasetJSON);
+    const result = types.DatasetWithNumericSolutionSchema.parse(datasetJSON);
     const result2 = {
       format: result.format,
       captchas: result.captchas.map((captcha) => {
         return {
           ...captcha,
-          solution: captcha.solution || [],
-          unlabelled: captcha.unlabelled || []
+          solution: captcha.solution ? matchItemsToSolutions(captcha.solution, captcha.items) : [],
+          unlabelled: captcha.unlabelled ? matchItemsToSolutions(captcha.unlabelled, captcha.items) : []
         };
       })
     };
@@ -105,18 +104,20 @@ async function computeItemHash(item) {
   }
 }
 function matchItemsToSolutions(solutions, items) {
-  return (solutions == null ? void 0 : solutions.map((solution) => {
-    var _a;
-    const index = parseInt(solution.toString());
-    const hash = items && items[index] && (((_a = items[index]) == null ? void 0 : _a.hash) || solution);
-    if (!hash) {
-      throw new common.ProsopoEnvError("CAPTCHA.MISSING_ITEM_HASH");
-    }
-    if (!util$2.isHex(hash)) {
-      throw new common.ProsopoEnvError("CAPTCHA.INVALID_ITEM_HASH");
+  if (!items) {
+    return [];
+  }
+  return solutions.map((solution) => {
+    if (typeof solution === "string") {
+      if (!(items == null ? void 0 : items.some((item2) => item2.hash === solution))) {
+        throw new common.ProsopoEnvError("CAPTCHA.INVALID_ITEM_HASH");
+      }
+      return solution;
     }
+    const item = util.at(items, solution);
+    const hash = item.hash;
     return hash;
-  })) || [];
+  });
 }
 function computeCaptchaSolutionHash(captcha) {
   return common.hexHashArray([captcha.captchaId, captcha.captchaContentId, [...captcha.solution].sort(), captcha.salt]);

package/dist/cjs/types/manager.cjs

@@ -5,7 +5,10 @@ const ProcapchaEventNames = [
   "onAccountNotFound",
   "onHuman",
   "onExtensionNotFound",
+  "onChallengeExpired",
+  "onFailed",
   "onExpired",
-  "onFailed"
+  "onOpen",
+  "onClose"
 ];
 exports.ProcapchaEventNames = ProcapchaEventNames;

package/dist/modules/Manager.d.ts

@@ -1,13 +1,14 @@
 import { ProcaptchaCallbacks, ProcaptchaConfigOptional, ProcaptchaState, ProcaptchaStateUpdateFn } from '../types/manager.js';
-import { ProsopoClientConfig } from '@prosopo/types';
+import { ProcaptchaClientConfigOutput } from '@prosopo/types';
 export declare const defaultState: () => Partial<ProcaptchaState>;
-export declare const getNetwork: (config: ProsopoClientConfig) => {
+export declare const getNetwork: (config: ProcaptchaClientConfigOutput) => {
     endpoint: string;
     contract: {
         address: string;
         name: string;
     };
-    accounts: string[];
+    pairType: "sr25519" | "ed25519" | "ecdsa" | "ethereum";
+    ss58Format: number;
 };
 /**
  * The state operator. This is used to mutate the state of Procaptcha during the captcha process. State updates are published via the onStateUpdate callback. This should be used by frontends, e.g. react, to maintain the state of Procaptcha across renders.

package/dist/modules/Manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../src/modules/Manager.ts"],"names":[],"mappings":"AAaA,OAAO,EAEH,mBAAmB,EACnB,wBAAwB,EAExB,eAAe,EACf,uBAAuB,EAC1B,MAAM,qBAAqB,CAAA;AAG5B,OAAO,EAA2C,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAiB7F,eAAO,MAAM,YAAY,QAAO,QAAQ,eAAe,CAatD,CAAA;AAgBD,eAAO,MAAM,UAAU,WAAY,mBAAmB;;;;;;;CAMrD,CAAA;AAED;;GAEG;AACH,wBAAgB,OAAO,CACnB,cAAc,EAAE,wBAAwB,EACxC,KAAK,EAAE,eAAe,EACtB,aAAa,EAAE,uBAAuB,EACtC,SAAS,EAAE,mBAAmB;;;;mBAoSR,MAAM;;EA4J/B"}
+{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../src/modules/Manager.ts"],"names":[],"mappings":"AAaA,OAAO,EAEH,mBAAmB,EACnB,wBAAwB,EAExB,eAAe,EACf,uBAAuB,EAC1B,MAAM,qBAAqB,CAAA;AAG5B,OAAO,EAGH,4BAA4B,EAE/B,MAAM,gBAAgB,CAAA;AAiBvB,eAAO,MAAM,YAAY,QAAO,QAAQ,eAAe,CAatD,CAAA;AAgBD,eAAO,MAAM,UAAU,WAAY,4BAA4B;;;;;;;;CAM9D,CAAA;AAED;;GAEG;AACH,wBAAgB,OAAO,CACnB,cAAc,EAAE,wBAAwB,EACxC,KAAK,EAAE,eAAe,EACtB,aAAa,EAAE,uBAAuB,EACtC,SAAS,EAAE,mBAAmB;;;;mBAmTR,MAAM;;EA+K/B"}

package/dist/modules/Manager.js

@@ -1,14 +1,15 @@
 import { AccountNotFoundError } from '../api/errors.js';
 import { ApiPromise, Keyring } from '@polkadot/api';
+import { ProcaptchaConfigSchema, } from '@prosopo/types';
 import { ProviderApi } from '@prosopo/api';
 import { ProsopoCaptchaContract, wrapQuery } from '@prosopo/contract';
+import { ProsopoEnvError, trimProviderUrl } from '@prosopo/common';
 import { ContractAbi as abiJson } from '@prosopo/captcha-contract';
 import { WsProvider } from '@polkadot/rpc-provider';
 import { at } from '@prosopo/util';
 import { randomAsHex } from '@polkadot/util-crypto';
 import { sleep } from '../utils/utils.js';
 import { stringToU8a } from '@polkadot/util';
-import { trimProviderUrl } from '@prosopo/common';
 import ExtensionWeb2 from '../api/ExtensionWeb2.js';
 import ExtensionWeb3 from '../api/ExtensionWeb3.js';
 import ProsopoCaptchaApi from './ProsopoCaptchaApi.js';
@@ -39,7 +40,7 @@ const buildUpdateState = (state, onStateUpdate) => {
     return updateCurrentState;
 };
 export const getNetwork = (config) => {
-    const network = config.networks[config.defaultEnvironment];
+    const network = config.networks[config.defaultNetwork];
     if (!network) {
         throw new Error(`No network found for environment ${config.defaultEnvironment}`);
     }
@@ -63,12 +64,21 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
         onExtensionNotFound: () => {
             alert('No extension found');
         },
-        onExpired: () => {
-            alert('Challenge has expired, please try again');
-        },
         onFailed: () => {
             alert('Captcha challenge failed. Please try again');
         },
+        onExpired: () => {
+            alert('Completed challenge has expired, please try again');
+        },
+        onChallengeExpired: () => {
+            alert('Uncompleted challenge has expired, please try again');
+        },
+        onOpen: () => {
+            console.log('onOpen event triggered');
+        },
+        onClose: () => {
+            console.log('onClose event triggered');
+        },
     }, callbacks);
     const dispatchErrorEvent = (err) => {
         const error = err instanceof Error ? err : new Error(String(err));
@@ -98,7 +108,7 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
         if (state.account) {
             config.userAccountAddress = state.account.account.address;
         }
-        return config;
+        return ProcaptchaConfigSchema.parse(config);
     };
     const fallable = async (fn) => {
         try {
@@ -117,6 +127,7 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
      */
     const start = async () => {
         console.log('Starting procaptcha');
+        events.onOpen();
         await fallable(async () => {
             if (state.loading) {
                 console.log('Procaptcha already loading');
@@ -153,8 +164,9 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
                 updateState({ isHuman: true, loading: false });
                 events.onHuman({
                     user: account.account.address,
-                    dapp: config.account.address,
+                    dapp: getDappAccount(),
                 });
+                setValidChallengeTimeout();
                 return;
             }
             // Check if there is a provider in local storage or get a random one from the contract
@@ -171,9 +183,10 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
                         events.onHuman({
                             providerUrl: providerUrlFromStorage,
                             user: account.account.address,
-                            dapp: config.account.address,
+                            dapp: getDappAccount(),
                             commitmentId: verifyDappUserResponse.commitmentId,
                         });
+                        setValidChallengeTimeout();
                         return;
                     }
                 }
@@ -191,7 +204,7 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
             const signed = await account.extension.signer.signRaw(payload);
             console.log('Signature:', signed);
             // get a random provider
-            const getRandomProviderResponse = await wrapQuery(contract.query.getRandomActiveProvider, contract.query)(account.account.address, config.account.address);
+            const getRandomProviderResponse = await wrapQuery(contract.query.getRandomActiveProvider, contract.query)(account.account.address, getDappAccount());
             const blockNumber = parseInt(getRandomProviderResponse.blockNumber.toString());
             console.log('provider', getRandomProviderResponse);
             const providerUrl = trimProviderUrl(getRandomProviderResponse.provider.url.toString());
@@ -212,7 +225,7 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
                 .reduce((a, b) => a + b);
             const timeout = setTimeout(() => {
                 console.log('challenge expired after ' + timeMillis + 'ms');
-                events.onExpired();
+                events.onChallengeExpired();
                 // expired, disallow user's claim to be human
                 updateState({ isHuman: false, showModal: false, loading: false });
             }, timeMillis);
@@ -282,6 +295,7 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
                     commitmentId: submission[1],
                     blockNumber,
                 });
+                setValidChallengeTimeout();
             }
         });
     };
@@ -291,6 +305,8 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
         clearTimeout();
         // abandon the captcha process
         resetState();
+        // trigger the onClose event
+        events.onClose();
     };
     /**
      * (De)Select an image from the solution for the current round. If the hash is already in the solutions list, it will be removed (deselected) and if not it will be added (selected).
@@ -334,13 +350,16 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
     const loadCaptchaApi = async (contract, provider, providerApi) => {
         const config = getConfig();
         // setup the captcha api to carry out a challenge
-        const captchaApi = new ProsopoCaptchaApi(getAccount().account.address, contract, provider, providerApi, config.web2, config.account.address);
+        const captchaApi = new ProsopoCaptchaApi(getAccount().account.address, contract, provider, providerApi, config.web2, getDappAccount());
         updateState({ captchaApi });
         return getCaptchaApi();
     };
     const loadProviderApi = async (providerUrl) => {
         const config = getConfig();
         const network = getNetwork(config);
+        if (!config.account.address) {
+            throw new ProsopoEnvError('GENERAL.SITE_KEY_MISSING');
+        }
         return new ProviderApi(network, providerUrl, config.account.address);
     };
     const clearTimeout = () => {
@@ -349,6 +368,17 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
         // then clear the timeout from the state
         updateState({ timeout: undefined });
     };
+    const setValidChallengeTimeout = () => {
+        console.log('setting valid challenge timeout');
+        const timeMillis = configOptional.challengeValidLength || 120 * 1000; // default to 2 minutes
+        const successfullChallengeTimeout = setTimeout(() => {
+            console.log('valid challenge expired after ' + timeMillis + 'ms');
+            // Human state expired, disallow user's claim to be human
+            updateState({ isHuman: false });
+            events.onExpired();
+        }, timeMillis);
+        updateState({ successfullChallengeTimeout });
+    };
     const resetState = () => {
         // clear timeout just in case a timer is still active (shouldn't be)
         clearTimeout();
@@ -387,7 +417,7 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
     };
     const getDappAccount = () => {
         if (!state.dappAccount) {
-            throw new Error('Dapp account not loaded');
+            throw new ProsopoEnvError('GENERAL.SITE_KEY_MISSING');
         }
         const dappAccount = state.dappAccount;
         return dappAccount;
@@ -409,7 +439,7 @@ export function Manager(configOptional, state, onStateUpdate, callbacks) {
         // TODO create a shared keyring that's stored somewhere
         const type = 'sr25519';
         const keyring = new Keyring({ type, ss58Format: api.registry.chainSS58 });
-        return new ProsopoCaptchaContract(api, JSON.parse(abiJson), network.contract.address, keyring.addFromAddress(getAccount().account.address), 'prosopo', 0);
+        return new ProsopoCaptchaContract(api, JSON.parse(abiJson), network.contract.address, 'prosopo', 0, keyring.addFromAddress(getAccount().account.address));
     };
     return {
         start,

package/dist/modules/Manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"Manager.js","sourceRoot":"","sources":["../../src/modules/Manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Manager.js","sourceRoot":"","sources":["../../src/modules/Manager.ts"],"names":[],"mappings":"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"}

package/dist/types/manager.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
 import { GetCaptchaResponse } from '@prosopo/api';
 import { InjectedAccount, InjectedExtension } from '@polkadot/extension-inject/types';
-import { ProcaptchaClientConfig, ProcaptchaOutput } from '@prosopo/types';
+import { ProcaptchaClientConfigInput, ProcaptchaOutput } from '@prosopo/types';
 import { ProsopoCaptchaApi } from '../modules/ProsopoCaptchaApi.js';
 import { TCaptchaSubmitResult } from './client.js';
 /**
@@ -15,7 +15,7 @@ export interface Account {
  * The config to be passed to procaptcha. Some fields can be optional, e.g.
  * userAccountAddress and web2, depending on the mode of Procaptcha (web2 or web3).
  */
-export type ProcaptchaConfigOptional = ProcaptchaClientConfig;
+export type ProcaptchaConfigOptional = ProcaptchaClientConfigInput;
 /**
  * The state of Procaptcha. This is mutated as required to reflect the captcha
  * process.
@@ -32,6 +32,7 @@ export interface ProcaptchaState {
     dappAccount: string | undefined;
     submission: TCaptchaSubmitResult | undefined;
     timeout: NodeJS.Timeout | undefined;
+    successfullChallengeTimeout: NodeJS.Timeout | undefined;
     blockNumber: number | undefined;
 }
 /**
@@ -54,8 +55,11 @@ export interface ProcaptchaEvents {
     onAccountNotFound: (address: string) => void;
     onHuman: (output: ProcaptchaOutput) => void;
     onExtensionNotFound: () => void;
+    onChallengeExpired: () => void;
     onExpired: () => void;
     onFailed: () => void;
+    onOpen: () => void;
+    onClose: () => void;
 }
 export type TProcaptchaEventNames = keyof ProcaptchaEvents;
 export declare const ProcapchaEventNames: TProcaptchaEventNames[];

package/dist/types/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/types/manager.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AACrF,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAClD;;GAEG;AACH,MAAM,WAAW,OAAO;IACpB,OAAO,EAAE,eAAe,CAAA;IACxB,SAAS,EAAE,iBAAiB,CAAA;CAC/B;AAED;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,sBAAsB,CAAA;AAE7D;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,EAAE,EAAE,CAAA;IACrB,UAAU,EAAE,iBAAiB,GAAG,SAAS,CAAA;IACzC,SAAS,EAAE,kBAAkB,GAAG,SAAS,CAAA;IACzC,SAAS,EAAE,OAAO,CAAA;IAClB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,GAAG,SAAS,CAAA;IAC5B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/B,UAAU,EAAE,oBAAoB,GAAG,SAAS,CAAA;IAC5C,OAAO,EAAE,MAAM,CAAC,OAAO,GAAG,SAAS,CAAA;IACnC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;CAClC;AAED;;;;;GAKG;AACH,MAAM,MAAM,uBAAuB,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,KAAK,IAAI,CAAA;AAE/E;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE3D;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;IAC/B,iBAAiB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5C,OAAO,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAA;IAC3C,mBAAmB,EAAE,MAAM,IAAI,CAAA;IAC/B,SAAS,EAAE,MAAM,IAAI,CAAA;IACrB,QAAQ,EAAE,MAAM,IAAI,CAAA;CACvB;AAED,MAAM,MAAM,qBAAqB,GAAG,MAAM,gBAAgB,CAAA;AAE1D,eAAO,MAAM,mBAAmB,EAAE,qBAAqB,EAOtD,CAAA"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/types/manager.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAA;AACrF,OAAO,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAClD;;GAEG;AACH,MAAM,WAAW,OAAO;IACpB,OAAO,EAAE,eAAe,CAAA;IACxB,SAAS,EAAE,iBAAiB,CAAA;CAC/B;AAED;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,2BAA2B,CAAA;AAElE;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC5B,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,EAAE,EAAE,CAAA;IACrB,UAAU,EAAE,iBAAiB,GAAG,SAAS,CAAA;IACzC,SAAS,EAAE,kBAAkB,GAAG,SAAS,CAAA;IACzC,SAAS,EAAE,OAAO,CAAA;IAClB,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,OAAO,GAAG,SAAS,CAAA;IAC5B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/B,UAAU,EAAE,oBAAoB,GAAG,SAAS,CAAA;IAC5C,OAAO,EAAE,MAAM,CAAC,OAAO,GAAG,SAAS,CAAA;IACnC,2BAA2B,EAAE,MAAM,CAAC,OAAO,GAAG,SAAS,CAAA;IACvD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;CAClC;AAED;;;;;GAKG;AACH,MAAM,MAAM,uBAAuB,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,KAAK,IAAI,CAAA;AAE/E;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAE3D;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;IAC/B,iBAAiB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;IAC5C,OAAO,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAA;IAC3C,mBAAmB,EAAE,MAAM,IAAI,CAAA;IAC/B,kBAAkB,EAAE,MAAM,IAAI,CAAA;IAC9B,SAAS,EAAE,MAAM,IAAI,CAAA;IACrB,QAAQ,EAAE,MAAM,IAAI,CAAA;IACpB,MAAM,EAAE,MAAM,IAAI,CAAA;IAClB,OAAO,EAAE,MAAM,IAAI,CAAA;CACtB;AAED,MAAM,MAAM,qBAAqB,GAAG,MAAM,gBAAgB,CAAA;AAE1D,eAAO,MAAM,mBAAmB,EAAE,qBAAqB,EAUtD,CAAA"}

package/dist/types/manager.js

@@ -3,7 +3,10 @@ export const ProcapchaEventNames = [
     'onAccountNotFound',
     'onHuman',
     'onExtensionNotFound',
-    'onExpired',
+    'onChallengeExpired',
     'onFailed',
+    'onExpired',
+    'onOpen',
+    'onClose',
 ];
 //# sourceMappingURL=manager.js.map

package/dist/types/manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/types/manager.ts"],"names":[],"mappings":"AA+EA,MAAM,CAAC,MAAM,mBAAmB,GAA4B;IACxD,SAAS;IACT,mBAAmB;IACnB,SAAS;IACT,qBAAqB;IACrB,WAAW;IACX,UAAU;CACb,CAAA"}
+{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/types/manager.ts"],"names":[],"mappings":"AAmFA,MAAM,CAAC,MAAM,mBAAmB,GAA4B;IACxD,SAAS;IACT,mBAAmB;IACnB,SAAS;IACT,qBAAqB;IACrB,oBAAoB;IACpB,UAAU;IACV,WAAW;IACX,QAAQ;IACR,SAAS;CACZ,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@prosopo/procaptcha",
-    "version": "0.2.7",
+    "version": "0.2.8",
     "author": "PROSOPO LIMITED <info@prosopo.io>",
     "license": "Apache-2.0",
     "main": "./dist/index.js",
@@ -11,7 +11,6 @@
         "npm": "8.9"
     },
     "scripts": {
-        "test": "NODE_ENV=test ts-mocha \"tests/**/*.test.ts\" && exit 0",
         "clean": "tsc --build --clean",
         "build": "tsc --build --verbose tsconfig.json",
         "build:cjs": "npx vite --config vite.cjs.config.ts build",
@@ -40,17 +39,15 @@
         "@polkadot/types": "10.9.1",
         "@polkadot/util": "12.3.2",
         "@polkadot/util-crypto": "12.3.2",
-        "@prosopo/api": "0.2.7",
-        "@prosopo/common": "0.2.7",
-        "@prosopo/contract": "0.2.7",
-        "@prosopo/datasets": "0.2.7",
-        "@prosopo/types": "0.2.7",
-        "@prosopo/util": "0.2.7",
+        "@prosopo/api": "0.2.8",
+        "@prosopo/common": "0.2.8",
+        "@prosopo/contract": "0.2.8",
+        "@prosopo/datasets": "0.2.8",
+        "@prosopo/types": "0.2.8",
+        "@prosopo/util": "0.2.8",
         "axios": "^1.5.0"
     },
     "devDependencies": {
-        "mocha": "^10.0.0",
-        "ts-mocha": "^10.0.0",
         "tslib": "2.6.2",
         "typescript": "5.1.6"
     },