@prosopo/procaptcha 0.3.1 → 0.3.3

package/dist/cjs/account/dist/extension/Extension.cjs

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+class Extension {
+}
+exports.Extension = Extension;

package/dist/cjs/{api → account/dist/extension}/ExtensionWeb2.cjs

@@ -1,5 +1,7 @@
 "use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Api = require("@polkadot/api/promise/Api");
+const Extension = require("./Extension.cjs");
 const keyring = require("@polkadot/keyring");
 const common = require("@prosopo/common");
 const ws = require("@polkadot/rpc-provider/ws");
@@ -9,9 +11,8 @@ const fingerprintjs = require("@fingerprintjs/fingerprintjs");
 const util = require("@prosopo/util");
 const string = require("@polkadot/util/string");
 const u8a = require("@polkadot/util/u8a");
-const Extension = require("./Extension.cjs");
 const Signer = require("@polkadot/extension-base/page/Signer");
-class ExtWeb2 extends Extension {
+class ExtensionWeb2 extends Extension.Extension {
   constructor() {
     super(...arguments);
     this.getNetwork = (config) => {
@@ -42,7 +43,6 @@ class ExtWeb2 extends Extension {
       const signature = account.keypair.sign(payload.data);
       return {
         id: 1,
-        // the id of the request to sign. This should be incremented each time and adjust the signature, but we're hacking around this. Hence the signature will always be the same given the same payload.
         signature: u8a.u8aToHex(signature)
       };
     };
@@ -97,4 +97,4 @@ class ExtWeb2 extends Extension {
     return fingerprintjs.hashComponents(componentsReduced);
   }
 }
-module.exports = ExtWeb2;
+exports.ExtensionWeb2 = ExtensionWeb2;

package/dist/cjs/{api → account/dist/extension}/ExtensionWeb3.cjs

@@ -1,16 +1,17 @@
 "use strict";
-const errors = require("./errors.cjs");
-const extensionDapp = require("@polkadot/extension-dapp");
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Extension = require("./Extension.cjs");
-class ExtWeb3 extends Extension {
+const common = require("@prosopo/common");
+const extensionDapp = require("@polkadot/extension-dapp");
+class ExtensionWeb3 extends Extension.Extension {
   async getAccount(config) {
     const { dappName, userAccountAddress: address } = config;
     if (!address) {
-      throw new errors.AccountNotFoundError("No account address provided");
+      throw new common.ProsopoError("WIDGET.NO_ACCOUNTS_FOUND", { context: { error: "No account address provided" } });
     }
     const extensions = await extensionDapp.web3Enable(dappName);
     if (extensions.length === 0) {
-      throw new errors.ExtensionNotFoundError();
+      throw new common.ProsopoError("WIDGET.NO_EXTENSION_FOUND");
     }
     for (const extension of extensions) {
       const accounts = await extension.accounts.get();
@@ -19,7 +20,9 @@ class ExtWeb3 extends Extension {
         return { account, extension };
       }
     }
-    throw new errors.AccountNotFoundError("No account found matching " + address);
+    throw new common.ProsopoError("WIDGET.ACCOUNT_NOT_FOUND", {
+      context: { error: `No account found matching ${address}` }
+    });
   }
 }
-module.exports = ExtWeb3;
+exports.ExtensionWeb3 = ExtensionWeb3;

package/dist/cjs/account/dist/index.cjs

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const Extension = require("./extension/Extension.cjs");
+const ExtensionWeb2 = require("./extension/ExtensionWeb2.cjs");
+const ExtensionWeb3 = require("./extension/ExtensionWeb3.cjs");
+exports.Extension = Extension.Extension;
+exports.ExtensionWeb2 = ExtensionWeb2.ExtensionWeb2;
+exports.ExtensionWeb3 = ExtensionWeb3.ExtensionWeb3;

package/dist/cjs/index.cjs

@@ -1,18 +1,12 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("./api/index.cjs");
 require("./modules/index.cjs");
-require("./types/index.cjs");
 require("./utils/index.cjs");
-const ExtensionWeb2 = require("./api/ExtensionWeb2.cjs");
 const Manager = require("./modules/Manager.cjs");
 const ProsopoCaptchaApi = require("./modules/ProsopoCaptchaApi.cjs");
 const collector = require("./modules/collector.cjs");
-const manager = require("./types/manager.cjs");
 const utils = require("./utils/utils.cjs");
-exports.ExtensionWeb2 = ExtensionWeb2;
 exports.Manager = Manager.Manager;
 exports.ProsopoCaptchaApi = ProsopoCaptchaApi.ProsopoCaptchaApi;
 exports.startCollector = collector.startCollector;
-exports.ProcapchaEventNames = manager.ProcapchaEventNames;
 exports.sleep = utils.sleep;

package/dist/cjs/modules/Manager.cjs

@@ -1,22 +1,23 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const types = require("@prosopo/types");
-const errors = require("../api/errors.cjs");
 const Api = require("@polkadot/api/promise/Api");
-const api = require("@prosopo/api");
+require("../account/dist/index.cjs");
 const keyring = require("@polkadot/keyring");
 const common = require("@prosopo/common");
 const contract = require("@prosopo/contract");
+const api = require("@prosopo/api");
 const ws = require("@polkadot/rpc-provider/ws");
 const contractInfo = require("@prosopo/captcha-contract/contract-info");
 const util = require("@prosopo/util");
+const procaptchaCommon = require("@prosopo/procaptcha-common");
 const random = require("@polkadot/util-crypto/random");
 const utils = require("../utils/utils.cjs");
 const string = require("@polkadot/util/string");
-const ExtensionWeb2 = require("../api/ExtensionWeb2.cjs");
-const ExtensionWeb3 = require("../api/ExtensionWeb3.cjs");
 const ProsopoCaptchaApi = require("./ProsopoCaptchaApi.cjs");
 const storage = require("./storage.cjs");
+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.
@@ -31,14 +32,6 @@ const defaultState = () => {
     // don't handle timeout here, this should be handled by the state management
   };
 };
-const buildUpdateState = (state, onStateUpdate) => {
-  const updateCurrentState = (nextState) => {
-    Object.assign(state, nextState);
-    onStateUpdate(nextState);
-    console.log("Procaptcha state update:", nextState, "\nResult:", state);
-  };
-  return updateCurrentState;
-};
 const getNetwork = (config) => {
   const network = config.networks[config.defaultNetwork];
   if (!network) {
@@ -50,49 +43,14 @@ const getNetwork = (config) => {
 };
 function Manager(configOptional, state, onStateUpdate, callbacks) {
   const alertError = (error) => {
-    console.log(error);
     alert(error.message);
   };
-  const events = Object.assign(
-    {
-      onAccountNotFound: alertError,
-      onError: alertError,
-      onHuman: (output) => {
-        console.log("onHuman event triggered", output);
-        updateState({ sendData: !state.sendData });
-      },
-      onExtensionNotFound: () => {
-        alert("No extension found");
-      },
-      onFailed: () => {
-        alert("Captcha challenge failed. Please try again");
-        updateState({ sendData: !state.sendData });
-      },
-      onExpired: () => {
-        alert("Completed challenge has expired, please try again");
-      },
-      onChallengeExpired: () => {
-        alert("Uncompleted challenge has expired, please try again");
-      },
-      onOpen: () => {
-        console.log("onOpen event triggered");
-        updateState({ sendData: !state.sendData });
-      },
-      onClose: () => {
-        console.log("onClose event triggered");
-      }
-    },
-    callbacks
-  );
+  const events = procaptchaCommon.getDefaultEvents(onStateUpdate, state, callbacks);
   const dispatchErrorEvent = (err) => {
     const error = err instanceof Error ? err : new Error(String(err));
-    if (error instanceof errors.AccountNotFoundError) {
-      events.onAccountNotFound(error.message);
-    } else {
-      events.onError(error);
-    }
+    events.onError(error);
   };
-  const updateState = buildUpdateState(state, onStateUpdate);
+  const updateState = procaptchaCommon.buildUpdateState(state, onStateUpdate);
   const getConfig = () => {
     const config = {
       userAccountAddress: "",
@@ -113,15 +71,12 @@ 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");
         return;
       }
       if (state.isHuman) {
-        console.log("already human");
         return;
       }
       resetState();
@@ -157,14 +112,16 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
             void 0,
             configOptional.challengeValidLength
           );
-          if (verifyDappUserResponse.solutionApproved) {
+          if (verifyDappUserResponse.verified) {
             updateState({ isHuman: true, loading: false });
-            events.onHuman({
-              providerUrl: providerUrlFromStorage,
-              user: account.account.address,
-              dapp: getDappAccount(),
-              commitmentId: verifyDappUserResponse.commitmentId
-            });
+            const output = {
+              [types.ApiParams.providerUrl]: providerUrlFromStorage,
+              [types.ApiParams.user]: account.account.address,
+              [types.ApiParams.dapp]: getDappAccount(),
+              [types.ApiParams.commitmentId]: util.hashToHex(verifyDappUserResponse.commitmentId),
+              [types.ApiParams.blockNumber]: verifyDappUserResponse.blockNumber
+            };
+            events.onHuman(output);
             setValidChallengeTimeout();
             return;
           }
@@ -178,26 +135,20 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
         type: "bytes"
       };
       const signed = await account.extension.signer.signRaw(payload);
-      console.log("Signature:", signed);
       const getRandomProviderResponse = await contract.wrapQuery(
         contract$1.query.getRandomActiveProvider,
         contract$1.query
       )(account.account.address, getDappAccount());
       const blockNumber = parseInt(getRandomProviderResponse.blockNumber.toString());
-      console.log("provider", getRandomProviderResponse);
       const providerUrl = common.trimProviderUrl(getRandomProviderResponse.provider.url.toString());
       providerApi = await loadProviderApi(providerUrl);
-      console.log("providerApi", providerApi);
       const captchaApi = await loadCaptchaApi(contract$1, getRandomProviderResponse, providerApi);
-      console.log("captchaApi", captchaApi);
       const challenge = await captchaApi.getCaptchaChallenge();
-      console.log("challenge", challenge);
       if (challenge.captchas.length <= 0) {
         throw new common.ProsopoApiError("DEVELOPER.PROVIDER_NO_CAPTCHA");
       }
       const timeMillis = challenge.captchas.map((captcha) => captcha.captcha.timeLimitMs || 30 * 1e3).reduce((a, b) => a + b);
       const timeout = setTimeout(() => {
-        console.log("challenge expired after " + timeMillis + "ms");
         events.onChallengeExpired();
         updateState({ isHuman: false, showModal: false, loading: false });
       }, timeMillis);
@@ -213,7 +164,6 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
   };
   const submit = async () => {
     await fallable(async () => {
-      console.log("submitting solutions");
       clearTimeout();
       if (!state.challenge) {
         throw new common.ProsopoError("CAPTCHA.NO_CAPTCHA", {
@@ -223,15 +173,17 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
       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.captcha.captchaId,
-          captchaContentId: captcha.captcha.captchaContentId,
-          salt,
-          solution
-        };
-      });
+      const captchaSolution = state.challenge.captchas.map(
+        (captcha, index) => {
+          const solution = util.at(state.solutions, index);
+          return {
+            captchaId: captcha.captcha.captchaId,
+            captchaContentId: captcha.captcha.captchaContentId,
+            salt,
+            solution
+          };
+        }
+      );
       const account = getAccount();
       const blockNumber = getBlockNumber();
       const signer = account.extension.signer;
@@ -249,7 +201,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
         captchaSolution,
         salt
       );
-      const isHuman = submission[0].solutionApproved;
+      const isHuman = submission[0].verified;
       if (!isHuman) {
         events.onFailed();
       }
@@ -265,7 +217,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
           providerUrl: trimmedUrl,
           user: account.account.address,
           dapp: getDappAccount(),
-          commitmentId: submission[1],
+          commitmentId: util.hashToHex(submission[1]),
           blockNumber
         });
         setValidChallengeTimeout();
@@ -273,7 +225,6 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
     });
   };
   const cancel = async () => {
-    console.log("cancel");
     clearTimeout();
     resetState();
     events.onClose();
@@ -293,10 +244,8 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
     const solutions = state.solutions;
     const solution = util.at(solutions, index);
     if (solution.includes(hash)) {
-      console.log("deselecting", hash);
       solution.splice(solution.indexOf(hash), 1);
     } else {
-      console.log("selecting", hash);
       solution.push(hash);
     }
     updateState({ solutions });
@@ -312,7 +261,6 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
         context: { error: "Cannot select, index is out of range for this Captcha" }
       });
     }
-    console.log("proceeding to next round");
     updateState({ index: state.index + 1 });
   };
   const loadCaptchaApi = async (contract2, provider, providerApi) => {
@@ -341,10 +289,8 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
     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);
@@ -367,10 +313,9 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
         context: { error: "Account address has not been set for web3 mode" }
       });
     }
-    const ext = config.web2 ? new ExtensionWeb2() : new ExtensionWeb3();
+    const ext = config.web2 ? new ExtensionWeb2.ExtensionWeb2() : new ExtensionWeb3.ExtensionWeb3();
     const account = await ext.getAccount(config);
     storage.setAccount(account.account.address);
-    console.log("Using account:", account);
     updateState({ account });
     return getAccount();
   };
@@ -411,12 +356,30 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
     );
   };
   const exportData = async (events2) => {
+    const providerUrlFromStorage = storage.getProviderUrl();
+    let providerApi;
+    if (providerUrlFromStorage) {
+      providerApi = await loadProviderApi(providerUrlFromStorage);
+    } else {
+      const contract$1 = await loadContract();
+      const getRandomProviderResponse = await contract.wrapQuery(
+        contract$1.query.getRandomActiveProvider,
+        contract$1.query
+      )(getAccount().account.address, getDappAccount());
+      const providerUrl2 = common.trimProviderUrl(getRandomProviderResponse.provider.url.toString());
+      providerApi = await loadProviderApi(providerUrl2);
+    }
     const providerUrl = storage.getProviderUrl() || state.captchaApi?.provider.provider.url.toString();
     if (!providerUrl) {
       return;
     }
-    const providerApi = await loadProviderApi(providerUrl);
-    await providerApi.submitUserEvents(events2, getAccount().account.address);
+    let account = "";
+    try {
+      account = getAccount().account.address;
+    } catch (e) {
+      console.error(e);
+    }
+    await providerApi.submitUserEvents(events2, account);
   };
   return {
     start,

package/dist/cjs/modules/ProsopoCaptchaApi.cjs

@@ -10,9 +10,12 @@ class ProsopoCaptchaApi {
     this.contract = contract;
     this.provider = provider;
     this.providerApi = providerApi;
-    this.web2 = web2;
+    this._web2 = web2;
     this.dappAccount = dappAccount;
   }
+  get web2() {
+    return this._web2;
+  }
   async getCaptchaChallenge() {
     try {
       const captchaChallenge = await this.providerApi.getCaptchaChallenge(this.userAccount, this.provider);
@@ -32,7 +35,6 @@ class ProsopoCaptchaApi {
   verifyCaptchaChallengeContent(provider, captchaChallenge) {
     const first = util.at(captchaChallenge.captchas, 0);
     const proofLength = first.proof.length;
-    console.log(provider.provider);
     const last = util.at(first.proof, proofLength - 1);
     if (provider.provider.datasetIdContent.toString() !== util.at(last, 0)) {
       throw new common.ProsopoEnvError("CAPTCHA.INVALID_DATASET_CONTENT_ID");
@@ -45,7 +47,6 @@ class ProsopoCaptchaApi {
         throw new common.ProsopoEnvError("CAPTCHA.INVALID_CAPTCHA_CHALLENGE");
       }
     }
-    console.log("CAPTCHA.CHALLENGE_VERIFIED");
     return;
   }
   async submitCaptchaSolution(signer, requestHash, datasetId, solutions, salt) {

package/dist/cjs/modules/collector.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const COLLECTOR_LIMIT = 1e3;
+const COLLECTOR_LIMIT = 1e4;
 const storeLog = (event, setEvents) => {
   setEvents((currentEvents) => {
     let newEvents = [...currentEvents, event];
@@ -28,11 +28,7 @@ const logKeyboardEvent = (event, setKeyboardEvent) => {
   storeLog(storedEvent, setKeyboardEvent);
 };
 const logTouchEvent = (event, setTouchEvent) => {
-  for (let i = 0; i < event.touches.length; i++) {
-    const touch = event.touches[i];
-    if (!touch) {
-      continue;
-    }
+  for (const touch of Array.from(event.touches)) {
     storeLog({ x: touch.clientX, y: touch.clientY, timestamp: event.timeStamp }, setTouchEvent);
   }
 };

package/dist/index.d.ts

@@ -1,6 +1,3 @@
-export * from './api/index.js';
 export * from './modules/index.js';
-export * from './types/index.js';
 export * from './utils/index.js';
-export { default as ExtensionWeb2 } from './api/ExtensionWeb2.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,gBAAgB,CAAA;AAC9B,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,wBAAwB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA"}

package/dist/index.js

@@ -1,6 +1,3 @@
-export * from './api/index.js';
 export * from './modules/index.js';
-export * from './types/index.js';
 export * from './utils/index.js';
-export { default as ExtensionWeb2 } from './api/ExtensionWeb2.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,gBAAgB,CAAA;AAC9B,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,wBAAwB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,oBAAoB,CAAA;AAClC,cAAc,kBAAkB,CAAA"}

package/dist/modules/Manager.d.ts

@@ -1,6 +1,5 @@
-import { StoredEvents } from '@prosopo/types';
-import { ProcaptchaCallbacks, ProcaptchaConfigOptional, ProcaptchaState, ProcaptchaStateUpdateFn } from '../types/manager.js';
-export declare function Manager(configOptional: ProcaptchaConfigOptional, state: ProcaptchaState, onStateUpdate: ProcaptchaStateUpdateFn, callbacks: ProcaptchaCallbacks): {
+import { ProcaptchaCallbacks, ProcaptchaClientConfigInput, ProcaptchaState, ProcaptchaStateUpdateFn, StoredEvents } from '@prosopo/types';
+export declare function Manager(configOptional: ProcaptchaClientConfigInput, state: ProcaptchaState, onStateUpdate: ProcaptchaStateUpdateFn, callbacks: ProcaptchaCallbacks): {
     start: () => Promise<void>;
     cancel: () => Promise<void>;
     submit: () => Promise<void>;

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,EAMH,YAAY,EACf,MAAM,gBAAgB,CAAA;AAKvB,OAAO,EACH,mBAAmB,EACnB,wBAAwB,EAExB,eAAe,EACf,uBAAuB,EAC1B,MAAM,qBAAqB,CAAA;AAkE5B,wBAAgB,OAAO,CACnB,cAAc,EAAE,wBAAwB,EACxC,KAAK,EAAE,eAAe,EACtB,aAAa,EAAE,uBAAuB,EACtC,SAAS,EAAE,mBAAmB;;;;mBA+TR,MAAM;;yBAkLM,YAAY;EAiBjD"}
+{"version":3,"file":"Manager.d.ts","sourceRoot":"","sources":["../../src/modules/Manager.ts"],"names":[],"mappings":"AAaA,OAAO,EAMH,mBAAmB,EACnB,2BAA2B,EAI3B,eAAe,EACf,uBAAuB,EACvB,YAAY,EAEf,MAAM,gBAAgB,CAAA;AAsDvB,wBAAgB,OAAO,CACnB,cAAc,EAAE,2BAA2B,EAC3C,KAAK,EAAE,eAAe,EACtB,aAAa,EAAE,uBAAuB,EACtC,SAAS,EAAE,mBAAmB;;;;mBAwRR,MAAM;;yBA4KM,YAAY;EAsCjD"}