@prosopo/server 0.3.39 → 0.3.41

package/dist/cjs/config.cjs

@@ -5,14 +5,21 @@ const getServerConfig = () => types.ProsopoServerConfigSchema.parse({
   defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT,
   // enviromental variables
   defaultNetwork: process.env.PROSOPO_DEFAULT_NETWORK,
-  serverUrl: (
-    // https://github.com/prosopo/captcha/issues/701
-    process.env.PROSOPO_SERVER_URL && process.env.PROSOPO_SERVER_PORT ? `${process.env.PROSOPO_SERVER_URL}:${process.env.PROSOPO_SERVER_PORT}` : "http://localhost:9228"
-  ),
+  serverUrl: getServerUrl(),
   dappName: process.env.PROSOPO_DAPP_NAME || "client-example-server",
   account: {
     password: "",
     address: process.env.PROSOPO_SITE_KEY || ""
   }
 });
+const getServerUrl = () => {
+  if (process.env.PROSOPO_SERVER_URL) {
+    if (process.env.PROSOPO_SERVER_URL.match(/:\d+/)) {
+      return process.env.PROSOPO_SERVER_URL;
+    }
+    return `${process.env.PROSOPO_SERVER_URL}:${process.env.PROSOPO_SERVER_PORT || 9228}`;
+  }
+  return "http://localhost:9228";
+};
 exports.getServerConfig = getServerConfig;
+exports.getServerUrl = getServerUrl;

package/dist/cjs/index.cjs

@@ -9,4 +9,5 @@ const PublicProsopoServer = async (config2) => {
 };
 exports.ProsopoServer = server.ProsopoServer;
 exports.getServerConfig = config.getServerConfig;
+exports.getServerUrl = config.getServerUrl;
 exports.PublicProsopoServer = PublicProsopoServer;

package/dist/cjs/server.cjs

@@ -9,8 +9,6 @@ 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 DEFAULT_MAX_VERIFIED_TIME_CACHED = 60 * 1e3;
-const DEFAULT_MAX_VERIFIED_TIME_CONTRACT = 5 * 60 * 1e3;
 class ProsopoServer {
   constructor(config, pair) {
     this.config = config;
@@ -97,18 +95,6 @@ class ProsopoServer {
     }
     return void 0;
   }
-  /**
-   * Verify the time since the blockNumber is equal to or less than the maxVerifiedTime.
-   * @param maxVerifiedTime
-   * @param blockNumber
-   */
-  async verifyRecency(blockNumber, maxVerifiedTime) {
-    const contractApi = await this.getContractApi();
-    const currentBlock = await contract.getCurrentBlockNumber(contractApi.api);
-    const blocksPassed = currentBlock - blockNumber;
-    const blockTime = contract.getBlockTimeMs(contractApi.api);
-    return blockTime * blocksPassed <= maxVerifiedTime;
-  }
   /**
    * Verify the user with the contract. We check the contract to see if the user has completed a captcha in the
    * past. If they have, we check the time since the last correct captcha is within the maxVerifiedTime and we check
@@ -116,13 +102,27 @@ class ProsopoServer {
    * @param user
    * @param maxVerifiedTime
    */
-  async verifyContract(user, maxVerifiedTime = DEFAULT_MAX_VERIFIED_TIME_CONTRACT) {
-    const contractApi = await this.getContractApi();
-    this.logger.info("Provider URL not provided. Verifying with contract.");
-    const correctCaptchaBlockNumber = (await contractApi.query.dappOperatorLastCorrectCaptcha(user)).value.unwrap().unwrap().before.valueOf();
-    const verifyRecency = await this.verifyRecency(correctCaptchaBlockNumber, maxVerifiedTime);
-    const isHuman = (await contractApi.query.dappOperatorIsHumanUser(user, this.config.solutionThreshold)).value.unwrap().unwrap();
-    return isHuman && verifyRecency;
+  async verifyContract(user, maxVerifiedTime) {
+    try {
+      const contractApi = await this.getContractApi();
+      this.logger.info("Provider URL not provided. Verifying with contract.");
+      const correctCaptchaBlockNumber = (await contractApi.query.dappOperatorLastCorrectCaptcha(user)).value.unwrap().unwrap().before.valueOf();
+      const recent = await contract.verifyRecency(
+        (await this.getContractApi()).api,
+        correctCaptchaBlockNumber,
+        maxVerifiedTime
+      );
+      if (!recent) {
+        this.logger.info("User has not completed a captcha recently");
+        return false;
+      }
+      const isHuman = (await contractApi.query.dappOperatorIsHumanUser(user, this.config.solutionThreshold)).value.unwrap().unwrap();
+      this.logger.info("isHuman", isHuman);
+      return isHuman;
+    } catch (error) {
+      this.logger.error(error);
+      return false;
+    }
   }
   /**
    * Verify the user with the provider URL passed in. If a challenge is provided, we use the challenge to verify the
@@ -131,28 +131,36 @@ class ProsopoServer {
    * @param dapp
    * @param user
    * @param blockNumber
+   * @param timeouts
    * @param challenge
    * @param commitmentId
-   * @param maxVerifiedTime
    */
-  async verifyProvider(providerUrl, dapp, user, blockNumber, challenge, commitmentId, maxVerifiedTime = DEFAULT_MAX_VERIFIED_TIME_CACHED) {
+  async verifyProvider(providerUrl, dapp, user, blockNumber, timeouts, challenge, commitmentId) {
     this.logger.info("Verifying with provider.");
     const providerApi = await this.getProviderApi(providerUrl);
     if (challenge) {
-      const result2 = await providerApi.submitPowCaptchaVerify(challenge, dapp);
+      const result2 = await providerApi.submitPowCaptchaVerify(challenge, dapp, timeouts.pow.cachedTimeout);
       return result2.verified;
     }
-    const result = await providerApi.verifyDappUser(dapp, user, blockNumber, commitmentId, maxVerifiedTime);
-    const verifyRecency = await this.verifyRecency(result.blockNumber, maxVerifiedTime);
-    return result.verified && verifyRecency;
+    const recent = await contract.verifyRecency((await this.getContractApi()).api, blockNumber, timeouts.image.cachedTimeout);
+    if (!recent) {
+      return false;
+    }
+    const result = await providerApi.verifyDappUser(
+      dapp,
+      user,
+      blockNumber,
+      commitmentId,
+      timeouts.image.cachedTimeout
+    );
+    return result.verified;
   }
   /**
    *
    * @param payload Info output by procaptcha on completion of the captcha process
-   * @param maxVerifiedTime Maximum time in milliseconds since the blockNumber
    * @returns
    */
-  async isVerified(payload, maxVerifiedTime) {
+  async isVerified(payload) {
     const { user, dapp, providerUrl, commitmentId, blockNumber, challenge } = payload;
     if (providerUrl && blockNumber) {
       return await this.verifyProvider(
@@ -160,12 +168,12 @@ class ProsopoServer {
         dapp,
         user,
         blockNumber,
+        this.config.timeouts,
         challenge,
-        commitmentId,
-        maxVerifiedTime
+        commitmentId
       );
     } else {
-      return await this.verifyContract(user, maxVerifiedTime);
+      return await this.verifyContract(user, this.config.timeouts.contract.maxVerifiedTime);
     }
   }
   async getContractApi() {
@@ -180,6 +188,4 @@ class ProsopoServer {
     return this.contract;
   }
 }
-exports.DEFAULT_MAX_VERIFIED_TIME_CACHED = DEFAULT_MAX_VERIFIED_TIME_CACHED;
-exports.DEFAULT_MAX_VERIFIED_TIME_CONTRACT = DEFAULT_MAX_VERIFIED_TIME_CONTRACT;
 exports.ProsopoServer = ProsopoServer;

package/dist/config.d.ts

@@ -8,17 +8,33 @@ export declare const getServerConfig: () => {
         password?: string | undefined;
     };
     networks: Record<"development" | "rococo" | "shiden", {
+        endpoint: string;
         contract: {
-            name: string;
             address: string;
+            name: string;
         };
-        endpoint: string;
         pairType: "sr25519" | "ed25519" | "ecdsa" | "ethereum";
         ss58Format: number;
     }>;
     web2: boolean;
     solutionThreshold: number;
     dappName: string;
+    timeouts: {
+        image: {
+            challengeTimeout: number;
+            solutionTimeout: number;
+            verifiedTimeout: number;
+            cachedTimeout: number;
+        };
+        contract: {
+            maxVerifiedTime: number;
+        };
+        pow: {
+            solutionTimeout: number;
+            verifiedTimeout: number;
+            cachedTimeout: number;
+        };
+    };
     database?: Partial<Record<"development" | "staging" | "production", {
         type: string;
         endpoint: string;
@@ -29,4 +45,5 @@ export declare const getServerConfig: () => {
     userAccountAddress?: string | undefined;
     serverUrl?: string | undefined;
 };
+export declare const getServerUrl: () => string;
 //# sourceMappingURL=config.d.ts.map

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CActB,CAAA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAUtB,CAAA;AAEN,eAAO,MAAM,YAAY,QAAO,MAQ/B,CAAA"}

package/dist/config.js

@@ -2,13 +2,20 @@ import { ProsopoServerConfigSchema } from '@prosopo/types';
 export const getServerConfig = () => ProsopoServerConfigSchema.parse({
     defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT,
     defaultNetwork: process.env.PROSOPO_DEFAULT_NETWORK,
-    serverUrl: process.env.PROSOPO_SERVER_URL && process.env.PROSOPO_SERVER_PORT
-        ? `${process.env.PROSOPO_SERVER_URL}:${process.env.PROSOPO_SERVER_PORT}`
-        : 'http://localhost:9228',
+    serverUrl: getServerUrl(),
     dappName: process.env.PROSOPO_DAPP_NAME || 'client-example-server',
     account: {
         password: '',
         address: process.env.PROSOPO_SITE_KEY || '',
     },
 });
+export const getServerUrl = () => {
+    if (process.env.PROSOPO_SERVER_URL) {
+        if (process.env.PROSOPO_SERVER_URL.match(/:\d+/)) {
+            return process.env.PROSOPO_SERVER_URL;
+        }
+        return `${process.env.PROSOPO_SERVER_URL}:${process.env.PROSOPO_SERVER_PORT || 9228}`;
+    }
+    return 'http://localhost:9228';
+};
 //# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAE1D,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE,CAChC,yBAAyB,CAAC,KAAK,CAAC;IAC5B,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,2BAA2B;IAC3D,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;IACnD,SAAS,EAEL,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB;QAC7D,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE;QACxE,CAAC,CAAC,uBAAuB;IACjC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,uBAAuB;IAClE,OAAO,EAAE;QACL,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE;KAC9C;CACJ,CAAC,CAAA"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAE1D,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE,CAChC,yBAAyB,CAAC,KAAK,CAAC;IAC5B,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,2BAA2B;IAC3D,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;IACnD,SAAS,EAAE,YAAY,EAAE;IACzB,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,uBAAuB;IAClE,OAAO,EAAE;QACL,QAAQ,EAAE,EAAE;QACZ,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE;KAC9C;CACJ,CAAC,CAAA;AAEN,MAAM,CAAC,MAAM,YAAY,GAAG,GAAW,EAAE;IACrC,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;QAChC,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YAC9C,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAA;SACxC;QACD,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,IAAI,EAAE,CAAA;KACxF;IACD,OAAO,uBAAuB,CAAA;AAClC,CAAC,CAAA"}

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { ProsopoServer } from './server.js';
 export { ProsopoServer } from './server.js';
-export { getServerConfig } from './config.js';
+export { getServerConfig, getServerUrl } from './config.js';
 import { ProsopoServerConfigOutput } from '@prosopo/types';
 export declare const PublicProsopoServer: (config: ProsopoServerConfigOutput) => Promise<ProsopoServer>;
 //# 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,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAE1D,eAAO,MAAM,mBAAmB,WAAkB,yBAAyB,2BAI1E,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAE1D,eAAO,MAAM,mBAAmB,WAAkB,yBAAyB,2BAI1E,CAAA"}

package/dist/index.js

@@ -1,6 +1,6 @@
 import { ProsopoServer } from './server.js';
 export { ProsopoServer } from './server.js';
-export { getServerConfig } from './config.js';
+export { getServerConfig, getServerUrl } from './config.js';
 import { getPairAsync } from '@prosopo/contract';
 export const PublicProsopoServer = async (config) => {
     const pair = await getPairAsync(config.networks[config.defaultNetwork], undefined, config.account.address);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,MAAiC,EAAE,EAAE;IAE3E,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAC1G,OAAO,IAAI,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AAC1C,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,MAAiC,EAAE,EAAE;IAE3E,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAC1G,OAAO,IAAI,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AAC1C,CAAC,CAAA"}

package/dist/server.d.ts

@@ -1,13 +1,11 @@
 import { ApiPromise } from '@polkadot/api/promise/Api';
-import { ContractAbi, NetworkConfig, ProcaptchaOutput, ProsopoServerConfigOutput } from '@prosopo/types';
+import { CaptchaTimeoutOutput, ContractAbi, NetworkConfig, ProcaptchaOutput, ProsopoServerConfigOutput } from '@prosopo/types';
 import { Keyring } from '@polkadot/keyring';
 import { KeyringPair } from '@polkadot/keyring/types';
 import { Logger } from '@prosopo/common';
 import { ProsopoCaptchaContract } from '@prosopo/contract';
 import { ProviderApi } from '@prosopo/api';
 import { WsProvider } from '@polkadot/rpc-provider/ws';
-export declare const DEFAULT_MAX_VERIFIED_TIME_CACHED: number;
-export declare const DEFAULT_MAX_VERIFIED_TIME_CONTRACT: number;
 export declare class ProsopoServer {
     config: ProsopoServerConfigOutput;
     contract: ProsopoCaptchaContract | undefined;
@@ -30,10 +28,9 @@ export declare class ProsopoServer {
     getApi(): ApiPromise;
     getContract(): ProsopoCaptchaContract;
     checkRandomProvider(user: string, dapp: string, providerUrl: string, blockNumber: number): Promise<import("@prosopo/captcha-contract/types-returns").Provider | undefined>;
-    verifyRecency(blockNumber: number, maxVerifiedTime: number): Promise<boolean>;
-    verifyContract(user: string, maxVerifiedTime?: number): Promise<boolean>;
-    verifyProvider(providerUrl: string, dapp: string, user: string, blockNumber: number, challenge?: string, commitmentId?: string, maxVerifiedTime?: number): Promise<boolean>;
-    isVerified(payload: ProcaptchaOutput, maxVerifiedTime?: number): Promise<boolean>;
+    verifyContract(user: string, maxVerifiedTime: number): Promise<boolean>;
+    verifyProvider(providerUrl: string, dapp: string, user: string, blockNumber: number, timeouts: CaptchaTimeoutOutput, challenge?: string, commitmentId?: string): Promise<boolean>;
+    isVerified(payload: ProcaptchaOutput): Promise<boolean>;
     getContractApi(): Promise<ProsopoCaptchaContract>;
 }
 //# sourceMappingURL=server.d.ts.map

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EACH,WAAW,EACX,aAAa,EAEb,gBAAgB,EAChB,yBAAyB,EAC5B,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAA+C,MAAM,iBAAiB,CAAA;AAC/F,OAAO,EAAE,sBAAsB,EAAyD,MAAM,mBAAmB,CAAA;AACjH,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAItD,eAAO,MAAM,gCAAgC,QAAY,CAAA;AACzD,eAAO,MAAM,kCAAkC,QAAgB,CAAA;AAE/D,qBAAa,aAAa;IACtB,MAAM,EAAE,yBAAyB,CAAA;IACjC,QAAQ,EAAE,sBAAsB,GAAG,SAAS,CAAA;IAC5C,sBAAsB,EAAE,MAAM,CAAA;IAC9B,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAA;IACvC,kBAAkB,EAAE,MAAM,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,GAAG,EAAE,WAAW,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,WAAW,GAAG,SAAS,CAAA;IAC7B,GAAG,EAAE,UAAU,GAAG,SAAS,CAAA;IAC3B,OAAO,EAAE,aAAa,CAAA;gBAEV,MAAM,EAAE,yBAAyB,EAAE,IAAI,CAAC,EAAE,WAAW;IAiBpD,cAAc,CAAC,WAAW,EAAE,MAAM;IAIxC,sBAAsB,IAAI,MAAM;IAOjC,OAAO;IAUP,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBhC,MAAM,IAAI,UAAU;IAOpB,WAAW,IAAI,sBAAsB;IAkB/B,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAoBjF,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM;IAmB1D,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,SAAqC;IAyBjF,cAAc,CACvB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,SAAS,CAAC,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM,EACrB,eAAe,SAAmC;IAoBzC,UAAU,CAAC,OAAO,EAAE,gBAAgB,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA+BjF,cAAc,IAAI,OAAO,CAAC,sBAAsB,CAAC;CAWjE"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AACtD,OAAO,EACH,oBAAoB,EACpB,WAAW,EACX,aAAa,EAEb,gBAAgB,EAChB,yBAAyB,EAC5B,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAA+C,MAAM,iBAAiB,CAAA;AAC/F,OAAO,EAAE,sBAAsB,EAAiC,MAAM,mBAAmB,CAAA;AACzF,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAItD,qBAAa,aAAa;IACtB,MAAM,EAAE,yBAAyB,CAAA;IACjC,QAAQ,EAAE,sBAAsB,GAAG,SAAS,CAAA;IAC5C,sBAAsB,EAAE,MAAM,CAAA;IAC9B,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAA;IACvC,kBAAkB,EAAE,MAAM,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,GAAG,EAAE,WAAW,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,UAAU,CAAA;IACtB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,WAAW,GAAG,SAAS,CAAA;IAC7B,GAAG,EAAE,UAAU,GAAG,SAAS,CAAA;IAC3B,OAAO,EAAE,aAAa,CAAA;gBAEV,MAAM,EAAE,yBAAyB,EAAE,IAAI,CAAC,EAAE,WAAW;IAiBpD,cAAc,CAAC,WAAW,EAAE,MAAM;IAIxC,sBAAsB,IAAI,MAAM;IAOjC,OAAO;IAUP,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBhC,MAAM,IAAI,UAAU;IAOpB,WAAW,IAAI,sBAAsB;IAkB/B,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAsBjF,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM;IAwCpD,cAAc,CACvB,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,oBAAoB,EAC9B,SAAS,CAAC,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM;IAgCZ,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA+BvD,cAAc,IAAI,OAAO,CAAC,sBAAsB,CAAC;CAWjE"}

package/dist/server.js

@@ -2,13 +2,11 @@ import { ApiPromise } from '@polkadot/api/promise/Api';
 import { NetworkNamesSchema, } from '@prosopo/types';
 import { Keyring } from '@polkadot/keyring';
 import { ProsopoEnvError, getLogger, trimProviderUrl } from '@prosopo/common';
-import { ProsopoCaptchaContract, getBlockTimeMs, getCurrentBlockNumber, getZeroAddress } from '@prosopo/contract';
+import { ProsopoCaptchaContract, getZeroAddress, verifyRecency } from '@prosopo/contract';
 import { ProviderApi } from '@prosopo/api';
 import { WsProvider } from '@polkadot/rpc-provider/ws';
 import { ContractAbi as abiJson } from '@prosopo/captcha-contract/contract-info';
 import { get } from '@prosopo/util';
-export const DEFAULT_MAX_VERIFIED_TIME_CACHED = 60 * 1000;
-export const DEFAULT_MAX_VERIFIED_TIME_CONTRACT = 5 * 60 * 1000;
 export class ProsopoServer {
     constructor(config, pair) {
         this.config = config;
@@ -81,44 +79,51 @@ export class ProsopoServer {
         }
         return undefined;
     }
-    async verifyRecency(blockNumber, maxVerifiedTime) {
-        const contractApi = await this.getContractApi();
-        const currentBlock = await getCurrentBlockNumber(contractApi.api);
-        const blocksPassed = currentBlock - blockNumber;
-        const blockTime = getBlockTimeMs(contractApi.api);
-        return blockTime * blocksPassed <= maxVerifiedTime;
-    }
-    async verifyContract(user, maxVerifiedTime = DEFAULT_MAX_VERIFIED_TIME_CONTRACT) {
-        const contractApi = await this.getContractApi();
-        this.logger.info('Provider URL not provided. Verifying with contract.');
-        const correctCaptchaBlockNumber = (await contractApi.query.dappOperatorLastCorrectCaptcha(user)).value
-            .unwrap()
-            .unwrap()
-            .before.valueOf();
-        const verifyRecency = await this.verifyRecency(correctCaptchaBlockNumber, maxVerifiedTime);
-        const isHuman = (await contractApi.query.dappOperatorIsHumanUser(user, this.config.solutionThreshold)).value
-            .unwrap()
-            .unwrap();
-        return isHuman && verifyRecency;
+    async verifyContract(user, maxVerifiedTime) {
+        try {
+            const contractApi = await this.getContractApi();
+            this.logger.info('Provider URL not provided. Verifying with contract.');
+            const correctCaptchaBlockNumber = (await contractApi.query.dappOperatorLastCorrectCaptcha(user)).value
+                .unwrap()
+                .unwrap()
+                .before.valueOf();
+            const recent = await verifyRecency((await this.getContractApi()).api, correctCaptchaBlockNumber, maxVerifiedTime);
+            if (!recent) {
+                this.logger.info('User has not completed a captcha recently');
+                return false;
+            }
+            const isHuman = (await contractApi.query.dappOperatorIsHumanUser(user, this.config.solutionThreshold)).value
+                .unwrap()
+                .unwrap();
+            this.logger.info('isHuman', isHuman);
+            return isHuman;
+        }
+        catch (error) {
+            this.logger.error(error);
+            return false;
+        }
     }
-    async verifyProvider(providerUrl, dapp, user, blockNumber, challenge, commitmentId, maxVerifiedTime = DEFAULT_MAX_VERIFIED_TIME_CACHED) {
+    async verifyProvider(providerUrl, dapp, user, blockNumber, timeouts, challenge, commitmentId) {
         this.logger.info('Verifying with provider.');
         const providerApi = await this.getProviderApi(providerUrl);
         if (challenge) {
-            const result = await providerApi.submitPowCaptchaVerify(challenge, dapp);
+            const result = await providerApi.submitPowCaptchaVerify(challenge, dapp, timeouts.pow.cachedTimeout);
             return result.verified;
         }
-        const result = await providerApi.verifyDappUser(dapp, user, blockNumber, commitmentId, maxVerifiedTime);
-        const verifyRecency = await this.verifyRecency(result.blockNumber, maxVerifiedTime);
-        return result.verified && verifyRecency;
+        const recent = await verifyRecency((await this.getContractApi()).api, blockNumber, timeouts.image.cachedTimeout);
+        if (!recent) {
+            return false;
+        }
+        const result = await providerApi.verifyDappUser(dapp, user, blockNumber, commitmentId, timeouts.image.cachedTimeout);
+        return result.verified;
     }
-    async isVerified(payload, maxVerifiedTime) {
+    async isVerified(payload) {
         const { user, dapp, providerUrl, commitmentId, blockNumber, challenge } = payload;
         if (providerUrl && blockNumber) {
-            return await this.verifyProvider(providerUrl, dapp, user, blockNumber, challenge, commitmentId, maxVerifiedTime);
+            return await this.verifyProvider(providerUrl, dapp, user, blockNumber, this.config.timeouts, challenge, commitmentId);
         }
         else {
-            return await this.verifyContract(user, maxVerifiedTime);
+            return await this.verifyContract(user, this.config.timeouts.contract.maxVerifiedTime);
         }
     }
     async getContractApi() {

package/dist/server.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@prosopo/server",
-    "version": "0.3.39",
+    "version": "0.3.41",
     "description": "NodeJS package for server side communication with the prosopo captcha client",
     "main": "./dist/index.js",
     "type": "module",
@@ -19,7 +19,7 @@
         "clean": "tsc --build --clean",
         "build": "tsc --build --verbose tsconfig.json",
         "build:cjs": "npx vite --config vite.cjs.config.ts build",
-        "eslint": "npx eslint . --no-error-on-unmatched-pattern --ignore-path ../../.eslintignore",
+        "eslint": "npx eslint . --no-error-on-unmatched-pattern --ignore-path ../../.eslintignore --quiet",
         "eslint:fix": "npm run eslint -- --fix",
         "prettier": "npx prettier . --check --no-error-on-unmatched-pattern --ignore-path ../../.eslintignore",
         "prettier:fix": "npm run prettier -- --write",
@@ -41,11 +41,12 @@
         "@polkadot/api": "10.13.1",
         "@polkadot/keyring": "12.6.2",
         "@polkadot/rpc-provider": "10.13.1",
-        "@polkadot/types": "10.13.1",
-        "@prosopo/api": "0.3.39",
-        "@prosopo/contract": "0.3.39",
-        "@prosopo/captcha-contract": "0.3.39",
-        "@prosopo/types": "0.3.39"
+        "@prosopo/api": "0.3.41",
+        "@prosopo/common": "0.3.41",
+        "@prosopo/contract": "0.3.41",
+        "@prosopo/captcha-contract": "0.3.41",
+        "@prosopo/util": "0.3.41",
+        "@prosopo/types": "0.3.41"
     },
     "devDependencies": {
         "tslib": "2.6.2",