@prosopo/procaptcha-frictionless 1.0.2 → 2.0.0

package/dist/cjs/procaptcha-pow/dist/Services/Manager.cjs

@@ -1,18 +1,16 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const types = require("@prosopo/types");
-const Api = require("@polkadot/api/promise/Api");
+const string = require("@polkadot/util/string");
 require("../../../account/dist/index.cjs");
-const keyring = require("@polkadot/keyring");
-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 common = require("@prosopo/common");
+const loadBalancer = require("@prosopo/load-balancer");
 const procaptcha = require("@prosopo/procaptcha");
+const procaptchaCommon = require("@prosopo/procaptcha-common");
+const types = require("@prosopo/types");
 const util = require("@prosopo/util");
 const ExtensionWeb2 = require("../../../account/dist/extension/ExtensionWeb2.cjs");
+const ExtensionWeb3 = require("../../../account/dist/extension/ExtensionWeb3.cjs");
 const Manager = (configInput, state, onStateUpdate, callbacks) => {
   const events = procaptchaCommon.getDefaultEvents(onStateUpdate, state, callbacks);
   const defaultState = () => {
@@ -31,39 +29,39 @@ const Manager = (configInput, state, onStateUpdate, callbacks) => {
     window.clearTimeout(state.timeout);
     updateState({ timeout: void 0 });
   };
+  const clearSuccessfulChallengeTimeout = () => {
+    window.clearTimeout(state.successfullChallengeTimeout);
+    updateState({ successfullChallengeTimeout: void 0 });
+  };
   const getConfig = () => {
     const config = {
       userAccountAddress: "",
       ...configInput
     };
+    if (state.account) {
+      config.userAccountAddress = state.account.account.address;
+    }
     return types.ProcaptchaConfigSchema.parse(config);
   };
   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 ${config.defaultEnvironment}` }
+        context: {
+          error: `No network found for environment ${config.defaultEnvironment}`
+        }
       });
     }
     return network;
   };
-  const loadContract = async () => {
-    const network = getNetwork(getConfig());
-    const api2 = await Api.ApiPromise.create({
-      provider: new ws.WsProvider(network.endpoint),
-      initWasm: false,
-      noInitWarn: true
-    });
-    const type = "sr25519";
-    const keyring$1 = new keyring.Keyring({ type, ss58Format: api2.registry.chainSS58 });
-    return new contract.ProsopoCaptchaContract(api2, JSON.parse(contractInfo.ContractAbi), network.contract.address, "prosopo", 0, keyring$1.addFromAddress(getConfig().account.address || ""));
-  };
   const getAccount = () => {
     if (!state.account) {
-      throw new common.ProsopoEnvError("GENERAL.ACCOUNT_NOT_FOUND", { context: { error: "Account not loaded" } });
+      throw new common.ProsopoEnvError("GENERAL.ACCOUNT_NOT_FOUND", {
+        context: { error: "Account not loaded" }
+      });
     }
     const account = state.account;
-    return account;
+    return { account };
   };
   const getDappAccount = () => {
     if (!state.dappAccount) {
@@ -75,6 +73,7 @@ const Manager = (configInput, state, onStateUpdate, callbacks) => {
   const updateState = procaptchaCommon.buildUpdateState(state, onStateUpdate);
   const resetState = () => {
     clearTimeout();
+    clearSuccessfulChallengeTimeout();
     updateState(defaultState());
   };
   const setValidChallengeTimeout = () => {
@@ -97,7 +96,7 @@ const Manager = (configInput, state, onStateUpdate, callbacks) => {
       loading: true
     });
     const config = getConfig();
-    const ext = new ExtensionWeb2.ExtensionWeb2();
+    const ext = config.web2 ? new ExtensionWeb2.ExtensionWeb2() : new ExtensionWeb3.ExtensionWeb3();
     const userAccount = config.userAccountAddress || (await ext.getAccount(config)).account.address;
     updateState({
       account: { account: { address: userAccount } }
@@ -109,14 +108,27 @@ const Manager = (configInput, state, onStateUpdate, callbacks) => {
         context: { error: "Account address has not been set for web3 mode" }
       });
     }
-    const contract$1 = await loadContract();
+    const getRandomProviderResponse = getRandomActiveProvider();
     const events2 = procaptchaCommon.getDefaultEvents(onStateUpdate, state, callbacks);
-    const getRandomProviderResponse = await contract.wrapQuery(contract$1.query.getRandomActiveProvider, contract$1.query)(userAccount, getDappAccount());
-    const providerUrl = common.trimProviderUrl(getRandomProviderResponse.provider.url.toString());
+    const providerUrl = getRandomProviderResponse.provider.url;
     const providerApi = new api.ProviderApi(getNetwork(getConfig()), providerUrl, getDappAccount());
     const challenge = await providerApi.getPowCaptchaChallenge(userAccount, getDappAccount());
     const solution = util.solvePoW(challenge.challenge, challenge.difficulty);
-    const verifiedSolution = await providerApi.submitPowCaptchaSolution(challenge, getAccount().account.address, getDappAccount(), getRandomProviderResponse, solution, config.captchas.pow.verifiedTimeout);
+    const user = await ext.getAccount(getConfig());
+    const signer = user.extension?.signer;
+    if (!signer || !signer.signRaw) {
+      throw new common.ProsopoEnvError("GENERAL.CANT_FIND_KEYRINGPAIR", {
+        context: {
+          error: "Signer is not defined, cannot sign message to prove account ownership"
+        }
+      });
+    }
+    const userTimestampSignature = await signer.signRaw({
+      address: userAccount,
+      data: string.stringToHex(challenge[types.ApiParams.timestamp].toString()),
+      type: "bytes"
+    });
+    const verifiedSolution = await providerApi.submitPowCaptchaSolution(challenge, getAccount().account.account.address, getDappAccount(), solution, userTimestampSignature.signature.toString(), config.captchas.pow.verifiedTimeout);
     if (verifiedSolution[types.ApiParams.verified]) {
       updateState({
         isHuman: true,
@@ -124,17 +136,40 @@ const Manager = (configInput, state, onStateUpdate, callbacks) => {
       });
       events2.onHuman(types.encodeProcaptchaOutput({
         [types.ApiParams.providerUrl]: providerUrl,
-        [types.ApiParams.user]: getAccount().account.address,
+        [types.ApiParams.user]: getAccount().account.account.address,
         [types.ApiParams.dapp]: getDappAccount(),
         [types.ApiParams.challenge]: challenge.challenge,
         [types.ApiParams.blockNumber]: getRandomProviderResponse.blockNumber,
-        [types.ApiParams.nonce]: solution
+        [types.ApiParams.nonce]: solution,
+        [types.ApiParams.timestamp]: challenge.timestamp,
+        [types.ApiParams.signature]: {
+          [types.ApiParams.provider]: challenge.signature.provider,
+          [types.ApiParams.user]: {
+            [types.ApiParams.timestamp]: userTimestampSignature.signature.toString()
+          }
+        }
       }));
       setValidChallengeTimeout();
     }
   };
+  const getRandomActiveProvider = () => {
+    const randomIntBetween = (min, max) => Math.floor(Math.random() * (max - min + 1) + min);
+    const environment = getConfig().defaultEnvironment;
+    const PROVIDERS = loadBalancer.loadBalancer(environment);
+    const randomProvderObj = util.at(PROVIDERS, randomIntBetween(0, PROVIDERS.length - 1));
+    return {
+      providerAccount: randomProvderObj.address,
+      provider: {
+        url: randomProvderObj.url,
+        datasetId: randomProvderObj.datasetId,
+        datasetIdContent: randomProvderObj.datasetIdContent
+      },
+      blockNumber: 0
+    };
+  };
   return {
-    start
+    start,
+    resetState
   };
 };
 exports.Manager = Manager;

package/dist/cjs/procaptcha-pow/dist/components/Captcha.cjs

@@ -1,9 +1,9 @@
 "use strict";
 const jsxRuntime = require("@emotion/react/jsx-runtime");
-const webComponents = require("@prosopo/web-components");
-const Manager = require("../Services/Manager.cjs");
 const procaptchaCommon = require("@prosopo/procaptcha-common");
+const webComponents = require("@prosopo/web-components");
 const react = require("react");
+const Manager = require("../Services/Manager.cjs");
 const Procaptcha = (props) => {
   const config = props.config;
   const themeColor = config.theme === "light" ? "light" : "dark";
@@ -11,8 +11,24 @@ const Procaptcha = (props) => {
   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 jsxRuntime.jsx("div", { children: jsxRuntime.jsx("div", { style: { maxWidth: "100%", maxHeight: "100%", overflowX: "auto" }, children: jsxRuntime.jsx(webComponents.ContainerDiv, { children: jsxRuntime.jsx(webComponents.WidthBasedStylesDiv, { children: jsxRuntime.jsxs("div", { style: webComponents.WIDGET_DIMENSIONS, "data-cy": "button-human", children: [" ", jsxRuntime.jsxs("div", { style: {
+  const manager = react.useRef(Manager.Manager(config, state, updateState, callbacks));
+  const captchaRef = react.useRef(null);
+  react.useEffect(() => {
+    const element = captchaRef.current;
+    if (!element)
+      return;
+    const form = element.closest("form");
+    if (!form)
+      return;
+    const handleSubmit = () => {
+      manager.current.resetState();
+    };
+    form.addEventListener("submit", handleSubmit);
+    return () => {
+      form.removeEventListener("submit", handleSubmit);
+    };
+  }, []);
+  return jsxRuntime.jsx("div", { ref: captchaRef, children: jsxRuntime.jsx("div", { style: { maxWidth: "100%", maxHeight: "100%", overflowX: "auto" }, children: jsxRuntime.jsx(webComponents.ContainerDiv, { children: jsxRuntime.jsx(webComponents.WidthBasedStylesDiv, { children: jsxRuntime.jsxs("div", { style: webComponents.WIDGET_DIMENSIONS, "data-cy": "button-human", children: [" ", jsxRuntime.jsxs("div", { style: {
     padding: webComponents.WIDGET_PADDING,
     border: webComponents.WIDGET_BORDER,
     backgroundColor: theme.palette.background.default,
@@ -37,6 +53,6 @@ const Procaptcha = (props) => {
     verticalAlign: "middle"
   }, children: jsxRuntime.jsx("div", { style: {
     display: "flex"
-  }, children: jsxRuntime.jsx("div", { style: { flex: 1 }, children: state.loading ? jsxRuntime.jsx(webComponents.LoadingSpinner, { themeColor, "aria-label": "Loading spinner" }) : jsxRuntime.jsx(webComponents.Checkbox, { checked: state.isHuman, onChange: manager.start, themeColor, labelText: "I am human", "aria-label": "human checkbox" }) }) }) }) }) }), jsxRuntime.jsx("div", { style: { display: "inline-flex", flexDirection: "column" }, children: jsxRuntime.jsx("a", { href: webComponents.WIDGET_URL, target: "_blank", "aria-label": webComponents.WIDGET_URL_TEXT, children: jsxRuntime.jsx("div", { style: { flex: 1 }, children: jsxRuntime.jsx(webComponents.Logo, { themeColor, "aria-label": "Prosopo logo" }) }) }) })] })] }) }) }) }) });
+  }, children: jsxRuntime.jsx("div", { style: { flex: 1 }, children: state.loading ? jsxRuntime.jsx(webComponents.LoadingSpinner, { themeColor, "aria-label": "Loading spinner" }) : jsxRuntime.jsx(webComponents.Checkbox, { checked: state.isHuman, onChange: manager.current.start, themeColor, labelText: "I am human", "aria-label": "human checkbox" }) }) }) }) }) }), jsxRuntime.jsx("div", { style: { display: "inline-flex", flexDirection: "column" }, children: jsxRuntime.jsx("a", { href: webComponents.WIDGET_URL, target: "_blank", "aria-label": webComponents.WIDGET_URL_TEXT, rel: "noreferrer", children: jsxRuntime.jsx("div", { style: { flex: 1 }, children: jsxRuntime.jsx(webComponents.Logo, { themeColor, "aria-label": "Prosopo logo" }) }) }) })] })] }) }) }) }) });
 };
 module.exports = Procaptcha;

package/dist/cjs/procaptcha-pow/dist/components/ProcaptchaPoW.cjs

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("@emotion/react/jsx-runtime");
-const react = require("react");
 const webComponents = require("@prosopo/web-components");
+const react = require("react");
 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 ProcaptchaPow = (props) => jsxRuntime.jsx(react.Suspense, { fallback: jsxRuntime.jsx(webComponents.ProcaptchaPlaceholder, { darkMode: props.config.theme }), children: jsxRuntime.jsx(ProcaptchaWidget, { config: props.config, callbacks: props.callbacks }) });

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export * from './ProcaptchaFrictionless.js';
+export * from "./ProcaptchaFrictionless.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,6BAA6B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,6BAA6B,CAAC"}

package/dist/index.js

@@ -1,2 +1,2 @@
-export * from './ProcaptchaFrictionless.js';
+export * from "./ProcaptchaFrictionless.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,6BAA6B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,6BAA6B,CAAC"}

package/package.json

@@ -1,60 +1,53 @@
 {
-    "name": "@prosopo/procaptcha-frictionless",
-    "version": "1.0.2",
-    "author": "PROSOPO LIMITED <info@prosopo.io>",
-    "license": "Apache-2.0",
-    "main": "./dist/index.js",
-    "type": "module",
-    "sideEffects": false,
-    "engines": {
-        "node": ">=20",
-        "npm": ">=9"
-    },
-    "exports": {
-        ".": {
-            "import": "./dist/index.js",
-            "require": "./dist/cjs/index.cjs"
-        }
-    },
-    "types": "./dist/index.d.ts",
-    "source": "./src/index.ts",
-    "scripts": {
-        "test": "echo \"No test specified\"",
-        "clean": "tsc --build --clean",
-        "build": "tsc --build --verbose tsconfig.json",
-        "build:cjs": "npx vite --config vite.cjs.config.ts build",
-        "eslint": "npx eslint . --cache --cache-location ../../node_modules/.cache/eslint/.eslintcache --no-error-on-unmatched-pattern --ignore-path ../../.eslintignore --quiet",
-        "eslint:fix": "npm run eslint -- --fix",
-        "prettier": "npx prettier . --cache --cache-location ../../node_modules/.cache/prettier/.prettiercache --check --no-error-on-unmatched-pattern --ignore-path ../../.eslintignore",
-        "prettier:fix": "npm run prettier -- --write",
-        "lint": "npm run eslint && npm run prettier",
-        "lint:fix": "npm run eslint:fix && npm run prettier:fix"
-    },
-    "browserslist": [
-        "> 0.5%, last 2 versions, not dead"
-    ],
-    "dependencies": {
-        "@fingerprintjs/botd": "^1.9.0",
-        "@prosopo/procaptcha-pow": "1.0.2",
-        "@prosopo/procaptcha-react": "1.0.2",
-        "@prosopo/types": "1.0.2",
-        "@prosopo/web-components": "1.0.2",
-        "react": "^18.3.1"
-    },
-    "devDependencies": {
-        "tslib": "2.6.2",
-        "typescript": "5.1.6"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/prosopo/captcha.git"
-    },
-    "bugs": {
-        "url": "https://github.com/prosopo/captcha/issues"
-    },
-    "homepage": "https://github.com/prosopo/captcha#readme",
-    "description": "",
-    "publishConfig": {
-        "registry": "https://registry.npmjs.org"
-    }
+	"name": "@prosopo/procaptcha-frictionless",
+	"version": "2.0.0",
+	"author": "PROSOPO LIMITED <info@prosopo.io>",
+	"license": "Apache-2.0",
+	"main": "./dist/index.js",
+	"type": "module",
+	"sideEffects": false,
+	"engines": {
+		"node": ">=20",
+		"npm": ">=9"
+	},
+	"exports": {
+		".": {
+			"import": "./dist/index.js",
+			"require": "./dist/cjs/index.cjs"
+		}
+	},
+	"types": "./dist/index.d.ts",
+	"source": "./src/index.ts",
+	"scripts": {
+		"test": "echo \"No test specified\"",
+		"clean": "tsc --build --clean",
+		"build": "tsc --build --verbose",
+		"build:cjs": "npx vite --config vite.cjs.config.ts build"
+	},
+	"browserslist": ["> 0.5%, last 2 versions, not dead"],
+	"dependencies": {
+		"@prosopo/detector": "2.0.0",
+		"@prosopo/procaptcha-pow": "2.0.0",
+		"@prosopo/procaptcha-react": "2.0.0",
+		"@prosopo/types": "2.0.0",
+		"@prosopo/web-components": "2.0.0",
+		"react": "^18.3.1"
+	},
+	"devDependencies": {
+		"@prosopo/config": "2.0.0",
+		"tslib": "2.6.2",
+		"typescript": "5.1.6"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/prosopo/captcha.git"
+	},
+	"bugs": {
+		"url": "https://github.com/prosopo/captcha/issues"
+	},
+	"homepage": "https://github.com/prosopo/captcha#readme",
+	"description": "",
+	"publishConfig": {
+		"registry": "https://registry.npmjs.org"
+	}
 }

package/vite.cjs.config.ts

@@ -1,3 +1,4 @@
+import path from "node:path";
 // Copyright 2021-2024 Prosopo (UK) Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,9 +12,11 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { ViteCommonJSConfig } from '@prosopo/config'
-import path from 'path'
+import { ViteCommonJSConfig } from "@prosopo/config";
 
 export default function () {
-    return ViteCommonJSConfig('procaptcha-frictionless', path.resolve('./tsconfig.cjs.json'))
+	return ViteCommonJSConfig(
+		"procaptcha-frictionless",
+		path.resolve("./tsconfig.cjs.json"),
+	);
 }