@prosopo/server 2.10.36 → 2.10.38

package/.turbo/turbo-build$colon$cjs.log

@@ -1,5 +1,5 @@
 
-> @prosopo/server@2.10.36 build:cjs
+> @prosopo/server@2.10.38 build:cjs
 > NODE_ENV=${NODE_ENV:-development}; vite build --config vite.cjs.config.ts --mode $NODE_ENV
 
 ViteCommonJSConfig: .
@@ -37,5 +37,5 @@ Build end
 rendering chunks...
 dist/cjs/index.cjs   0.57 kB
 dist/cjs/config.cjs  0.92 kB
-dist/cjs/server.cjs  4.43 kB
-✓ built in 124ms
+dist/cjs/server.cjs  6.26 kB
+✓ built in 155ms

package/.turbo/turbo-build$colon$tsc.log

@@ -1,8 +1,8 @@
 
-> @prosopo/server@2.10.36 build:tsc
+> @prosopo/server@2.10.38 build:tsc
 > tsc --build --verbose
 
-4:35:29 PM - Projects in this build: 
+8:38:06 AM - Projects in this build: 
     * ../../dev/config/tsconfig.json
     * ../locale/tsconfig.json
     * ../util/tsconfig.json
@@ -15,27 +15,27 @@
     * ../load-balancer/tsconfig.json
     * tsconfig.json
 
-4:35:29 PM - Project '../../dev/config/tsconfig.json' is up to date because newest input '../../dev/config/src/index.ts' is older than output '../../dev/config/tsconfig.tsbuildinfo'
+8:38:06 AM - Project '../../dev/config/tsconfig.json' is up to date because newest input '../../dev/config/src/index.ts' is older than output '../../dev/config/tsconfig.tsbuildinfo'
 
-4:35:29 PM - Project '../locale/tsconfig.json' is up to date because newest input '../locale/src/translationKey.ts' is older than output '../locale/tsconfig.tsbuildinfo'
+8:38:06 AM - Project '../locale/tsconfig.json' is up to date because newest input '../locale/src/translationKey.ts' is older than output '../locale/tsconfig.tsbuildinfo'
 
-4:35:29 PM - Project '../util/tsconfig.json' is up to date because newest input '../util/src/url.ts' is older than output '../util/tsconfig.tsbuildinfo'
+8:38:06 AM - Project '../util/tsconfig.json' is up to date because newest input '../util/src/url.ts' is older than output '../util/tsconfig.tsbuildinfo'
 
-4:35:29 PM - Project '../util-crypto/tsconfig.json' is up to date because newest input '../util-crypto/src/types.ts' is older than output '../util-crypto/tsconfig.tsbuildinfo'
+8:38:06 AM - Project '../util-crypto/tsconfig.json' is up to date because newest input '../util-crypto/src/types.ts' is older than output '../util-crypto/tsconfig.tsbuildinfo'
 
-4:35:29 PM - Project '../types/tsconfig.json' is up to date because newest input '../types/src/keyring/keyring/types.ts' is older than output '../types/tsconfig.tsbuildinfo'
+8:38:06 AM - Project '../types/tsconfig.json' is up to date because newest input '../types/src/keyring/keyring/types.ts' is older than output '../types/tsconfig.tsbuildinfo'
 
-4:35:30 PM - Project '../api/tsconfig.json' is up to date because newest input '../api/src/index.ts' is older than output '../api/tsconfig.tsbuildinfo'
+8:38:06 AM - Project '../api/tsconfig.json' is up to date because newest input '../api/src/index.ts' is older than output '../api/tsconfig.tsbuildinfo'
 
-4:35:30 PM - Project '../logger/tsconfig.json' is up to date because newest input '../logger/src/index.ts' is older than output '../logger/tsconfig.tsbuildinfo'
+8:38:06 AM - Project '../logger/tsconfig.json' is up to date because newest input '../logger/src/index.ts' is older than output '../logger/tsconfig.tsbuildinfo'
 
-4:35:30 PM - Project '../common/tsconfig.json' is up to date because newest input '../common/src/index.ts' is older than output '../common/tsconfig.tsbuildinfo'
+8:38:07 AM - Project '../common/tsconfig.json' is up to date because newest input '../common/src/utils/batches.ts' is older than output '../common/tsconfig.tsbuildinfo'
 
-4:35:30 PM - Project '../keyring/tsconfig.json' is up to date because newest input '../keyring/src/index.ts' is older than output '../keyring/tsconfig.tsbuildinfo'
+8:38:07 AM - Project '../keyring/tsconfig.json' is up to date because newest input '../keyring/src/index.ts' is older than output '../keyring/tsconfig.tsbuildinfo'
 
-4:35:30 PM - Project '../load-balancer/tsconfig.json' is up to date because newest input '../load-balancer/src/balancer.ts' is older than output '../load-balancer/tsconfig.tsbuildinfo'
+8:38:07 AM - Project '../load-balancer/tsconfig.json' is up to date because newest input '../load-balancer/src/tests/providers.unit.test.ts' is older than output '../load-balancer/tsconfig.tsbuildinfo'
 
-4:35:30 PM - Project 'tsconfig.json' is out of date because output file 'tsconfig.tsbuildinfo' does not exist
+8:38:07 AM - Project 'tsconfig.json' is out of date because output file 'tsconfig.tsbuildinfo' does not exist
 
-4:35:30 PM - Building project '/home/runner/work/captcha/captcha/packages/server/tsconfig.json'...
+8:38:07 AM - Building project '/home/runner/work/captcha/captcha/packages/server/tsconfig.json'...
 

package/.turbo/turbo-build.log

@@ -1,9 +1,9 @@
 
-> @prosopo/server@2.10.36 build
+> @prosopo/server@2.10.38 build
 > npm run build:cross-env -- --mode ${NODE_ENV:-development}
 
 
-> @prosopo/server@2.10.36 build:cross-env
+> @prosopo/server@2.10.38 build:cross-env
 > vite build --config vite.esm.config.ts --mode production
 
 ViteEsmConfig: .
@@ -41,5 +41,5 @@ Build end
 rendering chunks...
 dist/index.js   0.39 kB
 dist/config.js  0.81 kB
-dist/server.js  4.35 kB
-✓ built in 125ms
+dist/server.js  6.17 kB
+✓ built in 138ms

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @prosopo/server
 
+## 2.10.38
+### Patch Changes
+
+- Updated dependencies [a39c4ec]
+  - @prosopo/load-balancer@2.10.13
+
+## 2.10.37
+### Patch Changes
+
+- 0a4f902: fix(server): dispatch verify by captchaType so puzzle tokens hit the puzzle endpoint
+  
+  Puzzle tokens were silently failing server-side verification. `ProsopoServer.verifyProvider` only had two branches — `challenge` present → PoW verify, absent → image verify — but puzzle tokens carry a challenge too, so they were routed to `/VerifyPowCaptchaSolution` and 404'd on the pow record lookup (`captchastorage.puzzlecaptchas.serverChecked` stayed 0/N in prod). Customers using the puzzle flow got `verified: false` on legitimate solvers.
+  
+  Fix in two parts:
+  
+  - `@prosopo/types`: adds `captchaType?: CaptchaType` to `ProcaptchaOutputSchema` and appends `Option(str)` to `ProcaptchaTokenCodec`. The pre-existing binary layout is preserved in a frozen `ProcaptchaTokenCodecV1`, and `decodeProcaptchaOutput` falls back to it for tokens minted by client bundles that predate this field.
+  - `@prosopo/server`: `verifyProvider` now dispatches on `captchaType` (puzzle → `submitPuzzleCaptchaVerify`, pow → `submitPowCaptchaVerify`, image → `verifyDappUser`) with per-type `cachedTimeout` recency checks. The legacy challenge heuristic is kept as a fallback for old tokens with a `warn`-level log so ops can see the tail-off.
+  - `@prosopo/procaptcha-pow` / `procaptcha-puzzle` / `procaptcha`: each Manager now sets the correct `captchaType` on the object passed to `encodeProcaptchaOutput`.
+  
+  Backwards compatibility: pow and image tokens minted by any prior client bundle continue to verify. Puzzle tokens minted by old bundles still fall through to the pow branch and 404 — same behaviour as before — until the customer upgrades both the client bundle and `@prosopo/server` together.
+- Updated dependencies [0a4f902]
+  - @prosopo/types@4.9.10
+  - @prosopo/api@3.5.17
+  - @prosopo/keyring@2.9.58
+  - @prosopo/load-balancer@2.10.12
+
 ## 2.10.36
 ### Patch Changes
 

package/dist/cjs/server.cjs

@@ -26,8 +26,15 @@ class ProsopoServer {
     return new api.ProviderApi(providerUrl, this.dappAccount || "");
   }
   /**
-   * Verify the user with the provider URL passed in. If a challenge is provided, we use the challenge to verify the
-   * user. If not, we use the user, dapp, and optionally the commitmentID, to verify the user.
+   * Verify a token with the issuing provider. Dispatches to the correct
+   * verify endpoint by inspecting the token's declared captchaType:
+   *  - puzzle  → submitPuzzleCaptchaVerify
+   *  - pow     → submitPowCaptchaVerify
+   *  - image   → verifyDappUser
+   * When captchaType is absent (a legacy token minted before the field was
+   * added), fall back to the historical heuristic: presence of `challenge`
+   * routes to PoW, absence routes to image. Legacy puzzle tokens follow the
+   * PoW branch — same behaviour as before this dispatch was introduced.
    * @param token
    * @param timeouts
    * @param providerUrl
@@ -36,10 +43,11 @@ class ProsopoServer {
    * @param challenge
    * @param ip
    * @param email
+   * @param captchaType
    */
-  async verifyProvider(token, timeouts, providerUrl, timestamp, user, challenge, ip, email) {
+  async verifyProvider(token, timeouts, providerUrl, timestamp, user, challenge, ip, email, captchaType) {
     this.logger.info(() => ({
-      data: { providerUrl },
+      data: { providerUrl, captchaType: captchaType ?? "legacy" },
       msg: "Verifying with provider"
     }));
     const dappUserSignature = this.pair?.sign(timestamp.toString());
@@ -50,18 +58,54 @@ class ProsopoServer {
     }
     const signatureHex = util.u8aToHex(dappUserSignature);
     const providerApi = this.getProviderApi(providerUrl);
+    if (captchaType === types.CaptchaType.puzzle) {
+      const puzzleTimeout = this.config.timeouts.puzzle.cachedTimeout;
+      if (!this.isRecent(timestamp, puzzleTimeout, "Puzzle")) {
+        return this.notRecentResponse();
+      }
+      return await providerApi.submitPuzzleCaptchaVerify(
+        token,
+        signatureHex,
+        user,
+        ip,
+        email
+      );
+    }
+    if (captchaType === types.CaptchaType.pow) {
+      const powTimeout = this.config.timeouts.pow.cachedTimeout;
+      if (!this.isRecent(timestamp, powTimeout, "PoW")) {
+        return this.notRecentResponse();
+      }
+      return await providerApi.submitPowCaptchaVerify(
+        token,
+        signatureHex,
+        user,
+        ip,
+        email
+      );
+    }
+    if (captchaType === types.CaptchaType.image) {
+      const imageTimeout2 = this.config.timeouts.image.cachedTimeout;
+      if (!this.isRecent(timestamp, imageTimeout2, "Image")) {
+        return this.notRecentResponse();
+      }
+      return await providerApi.verifyDappUser(
+        token,
+        signatureHex,
+        user,
+        timeouts.image.cachedTimeout,
+        ip,
+        email
+      );
+    }
+    this.logger.warn(() => ({
+      data: { challenge: Boolean(challenge) },
+      msg: "Verifying legacy token without captchaType field; using challenge heuristic"
+    }));
     if (challenge) {
       const powTimeout = this.config.timeouts.pow.cachedTimeout;
-      const recent2 = timestamp ? Date.now() - timestamp < powTimeout : false;
-      if (!recent2) {
-        this.logger.error(() => ({
-          data: { timestamp },
-          msg: "PoW captcha is not recent"
-        }));
-        return {
-          verified: false,
-          status: i18n.t("API.USER_NOT_VERIFIED_TIME_EXPIRED")
-        };
+      if (!this.isRecent(timestamp, powTimeout, "PoW")) {
+        return this.notRecentResponse();
       }
       return await providerApi.submitPowCaptchaVerify(
         token,
@@ -72,16 +116,8 @@ class ProsopoServer {
       );
     }
     const imageTimeout = this.config.timeouts.image.cachedTimeout;
-    const recent = timestamp ? Date.now() - timestamp < imageTimeout : false;
-    if (!recent) {
-      this.logger.error(() => ({
-        data: { timestamp },
-        msg: "Image captcha is not recent"
-      }));
-      return {
-        verified: false,
-        status: i18n.t("API.USER_NOT_VERIFIED_TIME_EXPIRED")
-      };
+    if (!this.isRecent(timestamp, imageTimeout, "Image")) {
+      return this.notRecentResponse();
     }
     return await providerApi.verifyDappUser(
       token,
@@ -92,6 +128,23 @@ class ProsopoServer {
       email
     );
   }
+  isRecent(timestamp, timeoutMs, label) {
+    if (!timestamp) return false;
+    const recent = Date.now() - timestamp < timeoutMs;
+    if (!recent) {
+      this.logger.error(() => ({
+        data: { timestamp, timeoutMs },
+        msg: `${label} captcha is not recent`
+      }));
+    }
+    return recent;
+  }
+  notRecentResponse() {
+    return {
+      verified: false,
+      status: i18n.t("API.USER_NOT_VERIFIED_TIME_EXPIRED")
+    };
+  }
   /**
    * @param token
    * @param ip
@@ -100,7 +153,7 @@ class ProsopoServer {
   async isVerified(token, ip, email) {
     try {
       const payload = types.decodeProcaptchaOutput(token);
-      const { providerUrl, challenge, timestamp, user } = types.ProcaptchaOutputSchema.parse(payload);
+      const { providerUrl, challenge, timestamp, user, captchaType } = types.ProcaptchaOutputSchema.parse(payload);
       const providers = await loadBalancer.loadBalancer(this.config.defaultEnvironment);
       const provider = providers.find((p) => p.url === providerUrl);
       if (!provider) {
@@ -121,7 +174,8 @@ class ProsopoServer {
         user,
         challenge,
         ip,
-        email
+        email,
+        captchaType
       );
       this.logger.info(() => ({
         data: {
@@ -129,6 +183,7 @@ class ProsopoServer {
           providerUrl,
           user,
           challenge,
+          captchaType: captchaType ?? "legacy",
           siteKey: this.pair?.address
         }
       }));

package/dist/server.d.ts

@@ -2,7 +2,7 @@ import { ProviderApi } from "@prosopo/api";
 import { Keyring } from "@prosopo/keyring";
 import { type Logger } from "@prosopo/logger";
 import type { KeyringPair } from "@prosopo/types";
-import { type CaptchaTimeoutOutput, type ProcaptchaToken, type ProsopoServerConfigOutput, type VerificationResponse } from "@prosopo/types";
+import { type CaptchaTimeoutOutput, CaptchaType, type ProcaptchaToken, type ProsopoServerConfigOutput, type VerificationResponse } from "@prosopo/types";
 export declare class ProsopoServer {
     config: ProsopoServerConfigOutput;
     dappAccount: string | undefined;
@@ -12,7 +12,9 @@ export declare class ProsopoServer {
     pair: KeyringPair | undefined;
     constructor(config: ProsopoServerConfigOutput, pair?: KeyringPair);
     getProviderApi(providerUrl: string): ProviderApi;
-    verifyProvider(token: string, timeouts: CaptchaTimeoutOutput, providerUrl: string, timestamp: number, user: string, challenge?: string, ip?: string, email?: string): Promise<VerificationResponse>;
+    verifyProvider(token: string, timeouts: CaptchaTimeoutOutput, providerUrl: string, timestamp: number, user: string, challenge?: string, ip?: string, email?: string, captchaType?: CaptchaType): Promise<VerificationResponse>;
+    private isRecent;
+    private notRecentResponse;
     isVerified(token: ProcaptchaToken, ip?: string, email?: string): Promise<VerificationResponse>;
 }
 //# 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":"AAcA,OAAO,EAAa,WAAW,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,OAAO,EAAiB,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EACN,KAAK,oBAAoB,EAEzB,KAAK,eAAe,EACpB,KAAK,yBAAyB,EAC9B,KAAK,oBAAoB,EAEzB,MAAM,gBAAgB,CAAC;AAIxB,qBAAa,aAAa;IACzB,MAAM,EAAE,yBAAyB,CAAC;IAClC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;gBAElB,MAAM,EAAE,yBAAyB,EAAE,IAAI,CAAC,EAAE,WAAW;IAcjE,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW;IAgBnC,cAAc,CAC1B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,oBAAoB,EAC9B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,SAAS,CAAC,EAAE,MAAM,EAClB,EAAE,CAAC,EAAE,MAAM,EACX,KAAK,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,oBAAoB,CAAC;IA8DnB,UAAU,CACtB,KAAK,EAAE,eAAe,EACtB,EAAE,CAAC,EAAE,MAAM,EACX,KAAK,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,oBAAoB,CAAC;CAsDhC"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAcA,OAAO,EAAa,WAAW,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,OAAO,EAAiB,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EACN,KAAK,oBAAoB,EACzB,WAAW,EAEX,KAAK,eAAe,EACpB,KAAK,yBAAyB,EAC9B,KAAK,oBAAoB,EAEzB,MAAM,gBAAgB,CAAC;AAIxB,qBAAa,aAAa;IACzB,MAAM,EAAE,yBAAyB,CAAC;IAClC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;gBAElB,MAAM,EAAE,yBAAyB,EAAE,IAAI,CAAC,EAAE,WAAW;IAcjE,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW;IAwBnC,cAAc,CAC1B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,oBAAoB,EAC9B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,SAAS,CAAC,EAAE,MAAM,EAClB,EAAE,CAAC,EAAE,MAAM,EACX,KAAK,CAAC,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,WAAW,GACvB,OAAO,CAAC,oBAAoB,CAAC;IA+FhC,OAAO,CAAC,QAAQ;IAgBhB,OAAO,CAAC,iBAAiB;IAYZ,UAAU,CACtB,KAAK,EAAE,eAAe,EACtB,EAAE,CAAC,EAAE,MAAM,EACX,KAAK,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,oBAAoB,CAAC;CAwDhC"}

package/dist/server.js

@@ -3,7 +3,7 @@ import { ProsopoContractError, ProsopoApiError } from "@prosopo/common";
 import { Keyring } from "@prosopo/keyring";
 import { loadBalancer } from "@prosopo/load-balancer";
 import { getLogger } from "@prosopo/logger";
-import { decodeProcaptchaOutput, ProcaptchaOutputSchema } from "@prosopo/types";
+import { CaptchaType, decodeProcaptchaOutput, ProcaptchaOutputSchema } from "@prosopo/types";
 import { u8aToHex } from "@prosopo/util";
 import i18n from "i18next";
 class ProsopoServer {
@@ -24,8 +24,15 @@ class ProsopoServer {
     return new ProviderApi(providerUrl, this.dappAccount || "");
   }
   /**
-   * Verify the user with the provider URL passed in. If a challenge is provided, we use the challenge to verify the
-   * user. If not, we use the user, dapp, and optionally the commitmentID, to verify the user.
+   * Verify a token with the issuing provider. Dispatches to the correct
+   * verify endpoint by inspecting the token's declared captchaType:
+   *  - puzzle  → submitPuzzleCaptchaVerify
+   *  - pow     → submitPowCaptchaVerify
+   *  - image   → verifyDappUser
+   * When captchaType is absent (a legacy token minted before the field was
+   * added), fall back to the historical heuristic: presence of `challenge`
+   * routes to PoW, absence routes to image. Legacy puzzle tokens follow the
+   * PoW branch — same behaviour as before this dispatch was introduced.
    * @param token
    * @param timeouts
    * @param providerUrl
@@ -34,10 +41,11 @@ class ProsopoServer {
    * @param challenge
    * @param ip
    * @param email
+   * @param captchaType
    */
-  async verifyProvider(token, timeouts, providerUrl, timestamp, user, challenge, ip, email) {
+  async verifyProvider(token, timeouts, providerUrl, timestamp, user, challenge, ip, email, captchaType) {
     this.logger.info(() => ({
-      data: { providerUrl },
+      data: { providerUrl, captchaType: captchaType ?? "legacy" },
       msg: "Verifying with provider"
     }));
     const dappUserSignature = this.pair?.sign(timestamp.toString());
@@ -48,18 +56,54 @@ class ProsopoServer {
     }
     const signatureHex = u8aToHex(dappUserSignature);
     const providerApi = this.getProviderApi(providerUrl);
+    if (captchaType === CaptchaType.puzzle) {
+      const puzzleTimeout = this.config.timeouts.puzzle.cachedTimeout;
+      if (!this.isRecent(timestamp, puzzleTimeout, "Puzzle")) {
+        return this.notRecentResponse();
+      }
+      return await providerApi.submitPuzzleCaptchaVerify(
+        token,
+        signatureHex,
+        user,
+        ip,
+        email
+      );
+    }
+    if (captchaType === CaptchaType.pow) {
+      const powTimeout = this.config.timeouts.pow.cachedTimeout;
+      if (!this.isRecent(timestamp, powTimeout, "PoW")) {
+        return this.notRecentResponse();
+      }
+      return await providerApi.submitPowCaptchaVerify(
+        token,
+        signatureHex,
+        user,
+        ip,
+        email
+      );
+    }
+    if (captchaType === CaptchaType.image) {
+      const imageTimeout2 = this.config.timeouts.image.cachedTimeout;
+      if (!this.isRecent(timestamp, imageTimeout2, "Image")) {
+        return this.notRecentResponse();
+      }
+      return await providerApi.verifyDappUser(
+        token,
+        signatureHex,
+        user,
+        timeouts.image.cachedTimeout,
+        ip,
+        email
+      );
+    }
+    this.logger.warn(() => ({
+      data: { challenge: Boolean(challenge) },
+      msg: "Verifying legacy token without captchaType field; using challenge heuristic"
+    }));
     if (challenge) {
       const powTimeout = this.config.timeouts.pow.cachedTimeout;
-      const recent2 = timestamp ? Date.now() - timestamp < powTimeout : false;
-      if (!recent2) {
-        this.logger.error(() => ({
-          data: { timestamp },
-          msg: "PoW captcha is not recent"
-        }));
-        return {
-          verified: false,
-          status: i18n.t("API.USER_NOT_VERIFIED_TIME_EXPIRED")
-        };
+      if (!this.isRecent(timestamp, powTimeout, "PoW")) {
+        return this.notRecentResponse();
       }
       return await providerApi.submitPowCaptchaVerify(
         token,
@@ -70,16 +114,8 @@ class ProsopoServer {
       );
     }
     const imageTimeout = this.config.timeouts.image.cachedTimeout;
-    const recent = timestamp ? Date.now() - timestamp < imageTimeout : false;
-    if (!recent) {
-      this.logger.error(() => ({
-        data: { timestamp },
-        msg: "Image captcha is not recent"
-      }));
-      return {
-        verified: false,
-        status: i18n.t("API.USER_NOT_VERIFIED_TIME_EXPIRED")
-      };
+    if (!this.isRecent(timestamp, imageTimeout, "Image")) {
+      return this.notRecentResponse();
     }
     return await providerApi.verifyDappUser(
       token,
@@ -90,6 +126,23 @@ class ProsopoServer {
       email
     );
   }
+  isRecent(timestamp, timeoutMs, label) {
+    if (!timestamp) return false;
+    const recent = Date.now() - timestamp < timeoutMs;
+    if (!recent) {
+      this.logger.error(() => ({
+        data: { timestamp, timeoutMs },
+        msg: `${label} captcha is not recent`
+      }));
+    }
+    return recent;
+  }
+  notRecentResponse() {
+    return {
+      verified: false,
+      status: i18n.t("API.USER_NOT_VERIFIED_TIME_EXPIRED")
+    };
+  }
   /**
    * @param token
    * @param ip
@@ -98,7 +151,7 @@ class ProsopoServer {
   async isVerified(token, ip, email) {
     try {
       const payload = decodeProcaptchaOutput(token);
-      const { providerUrl, challenge, timestamp, user } = ProcaptchaOutputSchema.parse(payload);
+      const { providerUrl, challenge, timestamp, user, captchaType } = ProcaptchaOutputSchema.parse(payload);
       const providers = await loadBalancer(this.config.defaultEnvironment);
       const provider = providers.find((p) => p.url === providerUrl);
       if (!provider) {
@@ -119,7 +172,8 @@ class ProsopoServer {
         user,
         challenge,
         ip,
-        email
+        email,
+        captchaType
       );
       this.logger.info(() => ({
         data: {
@@ -127,6 +181,7 @@ class ProsopoServer {
           providerUrl,
           user,
           challenge,
+          captchaType: captchaType ?? "legacy",
           siteKey: this.pair?.address
         }
       }));

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/dist/tests/mintSites.unit.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=mintSites.unit.test.d.ts.map

package/dist/tests/mintSites.unit.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mintSites.unit.test.d.ts","sourceRoot":"","sources":["../../src/tests/mintSites.unit.test.ts"],"names":[],"mappings":""}

package/dist/tests/mintSites.unit.test.js

@@ -0,0 +1,40 @@
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+import { describe, expect, it } from "vitest";
+const MINT_SITES = [
+    {
+        packageName: "@prosopo/procaptcha-pow",
+        relativePath: "../../../procaptcha-pow/src/services/Manager.ts",
+        expectedCaptchaType: "CaptchaType.pow",
+    },
+    {
+        packageName: "@prosopo/procaptcha-puzzle",
+        relativePath: "../../../procaptcha-puzzle/src/services/Manager.ts",
+        expectedCaptchaType: "CaptchaType.puzzle",
+    },
+    {
+        packageName: "@prosopo/procaptcha",
+        relativePath: "../../../procaptcha/src/modules/Manager.ts",
+        expectedCaptchaType: "CaptchaType.image",
+    },
+];
+const readManagerSource = (relativePath) => {
+    const path = join(__dirname, relativePath);
+    return readFileSync(path, "utf8");
+};
+describe("client Manager mint sites — captchaType regression", () => {
+    for (const site of MINT_SITES) {
+        it(`${site.packageName} passes ${site.expectedCaptchaType} to encodeProcaptchaOutput`, () => {
+            const source = readManagerSource(site.relativePath);
+            expect(source).toContain("encodeProcaptchaOutput");
+            expect(source).toContain("[ApiParams.captchaType]:");
+            expect(source).toContain(site.expectedCaptchaType);
+        });
+        it(`${site.packageName} imports CaptchaType from @prosopo/types`, () => {
+            const source = readManagerSource(site.relativePath);
+            expect(source).toMatch(/from\s+["']@prosopo\/types["']/);
+            expect(source).toContain("CaptchaType");
+        });
+    }
+});
+//# sourceMappingURL=mintSites.unit.test.js.map

package/dist/tests/mintSites.unit.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mintSites.unit.test.js","sourceRoot":"","sources":["../../src/tests/mintSites.unit.test.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAU9C,MAAM,UAAU,GAAe;IAC9B;QACC,WAAW,EAAE,yBAAyB;QACtC,YAAY,EAAE,iDAAiD;QAC/D,mBAAmB,EAAE,iBAAiB;KACtC;IACD;QACC,WAAW,EAAE,4BAA4B;QACzC,YAAY,EAAE,oDAAoD;QAClE,mBAAmB,EAAE,oBAAoB;KACzC;IACD;QACC,WAAW,EAAE,qBAAqB;QAClC,YAAY,EAAE,4CAA4C;QAC1D,mBAAmB,EAAE,mBAAmB;KACxC;CACD,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,YAAoB,EAAU,EAAE;IAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IAC3C,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACnC,CAAC,CAAC;AAEF,QAAQ,CAAC,oDAAoD,EAAE,GAAG,EAAE;IACnE,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC/B,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,WAAW,IAAI,CAAC,mBAAmB,4BAA4B,EAAE,GAAG,EAAE;YAC3F,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAKpD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;YACnD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;YACrD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,0CAA0C,EAAE,GAAG,EAAE;YACtE,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAGpD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;YACzD,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACJ,CAAC;AACF,CAAC,CAAC,CAAC"}

package/dist/tests/server.unit.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=server.unit.test.d.ts.map

package/dist/tests/server.unit.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.unit.test.d.ts","sourceRoot":"","sources":["../../src/tests/server.unit.test.ts"],"names":[],"mappings":""}

package/dist/tests/server.unit.test.js

@@ -0,0 +1,260 @@
+import { ProviderApi } from "@prosopo/api";
+import * as loadBalancerModule from "@prosopo/load-balancer";
+import { ApiParams, CaptchaType, encodeProcaptchaOutput, } from "@prosopo/types";
+import { afterEach, beforeEach, describe, expect, it, vi, } from "vitest";
+import { ProsopoServer } from "../server.js";
+const PROVIDER_URL = "https://pronode1.example";
+const DAPP = "5C1cs9CfxYQfNi3ARtprMDzR7BFRWFVSoDaLb1JytkiXwq5m";
+const USER = "5CFHA8d3S1XXkZuBwGqiuA6SECTzfoucq397YL34FuPAH89G";
+const buildConfig = (powCachedMs, imageCachedMs, puzzleCachedMs) => ({
+    userAccountAddress: undefined,
+    web2: true,
+    solutionThreshold: 80,
+    dappName: "test",
+    serverUrl: undefined,
+    logLevel: "info",
+    defaultEnvironment: "development",
+    networks: {
+        development: {
+            endpoint: "wss://ignored",
+            dappContract: { address: DAPP },
+            procaptchaContract: { address: DAPP },
+            proxyContract: { address: DAPP },
+        },
+    },
+    account: { address: DAPP },
+    timeouts: {
+        image: {
+            challengeTimeout: 10_000,
+            solutionTimeout: 10_000,
+            verifiedTimeout: 10_000,
+            cachedTimeout: imageCachedMs,
+        },
+        pow: {
+            verifiedTimeout: 10_000,
+            solutionTimeout: 10_000,
+            cachedTimeout: powCachedMs,
+        },
+        puzzle: {
+            verifiedTimeout: 10_000,
+            solutionTimeout: 10_000,
+            cachedTimeout: puzzleCachedMs,
+        },
+        contract: { maxVerifiedTime: 10_000 },
+    },
+});
+const buildToken = (timestamp, overrides = {}) => {
+    const base = {
+        [ApiParams.providerUrl]: PROVIDER_URL,
+        [ApiParams.dapp]: DAPP,
+        [ApiParams.user]: USER,
+        [ApiParams.challenge]: "challenge-string",
+        [ApiParams.timestamp]: String(timestamp),
+        [ApiParams.signature]: {
+            [ApiParams.provider]: { [ApiParams.challenge]: "psig" },
+            [ApiParams.user]: { [ApiParams.timestamp]: "usig" },
+        },
+    };
+    return encodeProcaptchaOutput({ ...base, ...overrides });
+};
+const stubProviderList = () => [
+    {
+        address: DAPP,
+        url: PROVIDER_URL,
+        datasetId: "0xdatasetId",
+        weight: 1,
+    },
+];
+const stubPair = () => ({
+    address: DAPP,
+    sign: (_) => new Uint8Array([1, 2, 3, 4]),
+});
+const installProviderApiSpies = () => {
+    const puzzle = vi
+        .spyOn(ProviderApi.prototype, "submitPuzzleCaptchaVerify")
+        .mockResolvedValue({ status: "ok", verified: true });
+    const pow = vi
+        .spyOn(ProviderApi.prototype, "submitPowCaptchaVerify")
+        .mockResolvedValue({ status: "ok", verified: true });
+    const image = vi
+        .spyOn(ProviderApi.prototype, "verifyDappUser")
+        .mockResolvedValue({ status: "ok", verified: true });
+    return { puzzle, pow, image };
+};
+const installLoadBalancer = () => {
+    vi.spyOn(loadBalancerModule, "loadBalancer").mockResolvedValue(stubProviderList());
+};
+describe("ProsopoServer.verifyProvider — captchaType dispatch", () => {
+    let spies;
+    beforeEach(() => {
+        spies = installProviderApiSpies();
+        installLoadBalancer();
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it("routes puzzle tokens to submitPuzzleCaptchaVerify only", async () => {
+        const now = Date.now();
+        const token = buildToken(now, {
+            [ApiParams.captchaType]: CaptchaType.puzzle,
+        });
+        const server = new ProsopoServer(buildConfig(60_000, 60_000, 60_000), stubPair());
+        const result = await server.isVerified(token);
+        expect(result.verified).toBe(true);
+        expect(spies.puzzle).toHaveBeenCalledTimes(1);
+        expect(spies.pow).not.toHaveBeenCalled();
+        expect(spies.image).not.toHaveBeenCalled();
+    });
+    it("routes pow tokens to submitPowCaptchaVerify only", async () => {
+        const now = Date.now();
+        const token = buildToken(now, {
+            [ApiParams.captchaType]: CaptchaType.pow,
+        });
+        const server = new ProsopoServer(buildConfig(60_000, 60_000, 60_000), stubPair());
+        const result = await server.isVerified(token);
+        expect(result.verified).toBe(true);
+        expect(spies.pow).toHaveBeenCalledTimes(1);
+        expect(spies.puzzle).not.toHaveBeenCalled();
+        expect(spies.image).not.toHaveBeenCalled();
+    });
+    it("routes image tokens to verifyDappUser only", async () => {
+        const now = Date.now();
+        const token = buildToken(now, {
+            [ApiParams.captchaType]: CaptchaType.image,
+            [ApiParams.challenge]: undefined,
+            [ApiParams.commitmentId]: "0xdeadbeef",
+            [ApiParams.signature]: {
+                [ApiParams.provider]: { [ApiParams.requestHash]: "req" },
+                [ApiParams.user]: { [ApiParams.timestamp]: "usig" },
+            },
+        });
+        const server = new ProsopoServer(buildConfig(60_000, 60_000, 60_000), stubPair());
+        const result = await server.isVerified(token);
+        expect(result.verified).toBe(true);
+        expect(spies.image).toHaveBeenCalledTimes(1);
+        expect(spies.pow).not.toHaveBeenCalled();
+        expect(spies.puzzle).not.toHaveBeenCalled();
+    });
+});
+describe("ProsopoServer.verifyProvider — legacy tokens (no captchaType)", () => {
+    let spies;
+    beforeEach(() => {
+        spies = installProviderApiSpies();
+        installLoadBalancer();
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it("legacy token with challenge routes to PoW (preserves historical behaviour)", async () => {
+        const now = Date.now();
+        const token = buildToken(now);
+        const server = new ProsopoServer(buildConfig(60_000, 60_000, 60_000), stubPair());
+        await server.isVerified(token);
+        expect(spies.pow).toHaveBeenCalledTimes(1);
+        expect(spies.image).not.toHaveBeenCalled();
+        expect(spies.puzzle).not.toHaveBeenCalled();
+    });
+    it("legacy token without challenge routes to image", async () => {
+        const now = Date.now();
+        const token = buildToken(now, {
+            [ApiParams.challenge]: undefined,
+            [ApiParams.commitmentId]: "0xdeadbeef",
+            [ApiParams.signature]: {
+                [ApiParams.provider]: { [ApiParams.requestHash]: "req" },
+                [ApiParams.user]: { [ApiParams.timestamp]: "usig" },
+            },
+        });
+        const server = new ProsopoServer(buildConfig(60_000, 60_000, 60_000), stubPair());
+        await server.isVerified(token);
+        expect(spies.image).toHaveBeenCalledTimes(1);
+        expect(spies.pow).not.toHaveBeenCalled();
+        expect(spies.puzzle).not.toHaveBeenCalled();
+    });
+    it("legacy puzzle-looking token routes to PoW (documents the unavoidable compromise)", async () => {
+        const now = Date.now();
+        const token = buildToken(now);
+        const server = new ProsopoServer(buildConfig(60_000, 60_000, 60_000), stubPair());
+        await server.isVerified(token);
+        expect(spies.pow).toHaveBeenCalledTimes(1);
+        expect(spies.puzzle).not.toHaveBeenCalled();
+    });
+});
+describe("ProsopoServer.verifyProvider — recency checks", () => {
+    let spies;
+    beforeEach(() => {
+        spies = installProviderApiSpies();
+        installLoadBalancer();
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it("puzzle uses timeouts.puzzle.cachedTimeout — expired token short-circuits", async () => {
+        const puzzleCached = 1_000;
+        const staleTimestamp = Date.now() - (puzzleCached + 100);
+        const token = buildToken(staleTimestamp, {
+            [ApiParams.captchaType]: CaptchaType.puzzle,
+        });
+        const server = new ProsopoServer(buildConfig(60_000, 60_000, puzzleCached), stubPair());
+        const result = await server.isVerified(token);
+        expect(result.verified).toBe(false);
+        expect(spies.puzzle).not.toHaveBeenCalled();
+        expect(spies.pow).not.toHaveBeenCalled();
+    });
+    it("pow uses timeouts.pow.cachedTimeout — expired token short-circuits", async () => {
+        const powCached = 1_000;
+        const staleTimestamp = Date.now() - (powCached + 100);
+        const token = buildToken(staleTimestamp, {
+            [ApiParams.captchaType]: CaptchaType.pow,
+        });
+        const server = new ProsopoServer(buildConfig(powCached, 60_000, 60_000), stubPair());
+        const result = await server.isVerified(token);
+        expect(result.verified).toBe(false);
+        expect(spies.pow).not.toHaveBeenCalled();
+    });
+    it("image uses timeouts.image.cachedTimeout — expired token short-circuits", async () => {
+        const imageCached = 1_000;
+        const staleTimestamp = Date.now() - (imageCached + 100);
+        const token = buildToken(staleTimestamp, {
+            [ApiParams.captchaType]: CaptchaType.image,
+            [ApiParams.challenge]: undefined,
+            [ApiParams.commitmentId]: "0xdeadbeef",
+            [ApiParams.signature]: {
+                [ApiParams.provider]: { [ApiParams.requestHash]: "req" },
+                [ApiParams.user]: { [ApiParams.timestamp]: "usig" },
+            },
+        });
+        const server = new ProsopoServer(buildConfig(60_000, imageCached, 60_000), stubPair());
+        const result = await server.isVerified(token);
+        expect(result.verified).toBe(false);
+        expect(spies.image).not.toHaveBeenCalled();
+    });
+});
+describe("ProsopoServer.isVerified — short-circuits", () => {
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it("provider not in loadBalancer list returns USER_NOT_VERIFIED", async () => {
+        installProviderApiSpies();
+        vi.spyOn(loadBalancerModule, "loadBalancer").mockResolvedValue([
+            {
+                address: DAPP,
+                url: "https://a-different-provider.example",
+                datasetId: "0xother",
+                weight: 1,
+            },
+        ]);
+        const token = buildToken(Date.now(), {
+            [ApiParams.captchaType]: CaptchaType.puzzle,
+        });
+        const server = new ProsopoServer(buildConfig(60_000, 60_000, 60_000), stubPair());
+        const result = await server.isVerified(token);
+        expect(result.verified).toBe(false);
+    });
+    it("throws BAD_REQUEST for an unparseable token", async () => {
+        installProviderApiSpies();
+        installLoadBalancer();
+        const server = new ProsopoServer(buildConfig(60_000, 60_000, 60_000), stubPair());
+        await expect(server.isVerified("0xdeadbeef")).rejects.toThrow();
+    });
+});
+//# sourceMappingURL=server.unit.test.js.map

package/dist/tests/server.unit.test.js.map

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

package/dist/tests/token.unit.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=token.unit.test.d.ts.map

package/dist/tests/token.unit.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"token.unit.test.d.ts","sourceRoot":"","sources":["../../src/tests/token.unit.test.ts"],"names":[],"mappings":""}

package/dist/tests/token.unit.test.js

@@ -0,0 +1,162 @@
+import { hexToU8a } from "@polkadot/util";
+import { ApiParams, CaptchaType, ProcaptchaOutputSchema, ProcaptchaTokenCodec, ProcaptchaTokenCodecV1, decodeProcaptchaOutput, encodeProcaptchaOutput, } from "@prosopo/types";
+import { u8aToHex } from "@prosopo/util";
+import { describe, expect, it } from "vitest";
+import { ZodError } from "zod";
+const baseOutput = () => ({
+    [ApiParams.providerUrl]: "https://pronode1.example",
+    [ApiParams.dapp]: "5C1cs9CfxYQfNi3ARtprMDzR7BFRWFVSoDaLb1JytkiXwq5m",
+    [ApiParams.user]: "5CFHA8d3S1XXkZuBwGqiuA6SECTzfoucq397YL34FuPAH89G",
+    [ApiParams.challenge]: "challenge-string",
+    [ApiParams.timestamp]: "1710000000000",
+    [ApiParams.signature]: {
+        [ApiParams.provider]: {
+            [ApiParams.challenge]: "provider-sig",
+        },
+        [ApiParams.user]: {
+            [ApiParams.timestamp]: "user-sig",
+        },
+    },
+});
+describe("procaptcha token codec — round trip", () => {
+    for (const captchaType of [
+        CaptchaType.pow,
+        CaptchaType.image,
+        CaptchaType.puzzle,
+        CaptchaType.frictionless,
+    ]) {
+        it(`preserves captchaType=${captchaType}`, () => {
+            const output = { ...baseOutput(), [ApiParams.captchaType]: captchaType };
+            const token = encodeProcaptchaOutput(output);
+            const decoded = decodeProcaptchaOutput(token);
+            expect(decoded[ApiParams.captchaType]).toBe(captchaType);
+            expect(decoded[ApiParams.dapp]).toBe(output[ApiParams.dapp]);
+            expect(decoded[ApiParams.user]).toBe(output[ApiParams.user]);
+            expect(decoded[ApiParams.challenge]).toBe(output[ApiParams.challenge]);
+        });
+    }
+    it("preserves captchaType=undefined (opt-out path)", () => {
+        const output = baseOutput();
+        const token = encodeProcaptchaOutput(output);
+        const decoded = decodeProcaptchaOutput(token);
+        expect(decoded[ApiParams.captchaType]).toBeUndefined();
+    });
+    it("image-shape token (no challenge, has commitmentId) round-trips with captchaType", () => {
+        const output = {
+            [ApiParams.providerUrl]: "https://pronode1.example",
+            [ApiParams.dapp]: "5C1cs9CfxYQfNi3ARtprMDzR7BFRWFVSoDaLb1JytkiXwq5m",
+            [ApiParams.user]: "5CFHA8d3S1XXkZuBwGqiuA6SECTzfoucq397YL34FuPAH89G",
+            [ApiParams.commitmentId]: "0xdeadbeef",
+            [ApiParams.timestamp]: "1710000000000",
+            [ApiParams.signature]: {
+                [ApiParams.provider]: {
+                    [ApiParams.requestHash]: "req-hash",
+                },
+                [ApiParams.user]: {
+                    [ApiParams.timestamp]: "user-sig",
+                },
+            },
+            [ApiParams.captchaType]: CaptchaType.image,
+        };
+        const decoded = decodeProcaptchaOutput(encodeProcaptchaOutput(output));
+        expect(decoded[ApiParams.captchaType]).toBe(CaptchaType.image);
+        expect(decoded[ApiParams.commitmentId]).toBe("0xdeadbeef");
+        expect(decoded[ApiParams.challenge]).toBeUndefined();
+    });
+});
+describe("procaptcha token codec — legacy v1 fallback", () => {
+    const encodeV1 = (output) => {
+        return u8aToHex(ProcaptchaTokenCodecV1.enc({
+            [ApiParams.commitmentId]: undefined,
+            [ApiParams.providerUrl]: undefined,
+            [ApiParams.challenge]: undefined,
+            [ApiParams.nonce]: undefined,
+            ...output,
+            signature: {
+                provider: {
+                    challenge: output.signature.provider?.challenge || undefined,
+                    requestHash: output.signature.provider?.requestHash || undefined,
+                },
+                user: {
+                    timestamp: output.signature.user?.timestamp || undefined,
+                    requestHash: output.signature.user?.requestHash || undefined,
+                },
+            },
+        }));
+    };
+    it("decodes a legacy v1-encoded pow-shape token as captchaType=undefined", () => {
+        const legacyToken = encodeV1(baseOutput());
+        const decoded = decodeProcaptchaOutput(legacyToken);
+        expect(decoded[ApiParams.captchaType]).toBeUndefined();
+        expect(decoded[ApiParams.challenge]).toBe("challenge-string");
+        expect(decoded[ApiParams.dapp]).toBe("5C1cs9CfxYQfNi3ARtprMDzR7BFRWFVSoDaLb1JytkiXwq5m");
+    });
+    it("decodes a legacy v1-encoded image-shape token as captchaType=undefined", () => {
+        const legacyToken = encodeV1({
+            [ApiParams.providerUrl]: "https://pronode1.example",
+            [ApiParams.dapp]: "5C1cs9CfxYQfNi3ARtprMDzR7BFRWFVSoDaLb1JytkiXwq5m",
+            [ApiParams.user]: "5CFHA8d3S1XXkZuBwGqiuA6SECTzfoucq397YL34FuPAH89G",
+            [ApiParams.commitmentId]: "0xcafebabe",
+            [ApiParams.timestamp]: "1710000000000",
+            [ApiParams.signature]: {
+                [ApiParams.provider]: {
+                    [ApiParams.requestHash]: "req-hash",
+                },
+                [ApiParams.user]: {
+                    [ApiParams.timestamp]: "user-sig",
+                },
+            },
+        });
+        const decoded = decodeProcaptchaOutput(legacyToken);
+        expect(decoded[ApiParams.captchaType]).toBeUndefined();
+        expect(decoded[ApiParams.challenge]).toBeUndefined();
+        expect(decoded[ApiParams.commitmentId]).toBe("0xcafebabe");
+    });
+    it("legacy tokens do not carry the captchaType byte on the wire", () => {
+        const output = baseOutput();
+        const v1Bytes = hexToU8a(encodeV1(output));
+        const v2Bytes = hexToU8a(encodeProcaptchaOutput(output));
+        expect(v2Bytes.length).toBe(v1Bytes.length + 1);
+        expect(Array.from(v2Bytes.slice(0, v1Bytes.length))).toEqual(Array.from(v1Bytes));
+        expect(v2Bytes[v2Bytes.length - 1]).toBe(0);
+    });
+});
+describe("procaptcha token codec — rejection paths", () => {
+    it("throws on truncated hex input", () => {
+        expect(() => decodeProcaptchaOutput("0x00")).toThrow();
+    });
+    it("throws on non-hex input", () => {
+        expect(() => decodeProcaptchaOutput("not-a-hex-token")).toThrow();
+    });
+    it("rejects unknown captchaType strings via zod", () => {
+        const bogusHex = u8aToHex(ProcaptchaTokenCodec.enc({
+            [ApiParams.commitmentId]: undefined,
+            [ApiParams.providerUrl]: "https://pronode1.example",
+            [ApiParams.challenge]: "c",
+            [ApiParams.nonce]: undefined,
+            [ApiParams.dapp]: "5C1cs9CfxYQfNi3ARtprMDzR7BFRWFVSoDaLb1JytkiXwq5m",
+            [ApiParams.user]: "5CFHA8d3S1XXkZuBwGqiuA6SECTzfoucq397YL34FuPAH89G",
+            [ApiParams.timestamp]: "1710000000000",
+            [ApiParams.signature]: {
+                provider: { challenge: "s", requestHash: undefined },
+                user: { timestamp: "s", requestHash: undefined },
+            },
+            [ApiParams.captchaType]: "bogus-captcha-type",
+        }));
+        let error;
+        try {
+            decodeProcaptchaOutput(bogusHex);
+        }
+        catch (e) {
+            error = e;
+        }
+        expect(error).toBeInstanceOf(ZodError);
+    });
+    it("ProcaptchaOutputSchema rejects unknown captchaType directly", () => {
+        expect(() => ProcaptchaOutputSchema.parse({
+            ...baseOutput(),
+            [ApiParams.captchaType]: "not-a-real-type",
+        })).toThrow(ZodError);
+    });
+});
+//# sourceMappingURL=token.unit.test.js.map

package/dist/tests/token.unit.test.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/server",
-	"version": "2.10.36",
+	"version": "2.10.38",
 	"description": "NodeJS package for server side communication with the prosopo captcha client",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -22,7 +22,8 @@
 		"build:cross-env": "vite build --config vite.esm.config.ts",
 		"build:tsc": "tsc --build --verbose",
 		"build:cjs": "NODE_ENV=${NODE_ENV:-development}; vite build --config vite.cjs.config.ts --mode $NODE_ENV",
-		"typecheck": "tsc --project tsconfig.types.json"
+		"typecheck": "tsc --project tsconfig.types.json",
+		"test": "NODE_ENV=${NODE_ENV:-test}; npx vitest run --config ./vite.test.config.ts"
 	},
 	"repository": {
 		"type": "git",
@@ -37,16 +38,17 @@
 	"homepage": "https://github.com/prosopo/captcha#readme",
 	"sideEffects": false,
 	"dependencies": {
-		"@prosopo/api": "3.5.16",
+		"@prosopo/api": "3.5.17",
 		"@prosopo/common": "3.1.46",
 		"@prosopo/logger": "2.0.3",
-		"@prosopo/keyring": "2.9.57",
-		"@prosopo/load-balancer": "2.10.11",
-		"@prosopo/types": "4.9.9",
+		"@prosopo/keyring": "2.9.58",
+		"@prosopo/load-balancer": "2.10.13",
+		"@prosopo/types": "4.9.10",
 		"@prosopo/util": "3.3.4",
 		"i18next": "24.1.0"
 	},
 	"devDependencies": {
+		"@polkadot/util": "13.5.7",
 		"@prosopo/config": "3.3.4",
 		"@types/node": "22.10.2",
 		"@vitest/coverage-v8": "3.2.4",
@@ -57,6 +59,7 @@
 		"tsx": "4.20.3",
 		"typescript": "5.6.2",
 		"vite": "6.4.1",
-		"vitest": "3.2.4"
+		"vitest": "3.2.4",
+		"zod": "3.23.8"
 	}
 }

package/vite.test.config.ts

@@ -0,0 +1,19 @@
+// Copyright 2021-2026 Prosopo (UK) Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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 { ViteTestConfig } from "@prosopo/config";
+
+process.env.NODE_ENV = "test";
+
+export default ViteTestConfig();