@prosopo/database 3.5.5 → 3.5.6

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

@@ -0,0 +1,48 @@
+
+> @prosopo/database@3.5.6 build:cjs
+> NODE_ENV=${NODE_ENV:-development}; vite build --config vite.cjs.config.ts --mode $NODE_ENV
+
+ViteCommonJSConfig: .
+{
+  tsConfigPaths: [
+    '/home/runner/work/captcha/captcha/packages/common/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/locale/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/types/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/util/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/util-crypto/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/types-database/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/user-access-policy/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/api-route/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/redis-client/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/api/tsconfig.json'
+  ]
+}
+{
+  externals: [
+    '@prosopo/common',
+    '@prosopo/locale',
+    '@prosopo/types',
+    '@prosopo/util',
+    '@prosopo/util-crypto',
+    '@prosopo/types-database',
+    '@prosopo/user-access-policy',
+    '@prosopo/api-route',
+    '@prosopo/redis-client',
+    '@prosopo/api'
+  ]
+}
+vite v6.4.1 building SSR bundle for production...
+Bundle build started
+transforming...
+Build end
+✓ 8 modules transformed.
+rendering chunks...
+dist/cjs/base/index.cjs           0.28 kB
+dist/cjs/base/mongoMemory.cjs     0.71 kB
+dist/cjs/index.cjs                0.78 kB
+dist/cjs/databases/index.cjs      0.89 kB
+dist/cjs/databases/client.cjs     1.91 kB
+dist/cjs/base/mongo.cjs           4.48 kB
+dist/cjs/databases/captcha.cjs    5.82 kB
+dist/cjs/databases/provider.cjs  43.19 kB
+✓ built in 227ms

package/.turbo/turbo-build.log

@@ -0,0 +1,48 @@
+
+> @prosopo/database@3.5.6 build
+> NODE_ENV=${NODE_ENV:-development}; vite build --config vite.esm.config.ts --mode $NODE_ENV
+
+ViteEsmConfig: .
+{
+  tsConfigPaths: [
+    '/home/runner/work/captcha/captcha/packages/common/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/locale/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/types/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/util/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/util-crypto/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/types-database/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/user-access-policy/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/api-route/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/redis-client/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/api/tsconfig.json'
+  ]
+}
+{
+  externals: [
+    '@prosopo/common',
+    '@prosopo/locale',
+    '@prosopo/types',
+    '@prosopo/util',
+    '@prosopo/util-crypto',
+    '@prosopo/types-database',
+    '@prosopo/user-access-policy',
+    '@prosopo/api-route',
+    '@prosopo/redis-client',
+    '@prosopo/api'
+  ]
+}
+vite v6.4.1 building SSR bundle for production...
+Bundle build started
+transforming...
+Build end
+✓ 8 modules transformed.
+rendering chunks...
+dist/base/index.js           0.15 kB
+dist/index.js                0.54 kB
+dist/base/mongoMemory.js     0.59 kB
+dist/databases/index.js      0.67 kB
+dist/databases/client.js     1.79 kB
+dist/base/mongo.js           4.06 kB
+dist/databases/captcha.js    5.41 kB
+dist/databases/provider.js  42.97 kB
+✓ built in 412ms

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @prosopo/database
 
+## 3.5.6
+### Patch Changes
+
+- 7d5eb3f: bump
+- Updated dependencies [7d5eb3f]
+  - @prosopo/common@3.1.26
+  - @prosopo/locale@3.1.26
+  - @prosopo/redis-client@1.0.11
+  - @prosopo/types@3.6.4
+  - @prosopo/types-database@4.0.6
+  - @prosopo/user-access-policy@3.5.32
+
 ## 3.5.5
 ### Patch Changes
 

package/dist/cjs/databases/provider.cjs

@@ -20,7 +20,7 @@ var TableNames = /* @__PURE__ */ ((TableNames2) => {
   TableNames2["client"] = "client";
   TableNames2["session"] = "session";
   TableNames2["detector"] = "detector";
-  TableNames2["clientEntropy"] = "clientEntropy";
+  TableNames2["clientContextEntropy"] = "clientContextEntropy";
   return TableNames2;
 })(TableNames || {});
 const PROVIDER_TABLES = [
@@ -80,9 +80,9 @@ const PROVIDER_TABLES = [
     schema: typesDatabase.DetectorRecordSchema
   },
   {
-    collectionName: "clientEntropy",
-    modelName: "ClientEntropy",
-    schema: typesDatabase.ClientEntropyRecordSchema
+    collectionName: "clientContextEntropy",
+    modelName: "ClientContextEntropy",
+    schema: typesDatabase.ClientContextEntropyRecordSchema
   }
 ];
 class ProviderDatabase extends mongo.MongoDatabase {
@@ -1366,37 +1366,37 @@ class ProviderDatabase extends mongo.MongoDatabase {
     return (keyRecords || []).map((record) => record.detectorKey);
   }
   /**
-   * @description set client entropy
+   * @description set client context-specific entropy
    */
-  async setClientEntropy(account, entropy) {
-    const filter = { account };
-    await this.tables?.clientEntropy.updateOne(
+  async setClientContextEntropy(account, contextType, entropy) {
+    const filter = { account, contextType };
+    await this.tables?.clientContextEntropy.updateOne(
       filter,
-      { $set: { entropy } },
+      { $set: { account, contextType, entropy } },
       { upsert: true }
     );
   }
   /**
-   * @description get client entropy
+   * @description get client context-specific entropy
    */
-  async getClientEntropy(account) {
-    const filter = { account };
-    const doc = await this.tables?.clientEntropy.findOne(filter).lean();
+  async getClientContextEntropy(account, contextType) {
+    const filter = { account, contextType };
+    const doc = await this.tables?.clientContextEntropy.findOne(filter).lean();
     return doc ? doc.entropy : void 0;
   }
-  /** Sample captcha records from the database */
-  async sampleEntropy(sampleSize, siteKey) {
+  /** Sample captcha records from the database for a specific context */
+  async sampleContextEntropy(sampleSize, siteKey, contextType) {
     const size = sampleSize ? Math.abs(Math.trunc(sampleSize)) : 1;
     const max = 1e4;
     if (size > max) {
       throw new common.ProsopoDBError("DATABASE.CAPTCHA_SAMPLE_SIZE_EXCEEDED", {
         context: {
-          failedFuncName: this.sampleEntropy.name,
+          failedFuncName: this.sampleContextEntropy.name,
           sampleSize
         }
       });
     }
-    const cursor = this.tables?.powcaptcha.aggregate([
+    const pipeline = [
       {
         $match: {
           dappAccount: siteKey,
@@ -1405,24 +1405,54 @@ class ProviderDatabase extends mongo.MongoDatabase {
           }
         }
       },
+      {
+        $lookup: {
+          from: "session",
+          localField: "sessionId",
+          foreignField: "sessionId",
+          as: "sessionData"
+        }
+      },
+      {
+        $unwind: {
+          path: "$sessionData",
+          preserveNullAndEmptyArrays: false
+        }
+      }
+    ];
+    if (contextType === types.ContextType.Webview) {
+      pipeline.push({
+        $match: {
+          "sessionData.webView": true
+        }
+      });
+    } else if (contextType === types.ContextType.Default) {
+      pipeline.push({
+        $match: {
+          "sessionData.webView": false
+        }
+      });
+    }
+    pipeline.push(
       { $limit: max },
       { $sample: { size } },
       {
         $project: {
           _id: 0,
-          frictionlessTokenId: 1
+          sessionId: 1
         }
       }
-    ]);
+    );
+    const cursor = this.tables?.powcaptcha.aggregate(pipeline);
     const docs = await cursor;
     if (docs?.length === 0) {
       return [];
     }
     return (await Promise.all(
       docs.map(async (doc) => {
-        if (doc.frictionlessTokenId) {
-          const tokenRecord = await this.getSessionRecordByToken(
-            doc.frictionlessTokenId
+        if (doc.sessionId) {
+          const tokenRecord = await this.getSessionRecordBySessionId(
+            doc.sessionId
           );
           return tokenRecord?.decryptedHeadHash;
         }

package/dist/databases/provider.js

@@ -1,8 +1,8 @@
 import { isHex } from "@polkadot/util/is";
 import { ProsopoDBError } from "@prosopo/common";
 import { connectToRedis, setupRedisIndex } from "@prosopo/redis-client";
-import { DatasetWithIdsAndTreeSchema, StoredStatusNames, CaptchaStatus, ApiParams, CaptchaStates } from "@prosopo/types";
-import { CaptchaRecordSchema, PoWCaptchaRecordSchema, DatasetRecordSchema, SolutionRecordSchema, UserCommitmentRecordSchema, UserSolutionRecordSchema, PendingRecordSchema, ScheduledTaskRecordSchema, ClientRecordSchema, SessionRecordSchema, DetectorRecordSchema, ClientEntropyRecordSchema, UserCommitmentSchema, ScheduledTaskSchema } from "@prosopo/types-database";
+import { DatasetWithIdsAndTreeSchema, StoredStatusNames, CaptchaStatus, ApiParams, CaptchaStates, ContextType } from "@prosopo/types";
+import { CaptchaRecordSchema, PoWCaptchaRecordSchema, DatasetRecordSchema, SolutionRecordSchema, UserCommitmentRecordSchema, UserSolutionRecordSchema, PendingRecordSchema, ScheduledTaskRecordSchema, ClientRecordSchema, SessionRecordSchema, DetectorRecordSchema, ClientContextEntropyRecordSchema, UserCommitmentSchema, ScheduledTaskSchema } from "@prosopo/types-database";
 import { accessRulesRedisIndex, createRedisAccessRulesStorage } from "@prosopo/user-access-policy/redis";
 import { MongoDatabase } from "../base/mongo.js";
 const TWENTY_FOUR_HOURS_IN_MS = 24 * 60 * 60 * 1e3;
@@ -18,7 +18,7 @@ var TableNames = /* @__PURE__ */ ((TableNames2) => {
   TableNames2["client"] = "client";
   TableNames2["session"] = "session";
   TableNames2["detector"] = "detector";
-  TableNames2["clientEntropy"] = "clientEntropy";
+  TableNames2["clientContextEntropy"] = "clientContextEntropy";
   return TableNames2;
 })(TableNames || {});
 const PROVIDER_TABLES = [
@@ -78,9 +78,9 @@ const PROVIDER_TABLES = [
     schema: DetectorRecordSchema
   },
   {
-    collectionName: "clientEntropy",
-    modelName: "ClientEntropy",
-    schema: ClientEntropyRecordSchema
+    collectionName: "clientContextEntropy",
+    modelName: "ClientContextEntropy",
+    schema: ClientContextEntropyRecordSchema
   }
 ];
 class ProviderDatabase extends MongoDatabase {
@@ -1364,37 +1364,37 @@ class ProviderDatabase extends MongoDatabase {
     return (keyRecords || []).map((record) => record.detectorKey);
   }
   /**
-   * @description set client entropy
+   * @description set client context-specific entropy
    */
-  async setClientEntropy(account, entropy) {
-    const filter = { account };
-    await this.tables?.clientEntropy.updateOne(
+  async setClientContextEntropy(account, contextType, entropy) {
+    const filter = { account, contextType };
+    await this.tables?.clientContextEntropy.updateOne(
       filter,
-      { $set: { entropy } },
+      { $set: { account, contextType, entropy } },
       { upsert: true }
     );
   }
   /**
-   * @description get client entropy
+   * @description get client context-specific entropy
    */
-  async getClientEntropy(account) {
-    const filter = { account };
-    const doc = await this.tables?.clientEntropy.findOne(filter).lean();
+  async getClientContextEntropy(account, contextType) {
+    const filter = { account, contextType };
+    const doc = await this.tables?.clientContextEntropy.findOne(filter).lean();
     return doc ? doc.entropy : void 0;
   }
-  /** Sample captcha records from the database */
-  async sampleEntropy(sampleSize, siteKey) {
+  /** Sample captcha records from the database for a specific context */
+  async sampleContextEntropy(sampleSize, siteKey, contextType) {
     const size = sampleSize ? Math.abs(Math.trunc(sampleSize)) : 1;
     const max = 1e4;
     if (size > max) {
       throw new ProsopoDBError("DATABASE.CAPTCHA_SAMPLE_SIZE_EXCEEDED", {
         context: {
-          failedFuncName: this.sampleEntropy.name,
+          failedFuncName: this.sampleContextEntropy.name,
           sampleSize
         }
       });
     }
-    const cursor = this.tables?.powcaptcha.aggregate([
+    const pipeline = [
       {
         $match: {
           dappAccount: siteKey,
@@ -1403,24 +1403,54 @@ class ProviderDatabase extends MongoDatabase {
           }
         }
       },
+      {
+        $lookup: {
+          from: "session",
+          localField: "sessionId",
+          foreignField: "sessionId",
+          as: "sessionData"
+        }
+      },
+      {
+        $unwind: {
+          path: "$sessionData",
+          preserveNullAndEmptyArrays: false
+        }
+      }
+    ];
+    if (contextType === ContextType.Webview) {
+      pipeline.push({
+        $match: {
+          "sessionData.webView": true
+        }
+      });
+    } else if (contextType === ContextType.Default) {
+      pipeline.push({
+        $match: {
+          "sessionData.webView": false
+        }
+      });
+    }
+    pipeline.push(
       { $limit: max },
       { $sample: { size } },
       {
         $project: {
           _id: 0,
-          frictionlessTokenId: 1
+          sessionId: 1
         }
       }
-    ]);
+    );
+    const cursor = this.tables?.powcaptcha.aggregate(pipeline);
     const docs = await cursor;
     if (docs?.length === 0) {
       return [];
     }
     return (await Promise.all(
       docs.map(async (doc) => {
-        if (doc.frictionlessTokenId) {
-          const tokenRecord = await this.getSessionRecordByToken(
-            doc.frictionlessTokenId
+        if (doc.sessionId) {
+          const tokenRecord = await this.getSessionRecordBySessionId(
+            doc.sessionId
           );
           return tokenRecord?.decryptedHeadHash;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/database",
-	"version": "3.5.5",
+	"version": "3.5.6",
 	"description": "Prosopo database plugins for provider",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -35,19 +35,19 @@
 	"homepage": "https://github.com/prosopo/captcha#readme",
 	"dependencies": {
 		"@polkadot/util": "13.5.7",
-		"@prosopo/common": "3.1.25",
-		"@prosopo/locale": "3.1.25",
-		"@prosopo/redis-client": "1.0.10",
-		"@prosopo/types": "3.6.3",
-		"@prosopo/types-database": "4.0.5",
-		"@prosopo/user-access-policy": "3.5.31",
+		"@prosopo/common": "3.1.26",
+		"@prosopo/locale": "3.1.26",
+		"@prosopo/redis-client": "1.0.11",
+		"@prosopo/types": "3.6.4",
+		"@prosopo/types-database": "4.0.6",
+		"@prosopo/user-access-policy": "3.5.32",
 		"make-dir": "3.1.0",
 		"mongodb": "6.15.0",
 		"mongodb-memory-server": "10.3.0",
 		"mongoose": "8.13.0"
 	},
 	"devDependencies": {
-		"@prosopo/config": "3.1.25",
+		"@prosopo/config": "3.1.26",
 		"@types/node": "22.10.2",
 		"@vitest/coverage-v8": "3.2.4",
 		"concurrently": "9.0.1",