@prosopo/procaptcha 2.0.3 → 2.1.1

package/dist/cjs/modules/Manager.cjs

@@ -2,19 +2,16 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const utilCrypto = require("@polkadot/util-crypto");
 const random = require("@polkadot/util-crypto/random");
-require("../account/dist/index.cjs");
+const string = require("@polkadot/util/string");
+const account = require("@prosopo/account");
 const api = require("@prosopo/api");
 const common = require("@prosopo/common");
-const loadBalancer = require("@prosopo/load-balancer");
 const procaptchaCommon = require("@prosopo/procaptcha-common");
 const types = require("@prosopo/types");
 const util = require("@prosopo/util");
 const utils = require("../utils/utils.cjs");
 const ProsopoCaptchaApi = require("./ProsopoCaptchaApi.cjs");
 const storage = require("./storage.cjs");
-const string = require("@polkadot/util/string");
-const ExtensionWeb2 = require("../account/dist/extension/ExtensionWeb2.cjs");
-const ExtensionWeb3 = require("../account/dist/extension/ExtensionWeb3.cjs");
 const defaultState = () => {
   return {
     // note order matters! see buildUpdateState. These fields are set in order, so disable modal first, then set loading to false, etc.
@@ -29,28 +26,8 @@ const defaultState = () => {
     // don't handle timeout here, this should be handled by the state management
   };
 };
-const getRandomActiveProvider = (config) => {
-  const randomIntBetween = (min, max) => Math.floor(Math.random() * (max - min + 1) + min);
-  const PROVIDERS = loadBalancer.loadBalancer(config.defaultEnvironment);
-  const randomProvderObj = util.at(
-    PROVIDERS,
-    randomIntBetween(0, PROVIDERS.length - 1)
-  );
-  return {
-    providerAccount: randomProvderObj.address,
-    provider: {
-      url: randomProvderObj.url,
-      datasetId: randomProvderObj.datasetId,
-      datasetIdContent: randomProvderObj.datasetIdContent
-    }
-  };
-};
 function Manager(configOptional, state, onStateUpdate, callbacks) {
   const events = procaptchaCommon.getDefaultEvents(onStateUpdate, state, callbacks);
-  const dispatchErrorEvent = (err) => {
-    const error = err instanceof Error ? err : new Error(String(err));
-    events.onError(error);
-  };
   const updateState = procaptchaCommon.buildUpdateState(state, onStateUpdate);
   const getConfig = () => {
     const config = {
@@ -62,152 +39,167 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
     }
     return types.ProcaptchaConfigSchema.parse(config);
   };
-  const fallable = async (fn) => {
-    try {
-      await fn();
-    } catch (err) {
-      console.error(err);
-      dispatchErrorEvent(err);
-      updateState({ isHuman: false, showModal: false, loading: false });
-    }
-  };
   const start = async () => {
     events.onOpen();
-    await fallable(async () => {
-      if (state.loading) {
-        return;
-      }
-      if (state.isHuman) {
-        return;
-      }
-      await utilCrypto.cryptoWaitReady();
-      resetState();
-      updateState({ loading: true });
-      const config = getConfig();
-      updateState({ dappAccount: config.account.address });
-      await utils.sleep(100);
-      const account = await loadAccount();
-      const getRandomProviderResponse = getRandomActiveProvider(getConfig());
-      const providerUrl = getRandomProviderResponse.provider.url;
-      const providerApi = await loadProviderApi(providerUrl);
-      const captchaApi = new ProsopoCaptchaApi.ProsopoCaptchaApi(
-        account.account.address,
-        getRandomProviderResponse,
-        providerApi,
-        config.web2,
-        config.account.address || ""
-      );
-      updateState({ captchaApi });
-      const challenge = await captchaApi.getCaptchaChallenge();
-      if (challenge.captchas.length <= 0) {
-        throw new common.ProsopoDatasetError("DEVELOPER.PROVIDER_NO_CAPTCHA");
-      }
-      const timeMillis = challenge.captchas.map(
-        (captcha) => captcha.timeLimitMs || config.captchas.image.challengeTimeout
-      ).reduce((a, b) => a + b);
-      const timeout = setTimeout(() => {
-        events.onChallengeExpired();
-        updateState({ isHuman: false, showModal: false, loading: false });
-      }, timeMillis);
-      updateState({
-        index: 0,
-        solutions: challenge.captchas.map(() => []),
-        challenge,
-        showModal: true,
-        timeout
-      });
-    });
+    await procaptchaCommon.providerRetry(
+      async () => {
+        if (state.loading) {
+          return;
+        }
+        if (state.isHuman) {
+          return;
+        }
+        await utilCrypto.cryptoWaitReady();
+        resetState();
+        updateState({ loading: true });
+        updateState({
+          attemptCount: state.attemptCount ? state.attemptCount + 1 : 1
+        });
+        const config = getConfig();
+        updateState({ dappAccount: config.account.address });
+        await utils.sleep(100);
+        const account2 = await loadAccount();
+        const getRandomProviderResponse = await procaptchaCommon.getRandomActiveProvider(
+          getConfig()
+        );
+        const providerUrl = getRandomProviderResponse.provider.url;
+        const providerApi = await loadProviderApi(providerUrl);
+        const captchaApi = new ProsopoCaptchaApi.ProsopoCaptchaApi(
+          account2.account.address,
+          getRandomProviderResponse,
+          providerApi,
+          config.web2,
+          config.account.address || ""
+        );
+        updateState({ captchaApi });
+        const challenge = await captchaApi.getCaptchaChallenge();
+        if (challenge.error) {
+          updateState({
+            loading: false,
+            error: challenge.error
+          });
+        } else {
+          if (challenge.captchas.length <= 0) {
+            throw new common.ProsopoDatasetError("DEVELOPER.PROVIDER_NO_CAPTCHA");
+          }
+          const timeMillis = challenge.captchas.map(
+            (captcha) => captcha.timeLimitMs || config.captchas.image.challengeTimeout
+          ).reduce((a, b) => a + b);
+          const timeout = setTimeout(() => {
+            events.onChallengeExpired();
+            updateState({ isHuman: false, showModal: false, loading: false });
+          }, timeMillis);
+          updateState({
+            index: 0,
+            solutions: challenge.captchas.map(() => []),
+            challenge,
+            showModal: true,
+            timeout
+          });
+        }
+      },
+      start,
+      resetState,
+      state.attemptCount,
+      10
+    );
   };
   const submit = async () => {
-    await fallable(async () => {
-      clearTimeout();
-      if (!state.challenge) {
-        throw new common.ProsopoError("CAPTCHA.NO_CAPTCHA", {
-          context: { error: "Cannot submit, no Captcha found in state" }
-        });
-      }
-      updateState({ showModal: false });
-      const challenge = state.challenge;
-      const salt = random.randomAsHex();
-      const captchaSolution = state.challenge.captchas.map(
-        (captcha, index) => {
-          const solution = util.at(state.solutions, index);
-          return {
-            captchaId: captcha.captchaId,
-            captchaContentId: captcha.captchaContentId,
-            salt,
-            solution
-          };
+    await procaptchaCommon.providerRetry(
+      async () => {
+        clearTimeout();
+        if (!state.challenge) {
+          throw new common.ProsopoError("CAPTCHA.NO_CAPTCHA", {
+            context: { error: "Cannot submit, no Captcha found in state" }
+          });
         }
-      );
-      const account = getAccount();
-      const signer = getExtension(account).signer;
-      const first = util.at(challenge.captchas, 0);
-      if (!first.datasetId) {
-        throw new common.ProsopoDatasetError("CAPTCHA.INVALID_CAPTCHA_ID", {
-          context: { error: "No datasetId set for challenge" }
-        });
-      }
-      const captchaApi = state.captchaApi;
-      if (!captchaApi) {
-        throw new common.ProsopoError("CAPTCHA.INVALID_TOKEN", {
-          context: { error: "No Captcha API found in state" }
-        });
-      }
-      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"
+        updateState({ showModal: false });
+        const challenge = state.challenge;
+        const salt = random.randomAsHex();
+        const captchaSolution = state.challenge.captchas.map(
+          (captcha, index) => {
+            const solution = util.at(state.solutions, index);
+            return {
+              captchaId: captcha.captchaId,
+              captchaContentId: captcha.captchaContentId,
+              salt,
+              solution
+            };
           }
+        );
+        const account2 = getAccount();
+        const signer = getExtension(account2).signer;
+        const first = util.at(challenge.captchas, 0);
+        if (!first.datasetId) {
+          throw new common.ProsopoDatasetError("CAPTCHA.INVALID_CAPTCHA_ID", {
+            context: { error: "No datasetId set for challenge" }
+          });
+        }
+        const captchaApi = state.captchaApi;
+        if (!captchaApi) {
+          throw new common.ProsopoError("CAPTCHA.INVALID_TOKEN", {
+            context: { error: "No Captcha API found in state" }
+          });
+        }
+        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 userRequestHashSignature = await signer.signRaw({
+          address: account2.account.address,
+          data: string.stringToHex(challenge.requestHash),
+          type: "bytes"
         });
-      }
-      const userRequestHashSignature = await signer.signRaw({
-        address: account.account.address,
-        data: string.stringToHex(challenge.requestHash),
-        type: "bytes"
-      });
-      const submission = await captchaApi.submitCaptchaSolution(
-        userRequestHashSignature.signature,
-        challenge.requestHash,
-        captchaSolution,
-        challenge.timestamp,
-        challenge.signature.provider.requestHash
-      );
-      const isHuman = submission[0].verified;
-      if (!isHuman) {
-        events.onFailed();
-      }
-      updateState({
-        submission,
-        isHuman,
-        loading: false
-      });
-      if (state.isHuman) {
-        const providerUrl = captchaApi.provider.provider.url;
-        storage.setProcaptchaStorage({
-          ...storage.getProcaptchaStorage(),
-          providerUrl
+        const submission = await captchaApi.submitCaptchaSolution(
+          userRequestHashSignature.signature,
+          challenge.requestHash,
+          captchaSolution,
+          challenge.timestamp,
+          challenge.signature.provider.requestHash
+        );
+        const isHuman = submission[0].verified;
+        if (!isHuman) {
+          events.onFailed();
+        }
+        updateState({
+          submission,
+          isHuman,
+          loading: false
         });
-        events.onHuman(
-          types.encodeProcaptchaOutput({
-            [types.ApiParams.providerUrl]: providerUrl,
-            [types.ApiParams.user]: account.account.address,
-            [types.ApiParams.dapp]: getDappAccount(),
-            [types.ApiParams.commitmentId]: util.hashToHex(submission[1]),
-            [types.ApiParams.timestamp]: challenge.timestamp,
-            [types.ApiParams.signature]: {
-              [types.ApiParams.provider]: {
-                [types.ApiParams.requestHash]: challenge.signature.provider.requestHash
-              },
-              [types.ApiParams.user]: {
-                [types.ApiParams.requestHash]: userRequestHashSignature.signature
+        if (state.isHuman) {
+          const providerUrl = captchaApi.provider.provider.url;
+          storage.setProcaptchaStorage({
+            ...storage.getProcaptchaStorage(),
+            providerUrl
+          });
+          events.onHuman(
+            types.encodeProcaptchaOutput({
+              [types.ApiParams.providerUrl]: providerUrl,
+              [types.ApiParams.user]: account2.account.address,
+              [types.ApiParams.dapp]: getDappAccount(),
+              [types.ApiParams.commitmentId]: util.hashToHex(submission[1]),
+              [types.ApiParams.timestamp]: challenge.timestamp,
+              [types.ApiParams.signature]: {
+                [types.ApiParams.provider]: {
+                  [types.ApiParams.requestHash]: challenge.signature.provider.requestHash
+                },
+                [types.ApiParams.user]: {
+                  [types.ApiParams.requestHash]: userRequestHashSignature.signature
+                }
               }
-            }
-          })
-        );
-        setValidChallengeTimeout();
-      }
-    });
+            })
+          );
+          setValidChallengeTimeout();
+        }
+      },
+      start,
+      resetState,
+      state.attemptCount,
+      10
+    );
   };
   const cancel = async () => {
     clearTimeout();
@@ -282,10 +274,10 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
         context: { error: "Account address has not been set for web3 mode" }
       });
     }
-    const ext = config.web2 ? new ExtensionWeb2.ExtensionWeb2() : new ExtensionWeb3.ExtensionWeb3();
-    const account = await ext.getAccount(config);
-    storage.setAccount(account.account.address);
-    updateState({ account });
+    const ext = config.web2 ? new account.ExtensionWeb2() : new account.ExtensionWeb3();
+    const account$1 = await ext.getAccount(config);
+    storage.setAccount(account$1.account.address);
+    updateState({ account: account$1 });
     return getAccount();
   };
   const getAccount = () => {
@@ -294,8 +286,8 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
         context: { error: "Account not loaded" }
       });
     }
-    const account = state.account;
-    return account;
+    const account2 = state.account;
+    return account2;
   };
   const getDappAccount = () => {
     if (!state.dappAccount) {
@@ -305,13 +297,13 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
     return dappAccount;
   };
   const getExtension = (possiblyAccount) => {
-    const account = possiblyAccount || getAccount();
-    if (!account.extension) {
+    const account2 = possiblyAccount || getAccount();
+    if (!account2.extension) {
       throw new common.ProsopoEnvError("ACCOUNT.NO_POLKADOT_EXTENSION", {
         context: { error: "Extension not loaded" }
       });
     }
-    return account.extension;
+    return account2.extension;
   };
   return {
     start,

package/dist/cjs/modules/ProsopoCaptchaApi.cjs

@@ -2,6 +2,7 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const common = require("@prosopo/common");
 const datasets = require("@prosopo/datasets");
+const types = require("@prosopo/types");
 class ProsopoCaptchaApi {
   constructor(userAccount, provider, providerApi, web2, dappAccount) {
     this.userAccount = userAccount;
@@ -19,6 +20,9 @@ class ProsopoCaptchaApi {
         this.userAccount,
         this.provider
       );
+      if (captchaChallenge[types.ApiParams.error]) {
+        return captchaChallenge;
+      }
       for (const captcha of captchaChallenge.captchas) {
         for (const item of captcha.items) {
           if (item.data) {

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

@@ -1 +1 @@
-{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../src/modules/Manager.ts"],"names":[],"mappings":"AAwBA,OAAO,EAKL,KAAK,mBAAmB,EAExB,KAAK,4BAA4B,EAEjC,KAAK,eAAe,EACpB,KAAK,uBAAuB,EAK7B,MAAM,gBAAgB,CAAC;AAkDxB,wBAAgB,OAAO,CACrB,cAAc,EAAE,4BAA4B,EAC5C,KAAK,EAAE,eAAe,EACtB,aAAa,EAAE,uBAAuB,EACtC,SAAS,EAAE,mBAAmB;;;;mBAuPR,MAAM;;EA2I7B"}
+{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../src/modules/Manager.ts"],"names":[],"mappings":"AA8BA,OAAO,EAKN,KAAK,mBAAmB,EAExB,KAAK,4BAA4B,EAEjC,KAAK,eAAe,EACpB,KAAK,uBAAuB,EAG5B,MAAM,gBAAgB,CAAC;AAwBxB,wBAAgB,OAAO,CACtB,cAAc,EAAE,4BAA4B,EAC5C,KAAK,EAAE,eAAe,EACtB,aAAa,EAAE,uBAAuB,EACtC,SAAS,EAAE,mBAAmB;;;;mBA8PR,MAAM;;EA2I5B"}