@prosopo/procaptcha-pow 0.3.2 → 0.3.3

package/dist/Services/Manager.d.ts

@@ -1,21 +1,5 @@
-import { ProcaptchaClientConfigInput } from '@prosopo/types';
-type ProcaptchaPowOutput = {
-    user: string;
-    dapp: string;
-    commitmentId?: string | undefined;
-    providerUrl?: string | undefined;
-    blockNumber?: number | undefined;
+import { ProcaptchaCallbacks, ProcaptchaClientConfigInput, ProcaptchaState, ProcaptchaStateUpdateFn } from '@prosopo/types';
+export declare const Manager: (configInput: ProcaptchaClientConfigInput, state: ProcaptchaState, onStateUpdate: ProcaptchaStateUpdateFn, callbacks: ProcaptchaCallbacks) => {
+    start: () => Promise<void>;
 };
-export interface ProcaptchaEvents {
-    onError: (error: Error) => void;
-    onHuman: (output: ProcaptchaPowOutput) => void;
-    onExtensionNotFound: () => void;
-    onChallengeExpired: () => void;
-    onExpired: () => void;
-    onFailed: () => void;
-    onOpen: () => void;
-    onClose: () => void;
-}
-export declare const Manager: (configInput: ProcaptchaClientConfigInput) => Promise<import("@prosopo/api").PowCaptchaSolutionResponse>;
-export {};
 //# sourceMappingURL=Manager.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../src/Services/Manager.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,2BAA2B,EAAwD,MAAM,gBAAgB,CAAA;AASlH,KAAK,mBAAmB,GAAG;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACnC,CAAA;AAED,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;IAC/B,OAAO,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,IAAI,CAAA;IAC9C,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,eAAO,MAAM,OAAO,gBAAuB,2BAA2B,+DAmFrE,CAAA"}
+{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../src/Services/Manager.ts"],"names":[],"mappings":"AAaA,OAAO,EAGH,mBAAmB,EACnB,2BAA2B,EAG3B,eAAe,EACf,uBAAuB,EAC1B,MAAM,gBAAgB,CAAA;AAcvB,eAAO,MAAM,OAAO,gBACH,2BAA2B,SACjC,eAAe,iBACP,uBAAuB,aAC3B,mBAAmB;;CAmKjC,CAAA"}

package/dist/Services/Manager.js

@@ -1,14 +1,32 @@
+import { ApiParams, ProcaptchaConfigSchema, } from '@prosopo/types';
 import { ApiPromise } from '@polkadot/api/promise/Api';
 import { ExtensionWeb2 } from '@prosopo/account';
 import { Keyring } from '@polkadot/keyring';
-import { ProcaptchaConfigSchema } from '@prosopo/types';
 import { ProsopoCaptchaContract, wrapQuery } from '@prosopo/contract';
-import { ProsopoEnvError, trimProviderUrl } from '@prosopo/common';
+import { ProsopoContractError, ProsopoEnvError, trimProviderUrl } from '@prosopo/common';
 import { ProviderApi } from '@prosopo/api';
 import { WsProvider } from '@polkadot/rpc-provider/ws';
 import { ContractAbi as abiJson } from '@prosopo/captcha-contract/contract-info';
+import { buildUpdateState, getDefaultEvents } from '@prosopo/procaptcha-common';
+import { sleep } from '@prosopo/procaptcha';
 import { solvePoW } from './SolverService.js';
-export const Manager = async (configInput) => {
+export const Manager = (configInput, state, onStateUpdate, callbacks) => {
+    const defaultState = () => {
+        return {
+            showModal: false,
+            loading: false,
+            index: 0,
+            challenge: undefined,
+            solutions: undefined,
+            isHuman: false,
+            captchaApi: undefined,
+            account: undefined,
+        };
+    };
+    const clearTimeout = () => {
+        window.clearTimeout(state.timeout);
+        updateState({ timeout: undefined });
+    };
     const getConfig = () => {
         const config = {
             userAccountAddress: '',
@@ -32,25 +50,71 @@ export const Manager = async (configInput) => {
         const keyring = new Keyring({ type, ss58Format: api.registry.chainSS58 });
         return new ProsopoCaptchaContract(api, JSON.parse(abiJson), network.contract.address, 'prosopo', 0, keyring.addFromAddress(getConfig().account.address || ''));
     };
-    const config = getConfig();
-    if (!config.web2 && !config.userAccountAddress) {
-        throw new ProsopoEnvError('GENERAL.ACCOUNT_NOT_FOUND', {
-            context: { error: 'Account address has not been set for web3 mode' },
-        });
-    }
-    const ext = new ExtensionWeb2();
-    const account = await ext.getAccount(config);
-    const contract = await loadContract();
-    const getRandomProviderResponse = await wrapQuery(contract.query.getRandomActiveProvider, contract.query)(account.account.address, configInput.account.address || '');
-    const providerUrl = trimProviderUrl(getRandomProviderResponse.provider.url.toString());
-    const providerApi = new ProviderApi(getNetwork(getConfig()), providerUrl, configInput.account.address || '');
-    const challenge = await providerApi.getPowCaptchaChallenge(account.account.address, configInput.account.address || '');
-    console.log('challenge', challenge);
-    console.log('challenge', challenge.challenge);
-    console.log('challenge', challenge.difficulty);
-    const solution = solvePoW(challenge.challenge, challenge.difficulty);
-    console.log('solution', solution);
-    const verifiedSolution = await providerApi.submitPowCaptchaSolution(challenge, account.account.address, configInput.account.address || '', getRandomProviderResponse, solution);
-    return verifiedSolution;
+    const getAccount = () => {
+        if (!state.account) {
+            throw new ProsopoEnvError('GENERAL.ACCOUNT_NOT_FOUND', { context: { error: 'Account not loaded' } });
+        }
+        const account = state.account;
+        return account;
+    };
+    const getDappAccount = () => {
+        if (!state.dappAccount) {
+            throw new ProsopoEnvError('GENERAL.SITE_KEY_MISSING');
+        }
+        const dappAccount = state.dappAccount;
+        return dappAccount;
+    };
+    const getBlockNumber = () => {
+        if (!state.blockNumber) {
+            throw new ProsopoContractError('CAPTCHA.INVALID_BLOCK_NO', { context: { error: 'Block number not found' } });
+        }
+        const blockNumber = state.blockNumber;
+        return blockNumber;
+    };
+    const updateState = buildUpdateState(state, onStateUpdate);
+    const resetState = () => {
+        clearTimeout();
+        updateState(defaultState());
+    };
+    const start = async () => {
+        if (state.loading) {
+            return;
+        }
+        if (state.isHuman) {
+            return;
+        }
+        resetState();
+        updateState({ loading: true });
+        const config = getConfig();
+        updateState({ dappAccount: config.account.address });
+        await sleep(100);
+        if (!config.web2 && !config.userAccountAddress) {
+            throw new ProsopoEnvError('GENERAL.ACCOUNT_NOT_FOUND', {
+                context: { error: 'Account address has not been set for web3 mode' },
+            });
+        }
+        const ext = new ExtensionWeb2();
+        const account = await ext.getAccount(config);
+        const contract = await loadContract();
+        const events = getDefaultEvents(onStateUpdate, state, callbacks);
+        const getRandomProviderResponse = await wrapQuery(contract.query.getRandomActiveProvider, contract.query)(account.account.address, getDappAccount());
+        const providerUrl = trimProviderUrl(getRandomProviderResponse.provider.url.toString());
+        const providerApi = new ProviderApi(getNetwork(getConfig()), providerUrl, getDappAccount());
+        const challenge = await providerApi.getPowCaptchaChallenge(account.account.address, getDappAccount());
+        const solution = solvePoW(challenge.challenge, challenge.difficulty);
+        await providerApi.submitPowCaptchaSolution(challenge, getAccount().account.address, getDappAccount(), getRandomProviderResponse, solution);
+        if (state.isHuman) {
+            events.onHuman({
+                providerUrl,
+                [ApiParams.user]: getAccount().account.address,
+                [ApiParams.dapp]: getDappAccount(),
+                [ApiParams.challengeId]: challenge.challenge,
+                [ApiParams.blockNumber]: getBlockNumber(),
+            });
+        }
+    };
+    return {
+        start,
+    };
 };
 //# sourceMappingURL=Manager.js.map

package/dist/Services/Manager.js.map

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

package/dist/cjs/Services/Manager.cjs

@@ -1,29 +1,49 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const types = require("@prosopo/types");
 const Api = require("@polkadot/api/promise/Api");
 require("../account/dist/index.cjs");
 const keyring = require("@polkadot/keyring");
-const types = require("@prosopo/types");
 const contract = require("@prosopo/contract");
 const common = require("@prosopo/common");
 const api = require("@prosopo/api");
 const ws = require("@polkadot/rpc-provider/ws");
 const contractInfo = require("@prosopo/captcha-contract/contract-info");
+const procaptchaCommon = require("@prosopo/procaptcha-common");
+const procaptcha = require("@prosopo/procaptcha");
 const SolverService = require("./SolverService.cjs");
 const ExtensionWeb2 = require("../account/dist/extension/ExtensionWeb2.cjs");
-const Manager = async (configInput) => {
+const Manager = (configInput, state, onStateUpdate, callbacks) => {
+  const defaultState = () => {
+    return {
+      // note order matters! see buildUpdateState. These fields are set in order, so disable modal first, then set loading to false, etc.
+      showModal: false,
+      loading: false,
+      index: 0,
+      challenge: void 0,
+      solutions: void 0,
+      isHuman: false,
+      captchaApi: void 0,
+      account: void 0
+      // don't handle timeout here, this should be handled by the state management
+    };
+  };
+  const clearTimeout = () => {
+    window.clearTimeout(state.timeout);
+    updateState({ timeout: void 0 });
+  };
   const getConfig = () => {
-    const config2 = {
+    const config = {
       userAccountAddress: "",
       ...configInput
     };
-    return types.ProcaptchaConfigSchema.parse(config2);
+    return types.ProcaptchaConfigSchema.parse(config);
   };
-  const getNetwork = (config2) => {
-    const network = config2.networks[config2.defaultNetwork];
+  const getNetwork = (config) => {
+    const network = config.networks[config.defaultNetwork];
     if (!network) {
       throw new common.ProsopoEnvError("DEVELOPER.NETWORK_NOT_FOUND", {
-        context: { error: `No network found for environment ${config2.defaultEnvironment}` }
+        context: { error: `No network found for environment ${config.defaultEnvironment}` }
       });
     }
     return network;
@@ -42,37 +62,80 @@ const Manager = async (configInput) => {
       keyring$1.addFromAddress(getConfig().account.address || "")
     );
   };
-  const config = getConfig();
-  if (!config.web2 && !config.userAccountAddress) {
-    throw new common.ProsopoEnvError("GENERAL.ACCOUNT_NOT_FOUND", {
-      context: { error: "Account address has not been set for web3 mode" }
-    });
-  }
-  const ext = new ExtensionWeb2.ExtensionWeb2();
-  const account = await ext.getAccount(config);
-  const contract$1 = await loadContract();
-  const getRandomProviderResponse = await contract.wrapQuery(
-    contract$1.query.getRandomActiveProvider,
-    contract$1.query
-  )(account.account.address, configInput.account.address || "");
-  const providerUrl = common.trimProviderUrl(getRandomProviderResponse.provider.url.toString());
-  const providerApi = new api.ProviderApi(getNetwork(getConfig()), providerUrl, configInput.account.address || "");
-  const challenge = await providerApi.getPowCaptchaChallenge(
-    account.account.address,
-    configInput.account.address || ""
-  );
-  console.log("challenge", challenge);
-  console.log("challenge", challenge.challenge);
-  console.log("challenge", challenge.difficulty);
-  const solution = SolverService.solvePoW(challenge.challenge, challenge.difficulty);
-  console.log("solution", solution);
-  const verifiedSolution = await providerApi.submitPowCaptchaSolution(
-    challenge,
-    account.account.address,
-    configInput.account.address || "",
-    getRandomProviderResponse,
-    solution
-  );
-  return verifiedSolution;
+  const getAccount = () => {
+    if (!state.account) {
+      throw new common.ProsopoEnvError("GENERAL.ACCOUNT_NOT_FOUND", { context: { error: "Account not loaded" } });
+    }
+    const account = state.account;
+    return account;
+  };
+  const getDappAccount = () => {
+    if (!state.dappAccount) {
+      throw new common.ProsopoEnvError("GENERAL.SITE_KEY_MISSING");
+    }
+    const dappAccount = state.dappAccount;
+    return dappAccount;
+  };
+  const getBlockNumber = () => {
+    if (!state.blockNumber) {
+      throw new common.ProsopoContractError("CAPTCHA.INVALID_BLOCK_NO", { context: { error: "Block number not found" } });
+    }
+    const blockNumber = state.blockNumber;
+    return blockNumber;
+  };
+  const updateState = procaptchaCommon.buildUpdateState(state, onStateUpdate);
+  const resetState = () => {
+    clearTimeout();
+    updateState(defaultState());
+  };
+  const start = async () => {
+    if (state.loading) {
+      return;
+    }
+    if (state.isHuman) {
+      return;
+    }
+    resetState();
+    updateState({ loading: true });
+    const config = getConfig();
+    updateState({ dappAccount: config.account.address });
+    await procaptcha.sleep(100);
+    if (!config.web2 && !config.userAccountAddress) {
+      throw new common.ProsopoEnvError("GENERAL.ACCOUNT_NOT_FOUND", {
+        context: { error: "Account address has not been set for web3 mode" }
+      });
+    }
+    const ext = new ExtensionWeb2.ExtensionWeb2();
+    const account = await ext.getAccount(config);
+    const contract$1 = await loadContract();
+    const events = procaptchaCommon.getDefaultEvents(onStateUpdate, state, callbacks);
+    const getRandomProviderResponse = await contract.wrapQuery(
+      contract$1.query.getRandomActiveProvider,
+      contract$1.query
+    )(account.account.address, getDappAccount());
+    const providerUrl = common.trimProviderUrl(getRandomProviderResponse.provider.url.toString());
+    const providerApi = new api.ProviderApi(getNetwork(getConfig()), providerUrl, getDappAccount());
+    const challenge = await providerApi.getPowCaptchaChallenge(account.account.address, getDappAccount());
+    const solution = SolverService.solvePoW(challenge.challenge, challenge.difficulty);
+    await providerApi.submitPowCaptchaSolution(
+      challenge,
+      getAccount().account.address,
+      getDappAccount(),
+      getRandomProviderResponse,
+      solution
+    );
+    if (state.isHuman) {
+      events.onHuman({
+        providerUrl,
+        [types.ApiParams.user]: getAccount().account.address,
+        [types.ApiParams.dapp]: getDappAccount(),
+        [types.ApiParams.challengeId]: challenge.challenge,
+        [types.ApiParams.blockNumber]: getBlockNumber()
+      });
+    }
+  };
+  return {
+    start
+  };
 };
 exports.Manager = Manager;

package/dist/cjs/components/Captcha.cjs

@@ -2,6 +2,7 @@
 const jsxRuntime = require("@emotion/react/jsx-runtime");
 require("../web-components/dist/index.cjs");
 const Manager = require("../Services/Manager.cjs");
+const procaptchaCommon = require("@prosopo/procaptcha-common");
 const react = require("react");
 const theme = require("../web-components/dist/theme.cjs");
 const Containers = require("../web-components/dist/Containers.cjs");
@@ -10,21 +11,13 @@ const LoadingSpinner = require("../web-components/dist/LoadingSpinner.cjs");
 const Checkbox = require("../web-components/dist/Checkbox.cjs");
 const Logo = require("../web-components/dist/Logo.cjs");
 const Procaptcha = (props) => {
-  const [checked, setChecked] = react.useState(false);
-  const [loading, setLoading] = react.useState(false);
-  const darkMode = props.config.theme;
-  const themeColor = darkMode ? "light" : "dark";
-  const theme$1 = react.useMemo(() => darkMode === "light" ? theme.lightTheme : theme.darkTheme, [darkMode]);
-  const handlePowCaptcha = async () => {
-    setLoading(true);
-    Manager.Manager(props.config).then((verified) => {
-      if (verified.verified) {
-        console.log("verified");
-        setChecked(true);
-      }
-      setLoading(false);
-    });
-  };
+  const config = props.config;
+  const themeColor = config.theme === "light" ? "light" : "dark";
+  const theme$1 = props.config.theme === "light" ? theme.lightTheme : theme.darkTheme;
+  const callbacks = props.callbacks || {};
+  const [state, _updateState] = procaptchaCommon.useProcaptcha(react.useState, react.useRef);
+  const updateState = procaptchaCommon.buildUpdateState(state, _updateState);
+  const manager = Manager.Manager(config, state, updateState, callbacks);
   return /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx("div", { style: { maxWidth: "100%", maxHeight: "100%", overflowX: "auto" }, children: /* @__PURE__ */ jsxRuntime.jsx(Containers.ContainerDiv, { children: /* @__PURE__ */ jsxRuntime.jsx(Containers.WidthBasedStylesDiv, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { style: WidgetConstants.WIDGET_DIMENSIONS, "data-cy": "button-human", children: [
     " ",
     /* @__PURE__ */ jsxRuntime.jsxs(
@@ -69,11 +62,11 @@ const Procaptcha = (props) => {
                       style: {
                         display: "flex"
                       },
-                      children: /* @__PURE__ */ jsxRuntime.jsx("div", { style: { flex: 1 }, children: loading ? /* @__PURE__ */ jsxRuntime.jsx(LoadingSpinner.LoadingSpinner, { themeColor }) : /* @__PURE__ */ jsxRuntime.jsx(
+                      children: /* @__PURE__ */ jsxRuntime.jsx("div", { style: { flex: 1 }, children: state.loading ? /* @__PURE__ */ jsxRuntime.jsx(LoadingSpinner.LoadingSpinner, { themeColor }) : /* @__PURE__ */ jsxRuntime.jsx(
                         Checkbox.Checkbox,
                         {
-                          checked,
-                          onChange: handlePowCaptcha,
+                          checked: state.isHuman,
+                          onChange: manager.start,
                           themeColor,
                           labelText: "I am human"
                         }

package/dist/cjs/components/ProcaptchaPoW.cjs

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("@emotion/react/jsx-runtime");
-require("../web-components/dist/index.cjs");
 const react = require("react");
+require("../web-components/dist/index.cjs");
 const CaptchaPlaceholder = require("../web-components/dist/CaptchaPlaceholder.cjs");
 const _interopNamespaceDefaultOnly = (e) => Object.freeze(Object.defineProperty({ __proto__: null, default: e }, Symbol.toStringTag, { value: "Module" }));
-const ProcaptchaWidget = react.lazy(async () => Promise.resolve().then(() => /* @__PURE__ */ _interopNamespaceDefaultOnly(require("./Captcha.cjs"))));
+const ProcaptchaWidget = react.lazy(
+  async () => Promise.resolve().then(() => /* @__PURE__ */ _interopNamespaceDefaultOnly(require("./Captcha.cjs")))
+);
 const ProcaptchaPow = (props) => /* @__PURE__ */ jsxRuntime.jsx(react.Suspense, { fallback: /* @__PURE__ */ jsxRuntime.jsx(CaptchaPlaceholder.ProcaptchaPlaceholder, { darkMode: props.config.theme }), children: /* @__PURE__ */ jsxRuntime.jsx(ProcaptchaWidget, { config: props.config, callbacks: props.callbacks }) });
 exports.ProcaptchaPow = ProcaptchaPow;

package/dist/cjs/web-components/dist/CaptchaPlaceholder.cjs

@@ -5,12 +5,10 @@ const Containers = require("./Containers.cjs");
 const LoadingSpinner = require("./LoadingSpinner.cjs");
 const WidgetConstants = require("./WidgetConstants.cjs");
 const theme = require("./theme.cjs");
-const react = require("react");
 const Logo = require("./Logo.cjs");
 const ProcaptchaPlaceholder = (props) => {
-  const darkMode = props.darkMode;
   const themeColor = props.darkMode === "light" ? "light" : "dark";
-  const theme$1 = react.useMemo(() => darkMode === "light" ? theme.lightTheme : theme.darkTheme, [darkMode]);
+  const theme$1 = props.darkMode === "light" ? theme.lightTheme : theme.darkTheme;
   return jsxRuntime.jsx("div", { children: jsxRuntime.jsx("div", { style: { maxWidth: "100%", maxHeight: "100%", overflowX: "auto" }, children: jsxRuntime.jsx(Containers.ContainerDiv, { children: jsxRuntime.jsx(Containers.WidthBasedStylesDiv, { children: jsxRuntime.jsxs("div", { style: WidgetConstants.WIDGET_DIMENSIONS, "data-cy": "button-human", children: [" ", jsxRuntime.jsxs("div", { style: {
     padding: "2px",
     border: "1px solid",

package/dist/components/Captcha.d.ts

@@ -1,19 +1,4 @@
-import { ProcaptchaClientConfigInput, ProcaptchaOutput } from '@prosopo/types';
-export type ProcaptchaCallbacks = Partial<ProcaptchaEvents>;
-export interface ProcaptchaEvents {
-    onError: (error: Error) => void;
-    onHuman: (output: ProcaptchaOutput) => void;
-    onExtensionNotFound: () => void;
-    onChallengeExpired: () => void;
-    onExpired: () => void;
-    onFailed: () => void;
-    onOpen: () => void;
-    onClose: () => void;
-}
-export interface ProcaptchaProps {
-    config: ProcaptchaClientConfigInput;
-    callbacks?: Partial<ProcaptchaCallbacks>;
-}
+import { ProcaptchaProps } from '@prosopo/types';
 declare const Procaptcha: (props: ProcaptchaProps) => import("@emotion/react/jsx-runtime").JSX.Element;
 export default Procaptcha;
 //# sourceMappingURL=Captcha.d.ts.map

package/dist/components/Captcha.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Captcha.d.ts","sourceRoot":"","sources":["../../src/components/Captcha.tsx"],"names":[],"mappings":"AA2BA,OAAO,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAG9E,MAAM,MAAM,mBAAmB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAK3D,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;IAC/B,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,WAAW,eAAe;IAE5B,MAAM,EAAE,2BAA2B,CAAA;IAEnC,SAAS,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAA;CAC3C;AAED,QAAA,MAAM,UAAU,UAAW,eAAe,qDA8FzC,CAAA;AACD,eAAe,UAAU,CAAA"}
+{"version":3,"file":"Captcha.d.ts","sourceRoot":"","sources":["../../src/components/Captcha.tsx"],"names":[],"mappings":"AA2BA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAIhD,QAAA,MAAM,UAAU,UAAW,eAAe,qDAsFzC,CAAA;AACD,eAAe,UAAU,CAAA"}

package/dist/components/Captcha.js

@@ -1,23 +1,16 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
 import { Checkbox, ContainerDiv, LoadingSpinner, Logo, WIDGET_DIMENSIONS, WIDGET_INNER_HEIGHT, WIDGET_URL, WIDGET_URL_TEXT, WidthBasedStylesDiv, darkTheme, lightTheme, } from '@prosopo/web-components';
 import { Manager } from '../Services/Manager.js';
-import { useMemo, useState } from 'react';
+import { buildUpdateState, useProcaptcha } from '@prosopo/procaptcha-common';
+import { useRef, useState } from 'react';
 const Procaptcha = (props) => {
-    const [checked, setChecked] = useState(false);
-    const [loading, setLoading] = useState(false);
-    const darkMode = props.config.theme;
-    const themeColor = darkMode ? 'light' : 'dark';
-    const theme = useMemo(() => (darkMode === 'light' ? lightTheme : darkTheme), [darkMode]);
-    const handlePowCaptcha = async () => {
-        setLoading(true);
-        Manager(props.config).then((verified) => {
-            if (verified.verified) {
-                console.log('verified');
-                setChecked(true);
-            }
-            setLoading(false);
-        });
-    };
+    const config = props.config;
+    const themeColor = config.theme === 'light' ? 'light' : 'dark';
+    const theme = props.config.theme === 'light' ? lightTheme : darkTheme;
+    const callbacks = props.callbacks || {};
+    const [state, _updateState] = useProcaptcha(useState, useRef);
+    const updateState = buildUpdateState(state, _updateState);
+    const manager = Manager(config, state, updateState, callbacks);
     return (_jsx("div", { children: _jsx("div", { style: { maxWidth: '100%', maxHeight: '100%', overflowX: 'auto' }, children: _jsx(ContainerDiv, { children: _jsx(WidthBasedStylesDiv, { children: _jsxs("div", { style: WIDGET_DIMENSIONS, "data-cy": 'button-human', children: [' ', _jsxs("div", { style: {
                                     padding: '2px',
                                     border: '1px solid',
@@ -43,7 +36,7 @@ const Procaptcha = (props) => {
                                                     verticalAlign: 'middle',
                                                 }, children: _jsx("div", { style: {
                                                         display: 'flex',
-                                                    }, children: _jsx("div", { style: { flex: 1 }, children: loading ? (_jsx(LoadingSpinner, { themeColor: themeColor })) : (_jsx(Checkbox, { checked: checked, onChange: handlePowCaptcha, themeColor: themeColor, labelText: 'I am human' })) }) }) }) }) }), _jsx("div", { style: { display: 'inline-flex', flexDirection: 'column' }, children: _jsx("a", { href: WIDGET_URL, target: "_blank", "aria-label": WIDGET_URL_TEXT, children: _jsx("div", { style: { flex: 1 }, children: _jsx(Logo, { themeColor: themeColor }) }) }) })] })] }) }) }) }) }));
+                                                    }, children: _jsx("div", { style: { flex: 1 }, children: state.loading ? (_jsx(LoadingSpinner, { themeColor: themeColor })) : (_jsx(Checkbox, { checked: state.isHuman, onChange: manager.start, themeColor: themeColor, labelText: 'I am human' })) }) }) }) }) }), _jsx("div", { style: { display: 'inline-flex', flexDirection: 'column' }, children: _jsx("a", { href: WIDGET_URL, target: "_blank", "aria-label": WIDGET_URL_TEXT, children: _jsx("div", { style: { flex: 1 }, children: _jsx(Logo, { themeColor: themeColor }) }) }) })] })] }) }) }) }) }));
 };
 export default Procaptcha;
 //# sourceMappingURL=Captcha.js.map

package/dist/components/Captcha.js.map

@@ -1 +1 @@
-{"version":3,"file":"Captcha.js","sourceRoot":"","sources":["../../src/components/Captcha.tsx"],"names":[],"mappings":";AAaA,OAAO,EACH,QAAQ,EACR,YAAY,EACZ,cAAc,EACd,IAAI,EACJ,iBAAiB,EACjB,mBAAmB,EACnB,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,SAAS,EACT,UAAU,GACb,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAEhD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAyBzC,MAAM,UAAU,GAAG,CAAC,KAAsB,EAAE,EAAE;IAC1C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC7C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC7C,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAA;IACnC,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAA;IAC9C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAExF,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;QAChC,UAAU,CAAC,IAAI,CAAC,CAAA;QAChB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACpC,IAAI,QAAQ,CAAC,QAAQ,EAAE;gBACnB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBACvB,UAAU,CAAC,IAAI,CAAC,CAAA;aACnB;YACD,UAAU,CAAC,KAAK,CAAC,CAAA;QACrB,CAAC,CAAC,CAAA;IACN,CAAC,CAAA;IAED,OAAO,CACH,wBACI,cAAK,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,YAClE,KAAC,YAAY,cACT,KAAC,mBAAmB,cAChB,eAAK,KAAK,EAAE,iBAAiB,aAAW,cAAc,aACjD,GAAG,EACJ,eACI,KAAK,EAAE;oCACH,OAAO,EAAE,KAAK;oCACd,MAAM,EAAE,WAAW;oCACnB,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO;oCACjD,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;oCACpC,YAAY,EAAE,KAAK;oCACnB,OAAO,EAAE,MAAM;oCACf,UAAU,EAAE,QAAQ;oCACpB,QAAQ,EAAE,MAAM;oCAChB,cAAc,EAAE,eAAe;oCAC/B,SAAS,EAAE,GAAG,mBAAmB,IAAI;oCACrC,QAAQ,EAAE,QAAQ;iCACrB,aAED,cAAK,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,QAAQ,EAAE,YAC3D,cACI,KAAK,EAAE;gDACH,OAAO,EAAE,MAAM;gDACf,cAAc,EAAE,YAAY;gDAC5B,UAAU,EAAE,QAAQ;gDACpB,QAAQ,EAAE,MAAM;6CACnB,YAED,cACI,KAAK,EAAE;oDACH,OAAO,EAAE,MAAM;oDACf,UAAU,EAAE,QAAQ;oDACpB,cAAc,EAAE,QAAQ;oDACxB,aAAa,EAAE,QAAQ;oDACvB,aAAa,EAAE,QAAQ;iDAC1B,YAED,cACI,KAAK,EAAE;wDACH,OAAO,EAAE,MAAM;qDAClB,YAED,cAAK,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,YAClB,OAAO,CAAC,CAAC,CAAC,CACP,KAAC,cAAc,IAAC,UAAU,EAAE,UAAU,GAAI,CAC7C,CAAC,CAAC,CAAC,CACA,KAAC,QAAQ,IACL,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,gBAAgB,EAC1B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,YAAY,GACf,CACf,GACC,GACJ,GACJ,GACJ,GACJ,EAEN,cAAK,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,QAAQ,EAAE,YAC3D,YAAG,IAAI,EAAE,UAAU,EAAE,MAAM,EAAC,QAAQ,gBAAa,eAAe,YAC5D,cAAK,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,YACnB,KAAC,IAAI,IAAC,UAAU,EAAE,UAAU,GAAS,GACnC,GACN,GACF,IACJ,IACJ,GACY,GACX,GACb,GACJ,CACT,CAAA;AACL,CAAC,CAAA;AACD,eAAe,UAAU,CAAA"}
+{"version":3,"file":"Captcha.js","sourceRoot":"","sources":["../../src/components/Captcha.tsx"],"names":[],"mappings":"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"}

package/dist/components/ProcaptchaPoW.d.ts

@@ -1,6 +1,8 @@
-/// <reference types="react" />
-declare const ProcaptchaWidget: import("react").LazyExoticComponent<(props: import("./Captcha.js").ProcaptchaProps) => import("@emotion/react/jsx-runtime").JSX.Element>;
+import { LazyExoticComponent } from 'react';
+import { ProcaptchaEvents } from '@prosopo/types';
+import { ReactElement } from 'react';
 type ProcaptchaProps = React.ComponentProps<typeof ProcaptchaWidget>;
+declare const ProcaptchaWidget: LazyExoticComponent<(props: any, callbacks: Partial<ProcaptchaEvents>) => ReactElement>;
 export declare const ProcaptchaPow: (props: ProcaptchaProps) => import("@emotion/react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=ProcaptchaPoW.d.ts.map

package/dist/components/ProcaptchaPoW.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProcaptchaPoW.d.ts","sourceRoot":"","sources":["../../src/components/ProcaptchaPoW.tsx"],"names":[],"mappings":";AAgBA,QAAA,MAAM,gBAAgB,0IAA2C,CAAA;AACjE,KAAK,eAAe,GAAG,KAAK,CAAC,cAAc,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAEpE,eAAO,MAAM,aAAa,UAAW,eAAe,qDAInD,CAAA"}
+{"version":3,"file":"ProcaptchaPoW.d.ts","sourceRoot":"","sources":["../../src/components/ProcaptchaPoW.tsx"],"names":[],"mappings":"AAaA,OAAO,EAAE,mBAAmB,EAAkB,MAAM,OAAO,CAAA;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAEpC,KAAK,eAAe,GAAG,KAAK,CAAC,cAAc,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAEpE,QAAA,MAAM,gBAAgB,EAAE,mBAAmB,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,gBAAgB,CAAC,KAAK,YAAY,CAE7G,CAAA;AAED,eAAO,MAAM,aAAa,UAAW,eAAe,qDAInD,CAAA"}

package/dist/components/ProcaptchaPoW.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
-import { ProcaptchaPlaceholder } from '@prosopo/web-components';
 import { Suspense, lazy } from 'react';
+import { ProcaptchaPlaceholder } from '@prosopo/web-components';
 const ProcaptchaWidget = lazy(async () => import('./Captcha.js'));
 export const ProcaptchaPow = (props) => (_jsx(Suspense, { fallback: _jsx(ProcaptchaPlaceholder, { darkMode: props.config.theme }), children: _jsx(ProcaptchaWidget, { config: props.config, callbacks: props.callbacks }) }));
 //# sourceMappingURL=ProcaptchaPoW.js.map

package/dist/components/ProcaptchaPoW.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProcaptchaPoW.js","sourceRoot":"","sources":["../../src/components/ProcaptchaPoW.tsx"],"names":[],"mappings":";AAaA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEtC,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAA;AAGjE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAsB,EAAE,EAAE,CAAC,CACrD,KAAC,QAAQ,IAAC,QAAQ,EAAE,KAAC,qBAAqB,IAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,GAAI,YACvE,KAAC,gBAAgB,IAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,GAAqB,GAChF,CACd,CAAA"}
+{"version":3,"file":"ProcaptchaPoW.js","sourceRoot":"","sources":["../../src/components/ProcaptchaPoW.tsx"],"names":[],"mappings":";AAaA,OAAO,EAAuB,QAAQ,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAE3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAK/D,MAAM,gBAAgB,GAA4F,IAAI,CAClH,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CACrC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAsB,EAAE,EAAE,CAAC,CACrD,KAAC,QAAQ,IAAC,QAAQ,EAAE,KAAC,qBAAqB,IAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,GAAI,YACvE,KAAC,gBAAgB,IAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,GAAqB,GAChF,CACd,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@prosopo/procaptcha-pow",
-    "version": "0.3.2",
+    "version": "0.3.3",
     "author": "PROSOPO LIMITED <info@prosopo.io>",
     "license": "Apache-2.0",
     "main": "./dist/index.js",
@@ -37,13 +37,13 @@
         "@emotion/styled": "^11.11.0",
         "@noble/hashes": "^1.3.3",
         "@polkadot/extension-inject": "0.46.6",
-        "@prosopo/account": "0.3.2",
-        "@prosopo/api": "0.3.2",
-        "@prosopo/common": "0.3.2",
-        "@prosopo/procaptcha": "0.3.2",
-        "@prosopo/types": "0.3.2",
-        "@prosopo/util": "0.3.2",
-        "@prosopo/web-components": "0.3.2",
+        "@prosopo/account": "0.3.3",
+        "@prosopo/api": "0.3.3",
+        "@prosopo/common": "0.3.3",
+        "@prosopo/procaptcha": "0.3.3",
+        "@prosopo/types": "0.3.3",
+        "@prosopo/util": "0.3.3",
+        "@prosopo/web-components": "0.3.3",
         "react": "^18.2.0"
     },
     "devDependencies": {