@prosopo/database 3.14.0 → 3.14.2

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

@@ -1,5 +1,5 @@
 
-> @prosopo/database@3.14.0 build:cjs
+> @prosopo/database@3.14.2 build:cjs
 > NODE_ENV=${NODE_ENV:-development}; vite build --config vite.cjs.config.ts --mode $NODE_ENV
 
 ViteCommonJSConfig: .
@@ -46,7 +46,7 @@ rendering chunks...
 dist/cjs/databases/client.cjs              1.91 kB
 dist/cjs/databases/centralDbStreamer.cjs   4.20 kB
 dist/cjs/base/mongo.cjs                    4.58 kB
-dist/cjs/databases/captcha.cjs             5.87 kB
+dist/cjs/databases/captcha.cjs             7.87 kB
 dist/cjs/redisCache.cjs                   12.40 kB
-dist/cjs/databases/provider.cjs           66.79 kB
-✓ built in 528ms
+dist/cjs/databases/provider.cjs           69.18 kB
+✓ built in 468ms

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

@@ -1,8 +1,8 @@
 
-> @prosopo/database@3.14.0 build:tsc
+> @prosopo/database@3.14.2 build:tsc
 > tsc --build --verbose
 
-2:03:36 PM - Projects in this build: 
+1:48:40 PM - Projects in this build: 
     * ../../dev/config/tsconfig.json
     * ../locale/tsconfig.json
     * ../util/tsconfig.json
@@ -17,31 +17,31 @@
     * ../types-database/tsconfig.json
     * tsconfig.json
 
-2:03:36 PM - Project '../../dev/config/tsconfig.json' is up to date because newest input '../../dev/config/src/webpack/webpack.config.ts' is older than output '../../dev/config/tsconfig.tsbuildinfo'
+1:48:40 PM - Project '../../dev/config/tsconfig.json' is up to date because newest input '../../dev/config/src/webpack/webpack.config.ts' is older than output '../../dev/config/tsconfig.tsbuildinfo'
 
-2:03:36 PM - Project '../locale/tsconfig.json' is up to date because newest input '../locale/src/util.ts' is older than output '../locale/tsconfig.tsbuildinfo'
+1:48:40 PM - Project '../locale/tsconfig.json' is up to date because newest input '../locale/src/translationKey.ts' is older than output '../locale/tsconfig.tsbuildinfo'
 
-2:03:36 PM - Project '../util/tsconfig.json' is up to date because newest input '../util/src/url.ts' is older than output '../util/tsconfig.tsbuildinfo'
+1:48:40 PM - Project '../util/tsconfig.json' is up to date because newest input '../util/src/url.ts' is older than output '../util/tsconfig.tsbuildinfo'
 
-2:03:36 PM - Project '../logger/tsconfig.json' is up to date because newest input '../logger/src/index.ts' is older than output '../logger/tsconfig.tsbuildinfo'
+1:48:40 PM - Project '../logger/tsconfig.json' is up to date because newest input '../logger/src/index.ts' is older than output '../logger/tsconfig.tsbuildinfo'
 
-2:03:36 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'
+1:48:40 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'
 
-2:03:36 PM - Project '../types/tsconfig.json' is up to date because newest input '../types/src/provider/api.ts' is older than output '../types/tsconfig.tsbuildinfo'
+1:48:40 PM - Project '../types/tsconfig.json' is up to date because newest input '../types/src/provider/api.ts' is older than output '../types/tsconfig.tsbuildinfo'
 
-2:03:36 PM - Project '../common/tsconfig.json' is up to date because newest input '../common/src/index.ts' is older than output '../common/tsconfig.tsbuildinfo'
+1:48:40 PM - Project '../common/tsconfig.json' is up to date because newest input '../common/src/index.ts' is older than output '../common/tsconfig.tsbuildinfo'
 
-2:03:36 PM - Project '../api-route/tsconfig.json' is up to date because newest input '../api-route/src/apiRoutes.ts' is older than output '../api-route/tsconfig.tsbuildinfo'
+1:48:40 PM - Project '../api-route/tsconfig.json' is up to date because newest input '../api-route/src/apiRoutes.ts' is older than output '../api-route/tsconfig.tsbuildinfo'
 
-2:03:36 PM - Project '../redis-client/tsconfig.json' is up to date because newest input '../redis-client/src/index.ts' is older than output '../redis-client/tsconfig.tsbuildinfo'
+1:48:40 PM - Project '../redis-client/tsconfig.json' is up to date because newest input '../redis-client/src/tests/testRedisConnection.ts' is older than output '../redis-client/tsconfig.tsbuildinfo'
 
-2:03:37 PM - Project '../api/tsconfig.json' is up to date because newest input '../api/src/index.ts' is older than output '../api/tsconfig.tsbuildinfo'
+1:48:40 PM - Project '../api/tsconfig.json' is up to date because newest input '../api/src/index.ts' is older than output '../api/tsconfig.tsbuildinfo'
 
-2:03:37 PM - Project '../user-access-policy/tsconfig.json' is up to date because newest input '../user-access-policy/src/rule.ts' is older than output '../user-access-policy/tsconfig.tsbuildinfo'
+1:48:40 PM - Project '../user-access-policy/tsconfig.json' is up to date because newest input '../user-access-policy/src/transformRule.ts' is older than output '../user-access-policy/tsconfig.tsbuildinfo'
 
-2:03:37 PM - Project '../types-database/tsconfig.json' is up to date because newest input '../types-database/src/types/bannedDomain.ts' is older than output '../types-database/tsconfig.tsbuildinfo'
+1:48:40 PM - Project '../types-database/tsconfig.json' is up to date because newest input '../types-database/src/index.ts' is older than output '../types-database/tsconfig.tsbuildinfo'
 
-2:03:37 PM - Project 'tsconfig.json' is out of date because output file 'tsconfig.tsbuildinfo' does not exist
+1:48:40 PM - Project 'tsconfig.json' is out of date because output file 'tsconfig.tsbuildinfo' does not exist
 
-2:03:37 PM - Building project '/home/runner/work/captcha/captcha/packages/database/tsconfig.json'...
+1:48:40 PM - Building project '/home/runner/work/captcha/captcha/packages/database/tsconfig.json'...
 

package/.turbo/turbo-build.log

@@ -1,9 +1,9 @@
 
-> @prosopo/database@3.14.0 build
+> @prosopo/database@3.14.2 build
 > npm run build:cross-env -- --mode ${NODE_ENV:-development}
 
 
-> @prosopo/database@3.14.0 build:cross-env
+> @prosopo/database@3.14.2 build:cross-env
 > vite build --config vite.esm.config.ts --mode production
 
 ViteEsmConfig: .
@@ -50,7 +50,7 @@ rendering chunks...
 dist/databases/client.js              1.79 kB
 dist/databases/centralDbStreamer.js   4.09 kB
 dist/base/mongo.js                    4.14 kB
-dist/databases/captcha.js             5.45 kB
+dist/databases/captcha.js             7.45 kB
 dist/redisCache.js                   12.30 kB
-dist/databases/provider.js           66.57 kB
-✓ built in 524ms
+dist/databases/provider.js           68.96 kB
+✓ built in 472ms

package/CHANGELOG.md

@@ -1,5 +1,50 @@
 # @prosopo/database
 
+## 3.14.2
+### Patch Changes
+
+- 4626340: perf(provider): cut p95 on /captcha/frictionless and /captcha/image
+  
+  Replaces the `$match → $sample` random-captcha lookup with an indexed
+  range scan over a new `{datasetId, solved, randomKey}` compound index;
+  reorders the `sampleContextEntropy` aggregation so `$sample` runs
+  before `$lookup`; batches three pairs of independent awaits in the
+  frictionless handler via `Promise.all`. Adds an integration test
+  asserting via `.explain()` and wall-clock timing that the new paths
+  are quantifiably faster. The legacy aggregation remains as a fallback
+  in `getRandomCaptcha` so deployment can precede the
+  providerBackfillCaptchaRandomKey rollout.
+- 5f47c42: fix(database): widen `getSessionRecordBySessionId` projection so post-PoW routing escalations stop failing with `DATABASE.SESSION_STORE_FAILED`. The projection added in #2393 dropped `token`, `score`, `threshold`, `providerSelectEntropy`, `ipAddress`, etc., which `buildEscalation` forwards into a new session via `frictionlessManager.createSession`. With routing machines enabled for edge (2026-06-16) every escalation 500'd. Headers are now enumerated key-by-key so `headers.x-tls-clienthello` (multi-KB TLS ClientHello) stays out of the read.
+- Updated dependencies [4626340]
+- Updated dependencies [6962179]
+  - @prosopo/types@4.6.1
+  - @prosopo/types-database@4.10.2
+  - @prosopo/user-access-policy@3.10.2
+
+## 3.14.1
+### Patch Changes
+
+- 44eaebf: Fix `providedIp.lower` being persisted as BSON `Long` instead of `Decimal128` on `usercommitments`, which aborted the central-streaming sweep on a `CastError` and stopped *all* records from being streamed off the affected provider node.
+  
+  Three changes, each addressing one half of the regression introduced by #2681 ("lifecycle timestamps + submit→verify recency window"):
+  
+  - **provider.ts** — `updateDappUserCommitment` and `updatePuzzleCaptchaRecord` now branch between pipeline-form (`updateOne(filter, [{ $set: ... }])`) and ordinary `$set`. The pipeline form bypasses Mongoose schema casting, so a `bigint` IP half lands on disk as BSON Int64 (Long) rather than going through the `bigint → string → Decimal128` setter on `CompositeIpAddressRecordSchemaObj`. The pipeline form is only used when an `$ifNull` is genuinely required; the `imgCaptchaTasks` side-update call site only carries `providedIp`/`metadata`, so it now takes the ordinary path and the setter runs.
+  - **captcha.ts** — `CaptchaDatabase.saveCaptchas` normalises `ipAddress` / `providedIp` composite-IP halves on each lean doc before the `bulkWrite`. `Model.bulkWrite` skips setters, so a Long-typed `lower` (whose unsigned value exceeds `Number.MAX_SAFE_INTEGER` — every IPv6 lower with bit 63 set) hits the Decimal128 caster raw and the ordered bulkWrite aborts the entire batch. Normalisation converts the Long via `Long.fromBits(low, high, /*unsigned*/ true).toString() → Decimal128`, matching what the original schema setter would have produced.
+  - **types-database/provider.ts** — `CompositeIpAddressRecordSchemaObj.lower/upper` setters extracted into a shared `normaliseIpHalf` that also handles BSON `Long`. Defensive cover for the `updateOne`/`save`/`create` paths the streamer uses (those *do* run setters); does not run under `bulkWrite`, which is why the captcha.ts normalisation is also needed.
+  
+  Long-class checks use duck-typed `_bsontype === "Long"` rather than `instanceof Long` to stay robust against hoisting differences between the top-level `bson` import and the copy the MongoDB driver uses for deserialisation.
+  
+  Regression test under `packages/database/src/tests/integration/providedIpPipelineCast.integration.test.ts` pins both halves: ordinary `$set` writes Decimal128, `saveCaptchas` drains a Long-poisoned lean doc through to a clean Decimal128 at central, and a negative-control test keeps the underlying Mongoose pipeline-cast behaviour visible so a future regression on either side is unambiguous.
+- Updated dependencies [55b1388]
+- Updated dependencies [44eaebf]
+  - @prosopo/util@3.3.0
+  - @prosopo/types@4.6.0
+  - @prosopo/types-database@4.10.1
+  - @prosopo/logger@1.0.3
+  - @prosopo/user-access-policy@3.10.1
+  - @prosopo/common@3.1.39
+  - @prosopo/redis-client@1.0.24
+
 ## 3.14.0
 ### Minor Changes
 

package/dist/cjs/databases/captcha.cjs

@@ -3,9 +3,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const common = require("@prosopo/common");
 const logger$1 = require("@prosopo/logger");
 const typesDatabase = require("@prosopo/types-database");
+const bson = require("bson");
 require("../base/index.cjs");
 const mongo = require("../base/mongo.cjs");
 var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
+const isBsonLong = (value) => typeof value === "object" && value !== null && "_bsontype" in value && value._bsontype === "Long";
 const logger = logger$1.getLogger("info", typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("databases/captcha.cjs", document.baseURI).href);
 var TableNames = /* @__PURE__ */ ((TableNames2) => {
   TableNames2["frictionlessToken"] = "frictionlessToken";
@@ -85,6 +87,48 @@ class CaptchaDatabase extends mongo.MongoDatabase {
     await Promise.all(indexPromises);
     this.indexesEnsured = true;
   }
+  /**
+   * Convert a BSON `Long` (which Mongoose's Decimal128 caster rejects)
+   * into a Decimal128 with the *unsigned* numeric value — so a Long
+   * representing an IPv6 lower half with bit 63 set (signed Long shows
+   * as a negative integer) converts to a positive Decimal128 that
+   * matches what `bigint→string→Decimal128` would have produced if the
+   * schema setter had run on the original write.
+   *
+   * Production background: pipeline-form updates (`updateOne(filter,
+   * [{ $set: ... }])`) bypass Mongoose schema casting, so a `bigint`
+   * passed for an IP half is serialised by the driver as BSON Int64
+   * (Long) instead of going through the `Decimal128` setter. The
+   * central-streaming sweep below reads those docs via `.lean()` and
+   * tries to replay them with `bulkWrite`, but `bulkWrite` also skips
+   * setters — so the cast fires raw and throws. Normalising the lean
+   * doc here is the only place that's guaranteed to run before the
+   * bulkWrite sees it.
+   */
+  static normaliseCompositeIp(ip) {
+    if (!ip) return ip;
+    const normaliseHalf = (v) => {
+      if (isBsonLong(v)) {
+        const lng = v;
+        return bson.Decimal128.fromString(
+          bson.Long.fromBits(lng.low, lng.high, true).toString()
+        );
+      }
+      return v;
+    };
+    return {
+      ...ip,
+      lower: normaliseHalf(ip.lower),
+      upper: normaliseHalf(ip.upper)
+    };
+  }
+  static normaliseDocCompositeIps(doc) {
+    return {
+      ...doc,
+      ipAddress: CaptchaDatabase.normaliseCompositeIp(doc.ipAddress),
+      providedIp: CaptchaDatabase.normaliseCompositeIp(doc.providedIp)
+    };
+  }
   async saveCaptchas(sessionEvents, imageCaptchaEvents, powCaptchaEvents) {
     await this.connect();
     if (sessionEvents.length) {
@@ -93,7 +137,7 @@ class CaptchaDatabase extends mongo.MongoDatabase {
           const { _id, ...safeDoc } = document2;
           return {
             insertOne: {
-              document: safeDoc
+              document: CaptchaDatabase.normaliseDocCompositeIps(safeDoc)
             }
           };
         })
@@ -110,10 +154,11 @@ class CaptchaDatabase extends mongo.MongoDatabase {
       const result = await this.tables.commitment.bulkWrite(
         imageCaptchaEvents.map((doc) => {
           const { _id, ...safeDoc } = doc;
+          const normalised = CaptchaDatabase.normaliseDocCompositeIps(safeDoc);
           return {
             updateOne: {
-              filter: { id: safeDoc.id },
-              update: { $set: safeDoc },
+              filter: { id: normalised.id },
+              update: { $set: normalised },
               upsert: true
             }
           };
@@ -133,10 +178,11 @@ class CaptchaDatabase extends mongo.MongoDatabase {
       const result = await this.tables.powcaptcha.bulkWrite(
         powCaptchaEvents.map((doc) => {
           const { _id, ...safeDoc } = doc;
+          const normalised = CaptchaDatabase.normaliseDocCompositeIps(safeDoc);
           return {
             updateOne: {
-              filter: { challenge: safeDoc.challenge },
-              update: { $set: safeDoc },
+              filter: { challenge: normalised.challenge },
+              update: { $set: normalised },
               upsert: true
             }
           };

package/dist/cjs/databases/provider.cjs

@@ -262,7 +262,17 @@ class ProviderDatabase extends mongo.MongoDatabase {
           captchaDocs.map((captchaDoc) => ({
             updateOne: {
               filter: { captchaId: captchaDoc.captchaId },
-              update: { $set: captchaDoc },
+              // `$setOnInsert` stamps `randomKey` once on the
+              // initial insert and leaves it untouched on
+              // re-imports of the same captchaId. See
+              // `getRandomCaptcha` and the
+              // providerBackfillCaptchaRandomKey playbook for
+              // the corresponding read path and one-shot
+              // backfill of pre-existing rows.
+              update: {
+                $set: captchaDoc,
+                $setOnInsert: { randomKey: Math.random() }
+              },
               upsert: true
             }
           }))
@@ -368,24 +378,35 @@ class ProviderDatabase extends mongo.MongoDatabase {
       });
     }
     const sampleSize = size ? Math.abs(Math.trunc(size)) : 1;
-    const filter = { datasetId, solved };
-    const cursor = this.tables?.captcha.aggregate([
-      { $match: filter },
-      { $sample: { size: sampleSize } },
-      {
-        $project: {
-          datasetId: 1,
-          datasetContentId: 1,
-          captchaId: 1,
-          captchaContentId: 1,
-          items: 1,
-          target: 1
-        }
+    const projection = {
+      _id: 0,
+      datasetId: 1,
+      datasetContentId: 1,
+      captchaId: 1,
+      captchaContentId: 1,
+      items: 1,
+      target: 1
+    };
+    const baseFilter = { datasetId, solved };
+    const pivot = Math.random();
+    const head = await this.tables?.captcha.find({ ...baseFilter, randomKey: { $gte: pivot } }, projection).sort({ randomKey: 1 }).limit(sampleSize).lean() ?? [];
+    let docs = head;
+    if (docs.length < sampleSize) {
+      const tail = await this.tables?.captcha.find({ ...baseFilter, randomKey: { $lt: pivot } }, projection).sort({ randomKey: 1 }).limit(sampleSize - docs.length).lean() ?? [];
+      docs = docs.concat(tail);
+    }
+    if (docs.length === 0) {
+      const fallback = await this.tables?.captcha.aggregate([
+        { $match: baseFilter },
+        { $sample: { size: sampleSize } },
+        { $project: projection }
+      ]).exec() ?? [];
+      if (fallback.length > 0) {
+        return fallback.map(({ _id, ...keep }) => keep);
       }
-    ]);
-    const docs = await cursor;
-    if (docs?.length) {
-      return docs.map(({ _id, ...keepAttrs }) => keepAttrs);
+    }
+    if (docs.length > 0) {
+      return docs;
     }
     throw new common.ProsopoDBError("DATABASE.CAPTCHA_GET_FAILED", {
       context: {
@@ -946,26 +967,33 @@ class ProviderDatabase extends mongo.MongoDatabase {
   async updatePuzzleCaptchaRecord(challenge, updates) {
     const tables = this.getTables();
     const timestamp = /* @__PURE__ */ new Date();
-    const setStage = {
+    const baseSet = {
       ...updates,
       pendingStage: true
     };
+    const pipelineExprs = {};
     if (updates.serverChecked === true) {
-      setStage.verifiedAtTimestamp = {
+      pipelineExprs.verifiedAtTimestamp = {
         $ifNull: ["$verifiedAtTimestamp", timestamp]
       };
     }
     if (updates.userSubmitted === true) {
-      setStage.submittedAtTimestamp = {
+      pipelineExprs.submittedAtTimestamp = {
         $ifNull: ["$submittedAtTimestamp", timestamp]
       };
     }
     if (updates.result?.status === types.CaptchaStatus.disapproved) {
-      setStage.failedAtTimestamp = {
+      pipelineExprs.failedAtTimestamp = {
         $ifNull: ["$failedAtTimestamp", timestamp]
       };
     }
-    await tables.puzzlecaptcha.updateOne({ challenge }, [{ $set: setStage }]);
+    if (Object.keys(pipelineExprs).length === 0) {
+      await tables.puzzlecaptcha.updateOne({ challenge }, { $set: baseSet });
+      return;
+    }
+    await tables.puzzlecaptcha.updateOne({ challenge }, [
+      { $set: { ...baseSet, ...pipelineExprs } }
+    ]);
   }
   /** @description Get serverChecked Dapp User image captcha commitments from the commitments table
    */
@@ -1032,27 +1060,34 @@ class ProviderDatabase extends mongo.MongoDatabase {
   async updateDappUserCommitment(commitmentId, updates) {
     const filter = { id: commitmentId };
     const timestamp = /* @__PURE__ */ new Date();
-    const setStage = {
+    const baseSet = {
       ...updates,
       lastUpdatedAtTimestamp: timestamp,
       pendingStage: true
     };
+    const pipelineExprs = {};
     if (updates.userSubmitted === true) {
-      setStage.submittedAtTimestamp = {
+      pipelineExprs.submittedAtTimestamp = {
         $ifNull: ["$submittedAtTimestamp", timestamp]
       };
     }
     if (updates.serverChecked === true) {
-      setStage.verifiedAtTimestamp = {
+      pipelineExprs.verifiedAtTimestamp = {
         $ifNull: ["$verifiedAtTimestamp", timestamp]
       };
     }
     if (updates.result?.status === types.CaptchaStatus.disapproved) {
-      setStage.failedAtTimestamp = {
+      pipelineExprs.failedAtTimestamp = {
         $ifNull: ["$failedAtTimestamp", timestamp]
       };
     }
-    await this.tables?.commitment.updateOne(filter, [{ $set: setStage }]);
+    if (Object.keys(pipelineExprs).length === 0) {
+      await this.tables?.commitment.updateOne(filter, { $set: baseSet });
+      return;
+    }
+    await this.tables?.commitment.updateOne(filter, [
+      { $set: { ...baseSet, ...pipelineExprs } }
+    ]);
   }
   /**
    * @description Get Dapp User PoW captcha commitments that have not been counted towards the client's total
@@ -1194,11 +1229,41 @@ class ProviderDatabase extends mongo.MongoDatabase {
     const filter = { sessionId };
     const doc = await this.tables.session.findOne(filter, {
       sessionId: 1,
-      ipInfo: 1,
+      token: 1,
+      score: 1,
+      threshold: 1,
       scoreComponents: 1,
+      providerSelectEntropy: 1,
+      ipAddress: 1,
+      ipInfo: 1,
       webView: 1,
+      iFrame: 1,
+      decryptedHeadHash: 1,
+      siteKey: 1,
       reason: 1,
-      decryptedHeadHash: 1
+      mode: 1,
+      solvedImagesCount: 1,
+      userSitekeyIpHash: 1,
+      simdReadings: 1,
+      dnsEvent: 1,
+      "headers.user-agent": 1,
+      "headers.accept": 1,
+      "headers.accept-language": 1,
+      "headers.accept-encoding": 1,
+      "headers.sec-ch-ua": 1,
+      "headers.sec-ch-ua-mobile": 1,
+      "headers.sec-ch-ua-platform": 1,
+      "headers.sec-ch-ua-platform-version": 1,
+      "headers.sec-fetch-dest": 1,
+      "headers.sec-fetch-mode": 1,
+      "headers.sec-fetch-site": 1,
+      "headers.sec-fetch-user": 1,
+      "headers.referer": 1,
+      "headers.origin": 1,
+      "headers.prosopo-user": 1,
+      "headers.prosopo-site-key": 1,
+      "headers.prosopo-type": 1,
+      "headers.x-tls-version": 1
     }).lean();
     return doc || void 0;
   }
@@ -2052,6 +2117,7 @@ class ProviderDatabase extends mongo.MongoDatabase {
           }
         }
       },
+      { $sample: { size: max } },
       {
         $lookup: {
           from: "sessions",
@@ -2081,7 +2147,6 @@ class ProviderDatabase extends mongo.MongoDatabase {
       });
     }
     pipeline.push(
-      { $limit: max },
       { $sample: { size } },
       {
         $project: {

package/dist/databases/captcha.d.ts

@@ -15,6 +15,8 @@ export declare class CaptchaDatabase extends MongoDatabase implements ICaptchaDa
     connect(): Promise<void>;
     getTables(): Tables<TableNames>;
     ensureIndexes(): Promise<void>;
+    private static normaliseCompositeIp;
+    private static normaliseDocCompositeIps;
     saveCaptchas(sessionEvents: StoredSession[], imageCaptchaEvents: UserCommitmentRecord[], powCaptchaEvents: PoWCaptchaRecord[]): Promise<void>;
     getCaptchas(filter?: RootFilterQuery<CaptchaProperties>, limit?: number): Promise<{
         userCommitmentRecords: UserCommitmentRecord[];

package/dist/databases/captcha.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/databases/captcha.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AACzD,OAAO,EACN,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAErB,KAAK,aAAa,EAGlB,KAAK,MAAM,EACX,KAAK,oBAAoB,EACzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,aAAK,UAAU;IACd,iBAAiB,sBAAsB;IACvC,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,UAAU,eAAe;CACzB;AAoBD,qBAAa,eAAgB,SAAQ,aAAc,YAAW,gBAAgB;IAC7E,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAC3B,OAAO,CAAC,cAAc,CAAS;gBAG9B,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM;IAMD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAUvC,SAAS,IAAI,MAAM,CAAC,UAAU,CAAC;IAUzB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC9B,YAAY,CACjB,aAAa,EAAE,aAAa,EAAE,EAC9B,kBAAkB,EAAE,oBAAoB,EAAE,EAC1C,gBAAgB,EAAE,gBAAgB,EAAE;IA2E/B,WAAW,CAChB,MAAM,GAAE,eAAe,CAAC,iBAAiB,CAAM,EAC/C,KAAK,SAAM,GACT,OAAO,CAAC;QACV,qBAAqB,EAAE,oBAAoB,EAAE,CAAC;QAC9C,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;KACtC,CAAC;CAgCF"}
+{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/databases/captcha.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AACzD,OAAO,EACN,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAErB,KAAK,aAAa,EAGlB,KAAK,MAAM,EACX,KAAK,oBAAoB,EACzB,MAAM,yBAAyB,CAAC;AAajC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,aAAK,UAAU;IACd,iBAAiB,sBAAsB;IACvC,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,UAAU,eAAe;CACzB;AAoBD,qBAAa,eAAgB,SAAQ,aAAc,YAAW,gBAAgB;IAC7E,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAC3B,OAAO,CAAC,cAAc,CAAS;gBAG9B,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM;IAMD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAUvC,SAAS,IAAI,MAAM,CAAC,UAAU,CAAC;IAUzB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAqDpC,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAoBnC,OAAO,CAAC,MAAM,CAAC,wBAAwB;IAajC,YAAY,CACjB,aAAa,EAAE,aAAa,EAAE,EAC9B,kBAAkB,EAAE,oBAAoB,EAAE,EAC1C,gBAAgB,EAAE,gBAAgB,EAAE;IA6E/B,WAAW,CAChB,MAAM,GAAE,eAAe,CAAC,iBAAiB,CAAM,EAC/C,KAAK,SAAM,GACT,OAAO,CAAC;QACV,qBAAqB,EAAE,oBAAoB,EAAE,CAAC;QAC9C,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;KACtC,CAAC;CAgCF"}

package/dist/databases/captcha.js

@@ -1,8 +1,10 @@
 import { ProsopoDBError } from "@prosopo/common";
 import { getLogger } from "@prosopo/logger";
 import { StoredSessionRecordSchema, StoredPoWCaptchaRecordSchema, StoredUserCommitmentRecordSchema } from "@prosopo/types-database";
+import { Decimal128, Long } from "bson";
 import "../base/index.js";
 import { MongoDatabase } from "../base/mongo.js";
+const isBsonLong = (value) => typeof value === "object" && value !== null && "_bsontype" in value && value._bsontype === "Long";
 const logger = getLogger("info", import.meta.url);
 var TableNames = /* @__PURE__ */ ((TableNames2) => {
   TableNames2["frictionlessToken"] = "frictionlessToken";
@@ -82,6 +84,48 @@ class CaptchaDatabase extends MongoDatabase {
     await Promise.all(indexPromises);
     this.indexesEnsured = true;
   }
+  /**
+   * Convert a BSON `Long` (which Mongoose's Decimal128 caster rejects)
+   * into a Decimal128 with the *unsigned* numeric value — so a Long
+   * representing an IPv6 lower half with bit 63 set (signed Long shows
+   * as a negative integer) converts to a positive Decimal128 that
+   * matches what `bigint→string→Decimal128` would have produced if the
+   * schema setter had run on the original write.
+   *
+   * Production background: pipeline-form updates (`updateOne(filter,
+   * [{ $set: ... }])`) bypass Mongoose schema casting, so a `bigint`
+   * passed for an IP half is serialised by the driver as BSON Int64
+   * (Long) instead of going through the `Decimal128` setter. The
+   * central-streaming sweep below reads those docs via `.lean()` and
+   * tries to replay them with `bulkWrite`, but `bulkWrite` also skips
+   * setters — so the cast fires raw and throws. Normalising the lean
+   * doc here is the only place that's guaranteed to run before the
+   * bulkWrite sees it.
+   */
+  static normaliseCompositeIp(ip) {
+    if (!ip) return ip;
+    const normaliseHalf = (v) => {
+      if (isBsonLong(v)) {
+        const lng = v;
+        return Decimal128.fromString(
+          Long.fromBits(lng.low, lng.high, true).toString()
+        );
+      }
+      return v;
+    };
+    return {
+      ...ip,
+      lower: normaliseHalf(ip.lower),
+      upper: normaliseHalf(ip.upper)
+    };
+  }
+  static normaliseDocCompositeIps(doc) {
+    return {
+      ...doc,
+      ipAddress: CaptchaDatabase.normaliseCompositeIp(doc.ipAddress),
+      providedIp: CaptchaDatabase.normaliseCompositeIp(doc.providedIp)
+    };
+  }
   async saveCaptchas(sessionEvents, imageCaptchaEvents, powCaptchaEvents) {
     await this.connect();
     if (sessionEvents.length) {
@@ -90,7 +134,7 @@ class CaptchaDatabase extends MongoDatabase {
           const { _id, ...safeDoc } = document;
           return {
             insertOne: {
-              document: safeDoc
+              document: CaptchaDatabase.normaliseDocCompositeIps(safeDoc)
             }
           };
         })
@@ -107,10 +151,11 @@ class CaptchaDatabase extends MongoDatabase {
       const result = await this.tables.commitment.bulkWrite(
         imageCaptchaEvents.map((doc) => {
           const { _id, ...safeDoc } = doc;
+          const normalised = CaptchaDatabase.normaliseDocCompositeIps(safeDoc);
           return {
             updateOne: {
-              filter: { id: safeDoc.id },
-              update: { $set: safeDoc },
+              filter: { id: normalised.id },
+              update: { $set: normalised },
               upsert: true
             }
           };
@@ -130,10 +175,11 @@ class CaptchaDatabase extends MongoDatabase {
       const result = await this.tables.powcaptcha.bulkWrite(
         powCaptchaEvents.map((doc) => {
           const { _id, ...safeDoc } = doc;
+          const normalised = CaptchaDatabase.normaliseDocCompositeIps(safeDoc);
           return {
             updateOne: {
-              filter: { challenge: safeDoc.challenge },
-              update: { $set: safeDoc },
+              filter: { challenge: normalised.challenge },
+              update: { $set: normalised },
               upsert: true
             }
           };

package/dist/databases/captcha.js.map

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