@prosopo/procaptcha 0.2.32 → 0.2.36

package/dist/cjs/index.cjs

@@ -6,11 +6,13 @@ require("./types/index.cjs");
 require("./utils/index.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.Manager = Manager.Manager;
 exports.defaultState = Manager.defaultState;
 exports.getNetwork = Manager.getNetwork;
 exports.ProsopoCaptchaApi = ProsopoCaptchaApi.ProsopoCaptchaApi;
+exports.startCollector = collector.startCollector;
 exports.ProcapchaEventNames = manager.ProcapchaEventNames;
 exports.sleep = utils.sleep;

package/dist/cjs/modules/Manager.cjs

@@ -5,10 +5,10 @@ const Api = require("@polkadot/api/promise/Api");
 const types = require("@prosopo/types");
 const api = require("@prosopo/api");
 const keyring = require("@polkadot/keyring");
-const contract = require("@prosopo/contract");
 const common = require("@prosopo/common");
+const contract = require("@prosopo/contract");
 const ws = require("@polkadot/rpc-provider/ws");
-const captcha = require("../contracts/captcha/dist/contract-info/captcha.cjs");
+const contractInfo = require("@prosopo/captcha-contract/contract-info");
 const util = require("@prosopo/util");
 const random = require("@polkadot/util-crypto/random");
 const utils = require("../utils/utils.cjs");
@@ -42,7 +42,9 @@ const buildUpdateState = (state, onStateUpdate) => {
 const getNetwork = (config) => {
   const network = config.networks[config.defaultNetwork];
   if (!network) {
-    throw new Error(`No network found for environment ${config.defaultEnvironment}`);
+    throw new common.ProsopoEnvError("DEVELOPER.NETWORK_NOT_FOUND", {
+      context: { error: `No network found for environment ${config.defaultEnvironment}` }
+    });
   }
   return network;
 };
@@ -57,12 +59,14 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
       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");
@@ -72,6 +76,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
       },
       onOpen: () => {
         console.log("onOpen event triggered");
+        updateState({ sendData: !state.sendData });
       },
       onClose: () => {
         console.log("onClose event triggered");
@@ -146,7 +151,12 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
       if (providerUrlFromStorage) {
         providerApi = await loadProviderApi(providerUrlFromStorage);
         try {
-          const verifyDappUserResponse = await providerApi.verifyDappUser(account.account.address);
+          const verifyDappUserResponse = await providerApi.verifyDappUser(
+            getDappAccount(),
+            account.account.address,
+            void 0,
+            configOptional.challengeValidLength
+          );
           if (verifyDappUserResponse.solutionApproved) {
             updateState({ isHuman: true, loading: false });
             events.onHuman({
@@ -183,9 +193,9 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
       const challenge = await captchaApi.getCaptchaChallenge();
       console.log("challenge", challenge);
       if (challenge.captchas.length <= 0) {
-        throw new Error("No captchas returned from provider");
+        throw new common.ProsopoApiError("DEVELOPER.PROVIDER_NO_CAPTCHA");
       }
-      const timeMillis = challenge.captchas.map((captcha2) => captcha2.captcha.timeLimitMs || 30 * 1e3).reduce((a, b) => a + b);
+      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();
@@ -206,16 +216,18 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
       console.log("submitting solutions");
       clearTimeout();
       if (!state.challenge) {
-        throw new Error("cannot submit, no challenge found");
+        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((captcha2, index) => {
+      const captchaSolution = state.challenge.captchas.map((captcha, index) => {
         const solution = util.at(state.solutions, index);
         return {
-          captchaId: captcha2.captcha.captchaId,
-          captchaContentId: captcha2.captcha.captchaContentId,
+          captchaId: captcha.captcha.captchaId,
+          captchaContentId: captcha.captcha.captchaContentId,
           salt,
           solution
         };
@@ -225,7 +237,9 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
       const signer = account.extension.signer;
       const first = util.at(challenge.captchas, 0);
       if (!first.captcha.datasetId) {
-        throw new Error("No datasetId set for challenge");
+        throw new common.ProsopoDatasetError("CAPTCHA.INVALID_CAPTCHA_ID", {
+          context: { error: "No datasetId set for challenge" }
+        });
       }
       const captchaApi = getCaptchaApi();
       const submission = await captchaApi.submitCaptchaSolution(
@@ -266,10 +280,14 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
   };
   const select = (hash) => {
     if (!state.challenge) {
-      throw new Error("cannot select, no challenge found");
+      throw new common.ProsopoError("CAPTCHA.NO_CAPTCHA", {
+        context: { error: "Cannot select, no Captcha found in state" }
+      });
     }
     if (state.index >= state.challenge.captchas.length || state.index < 0) {
-      throw new Error("cannot select, round index out of range");
+      throw new common.ProsopoError("CAPTCHA.NO_CAPTCHA", {
+        context: { error: "Cannot select, index is out of range for this Captcha" }
+      });
     }
     const index = state.index;
     const solutions = state.solutions;
@@ -285,10 +303,14 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
   };
   const nextRound = () => {
     if (!state.challenge) {
-      throw new Error("cannot proceed to next round, no challenge found");
+      throw new common.ProsopoError("CAPTCHA.NO_CAPTCHA", {
+        context: { error: "Cannot select, no Captcha found in state" }
+      });
     }
     if (state.index + 1 >= state.challenge.captchas.length) {
-      throw new Error("cannot proceed to next round, already at last round");
+      throw new common.ProsopoError("CAPTCHA.NO_CAPTCHA", {
+        context: { error: "Cannot select, index is out of range for this Captcha" }
+      });
     }
     console.log("proceeding to next round");
     updateState({ index: state.index + 1 });
@@ -334,14 +356,16 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
   };
   const getCaptchaApi = () => {
     if (!state.captchaApi) {
-      throw new Error("Captcha api not set");
+      throw new common.ProsopoApiError("API.UNKNOWN", { context: { error: "Captcha api not set", state } });
     }
     return state.captchaApi;
   };
   const loadAccount = async () => {
     const config = getConfig();
     if (!config.web2 && !config.userAccountAddress) {
-      throw new Error("Account address has not been set for web3 mode");
+      throw new common.ProsopoEnvError("GENERAL.ACCOUNT_NOT_FOUND", {
+        context: { error: "Account address has not been set for web3 mode" }
+      });
     }
     const ext = config.web2 ? new ExtensionWeb2() : new ExtensionWeb3();
     const account = await ext.getAccount(config);
@@ -352,7 +376,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
   };
   const getAccount = () => {
     if (!state.account) {
-      throw new Error("Account not loaded");
+      throw new common.ProsopoEnvError("GENERAL.ACCOUNT_NOT_FOUND", { context: { error: "Account not loaded" } });
     }
     const account = state.account;
     return account;
@@ -366,7 +390,7 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
   };
   const getBlockNumber = () => {
     if (!state.blockNumber) {
-      throw new Error("Account not loaded");
+      throw new common.ProsopoContractError("CAPTCHA.INVALID_BLOCK_NO", { context: { error: "Block number not found" } });
     }
     const blockNumber = state.blockNumber;
     return blockNumber;
@@ -379,19 +403,29 @@ function Manager(configOptional, state, onStateUpdate, callbacks) {
     const keyring$1 = new keyring.Keyring({ type, ss58Format: api2.registry.chainSS58 });
     return new contract.ProsopoCaptchaContract(
       api2,
-      JSON.parse(captcha.ContractAbi),
+      JSON.parse(contractInfo.ContractAbi),
       network.contract.address,
       "prosopo",
       0,
       keyring$1.addFromAddress(getAccount().account.address)
     );
   };
+  const exportData = async (events2) => {
+    var _a;
+    const providerUrl = storage.getProviderUrl() || ((_a = state.captchaApi) == null ? void 0 : _a.provider.provider.url.toString());
+    if (!providerUrl) {
+      return;
+    }
+    const providerApi = await loadProviderApi(providerUrl);
+    await providerApi.submitUserEvents(events2, getAccount().account.address);
+  };
   return {
     start,
     cancel,
     submit,
     select,
-    nextRound
+    nextRound,
+    exportData
   };
 }
 exports.Manager = Manager;

package/dist/cjs/modules/ProsopoCaptchaApi.cjs

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-require("../packages/datasets/dist/index.cjs");
-const handlers = require("../api/handlers.cjs");
+const datasets = require("@prosopo/datasets");
 const common = require("@prosopo/common");
 const util = require("@prosopo/util");
 const string = require("@polkadot/util/string");
-const merkle = require("../packages/datasets/dist/captcha/merkle.cjs");
-const captcha = require("../packages/datasets/dist/captcha/captcha.cjs");
 class ProsopoCaptchaApi {
   constructor(userAccount, contract, provider, providerApi, web2, dappAccount) {
     this.userAccount = userAccount;
@@ -20,9 +17,16 @@ class ProsopoCaptchaApi {
     try {
       const captchaChallenge = await this.providerApi.getCaptchaChallenge(this.userAccount, this.provider);
       this.verifyCaptchaChallengeContent(this.provider, captchaChallenge);
+      captchaChallenge.captchas.forEach((captcha) => {
+        captcha.captcha.items.forEach((item) => {
+          if (item.data) {
+            item.data = item.data.replace(/^http(s)*:\/\//, "//");
+          }
+        });
+      });
       return captchaChallenge;
-    } catch (e) {
-      throw new common.ProsopoEnvError(e);
+    } catch (error) {
+      throw new common.ProsopoEnvError("CAPTCHA.INVALID_CAPTCHA_CHALLENGE", { context: { error } });
     }
   }
   verifyCaptchaChallengeContent(provider, captchaChallenge) {
@@ -37,7 +41,7 @@ class ProsopoCaptchaApi {
       if (!verifyCaptchaData(captchaWithProof)) {
         throw new common.ProsopoEnvError("CAPTCHA.INVALID_CAPTCHA_CHALLENGE");
       }
-      if (!merkle.verifyProof(captchaWithProof.captcha.captchaContentId, captchaWithProof.proof)) {
+      if (!datasets.verifyProof(captchaWithProof.captcha.captchaContentId, captchaWithProof.proof)) {
         throw new common.ProsopoEnvError("CAPTCHA.INVALID_CAPTCHA_CHALLENGE");
       }
     }
@@ -45,8 +49,8 @@ class ProsopoCaptchaApi {
     return;
   }
   async submitCaptchaSolution(signer, requestHash, datasetId, solutions, salt) {
-    const tree = new merkle.CaptchaMerkleTree();
-    const captchasHashed = solutions.map((captcha$1) => captcha.computeCaptchaSolutionHash(captcha$1));
+    const tree = new datasets.CaptchaMerkleTree();
+    const captchasHashed = solutions.map((captcha) => datasets.computeCaptchaSolutionHash(captcha));
     tree.build(captchasHashed);
     const commitmentId = tree.root.hash;
     console.log("solveCaptchaChallenge commitmentId", commitmentId);
@@ -54,7 +58,9 @@ class ProsopoCaptchaApi {
     let signature = void 0;
     if (this.web2) {
       if (!signer || !signer.signRaw) {
-        throw new Error("Signer is not defined, cannot sign message to prove account ownership");
+        throw new common.ProsopoEnvError("GENERAL.CANT_FIND_KEYRINGPAIR", {
+          context: { error: "Signer is not defined, cannot sign message to prove account ownership" }
+        });
       }
       const signed = await signer.signRaw({
         address: this.userAccount,
@@ -72,22 +78,22 @@ class ProsopoCaptchaApi {
         salt,
         signature
       );
-    } catch (err) {
-      throw new handlers.ProsopoApiError(err);
+    } catch (error) {
+      throw new common.ProsopoDatasetError("CAPTCHA.INVALID_CAPTCHA_CHALLENGE", { context: { error } });
     }
     return [result, commitmentId, tx];
   }
 }
 async function verifyCaptchaData(captchaWithProof) {
-  const captcha$1 = captchaWithProof.captcha;
+  const captcha = captchaWithProof.captcha;
   const proof = captchaWithProof.proof;
-  if (!(await Promise.all(captcha$1.items.map(async (item) => (await captcha.computeItemHash(item)).hash === item.hash))).every(
+  if (!(await Promise.all(captcha.items.map(async (item) => (await datasets.computeItemHash(item)).hash === item.hash))).every(
     (hash) => hash === true
   )) {
     return false;
   }
-  const captchaHash = captcha.computeCaptchaHash(captcha$1, false, false, false);
-  if (captchaHash !== captcha$1.captchaContentId) {
+  const captchaHash = datasets.computeCaptchaHash(captcha, false, false, false);
+  if (captchaHash !== captcha.captchaContentId) {
     return false;
   }
   return util.at(proof, 0).indexOf(captchaHash) !== -1;

package/dist/cjs/modules/canvas.cjs

@@ -366,9 +366,8 @@ function picassoCanvas(roundNumber, seed, params) {
       }
     }
     return x64hash128(canvasElt.toDataURL(), seed);
-  } catch (e) {
-    console.log(e);
-    throw new common.ProsopoEnvError(e);
+  } catch (error) {
+    throw new common.ProsopoError("WIDGET.CANVAS", { context: { error } });
   }
 }
 exports.picassoCanvas = picassoCanvas;

package/dist/cjs/modules/collector.cjs

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const COLLECTOR_LIMIT = 1e3;
+const storeLog = (event, setEvents) => {
+  setEvents((currentEvents) => {
+    let newEvents = [...currentEvents, event];
+    if (newEvents.length > COLLECTOR_LIMIT) {
+      newEvents = newEvents.slice(1);
+    }
+    return newEvents;
+  });
+};
+const logMouseEvent = (event, setMouseEvent) => {
+  const storedEvent = {
+    x: event.x,
+    y: event.y,
+    timestamp: event.timeStamp
+  };
+  storeLog(storedEvent, setMouseEvent);
+};
+const logKeyboardEvent = (event, setKeyboardEvent) => {
+  const storedEvent = {
+    key: event.key,
+    timestamp: event.timeStamp,
+    isShiftKey: event.shiftKey,
+    isCtrlKey: event.ctrlKey
+  };
+  storeLog(storedEvent, setKeyboardEvent);
+};
+const logTouchEvent = (event, setTouchEvent) => {
+  for (let i = 0; i < event.touches.length; i++) {
+    const touch = event.touches[i];
+    if (!touch) {
+      continue;
+    }
+    storeLog({ x: touch.clientX, y: touch.clientY, timestamp: event.timeStamp }, setTouchEvent);
+  }
+};
+const startCollector = (setStoredMouseEvents, setStoredTouchEvents, setStoredKeyboardEvents, rootElement) => {
+  const form = findContainingForm(rootElement);
+  if (form) {
+    form.addEventListener("mousemove", (e) => logMouseEvent(e, setStoredMouseEvents));
+    form.addEventListener("keydown", (e) => logKeyboardEvent(e, setStoredKeyboardEvents));
+    form.addEventListener("keyup", (e) => logKeyboardEvent(e, setStoredKeyboardEvents));
+    form.addEventListener("touchstart", (e) => logTouchEvent(e, setStoredTouchEvents));
+    form.addEventListener("touchend", (e) => logTouchEvent(e, setStoredTouchEvents));
+    form.addEventListener("touchcancel", (e) => logTouchEvent(e, setStoredTouchEvents));
+    form.addEventListener("touchmove", (e) => logTouchEvent(e, setStoredTouchEvents));
+  }
+};
+const findContainingForm = (element) => {
+  if (element.tagName === "FORM") {
+    return element;
+  }
+  if (element.parentElement) {
+    return findContainingForm(element.parentElement);
+  }
+  return null;
+};
+exports.startCollector = startCollector;

package/dist/cjs/modules/index.cjs

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Manager = require("./Manager.cjs");
 const ProsopoCaptchaApi = require("./ProsopoCaptchaApi.cjs");
+const collector = require("./collector.cjs");
 exports.Manager = Manager.Manager;
 exports.defaultState = Manager.defaultState;
 exports.getNetwork = Manager.getNetwork;
 exports.ProsopoCaptchaApi = ProsopoCaptchaApi.ProsopoCaptchaApi;
+exports.startCollector = collector.startCollector;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@prosopo/procaptcha",
-    "version": "0.2.32",
+    "version": "0.2.36",
     "author": "PROSOPO LIMITED <info@prosopo.io>",
     "license": "Apache-2.0",
     "main": "./dist/index.js",
@@ -45,12 +45,12 @@
         "@polkadot/types": "10.11.1",
         "@polkadot/util": "12.6.1",
         "@polkadot/util-crypto": "12.6.1",
-        "@prosopo/api": "0.2.32",
-        "@prosopo/common": "0.2.32",
-        "@prosopo/contract": "0.2.32",
-        "@prosopo/datasets": "0.2.32",
-        "@prosopo/types": "0.2.32",
-        "@prosopo/util": "0.2.32",
+        "@prosopo/api": "0.2.36",
+        "@prosopo/common": "0.2.36",
+        "@prosopo/contract": "0.2.36",
+        "@prosopo/datasets": "0.2.36",
+        "@prosopo/types": "0.2.36",
+        "@prosopo/util": "0.2.36",
         "rxjs": "7.8.1"
     },
     "devDependencies": {

package/dist/cjs/api/handlers.cjs

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-class ProsopoApiError extends Error {
-  constructor(error, context, ...params) {
-    var __super = (...args) => {
-      super(...args);
-    };
-    if (error instanceof Response) {
-      __super(`HTTP Error: ${error.status} ${error.statusText}`);
-      this.cause = error;
-    } else {
-      __super(error.message || "Unknown API Error");
-      this.cause = error;
-    }
-    this.name = context && `${ProsopoApiError.name}@${context}` || ProsopoApiError.name;
-    console.error("\n********************* ERROR *********************\n");
-    console.error(this.cause, this.stack, ...params);
-  }
-}
-exports.ProsopoApiError = ProsopoApiError;