npm - @prosopo/user-access-policy - Versions diffs - 2.4.1 → 2.5.0 - Mend

@prosopo/user-access-policy 2.4.1 → 2.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (49) hide show

package/dist/blacklistInspector.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import type { IPAddress } from "@prosopo/types";
 interface BlacklistInspector {
-    isUserBlacklisted(clientId: string, userIpAddress: IPAddress, userId: string): Promise<boolean>;
+    isUserBlacklisted(clientId: string, userIpAddress: IPAddress, ja4: string, userId: string): Promise<boolean>;
 }
 export type { BlacklistInspector };
 //# sourceMappingURL=blacklistInspector.d.ts.map

package/dist/blacklistInspector.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"blacklistInspector.d.ts","sourceRoot":"","sources":["../src/blacklistInspector.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,UAAU,kBAAkB;IAC3B,iBAAiB,CAChB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC,CAAC;CACpB;AAED,YAAY,EAAE,kBAAkB,EAAE,CAAC"}
1	+ {"version":3,"file":"blacklistInspector.d.ts","sourceRoot":"","sources":["../src/blacklistInspector.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,UAAU,kBAAkB;IAC3B,iBAAiB,CAChB,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EACxB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC,CAAC;CACpB;AAED,YAAY,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/imageCaptchaConfigResolver.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import type { IPAddress, ProsopoCaptchaCountConfigSchemaOutput } from "@prosopo/types";
 interface ImageCaptchaConfigResolver {
-    isConfigDefined(clientId: string, userIpAddress: IPAddress, userId: string): Promise<boolean>;
-    resolveConfig(defaults: ProsopoCaptchaCountConfigSchemaOutput, userIpAddress: IPAddress, userId: string, clientId: string): Promise<ProsopoCaptchaCountConfigSchemaOutput>;
+    isConfigDefined(clientId: string, userIpAddress: IPAddress, ja4: string, userId: string): Promise<boolean>;
+    resolveConfig(defaults: ProsopoCaptchaCountConfigSchemaOutput, userIpAddress: IPAddress, ja4: string, userId: string, clientId: string): Promise<ProsopoCaptchaCountConfigSchemaOutput>;
 }
 export type { ImageCaptchaConfigResolver };
 //# sourceMappingURL=imageCaptchaConfigResolver.d.ts.map

package/dist/imageCaptchaConfigResolver.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"imageCaptchaConfigResolver.d.ts","sourceRoot":"","sources":["../src/imageCaptchaConfigResolver.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACX,SAAS,EACT,qCAAqC,EACrC,MAAM,gBAAgB,CAAC;AAExB,UAAU,0BAA0B;IACnC,eAAe,CACd,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB,aAAa,CACZ,QAAQ,EAAE,qCAAqC,EAC/C,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,qCAAqC,CAAC,CAAC;CAClD;AAED,YAAY,EAAE,0BAA0B,EAAE,CAAC"}
1	+ {"version":3,"file":"imageCaptchaConfigResolver.d.ts","sourceRoot":"","sources":["../src/imageCaptchaConfigResolver.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACX,SAAS,EACT,qCAAqC,EACrC,MAAM,gBAAgB,CAAC;AAExB,UAAU,0BAA0B;IACnC,eAAe,CACd,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EACxB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB,aAAa,CACZ,QAAQ,EAAE,qCAAqC,EAC/C,aAAa,EAAE,SAAS,EACxB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,qCAAqC,CAAC,CAAC;CAClD;AAED,YAAY,EAAE,0BAA0B,EAAE,CAAC"}

package/dist/index.d.ts CHANGED Viewed

@@ -4,6 +4,7 @@ import type { Model } from "mongoose";
 import type { BlacklistInspector } from "./blacklistInspector.js";
 import { apiRulePaths } from "./rules/api/apiRulePaths.js";
 import { getExpressApiRuleRateLimits } from "./rules/api/getExpressApiRuleRateLimits.js";
+import type { ApiInsertManyRulesArgsOutputSchema, ApiInsertManyRulesArgsSchema } from "./rules/api/insertMany/apiInsertManyRulesArgsSchema.js";
 import { ImageCaptchaConfigRulesResolver } from "./rules/imageCaptchaConfigRulesResolver.js";
 import { getRuleMongooseSchema } from "./rules/mongoose/schemas/getRuleMongooseSchema.js";
 import type { Rule } from "./rules/rule/rule.js";
@@ -12,5 +13,5 @@ declare const createBlacklistInspector: (rulesStorage: RulesStorage, logger: Log
 declare const createImageCaptchaConfigResolver: (rulesStorage: RulesStorage, logger: Logger) => ImageCaptchaConfigRulesResolver;
 declare const createApiRuleRoutesProvider: (rulesStorage: RulesStorage) => ApiRoutesProvider;
 declare const createMongooseRulesStorage: (logger: Logger, readingModel: Model<Rule> | null, writingModel?: Model<Rule> | null) => RulesStorage;
-export { type Rule, type RulesStorage, type BlacklistInspector, createMongooseRulesStorage, createImageCaptchaConfigResolver, createBlacklistInspector, createApiRuleRoutesProvider, getRuleMongooseSchema, getExpressApiRuleRateLimits, apiRulePaths, };
+export { type Rule, type RulesStorage, type BlacklistInspector, type ApiInsertManyRulesArgsSchema, type ApiInsertManyRulesArgsOutputSchema, createMongooseRulesStorage, createImageCaptchaConfigResolver, createBlacklistInspector, createApiRuleRoutesProvider, getRuleMongooseSchema, getExpressApiRuleRateLimits, apiRulePaths, };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;~~AAEzF~~,OAAO,EAAE,+BAA+B,EAAE,MAAM,4CAA4C,CAAC;AAE7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEpE,QAAA,MAAM,wBAAwB,iBACf,YAAY,UAClB,MAAM,KACZ,kBAEF,CAAC;AAEF,QAAA,MAAM,gCAAgC,iBACvB,YAAY,UAClB,MAAM,KACZ,+BAEF,CAAC;AAEF,QAAA,MAAM,2BAA2B,iBAClB,YAAY,KACxB,iBAEF,CAAC;AAEF,QAAA,MAAM,0BAA0B,WACvB,MAAM,gBACA,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,iBAClB,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,KAC9B,YAEF,CAAC;AAEF,OAAO,EACN,KAAK,IAAI,EACT,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,0BAA0B,EAC1B,gCAAgC,EAChC,wBAAwB,EACxB,2BAA2B,EAC3B,qBAAqB,EACrB,2BAA2B,EAC3B,YAAY,GACZ,CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AACzF,OAAO,KAAK,EACX,kCAAkC,EAClC,4BAA4B,EAC5B,MAAM,wDAAwD,CAAC;AAEhE,OAAO,EAAE,+BAA+B,EAAE,MAAM,4CAA4C,CAAC;AAE7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEpE,QAAA,MAAM,wBAAwB,iBACf,YAAY,UAClB,MAAM,KACZ,kBAEF,CAAC;AAEF,QAAA,MAAM,gCAAgC,iBACvB,YAAY,UAClB,MAAM,KACZ,+BAEF,CAAC;AAEF,QAAA,MAAM,2BAA2B,iBAClB,YAAY,KACxB,iBAEF,CAAC;AAEF,QAAA,MAAM,0BAA0B,WACvB,MAAM,gBACA,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,iBAClB,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,KAC9B,YAEF,CAAC;AAEF,OAAO,EACN,KAAK,IAAI,EACT,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,4BAA4B,EACjC,KAAK,kCAAkC,EACvC,0BAA0B,EAC1B,gCAAgC,EAChC,wBAAwB,EACxB,2BAA2B,EAC3B,qBAAqB,EACrB,2BAA2B,EAC3B,YAAY,GACZ,CAAC"}

package/dist/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;~~AACzF~~,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,+BAA+B,EAAE,MAAM,4CAA4C,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAI1F,MAAM,wBAAwB,GAAG,CAChC,YAA0B,EAC1B,MAAc,EACO,EAAE;IACvB,OAAO,IAAI,uBAAuB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,MAAM,gCAAgC,GAAG,CACxC,YAA0B,EAC1B,MAAc,EACoB,EAAE;IACpC,OAAO,IAAI,+BAA+B,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,2BAA2B,GAAG,CACnC,YAA0B,EACN,EAAE;IACtB,OAAO,IAAI,qBAAqB,CAAC,YAAY,CAAC,CAAC;AAChD,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAClC,MAAc,EACd,YAAgC,EAChC,eAAmC,IAAI,EACxB,EAAE;IACjB,OAAO,IAAI,oBAAoB,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;AACrE,CAAC,CAAC;AAEF,OAAO,~~EAIN~~,0BAA0B,EAC1B,gCAAgC,EAChC,wBAAwB,EACxB,2BAA2B,EAC3B,qBAAqB,EACrB,2BAA2B,EAC3B,YAAY,GACZ,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,2BAA2B,EAAE,MAAM,4CAA4C,CAAC;AAKzF,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,+BAA+B,EAAE,MAAM,4CAA4C,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAI1F,MAAM,wBAAwB,GAAG,CAChC,YAA0B,EAC1B,MAAc,EACO,EAAE;IACvB,OAAO,IAAI,uBAAuB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,MAAM,gCAAgC,GAAG,CACxC,YAA0B,EAC1B,MAAc,EACoB,EAAE;IACpC,OAAO,IAAI,+BAA+B,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,2BAA2B,GAAG,CACnC,YAA0B,EACN,EAAE;IACtB,OAAO,IAAI,qBAAqB,CAAC,YAAY,CAAC,CAAC;AAChD,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,CAClC,MAAc,EACd,YAAgC,EAChC,eAAmC,IAAI,EACxB,EAAE;IACjB,OAAO,IAAI,oBAAoB,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;AACrE,CAAC,CAAC;AAEF,OAAO,EAMN,0BAA0B,EAC1B,gCAAgC,EAChC,wBAAwB,EACxB,2BAA2B,EAC3B,qBAAqB,EACrB,2BAA2B,EAC3B,YAAY,GACZ,CAAC"}

package/dist/rules/api/deleteMany/apiDeleteManyRulesArgsSchema.d.ts CHANGED Viewed

@@ -107,6 +107,7 @@ declare const apiDeleteManyRulesArgsSchema: import("zod").ZodArray<import("zod")
         } | undefined;
     }>>;
     userId: import("zod").ZodOptional<import("zod").ZodString>;
+    ja4: import("zod").ZodOptional<import("zod").ZodString>;
 }, "strip", import("zod").ZodTypeAny, {
     clientId?: string | undefined;
     userIp?: {
@@ -130,6 +131,7 @@ declare const apiDeleteManyRulesArgsSchema: import("zod").ZodArray<import("zod")
         } | undefined;
     } | undefined;
     userId?: string | undefined;
+    ja4?: string | undefined;
 }, {
     clientId?: string | undefined;
     userIp?: {
@@ -153,6 +155,7 @@ declare const apiDeleteManyRulesArgsSchema: import("zod").ZodArray<import("zod")
         } | undefined;
     } | undefined;
     userId?: string | undefined;
+    ja4?: string | undefined;
 }>, "many">;
 type ApiDeleteManyRulesArgsSchema = typeof apiDeleteManyRulesArgsSchema;
 export { apiDeleteManyRulesArgsSchema, type ApiDeleteManyRulesArgsSchema };

package/dist/rules/api/deleteMany/apiDeleteManyRulesArgsSchema.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"apiDeleteManyRulesArgsSchema.d.ts","sourceRoot":"","sources":["../../../../src/rules/api/deleteMany/apiDeleteManyRulesArgsSchema.ts"],"names":[],"mappings":"AAiBA,QAAA,MAAM,4BAA4B~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAMjC~~,CAAC;AAEF,KAAK,4BAA4B,GAAG,OAAO,4BAA4B,CAAC;AAExE,OAAO,EAAE,4BAA4B,EAAE,KAAK,4BAA4B,EAAE,CAAC"}
1	+ {"version":3,"file":"apiDeleteManyRulesArgsSchema.d.ts","sourceRoot":"","sources":["../../../../src/rules/api/deleteMany/apiDeleteManyRulesArgsSchema.ts"],"names":[],"mappings":"AAiBA,QAAA,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAOjC,CAAC;AAEF,KAAK,4BAA4B,GAAG,OAAO,4BAA4B,CAAC;AAExE,OAAO,EAAE,4BAA4B,EAAE,KAAK,4BAA4B,EAAE,CAAC"}

package/dist/rules/api/deleteMany/apiDeleteManyRulesArgsSchema.js CHANGED Viewed

@@ -4,6 +4,7 @@ const apiDeleteManyRulesArgsSchema = array(object({
     clientId: string().optional(),
     userIp: ruleIpSchema.optional(),
     userId: string().optional(),
+    ja4: string().optional(),
 }));
 export { apiDeleteManyRulesArgsSchema };
 //# sourceMappingURL=apiDeleteManyRulesArgsSchema.js.map

package/dist/rules/api/deleteMany/apiDeleteManyRulesArgsSchema.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"apiDeleteManyRulesArgsSchema.js","sourceRoot":"","sources":["../../../../src/rules/api/deleteMany/apiDeleteManyRulesArgsSchema.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,MAAM,4BAA4B,GAAG,KAAK,CACzC,MAAM,CAAC;IACN,QAAQ,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,MAAM,EAAE,YAAY,CAAC,QAAQ,EAAE;IAC/B,MAAM,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;~~CAC3B~~,CAAC,CACF,CAAC;AAIF,OAAO,EAAE,4BAA4B,EAAqC,CAAC"}
1	+ {"version":3,"file":"apiDeleteManyRulesArgsSchema.js","sourceRoot":"","sources":["../../../../src/rules/api/deleteMany/apiDeleteManyRulesArgsSchema.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,MAAM,4BAA4B,GAAG,KAAK,CACzC,MAAM,CAAC;IACN,QAAQ,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,MAAM,EAAE,YAAY,CAAC,QAAQ,EAAE;IAC/B,MAAM,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,GAAG,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;CACxB,CAAC,CACF,CAAC;AAIF,OAAO,EAAE,4BAA4B,EAAqC,CAAC"}

package/dist/rules/api/insertMany/apiInsertManyRulesArgsSchema.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import { type output } from "zod";
 declare const apiInsertManyRulesArgsSchema: import("zod").ZodObject<{
     isUserBlocked: import("zod").ZodBoolean;
     clientId: import("zod").ZodOptional<import("zod").ZodString>;
@@ -12,7 +13,60 @@ declare const apiInsertManyRulesArgsSchema: import("zod").ZodObject<{
         v4?: string[] | undefined;
         v6?: string[] | undefined;
     }>;
+    userIpMasks: import("zod").ZodObject<{
+        v4: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
+            min: import("zod").ZodString;
+            max: import("zod").ZodString;
+        }, "strip", import("zod").ZodTypeAny, {
+            min: string;
+            max: string;
+        }, {
+            min: string;
+            max: string;
+        }>, "many">>;
+        v6: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
+            min: import("zod").ZodString;
+            max: import("zod").ZodString;
+        }, "strip", import("zod").ZodTypeAny, {
+            min: string;
+            max: string;
+        }, {
+            min: string;
+            max: string;
+        }>, "many">>;
+    }, "strip", import("zod").ZodTypeAny, {
+        v4?: {
+            min: string;
+            max: string;
+        }[] | undefined;
+        v6?: {
+            min: string;
+            max: string;
+        }[] | undefined;
+    }, {
+        v4?: {
+            min: string;
+            max: string;
+        }[] | undefined;
+        v6?: {
+            min: string;
+            max: string;
+        }[] | undefined;
+    }>;
     userIds: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodString, "many">>;
+    ja4s: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodString, "many">>;
+    userIp: import("zod").ZodOptional<import("zod").ZodObject<{
+        v4: import("zod").ZodOptional<import("zod").ZodString>;
+        v6: import("zod").ZodOptional<import("zod").ZodString>;
+    }, "strip", import("zod").ZodTypeAny, {
+        v4?: string | undefined;
+        v6?: string | undefined;
+    }, {
+        v4?: string | undefined;
+        v6?: string | undefined;
+    }>>;
+    userId: import("zod").ZodOptional<import("zod").ZodString>;
+    ja4: import("zod").ZodOptional<import("zod").ZodString>;
     config: import("zod").ZodOptional<import("zod").ZodObject<{
         imageCaptcha: import("zod").ZodOptional<import("zod").ZodObject<{
             solvedCount: import("zod").ZodOptional<import("zod").ZodNumber>;
@@ -42,9 +96,26 @@ declare const apiInsertManyRulesArgsSchema: import("zod").ZodObject<{
         v4?: string[] | undefined;
         v6?: string[] | undefined;
     };
+    userIpMasks: {
+        v4?: {
+            min: string;
+            max: string;
+        }[] | undefined;
+        v6?: {
+            min: string;
+            max: string;
+        }[] | undefined;
+    };
     clientId?: string | undefined;
+    userIp?: {
+        v4?: string | undefined;
+        v6?: string | undefined;
+    } | undefined;
+    userId?: string | undefined;
+    ja4?: string | undefined;
     description?: string | undefined;
     userIds?: string[] | undefined;
+    ja4s?: string[] | undefined;
     config?: {
         imageCaptcha?: {
             solvedCount?: number | undefined;
@@ -58,9 +129,26 @@ declare const apiInsertManyRulesArgsSchema: import("zod").ZodObject<{
         v4?: string[] | undefined;
         v6?: string[] | undefined;
     };
+    userIpMasks: {
+        v4?: {
+            min: string;
+            max: string;
+        }[] | undefined;
+        v6?: {
+            min: string;
+            max: string;
+        }[] | undefined;
+    };
     clientId?: string | undefined;
+    userIp?: {
+        v4?: string | undefined;
+        v6?: string | undefined;
+    } | undefined;
+    userId?: string | undefined;
+    ja4?: string | undefined;
     description?: string | undefined;
     userIds?: string[] | undefined;
+    ja4s?: string[] | undefined;
     config?: {
         imageCaptcha?: {
             solvedCount?: number | undefined;
@@ -70,5 +158,6 @@ declare const apiInsertManyRulesArgsSchema: import("zod").ZodObject<{
     score?: number | undefined;
 }>;
 type ApiInsertManyRulesArgsSchema = typeof apiInsertManyRulesArgsSchema;
-export { apiInsertManyRulesArgsSchema, type ApiInsertManyRulesArgsSchema };
+type ApiInsertManyRulesArgsOutputSchema = output<typeof apiInsertManyRulesArgsSchema>;
+export { apiInsertManyRulesArgsSchema, type ApiInsertManyRulesArgsSchema, type ApiInsertManyRulesArgsOutputSchema, };
 //# sourceMappingURL=apiInsertManyRulesArgsSchema.d.ts.map

package/dist/rules/api/insertMany/apiInsertManyRulesArgsSchema.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"apiInsertManyRulesArgsSchema.d.ts","sourceRoot":"","sources":["../../../../src/rules/api/insertMany/apiInsertManyRulesArgsSchema.ts"],"names":[],"mappings":"~~AAiBA~~,QAAA,MAAM,4BAA4B~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAWhC~~,CAAC;AAEH,KAAK,4BAA4B,GAAG,OAAO,4BAA4B,CAAC;AAExE,OAAO,~~EAAE~~,4BAA4B,~~EAAE~~,KAAK,4BAA4B,~~EAAE~~,CAAC"}
1	+ {"version":3,"file":"apiInsertManyRulesArgsSchema.d.ts","sourceRoot":"","sources":["../../../../src/rules/api/insertMany/apiInsertManyRulesArgsSchema.ts"],"names":[],"mappings":"AAcA,OAAO,EAA2B,KAAK,MAAM,EAAU,MAAM,KAAK,CAAC;AAGnE,QAAA,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiChC,CAAC;AAEH,KAAK,4BAA4B,GAAG,OAAO,4BAA4B,CAAC;AAExE,KAAK,kCAAkC,GAAG,MAAM,CAC/C,OAAO,4BAA4B,CACnC,CAAC;AAEF,OAAO,EACN,4BAA4B,EAC5B,KAAK,4BAA4B,EACjC,KAAK,kCAAkC,GACvC,CAAC"}

package/dist/rules/api/insertMany/apiInsertManyRulesArgsSchema.js CHANGED Viewed

@@ -8,9 +8,30 @@ const apiInsertManyRulesArgsSchema = object({
         v4: string().array().optional(),
         v6: string().array().optional(),
     }),
+    userIpMasks: object({
+        v4: object({
+            min: string(),
+            max: string(),
+        })
+            .array()
+            .optional(),
+        v6: object({
+            min: string(),
+            max: string(),
+        })
+            .array()
+            .optional(),
+    }),
     userIds: string().array().optional(),
+    ja4s: string().array().optional(),
+    userIp: object({
+        v4: string().optional(),
+        v6: string().optional(),
+    }).optional(),
+    userId: string().optional(),
+    ja4: string().optional(),
     config: ruleConfigSchema.optional(),
     score: number().optional(),
 });
-export { apiInsertManyRulesArgsSchema };
+export { apiInsertManyRulesArgsSchema, };
 //# sourceMappingURL=apiInsertManyRulesArgsSchema.js.map

package/dist/rules/api/insertMany/apiInsertManyRulesArgsSchema.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"apiInsertManyRulesArgsSchema.js","sourceRoot":"","sources":["../../../../src/rules/api/insertMany/apiInsertManyRulesArgsSchema.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,~~EAAE~~,MAAM,EAAE,MAAM,KAAK,CAAC;~~AACtD~~,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEzE,MAAM,4BAA4B,GAAG,MAAM,CAAC;IAC3C,aAAa,EAAE,OAAO,EAAE;IACxB,QAAQ,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,WAAW,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,OAAO,EAAE,MAAM,CAAC;QACf,EAAE,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;QAC/B,EAAE,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;KAC/B,CAAC;IACF,OAAO,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;IACpC,MAAM,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IACnC,KAAK,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC1B,CAAC,CAAC;~~AAIH~~,OAAO,~~EAAE~~,4BAA4B,~~EAAqC~~,CAAC"}
1	+ {"version":3,"file":"apiInsertManyRulesArgsSchema.js","sourceRoot":"","sources":["../../../../src/rules/api/insertMany/apiInsertManyRulesArgsSchema.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAe,MAAM,EAAE,MAAM,KAAK,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAEzE,MAAM,4BAA4B,GAAG,MAAM,CAAC;IAC3C,aAAa,EAAE,OAAO,EAAE;IACxB,QAAQ,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,WAAW,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,OAAO,EAAE,MAAM,CAAC;QACf,EAAE,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;QAC/B,EAAE,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;KAC/B,CAAC;IACF,WAAW,EAAE,MAAM,CAAC;QACnB,EAAE,EAAE,MAAM,CAAC;YACV,GAAG,EAAE,MAAM,EAAE;YACb,GAAG,EAAE,MAAM,EAAE;SACb,CAAC;aACA,KAAK,EAAE;aACP,QAAQ,EAAE;QACZ,EAAE,EAAE,MAAM,CAAC;YACV,GAAG,EAAE,MAAM,EAAE;YACb,GAAG,EAAE,MAAM,EAAE;SACb,CAAC;aACA,KAAK,EAAE;aACP,QAAQ,EAAE;KACZ,CAAC;IACF,OAAO,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;IACpC,IAAI,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;IAEjC,MAAM,EAAE,MAAM,CAAC;QACd,EAAE,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;QACvB,EAAE,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;KACvB,CAAC,CAAC,QAAQ,EAAE;IACb,MAAM,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,GAAG,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;IACxB,MAAM,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IACnC,KAAK,EAAE,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC1B,CAAC,CAAC;AAQH,OAAO,EACN,4BAA4B,GAG5B,CAAC"}

package/dist/rules/api/insertMany/apiInsertManyRulesEndpoint.d.ts CHANGED Viewed

@@ -9,7 +9,10 @@ declare class ApiInsertManyRulesEndpoint implements ApiEndpoint<ApiInsertManyRul
     processRequest(args: z.infer<ApiInsertManyRulesArgsSchema>): Promise<ApiEndpointResponse>;
     getRequestArgsSchema(): ApiInsertManyRulesArgsSchema;
     protected getUserIpRules(args: z.infer<ApiInsertManyRulesArgsSchema>): Rule[];
+    protected getUserIPMaskRules(args: z.infer<ApiInsertManyRulesArgsSchema>): Rule[];
     protected getUserIdRules(args: z.infer<ApiInsertManyRulesArgsSchema>): Rule[];
+    protected getJa4Rules(args: z.infer<ApiInsertManyRulesArgsSchema>): Rule[];
+    protected getSingleRule(args: z.infer<ApiInsertManyRulesArgsSchema>): Rule | undefined;
 }
 export { ApiInsertManyRulesEndpoint };
 //# sourceMappingURL=apiInsertManyRulesEndpoint.d.ts.map

package/dist/rules/api/insertMany/apiInsertManyRulesEndpoint.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"apiInsertManyRulesEndpoint.d.ts","sourceRoot":"","sources":["../../../../src/rules/api/insertMany/apiInsertManyRulesEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,WAAW,EAChB,KAAK,mBAAmB,EAExB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EACN,KAAK,4BAA4B,EAEjC,MAAM,mCAAmC,CAAC;AAE3C,cAAM,0BACL,YAAW,WAAW,CAAC,4BAA4B,CAAC;IAEjC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAAZ,YAAY,EAAE,YAAY;IAExD,cAAc,CACnB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,4BAA4B,CAAC,GACzC,OAAO,CAAC,mBAAmB,CAAC;~~IAaxB~~,oBAAoB,IAAI,4BAA4B;IAI3D,SAAS,CAAC,cAAc,CACvB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,4BAA4B,CAAC,GACzC,IAAI,EAAE;~~IAyCT~~,SAAS,CAAC,cAAc,CACvB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,4BAA4B,CAAC,GACzC,IAAI,EAAE;~~CAkBT~~;AAED,OAAO,EAAE,0BAA0B,EAAE,CAAC"}
1	+ {"version":3,"file":"apiInsertManyRulesEndpoint.d.ts","sourceRoot":"","sources":["../../../../src/rules/api/insertMany/apiInsertManyRulesEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EACN,KAAK,WAAW,EAChB,KAAK,mBAAmB,EAExB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EACN,KAAK,4BAA4B,EAEjC,MAAM,mCAAmC,CAAC;AAE3C,cAAM,0BACL,YAAW,WAAW,CAAC,4BAA4B,CAAC;IAEjC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAAZ,YAAY,EAAE,YAAY;IAExD,cAAc,CACnB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,4BAA4B,CAAC,GACzC,OAAO,CAAC,mBAAmB,CAAC;IAgCxB,oBAAoB,IAAI,4BAA4B;IAI3D,SAAS,CAAC,cAAc,CACvB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,4BAA4B,CAAC,GACzC,IAAI,EAAE;IAwCT,SAAS,CAAC,kBAAkB,CAC3B,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,4BAA4B,CAAC,GACzC,IAAI,EAAE;IAkDT,SAAS,CAAC,cAAc,CACvB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,4BAA4B,CAAC,GACzC,IAAI,EAAE;IAmBT,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,4BAA4B,CAAC,GAAG,IAAI,EAAE;IAmB1E,SAAS,CAAC,aAAa,CACtB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,4BAA4B,CAAC,GACzC,IAAI,GAAG,SAAS;CAqCnB;AAED,OAAO,EAAE,0BAA0B,EAAE,CAAC"}

package/dist/rules/api/insertMany/apiInsertManyRulesEndpoint.js CHANGED Viewed

@@ -7,14 +7,33 @@ class ApiInsertManyRulesEndpoint {
         this.rulesStorage = rulesStorage;
     }
     async processRequest(args) {
+        const singleRule = this.getSingleRule(args);
         const rules = [
             ...this.getUserIpRules(args),
+            ...this.getUserIPMaskRules(args),
             ...this.getUserIdRules(args),
+            ...this.getJa4Rules(args),
+            ...(singleRule ? [singleRule] : []),
         ];
-        await this.rulesStorage.insertMany(rules);
-        return {
-            status: ApiEndpointResponseStatus.SUCCESS,
-        };
+        return new Promise((resolve) => {
+            this.rulesStorage
+                .insertMany(rules)
+                .then(() => {
+                resolve({
+                    status: ApiEndpointResponseStatus.SUCCESS,
+                });
+            })
+                .catch(() => {
+                resolve({
+                    status: ApiEndpointResponseStatus.FAIL,
+                });
+            });
+            setTimeout(() => {
+                resolve({
+                    status: ApiEndpointResponseStatus.PROCESSING,
+                });
+            }, 5000);
+        });
     }
     getRequestArgsSchema() {
         return apiInsertManyRulesArgsSchema;
@@ -56,6 +75,55 @@ class ApiInsertManyRulesEndpoint {
         }
         return rules;
     }
+    getUserIPMaskRules(args) {
+        const rules = [];
+        const userIpMasks = args.userIpMasks || [];
+        for (const userMask of userIpMasks.v4 || []) {
+            const min = new Address4(userMask.min);
+            const max = new Address4(userMask.max);
+            rules.push({
+                userIp: ruleIpSchema.parse({
+                    v4: {
+                        asNumeric: min.bigInt(),
+                        asString: min.address,
+                        mask: {
+                            rangeMinAsNumeric: min.bigInt(),
+                            rangeMaxAsNumeric: max.bigInt(),
+                            asNumeric: Number(min.bigInt()),
+                        },
+                    },
+                }),
+                isUserBlocked: args.isUserBlocked,
+                description: args.description,
+                clientId: args.clientId,
+                config: args.config,
+                score: args.score,
+            });
+        }
+        for (const userMask of userIpMasks.v6 || []) {
+            const min = new Address6(userMask.min);
+            const max = new Address6(userMask.max);
+            rules.push({
+                userIp: ruleIpSchema.parse({
+                    v6: {
+                        asNumeric: min.bigInt(),
+                        asString: min.address,
+                        mask: {
+                            rangeMinAsNumeric: min.bigInt(),
+                            rangeMaxAsNumeric: max.bigInt(),
+                            asNumeric: Number(min.bigInt()),
+                        },
+                    },
+                }),
+                isUserBlocked: args.isUserBlocked,
+                description: args.description,
+                clientId: args.clientId,
+                config: args.config,
+                score: args.score,
+            });
+        }
+        return rules;
+    }
     getUserIdRules(args) {
         const rules = [];
         const userIds = args.userIds || [];
@@ -71,6 +139,57 @@ class ApiInsertManyRulesEndpoint {
         }
         return rules;
     }
+    getJa4Rules(args) {
+        const rules = [];
+        const ja4s = args.ja4s || [];
+        for (const ja4 of ja4s) {
+            rules.push({
+                ja4: ja4,
+                isUserBlocked: args.isUserBlocked,
+                description: args.description,
+                clientId: args.clientId,
+                config: args.config,
+                score: args.score,
+            });
+        }
+        return rules;
+    }
+    getSingleRule(args) {
+        if (!args.userIp && !args.userId && !args.ja4) {
+            return undefined;
+        }
+        const rule = {
+            isUserBlocked: args.isUserBlocked,
+            ...(args.description && { description: args.description }),
+            ...(args.clientId && { clientId: args.clientId }),
+            ...(args.config && { config: args.config }),
+            ...(args.score && { score: args.score }),
+            ...(args.ja4 && { ja4: args.ja4 }),
+            ...(args.userId && { userId: args.userId }),
+        };
+        if (args.userIp) {
+            const userIp = args.userIp;
+            if (userIp.v4) {
+                const ipAddress = new Address4(userIp.v4);
+                rule.userIp = ruleIpSchema.parse({
+                    v4: {
+                        asNumeric: ipAddress.bigInt(),
+                        asString: ipAddress.address,
+                    },
+                });
+            }
+            if (userIp.v6) {
+                const ipAddress = new Address6(userIp.v6);
+                rule.userIp = ruleIpSchema.parse({
+                    v6: {
+                        asNumeric: ipAddress.bigInt(),
+                        asString: ipAddress.address,
+                    },
+                });
+            }
+        }
+        return rule;
+    }
 }
 export { ApiInsertManyRulesEndpoint };
 //# sourceMappingURL=apiInsertManyRulesEndpoint.js.map

package/dist/rules/api/insertMany/apiInsertManyRulesEndpoint.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"apiInsertManyRulesEndpoint.js","sourceRoot":"","sources":["../../../../src/rules/api/insertMany/apiInsertManyRulesEndpoint.ts"],"names":[],"mappings":"AAcA,OAAO,EAGN,yBAAyB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEhD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D,OAAO,EAEN,4BAA4B,GAC5B,MAAM,mCAAmC,CAAC;AAE3C,MAAM,0BAA0B;IAG/B,YAAoC,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAElE,KAAK,CAAC,cAAc,CACnB,IAA2C;QAE3C,MAAM,KAAK,GAAW;YACrB,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;YAC5B,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;~~SAC5B~~,CAAC;~~QAEF~~,~~MAAM~~,IAAI,CAAC,~~YAAY~~,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;~~QAE1C~~,OAAO;~~YACN~~,MAAM,EAAE,yBAAyB,CAAC,OAAO;~~SACzC~~,CAAC;~~IACH~~,CAAC;IAEM,oBAAoB;QAC1B,OAAO,4BAA4B,CAAC;IACrC,CAAC;IAES,cAAc,CACvB,IAA2C;QAE3C,MAAM,KAAK,GAAW,EAAE,CAAC;QAEzB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;~~QAEnC~~,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC;YACvC,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;YACvC,KAAK,CAAC,IAAI,CAAC;gBACV,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC;oBAC1B,EAAE,EAAE;wBACH,SAAS,EAAE,SAAS,CAAC,MAAM,EAAE;wBAC7B,QAAQ,EAAE,SAAS,CAAC,OAAO;qBAC3B;iBACD,CAAC;gBACF,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,KAAK,EAAE,IAAI,CAAC,KAAK;aACjB,CAAC,CAAC;QACJ,CAAC;QACD,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC;YACvC,MAAM,SAAS,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;YACvC,KAAK,CAAC,IAAI,CAAC;gBACV,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC;oBAC1B,EAAE,EAAE;wBACH,SAAS,EAAE,SAAS,CAAC,MAAM,EAAE;wBAC7B,QAAQ,EAAE,SAAS,CAAC,OAAO;qBAC3B;iBACD,CAAC;gBACF,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,KAAK,EAAE,IAAI,CAAC,KAAK;aACjB,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,KAAK,CAAC;IACd,CAAC;IAES,cAAc,CACvB,IAA2C;QAE3C,MAAM,KAAK,GAAW,EAAE,CAAC;QAEzB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;QAEnC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,KAAK,CAAC,IAAI,CAAC;gBACV,MAAM,EAAE,MAAM;gBACd,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,KAAK,EAAE,IAAI,CAAC,KAAK;aACjB,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,KAAK,CAAC;IACd,CAAC;CACD;AAED,OAAO,EAAE,0BAA0B,EAAE,CAAC"}
1	+ {"version":3,"file":"apiInsertManyRulesEndpoint.js","sourceRoot":"","sources":["../../../../src/rules/api/insertMany/apiInsertManyRulesEndpoint.ts"],"names":[],"mappings":"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"}

package/dist/rules/blacklistRulesInspector.d.ts CHANGED Viewed

@@ -6,7 +6,7 @@ declare class BlacklistRulesInspector implements BlacklistInspector {
     private readonly rulesStorage;
     private readonly logger;
     constructor(rulesStorage: RulesStorage, logger: Logger);
-    isUserBlacklisted(clientId: string, userIpAddress: IPAddress, userId: string): Promise<boolean>;
+    isUserBlacklisted(clientId: string, userIpAddress: IPAddress, ja4: string, userId: string): Promise<boolean>;
 }
 export { BlacklistRulesInspector };
 //# sourceMappingURL=blacklistRulesInspector.d.ts.map

package/dist/rules/blacklistRulesInspector.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"blacklistRulesInspector.d.ts","sourceRoot":"","sources":["../../src/rules/blacklistRulesInspector.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,cAAM,uBAAwB,YAAW,kBAAkB;IAEzD,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM;IAGnB,iBAAiB,CAC7B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;~~CA8BnB~~;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAC"}
1	+ {"version":3,"file":"blacklistRulesInspector.d.ts","sourceRoot":"","sources":["../../src/rules/blacklistRulesInspector.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,cAAM,uBAAwB,YAAW,kBAAkB;IAEzD,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM;IAGnB,iBAAiB,CAC7B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EACxB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;CAuCnB;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAC"}

package/dist/rules/blacklistRulesInspector.js CHANGED Viewed

@@ -3,10 +3,17 @@ class BlacklistRulesInspector {
         this.rulesStorage = rulesStorage;
         this.logger = logger;
     }
-    async isUserBlacklisted(clientId, userIpAddress, userId) {
+    async isUserBlacklisted(clientId, userIpAddress, ja4, userId) {
+        this.logger.debug({
+            clientId: clientId,
+            userIpAddress: userIpAddress,
+            ja4: ja4,
+            userId: userId,
+        });
         const accessRules = await this.rulesStorage.find({
             clientId: clientId,
             userIpAddress: userIpAddress,
+            ja4: ja4,
             userId: userId,
         }, {
             includeRecordsWithPartialFilterMatches: true,
@@ -14,14 +21,16 @@ class BlacklistRulesInspector {
         });
         const blockingRules = accessRules.filter((accessRule) => accessRule.isUserBlocked);
         const userBlacklisted = blockingRules.length > 0;
-        this.logger.info("BlacklistRulesInspector.isUserBlacklisted", {
-            userBlacklisted: userBlacklisted,
-            clientId: clientId,
-            userIpAddress: userIpAddress.address.toString(),
-            userId: userId,
-            accessRules: accessRules.length,
-            blockingRules: blockingRules.length,
-        });
+        if (userBlacklisted) {
+            this.logger.info({
+                userBlacklisted: userBlacklisted,
+                clientId: clientId,
+                userIpAddress: userIpAddress.address.toString(),
+                userId: userId,
+                accessRules: accessRules.length,
+                blockingRules: blockingRules.length,
+            });
+        }
         return userBlacklisted;
     }
 }

package/dist/rules/blacklistRulesInspector.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"blacklistRulesInspector.js","sourceRoot":"","sources":["../../src/rules/blacklistRulesInspector.ts"],"names":[],"mappings":"AAmBA,MAAM,uBAAuB;IAC5B,YACkB,YAA0B,EAC1B,MAAc;QADd,iBAAY,GAAZ,YAAY,CAAc;QAC1B,WAAM,GAAN,MAAM,CAAQ;IAC7B,CAAC;IAEG,KAAK,CAAC,iBAAiB,CAC7B,QAAgB,EAChB,aAAwB,EACxB,MAAc;QAEd,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAC/C;YACC,QAAQ,EAAE,QAAQ;YAClB,aAAa,EAAE,aAAa;YAC5B,MAAM,EAAE,MAAM;SACd,EACD;YACC,sCAAsC,EAAE,IAAI;YAC5C,6BAA6B,EAAE,IAAI;SACnC,CACD,CAAC;QAEF,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CACvC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CACxC,CAAC;QAEF,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC;QAEjD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC~~,2CAA2C,EAAE~~;~~YAC7D~~,eAAe,EAAE,eAAe;~~YAChC~~,QAAQ,EAAE,QAAQ;~~YAClB~~,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE;~~YAC~~/C,MAAM,EAAE,MAAM;~~YACd~~,WAAW,EAAE,WAAW,CAAC,MAAM;~~YAC~~/B,aAAa,EAAE,aAAa,CAAC,MAAM;~~SACnC~~,CAAC,CAAC;~~QAEH~~,OAAO,eAAe,CAAC;IACxB,CAAC;CACD;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAC"}
1	+ {"version":3,"file":"blacklistRulesInspector.js","sourceRoot":"","sources":["../../src/rules/blacklistRulesInspector.ts"],"names":[],"mappings":"AAmBA,MAAM,uBAAuB;IAC5B,YACkB,YAA0B,EAC1B,MAAc;QADd,iBAAY,GAAZ,YAAY,CAAc;QAC1B,WAAM,GAAN,MAAM,CAAQ;IAC7B,CAAC;IAEG,KAAK,CAAC,iBAAiB,CAC7B,QAAgB,EAChB,aAAwB,EACxB,GAAW,EACX,MAAc;QAEd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YACjB,QAAQ,EAAE,QAAQ;YAClB,aAAa,EAAE,aAAa;YAC5B,GAAG,EAAE,GAAG;YACR,MAAM,EAAE,MAAM;SACd,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAC/C;YACC,QAAQ,EAAE,QAAQ;YAClB,aAAa,EAAE,aAAa;YAC5B,GAAG,EAAE,GAAG;YACR,MAAM,EAAE,MAAM;SACd,EACD;YACC,sCAAsC,EAAE,IAAI;YAC5C,6BAA6B,EAAE,IAAI;SACnC,CACD,CAAC;QAEF,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CACvC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CACxC,CAAC;QAEF,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC;QAEjD,IAAI,eAAe,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;gBAChB,eAAe,EAAE,eAAe;gBAChC,QAAQ,EAAE,QAAQ;gBAClB,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE;gBAC/C,MAAM,EAAE,MAAM;gBACd,WAAW,EAAE,WAAW,CAAC,MAAM;gBAC/B,aAAa,EAAE,aAAa,CAAC,MAAM;aACnC,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,eAAe,CAAC;IACxB,CAAC;CACD;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAC"}

package/dist/rules/imageCaptchaConfigRulesResolver.d.ts CHANGED Viewed

@@ -10,10 +10,10 @@ declare class ImageCaptchaConfigRulesResolver implements ImageCaptchaConfigResol
     private _accessRule;
     constructor(rulesStorage: RulesStorage, logger: Logger, _accessRule?: Rule | null);
     get accessRule(): Rule | null;
-    isConfigDefined(clientId: string, userIpAddress: IPAddress, userId: string): Promise<boolean>;
-    resolveConfig(defaults: ProsopoCaptchaCountConfigSchemaOutput, userIpAddress: IPAddress, userId: string, clientId: string): Promise<ProsopoCaptchaCountConfigSchemaOutput>;
-    protected fetchUserAccessRule(userIpAddress: IPAddress, userId: string, clientId: string): Promise<Rule | null>;
-    protected queryUserAccessRules(ipAddress: IPAddress, user: string, clientId: string): Promise<Rule[]>;
+    isConfigDefined(clientId: string, userIpAddress: IPAddress, ja4: string, userId: string): Promise<boolean>;
+    resolveConfig(defaults: ProsopoCaptchaCountConfigSchemaOutput, userIpAddress: IPAddress, ja4: string, userId: string, clientId: string): Promise<ProsopoCaptchaCountConfigSchemaOutput>;
+    protected fetchUserAccessRule(userIpAddress: IPAddress, ja4: string, userId: string, clientId: string): Promise<Rule | null>;
+    protected queryUserAccessRules(ipAddress: IPAddress, ja4: string, user: string, clientId: string): Promise<Rule[]>;
     protected selectPrimaryUserAccessRule(accessRules: Rule[]): Rule | null;
     protected getImageCaptchaConfig(defaults: ProsopoCaptchaCountConfigSchemaOutput, imageCaptchaConfig: ImageCaptchaConfig): ProsopoCaptchaCountConfigSchemaOutput;
 }

package/dist/rules/imageCaptchaConfigRulesResolver.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"imageCaptchaConfigRulesResolver.d.ts","sourceRoot":"","sources":["../../src/rules/imageCaptchaConfigRulesResolver.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EACX,SAAS,EACT,qCAAqC,EACrC,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AAC3F,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,cAAM,+BAAgC,YAAW,0BAA0B;IAEzE,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,WAAW;gBAFF,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACvB,WAAW,GAAE,IAAI,GAAG,IAAW;IAGxC,IAAI,UAAU,IAAI,IAAI,GAAG,IAAI,CAE5B;IAEY,eAAe,CAC3B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;~~IAsBN~~,aAAa,CACzB,QAAQ,EAAE,qCAAqC,EAC/C,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,qCAAqC,CAAC;~~cAqCjC~~,mBAAmB,CAClC,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;~~cAiBP~~,oBAAoB,CACnC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,EAAE,CAAC;~~IAclB~~,SAAS,CAAC,2BAA2B,CAAC,WAAW,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,IAAI;IAcvE,SAAS,CAAC,qBAAqB,CAC9B,QAAQ,EAAE,qCAAqC,EAC/C,kBAAkB,EAAE,kBAAkB,GACpC,qCAAqC;CAUxC;AAED,OAAO,EAAE,+BAA+B,EAAE,CAAC"}
1	+ {"version":3,"file":"imageCaptchaConfigRulesResolver.d.ts","sourceRoot":"","sources":["../../src/rules/imageCaptchaConfigRulesResolver.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EACX,SAAS,EACT,qCAAqC,EACrC,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AAC3F,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,cAAM,+BAAgC,YAAW,0BAA0B;IAEzE,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,WAAW;gBAFF,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACvB,WAAW,GAAE,IAAI,GAAG,IAAW;IAGxC,IAAI,UAAU,IAAI,IAAI,GAAG,IAAI,CAE5B;IAEY,eAAe,CAC3B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,SAAS,EACxB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;IAyBN,aAAa,CACzB,QAAQ,EAAE,qCAAqC,EAC/C,aAAa,EAAE,SAAS,EACxB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,qCAAqC,CAAC;cAsCjC,mBAAmB,CAClC,aAAa,EAAE,SAAS,EACxB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;cAkBP,oBAAoB,CACnC,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,EAAE,CAAC;IAelB,SAAS,CAAC,2BAA2B,CAAC,WAAW,EAAE,IAAI,EAAE,GAAG,IAAI,GAAG,IAAI;IAcvE,SAAS,CAAC,qBAAqB,CAC9B,QAAQ,EAAE,qCAAqC,EAC/C,kBAAkB,EAAE,kBAAkB,GACpC,qCAAqC;CAUxC;AAED,OAAO,EAAE,+BAA+B,EAAE,CAAC"}

package/dist/rules/imageCaptchaConfigRulesResolver.js CHANGED Viewed

@@ -7,29 +7,31 @@ class ImageCaptchaConfigRulesResolver {
     get accessRule() {
         return this._accessRule;
     }
-    async isConfigDefined(clientId, userIpAddress, userId) {
-        const accessRule = await this.fetchUserAccessRule(userIpAddress, userId, clientId);
+    async isConfigDefined(clientId, userIpAddress, ja4, userId) {
+        const accessRule = await this.fetchUserAccessRule(userIpAddress, ja4, userId, clientId);
         const imageCaptchaConfig = accessRule?.config?.imageCaptcha || null;
         const configDefined = null !== imageCaptchaConfig;
-        this.logger.info("ImageCaptchaConfigRulesResolver.isConfigDefined", {
-            configDefined: configDefined,
-            clientId: clientId,
-            userIpAddress: userIpAddress.toString(),
-            userId: userId,
-            imageCaptchaConfig: imageCaptchaConfig,
-        });
+        if (configDefined) {
+            this.logger.info({
+                configDefined: configDefined,
+                clientId: clientId,
+                userIpAddress: userIpAddress.toString(),
+                userId: userId,
+                imageCaptchaConfig: imageCaptchaConfig,
+            });
+        }
         return configDefined;
     }
-    async resolveConfig(defaults, userIpAddress, userId, clientId) {
+    async resolveConfig(defaults, userIpAddress, ja4, userId, clientId) {
         const logArgs = {
             userIpAddress: userIpAddress.address.toString(),
             userId: userId,
             clientId: clientId,
             defaults: defaults,
         };
-        this._accessRule = await this.fetchUserAccessRule(userIpAddress, userId, clientId);
+        this._accessRule = await this.fetchUserAccessRule(userIpAddress, ja4, userId, clientId);
         if (null === this.accessRule) {
-            this.logger.info("ImageCaptchaConfigRulesResolver.resolveConfig", {
+            this.logger.debug("ImageCaptchaConfigRulesResolver.resolveConfig", {
                 configDefined: false,
                 ...logArgs,
             });
@@ -45,9 +47,9 @@ class ImageCaptchaConfigRulesResolver {
         });
         return config;
     }
-    async fetchUserAccessRule(userIpAddress, userId, clientId) {
-        const accessRules = await this.queryUserAccessRules(userIpAddress, userId, clientId);
-        this.logger.info("ImageCaptchaConfigRulesResolver.fetchUserAccessRule", {
+    async fetchUserAccessRule(userIpAddress, ja4, userId, clientId) {
+        const accessRules = await this.queryUserAccessRules(userIpAddress, ja4, userId, clientId);
+        this.logger.debug("ImageCaptchaConfigRulesResolver.fetchUserAccessRule", {
             accessRules: accessRules.length,
             userIpAddress: userIpAddress.address.toString(),
             userId: userId,
@@ -55,11 +57,12 @@ class ImageCaptchaConfigRulesResolver {
         });
         return this.selectPrimaryUserAccessRule(accessRules);
     }
-    async queryUserAccessRules(ipAddress, user, clientId) {
+    async queryUserAccessRules(ipAddress, ja4, user, clientId) {
         return await this.rulesStorage.find({
             clientId: clientId,
             userId: user,
             userIpAddress: ipAddress,
+            ja4: ja4,
         }, {
             includeRecordsWithoutClientId: true,
             includeRecordsWithPartialFilterMatches: true,

package/dist/rules/imageCaptchaConfigRulesResolver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"imageCaptchaConfigRulesResolver.js","sourceRoot":"","sources":["../../src/rules/imageCaptchaConfigRulesResolver.ts"],"names":[],"mappings":"AAwBA,MAAM,+BAA+B;IACpC,YACkB,YAA0B,EAC1B,MAAc,EACvB,cAA2B,IAAI;QAFtB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,WAAM,GAAN,MAAM,CAAQ;QACvB,gBAAW,GAAX,WAAW,CAAoB;IACrC,CAAC;IAEJ,IAAI,UAAU;QACb,OAAO,IAAI,CAAC,WAAW,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,eAAe,CAC3B,QAAgB,EAChB,aAAwB,EACxB,MAAc;QAEd,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAChD,aAAa,EACb,MAAM,EACN,QAAQ,CACR,CAAC;QAEF,MAAM,kBAAkB,GAAG,UAAU,EAAE,MAAM,EAAE,YAAY,IAAI,IAAI,CAAC;QAEpE,MAAM,aAAa,GAAG,IAAI,KAAK,kBAAkB,CAAC;QAElD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC~~,iDAAiD,EAAE~~;~~YACnE~~,aAAa,EAAE,aAAa;~~YAC5B~~,QAAQ,EAAE,QAAQ;~~YAClB~~,aAAa,EAAE,aAAa,CAAC,QAAQ,EAAE;~~YACvC~~,MAAM,EAAE,MAAM;~~YACd~~,kBAAkB,EAAE,kBAAkB;~~SACtC~~,CAAC,CAAC;~~QAEH~~,OAAO,aAAa,CAAC;IACtB,CAAC;IAEM,KAAK,CAAC,aAAa,CACzB,QAA+C,EAC/C,aAAwB,EACxB,MAAc,EACd,QAAgB;QAEhB,MAAM,OAAO,GAAG;YACf,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE;YAC/C,MAAM,EAAE,MAAM;YACd,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,QAAQ;SAClB,CAAC;QAEF,IAAI,CAAC,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAChD,aAAa,EACb,MAAM,EACN,QAAQ,CACR,CAAC;QAEF,IAAI,IAAI,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,~~IAAI~~,CAAC,+CAA+C,EAAE;~~gBACjE~~,aAAa,EAAE,KAAK;gBACpB,GAAG,OAAO;aACV,CAAC,CAAC;YAEH,OAAO,QAAQ,CAAC;QACjB,CAAC;QAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,YAAY,IAAI,EAAE,CAAC;QAEtE,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QAExE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+CAA+C,EAAE;YACjE,aAAa,EAAE,IAAI;YACnB,kBAAkB,EAAE,kBAAkB;YACtC,MAAM,EAAE,MAAM;YACd,GAAG,OAAO;SACV,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IACf,CAAC;IAES,KAAK,CAAC,mBAAmB,CAClC,aAAwB,EACxB,MAAc,EACd,QAAgB;QAEhB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAClD,aAAa,EACb,MAAM,EACN,QAAQ,CACR,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,~~IAAI~~,CAAC,qDAAqD,EAAE;~~YACvE~~,WAAW,EAAE,WAAW,CAAC,MAAM;YAC/B,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE;YAC/C,MAAM,EAAE,MAAM;YACd,QAAQ,EAAE,QAAQ;SAClB,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC;IACtD,CAAC;IAES,KAAK,CAAC,oBAAoB,CACnC,SAAoB,EACpB,IAAY,EACZ,QAAgB;QAEhB,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAClC;YACC,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,IAAI;YACZ,aAAa,EAAE,SAAS;~~SACxB~~,EACD;YACC,6BAA6B,EAAE,IAAI;YACnC,sCAAsC,EAAE,IAAI;SAC5C,CACD,CAAC;IACH,CAAC;IAES,2BAA2B,CAAC,WAAmB;QACxD,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CACrC,CAAC,UAAU,EAAE,EAAE,CAAC,QAAQ,KAAK,OAAO,UAAU,CAAC,QAAQ,CACvD,CAAC;QACF,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CACrC,CAAC,UAAU,EAAE,EAAE,CAAC,SAAS,KAAK,UAAU,CAAC,QAAQ,CACjD,CAAC;QAEF,MAAM,UAAU,GACf,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QAEpE,OAAO,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC;IACrD,CAAC;IAES,qBAAqB,CAC9B,QAA+C,EAC/C,kBAAsC;QAEtC,OAAO;YACN,MAAM,EAAE;gBACP,KAAK,EAAE,kBAAkB,CAAC,WAAW,IAAI,QAAQ,CAAC,MAAM,CAAC,KAAK;aAC9D;YACD,QAAQ,EAAE;gBACT,KAAK,EAAE,kBAAkB,CAAC,aAAa,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK;aAClE;SACD,CAAC;IACH,CAAC;CACD;AAED,OAAO,EAAE,+BAA+B,EAAE,CAAC"}
1	+ {"version":3,"file":"imageCaptchaConfigRulesResolver.js","sourceRoot":"","sources":["../../src/rules/imageCaptchaConfigRulesResolver.ts"],"names":[],"mappings":"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"}

package/dist/rules/mongoose/indexes/rulePerformanceMongooseIndexes.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"rulePerformanceMongooseIndexes.d.ts","sourceRoot":"","sources":["../../../../src/rules/mongoose/indexes/rulePerformanceMongooseIndexes.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;~~AAkDxD~~,QAAA,MAAM,8BAA8B,~~iBAA2C~~,CAAC;~~AAEhF~~,OAAO,EAAE,8BAA8B,EAAE,CAAC"}
1	+ {"version":3,"file":"rulePerformanceMongooseIndexes.d.ts","sourceRoot":"","sources":["../../../../src/rules/mongoose/indexes/rulePerformanceMongooseIndexes.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAsExD,QAAA,MAAM,8BAA8B,iBAInC,CAAC;AAEF,OAAO,EAAE,8BAA8B,EAAE,CAAC"}

package/dist/rules/mongoose/indexes/rulePerformanceMongooseIndexes.js CHANGED Viewed

@@ -25,6 +25,7 @@ const userIpMaskIndexes = [
         definition: {
             "userIp.v4.mask.rangeMinAsNumeric": 1,
             "userIp.v4.mask.rangeMaxAsNumeric": 1,
+            "userIp.v4.asNumeric": 1,
         },
         options: {
             partialFilterExpression: {
@@ -44,6 +45,28 @@ const userIpMaskIndexes = [
         },
     },
 ];
-const rulePerformanceMongooseIndexes = [...userIpIndexes, ...userIpMaskIndexes];
+const otherIndexes = [
+    {
+        definition: {
+            userId: 1,
+        },
+        options: {
+            unique: true,
+        },
+    },
+    {
+        definition: {
+            ja4: 1,
+        },
+        options: {
+            unique: true,
+        },
+    },
+];
+const rulePerformanceMongooseIndexes = [
+    ...userIpIndexes,
+    ...userIpMaskIndexes,
+    ...otherIndexes,
+];
 export { rulePerformanceMongooseIndexes };
 //# sourceMappingURL=rulePerformanceMongooseIndexes.js.map

package/dist/rules/mongoose/indexes/rulePerformanceMongooseIndexes.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"rulePerformanceMongooseIndexes.js","sourceRoot":"","sources":["../../../../src/rules/mongoose/indexes/rulePerformanceMongooseIndexes.ts"],"names":[],"mappings":"AAgBA,MAAM,aAAa,GAAoB;IACtC;QACC,UAAU,EAAE;YACX,qBAAqB,EAAE,CAAC;SACxB;QACD,OAAO,EAAE;YACR,uBAAuB,EAAE;gBACxB,qBAAqB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aACxC;SACD;KACD;IACD;QACC,UAAU,EAAE;YACX,2BAA2B,EAAE,CAAC;SAC9B;QACD,OAAO,EAAE;YACR,uBAAuB,EAAE;gBACxB,2BAA2B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aAC9C;SACD;KACD;CACD,CAAC;AAEF,MAAM,iBAAiB,GAAoB;IAC1C;QACC,UAAU,EAAE;YACX,kCAAkC,EAAE,CAAC;YACrC,kCAAkC,EAAE,CAAC;~~SACrC~~;QACD,OAAO,EAAE;YACR,uBAAuB,EAAE;gBACxB,0BAA0B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aAC7C;SACD;KACD;IACD;QACC,UAAU,EAAE;YACX,wCAAwC,EAAE,CAAC;YAC3C,wCAAwC,EAAE,CAAC;SAC3C;QACD,OAAO,EAAE;YACR,uBAAuB,EAAE;gBACxB,0BAA0B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aAC7C;SACD;KACD;CACD,CAAC;AAEF,MAAM,~~8BAA8B~~,~~GAAG~~,CAAC,GAAG,~~aAAa~~,EAAE,GAAG,iBAAiB,~~CAAC~~,CAAC;~~AAEhF~~,OAAO,EAAE,8BAA8B,EAAE,CAAC"}
1	+ {"version":3,"file":"rulePerformanceMongooseIndexes.js","sourceRoot":"","sources":["../../../../src/rules/mongoose/indexes/rulePerformanceMongooseIndexes.ts"],"names":[],"mappings":"AAgBA,MAAM,aAAa,GAAoB;IACtC;QACC,UAAU,EAAE;YACX,qBAAqB,EAAE,CAAC;SACxB;QACD,OAAO,EAAE;YACR,uBAAuB,EAAE;gBACxB,qBAAqB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aACxC;SACD;KACD;IACD;QACC,UAAU,EAAE;YACX,2BAA2B,EAAE,CAAC;SAC9B;QACD,OAAO,EAAE;YACR,uBAAuB,EAAE;gBACxB,2BAA2B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aAC9C;SACD;KACD;CACD,CAAC;AAEF,MAAM,iBAAiB,GAAoB;IAC1C;QACC,UAAU,EAAE;YACX,kCAAkC,EAAE,CAAC;YACrC,kCAAkC,EAAE,CAAC;YACrC,qBAAqB,EAAE,CAAC;SACxB;QACD,OAAO,EAAE;YACR,uBAAuB,EAAE;gBACxB,0BAA0B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aAC7C;SACD;KACD;IACD;QACC,UAAU,EAAE;YACX,wCAAwC,EAAE,CAAC;YAC3C,wCAAwC,EAAE,CAAC;SAC3C;QACD,OAAO,EAAE;YACR,uBAAuB,EAAE;gBACxB,0BAA0B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aAC7C;SACD;KACD;CACD,CAAC;AAEF,MAAM,YAAY,GAAoB;IACrC;QACC,UAAU,EAAE;YACX,MAAM,EAAE,CAAC;SACT;QACD,OAAO,EAAE;YACR,MAAM,EAAE,IAAI;SACZ;KACD;IACD;QACC,UAAU,EAAE;YACX,GAAG,EAAE,CAAC;SACN;QACD,OAAO,EAAE;YACR,MAAM,EAAE,IAAI;SACZ;KACD;CACD,CAAC;AAEF,MAAM,8BAA8B,GAAG;IACtC,GAAG,aAAa;IAChB,GAAG,iBAAiB;IACpB,GAAG,YAAY;CACf,CAAC;AAEF,OAAO,EAAE,8BAA8B,EAAE,CAAC"}

package/dist/rules/mongoose/rulesMongooseStorage.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"rulesMongooseStorage.d.ts","sourceRoot":"","sources":["../../../src/rules/mongoose/rulesMongooseStorage.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,MAAM,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAGtC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uDAAuD,CAAC;AACtG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACxF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,cAAM,oBAAqB,YAAW,YAAY;IAEhD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,YAAY;gBAFH,MAAM,EAAE,MAAM,EACvB,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,EAChC,YAAY,GAAE,KAAK,CAAC,IAAI,CAAC,GAAG,IAAW;IAOnC,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;IAkBzC,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;~~IA2BlD~~,IAAI,CAChB,OAAO,EAAE,iBAAiB,EAC1B,cAAc,CAAC,EAAE,wBAAwB,GACvC,OAAO,CAAC,UAAU,EAAE,CAAC;IAeX,UAAU,CAAC,aAAa,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAU5C,SAAS,CAAC,uBAAuB,IAAI,YAAY;IAIjD,SAAS,CAAC,iBAAiB,CAC1B,OAAO,EAAE,iBAAiB,EAC1B,cAAc,CAAC,EAAE,wBAAwB,GACvC,MAAM;IAoBT,SAAS,CAAC,qBAAqB,CAC9B,OAAO,EAAE,iBAAiB,EAC1B,sCAAsC,EAAE,OAAO,GAC7C,MAAM,EAAE;~~IAgBX~~,SAAS,CAAC,mBAAmB,CAC5B,6BAA6B,EAAE,OAAO,EACtC,QAAQ,CAAC,EAAE,MAAM,GACf,MAAM;IAeT,SAAS,CAAC,iBAAiB,CAAC,aAAa,EAAE,SAAS,GAAG,IAAI,GAAG,MAAM;IAMpE,SAAS,CAAC,wBAAwB,CAAC,aAAa,EAAE,SAAS,GAAG,MAAM;IAyCpE,SAAS,CAAC,mCAAmC,CAC5C,eAAe,EAAE,kBAAkB,EAAE,GACnC,UAAU,EAAE;IAQf,SAAS,CAAC,iCAAiC,CAC1C,cAAc,EAAE,kBAAkB,GAChC,UAAU;CAQb;AAED,OAAO,EAAE,oBAAoB,EAAE,CAAC"}
1	+ {"version":3,"file":"rulesMongooseStorage.d.ts","sourceRoot":"","sources":["../../../src/rules/mongoose/rulesMongooseStorage.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,MAAM,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAGtC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uDAAuD,CAAC;AACtG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACxF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,cAAM,oBAAqB,YAAW,YAAY;IAEhD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,YAAY;gBAFH,MAAM,EAAE,MAAM,EACvB,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,EAChC,YAAY,GAAE,KAAK,CAAC,IAAI,CAAC,GAAG,IAAW;IAOnC,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;IAkBzC,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IA0BlD,IAAI,CAChB,OAAO,EAAE,iBAAiB,EAC1B,cAAc,CAAC,EAAE,wBAAwB,GACvC,OAAO,CAAC,UAAU,EAAE,CAAC;IAeX,UAAU,CAAC,aAAa,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7D,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAU5C,SAAS,CAAC,uBAAuB,IAAI,YAAY;IAIjD,SAAS,CAAC,iBAAiB,CAC1B,OAAO,EAAE,iBAAiB,EAC1B,cAAc,CAAC,EAAE,wBAAwB,GACvC,MAAM;IAoBT,SAAS,CAAC,qBAAqB,CAC9B,OAAO,EAAE,iBAAiB,EAC1B,sCAAsC,EAAE,OAAO,GAC7C,MAAM,EAAE;IAoBX,SAAS,CAAC,mBAAmB,CAC5B,6BAA6B,EAAE,OAAO,EACtC,QAAQ,CAAC,EAAE,MAAM,GACf,MAAM;IAeT,SAAS,CAAC,iBAAiB,CAAC,aAAa,EAAE,SAAS,GAAG,IAAI,GAAG,MAAM;IAMpE,SAAS,CAAC,wBAAwB,CAAC,aAAa,EAAE,SAAS,GAAG,MAAM;IAyCpE,SAAS,CAAC,mCAAmC,CAC5C,eAAe,EAAE,kBAAkB,EAAE,GACnC,UAAU,EAAE;IAQf,SAAS,CAAC,iCAAiC,CAC1C,cAAc,EAAE,kBAAkB,GAChC,UAAU;CAQb;AAED,OAAO,EAAE,oBAAoB,EAAE,CAAC"}

package/dist/rules/mongoose/rulesMongooseStorage.js CHANGED Viewed

@@ -29,7 +29,6 @@ class RulesMongooseStorage {
         await this.writingModel.bulkWrite(records.map((record) => ({
             deleteOne: {
                 filter: {
-                    userId: record.userId,
                     clientId: record.clientId,
                     userIp: record.userIp,
                 },
@@ -80,12 +79,15 @@ class RulesMongooseStorage {
     }
     getSearchQueryFilters(filters, includeRecordsWithPartialFilterMatches) {
         const queryFilters = [];
-        if (undefined !== filters.userId) {
+        if (filters.userId) {
             queryFilters.push({ userId: filters.userId });
         }
-        if (undefined !== filters.userIpAddress) {
+        if (filters.userIpAddress) {
             queryFilters.push(this.getFilterByUserIp(filters.userIpAddress));
         }
+        if (filters.ja4) {
+            queryFilters.push({ ja4: filters.ja4 });
+        }
         return includeRecordsWithPartialFilterMatches && queryFilters.length > 1
             ? [{ $or: queryFilters }]
             : queryFilters;

package/dist/rules/mongoose/rulesMongooseStorage.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"rulesMongooseStorage.js","sourceRoot":"","sources":["../../../src/rules/mongoose/rulesMongooseStorage.ts"],"names":[],"mappings":"AAcA,OAAO,EAAe,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE5D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AAQzF,MAAM,oBAAoB;IACzB,YACkB,MAAc,EACvB,YAAgC,EAChC,eAAmC,IAAI;QAF9B,WAAM,GAAN,MAAM,CAAQ;QACvB,iBAAY,GAAZ,YAAY,CAAoB;QAChC,iBAAY,GAAZ,YAAY,CAA2B;QAE/C,IAAI,IAAI,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;YAChC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,CAAC;IACF,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,MAAY;QAC/B,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACtC,CAAC;QAED,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEhE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACnD,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,iCAAiC,CACxD,QAAQ,CAAC,QAAQ,EAAE,CACnB,CAAC;QAEF,OAAO,UAAU,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,OAAe;QACtC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACtC,CAAC;QAGD,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAChC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACxB,SAAS,EAAE;gBACV,MAAM,EAAE;oBACP,~~MAAM,EAAE,MAAM,CAAC,MAAM;oBACrB,~~QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,MAAM,EAAE,MAAM,CAAC,MAAM;iBAC2B;aACjD;SACD,CAAC,CAAC,CACH,CAAC;QAEF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,eAAe,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEzE,MAAM,WAAW,GAChB,IAAI,CAAC,mCAAmC,CAAC,eAAe,CAAC,CAAC;QAE3D,OAAO,WAAW,CAAC;IACpB,CAAC;IAEM,KAAK,CAAC,IAAI,CAChB,OAA0B,EAC1B,cAAyC;QAEzC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACtC,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAE9D,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;QAE1E,MAAM,WAAW,GAChB,IAAI,CAAC,mCAAmC,CAAC,eAAe,CAAC,CAAC;QAE3D,OAAO,WAAW,CAAC;IACpB,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,aAAkC;QACzD,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACtC,CAAC;QAED,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YAC1C,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC;QACxD,CAAC;IACF,CAAC;IAEM,KAAK,CAAC,YAAY;QACxB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACtC,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,CAAC;QAE9D,OAAO,KAAK,CAAC;IACd,CAAC;IAES,uBAAuB;QAChC,OAAO,IAAI,YAAY,CAAC,gDAAgD,CAAC,CAAC;IAC3E,CAAC;IAES,iBAAiB,CAC1B,OAA0B,EAC1B,cAAyC;QAEzC,MAAM,6BAA6B,GAClC,cAAc,EAAE,6BAA6B,IAAI,KAAK,CAAC;QACxD,MAAM,sCAAsC,GAC3C,cAAc,EAAE,sCAAsC,IAAI,KAAK,CAAC;QAEjE,MAAM,UAAU,GAAG;YAClB,IAAI,CAAC,mBAAmB,CAAC,6BAA6B,EAAE,OAAO,CAAC,QAAQ,CAAC;SACzE,CAAC;QAEF,MAAM,YAAY,GAAG,IAAI,CAAC,qBAAqB,CAC9C,OAAO,EACP,sCAAsC,CACtC,CAAC;QAEF,OAAO;YACN,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC;SACrC,CAAC;IACH,CAAC;IAES,qBAAqB,CAC9B,OAA0B,EAC1B,sCAA+C;QAE/C,MAAM,YAAY,GAAG,EAAE,CAAC;QAExB,IAAI,~~SAAS,KAAK,~~OAAO,CAAC,MAAM,EAAE,CAAC;~~YAClC~~,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,~~SAAS,KAAK,~~OAAO,CAAC,aAAa,EAAE,CAAC;~~YACzC~~,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;QAClE,CAAC;QAED,OAAO,sCAAsC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC;YACvE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC;YACzB,CAAC,CAAC,YAAY,CAAC;IACjB,CAAC;IAES,mBAAmB,CAC5B,6BAAsC,EACtC,QAAiB;QAEjB,MAAM,aAAa,GAClB,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;QAExD,MAAM,cAAc,GAAG;YACtB,QAAQ,EAAE,aAAa;SACvB,CAAC;QAEF,OAAO,6BAA6B;YACnC,CAAC,CAAC;gBACA,GAAG,EAAE,CAAC,cAAc,EAAE,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC;aACvD;YACF,CAAC,CAAC,cAAc,CAAC;IACnB,CAAC;IAES,iBAAiB,CAAC,aAA+B;QAC1D,OAAO,IAAI,KAAK,aAAa;YAC5B,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,aAAa,CAAC;YAC9C,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACrB,CAAC;IAES,wBAAwB,CAAC,aAAwB;QAC1D,MAAM,MAAM,GAAG,aAAa,YAAY,QAAQ,CAAC;QAEjD,MAAM,aAAa,GAAG,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC;QAEnE,MAAM,eAAe,GAAG,MAAM;YAC7B,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE;YACxB,CAAC;gBACA,aAAa;qBACX,MAAM,EAAE;qBACR,QAAQ,EAAE;qBACV,QAAQ,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;QAEhD,MAAM,SAAS,GACd,aAAa,KAAK,aAAa,CAAC,EAAE;YACjC,CAAC,CAAC,qBAAqB;YACvB,CAAC,CAAC,2BAA2B,CAAC;QAChC,MAAM,WAAW,GAChB,aAAa,KAAK,aAAa,CAAC,EAAE;YACjC,CAAC,CAAC,kCAAkC;YACpC,CAAC,CAAC,wCAAwC,CAAC;QAC7C,MAAM,WAAW,GAChB,aAAa,KAAK,aAAa,CAAC,EAAE;YACjC,CAAC,CAAC,kCAAkC;YACpC,CAAC,CAAC,wCAAwC,CAAC;QAE7C,OAAO;YACN,GAAG,EAAE;gBACJ,EAAE,CAAC,SAAS,CAAC,EAAE,eAAe,EAAE;gBAChC;oBACC,CAAC,WAAW,CAAC,EAAE;wBACd,IAAI,EAAE,eAAe;qBACrB;oBACD,CAAC,WAAW,CAAC,EAAE;wBACd,IAAI,EAAE,eAAe;qBACrB;iBACD;aACD;SACD,CAAC;IACH,CAAC;IAES,mCAAmC,CAC5C,eAAqC;QAErC,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE,CAC1D,IAAI,CAAC,iCAAiC,CAAC,cAAc,CAAC,CACtD,CAAC;QAEF,OAAO,WAAW,CAAC;IACpB,CAAC;IAES,iCAAiC,CAC1C,cAAkC;QAElC,MAAM,UAAU,GAAG;YAClB,GAAG,cAAc;YACjB,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE;SAClC,CAAC;QAEF,OAAO,UAAU,CAAC;IACnB,CAAC;CACD;AAED,OAAO,EAAE,oBAAoB,EAAE,CAAC"}
1	+ {"version":3,"file":"rulesMongooseStorage.js","sourceRoot":"","sources":["../../../src/rules/mongoose/rulesMongooseStorage.ts"],"names":[],"mappings":"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"}

package/dist/rules/mongoose/schemas/ruleMongooseSchema.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ruleMongooseSchema.d.ts","sourceRoot":"","sources":["../../../../src/rules/mongoose/schemas/ruleMongooseSchema.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAI/C,QAAA,MAAM,kBAAkB;;;;~~EA2BtB~~,CAAC;AAEH,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
1	+ {"version":3,"file":"ruleMongooseSchema.d.ts","sourceRoot":"","sources":["../../../../src/rules/mongoose/schemas/ruleMongooseSchema.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAI/C,QAAA,MAAM,kBAAkB;;;;EAoCtB,CAAC;AAEH,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/rules/mongoose/schemas/ruleMongooseSchema.js CHANGED Viewed

@@ -9,18 +9,27 @@ const ruleMongooseSchema = new Schema({
         type: ipMongooseSchema,
         required: [
             function () {
-                return !this.userId;
+                return !this.userId && !this.ja4;
             },
-            "userIp is required when userId is not set",
+            "userIp is required when userId is not set and ja4 is not set",
         ],
     },
     userId: {
         type: String,
         required: [
             function () {
-                return !this.userIp;
+                return !this.userIp && !this.ja4;
             },
-            "userId is required when userIp is not set",
+            "userId is required when userIp is not set and ja4 is not set",
+        ],
+    },
+    ja4: {
+        type: String,
+        required: [
+            function () {
+                return !this.userIp && !this.userId;
+            },
+            "ja4 is required when userIp is not set and userId is not set",
         ],
     },
     config: {

package/dist/rules/mongoose/schemas/ruleMongooseSchema.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ruleMongooseSchema.js","sourceRoot":"","sources":["../../../../src/rules/mongoose/schemas/ruleMongooseSchema.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,kBAAkB,GAAG,IAAI,MAAM,CAAO;IAC3C,aAAa,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE;IAChD,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;IAC3C,WAAW,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;IAC9C,MAAM,EAAE;QACP,IAAI,EAAE,gBAAgB;QACtB,QAAQ,EAAE;YACT;gBACC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;~~YACrB~~,CAAC;YACD,~~2CAA2C~~;~~SAC3C~~;KACD;IACD,MAAM,EAAE;QACP,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE;YACT;gBACC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;~~YACrB~~,CAAC;YACD,~~2CAA2C~~;~~SAC3C~~;KACD;IACD,MAAM,EAAE;QACP,IAAI,EAAE,oBAAoB;QAC1B,QAAQ,EAAE,KAAK;KACf;IACD,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;CACxC,CAAC,CAAC;AAEH,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
1	+ {"version":3,"file":"ruleMongooseSchema.js","sourceRoot":"","sources":["../../../../src/rules/mongoose/schemas/ruleMongooseSchema.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,kBAAkB,GAAG,IAAI,MAAM,CAAO;IAC3C,aAAa,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE;IAChD,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;IAC3C,WAAW,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;IAC9C,MAAM,EAAE;QACP,IAAI,EAAE,gBAAgB;QACtB,QAAQ,EAAE;YACT;gBACC,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;YAClC,CAAC;YACD,8DAA8D;SAC9D;KACD;IACD,MAAM,EAAE;QACP,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE;YACT;gBACC,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;YAClC,CAAC;YACD,8DAA8D;SAC9D;KACD;IACD,GAAG,EAAE;QACJ,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE;YACT;gBACC,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;YACrC,CAAC;YACD,8DAA8D;SAC9D;KACD;IACD,MAAM,EAAE;QACP,IAAI,EAAE,oBAAoB;QAC1B,QAAQ,EAAE,KAAK;KACf;IACD,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;CACxC,CAAC,CAAC;AAEH,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/rules/rule/rule.d.ts CHANGED Viewed

@@ -5,6 +5,7 @@ interface Rule {
     clientId?: string;
     description?: string;
     userIp?: RuleIp;
+    ja4?: string;
     userId?: string;
     config?: RuleConfig;
     score?: number;

package/dist/rules/rule/rule.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"rule.d.ts","sourceRoot":"","sources":["../../../src/rules/rule/rule.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE7C,UAAU,IAAI;IACb,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED,YAAY,EAAE,IAAI,EAAE,CAAC"}
1	+ {"version":3,"file":"rule.d.ts","sourceRoot":"","sources":["../../../src/rules/rule/rule.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAE7C,UAAU,IAAI;IACb,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED,YAAY,EAAE,IAAI,EAAE,CAAC"}

package/dist/rules/storage/filters/deleteRuleFilters.d.ts CHANGED Viewed

@@ -2,6 +2,7 @@ import type { RuleIp } from "../../rule/ip/ruleIp.js";
 interface DeleteRuleFilters {
     clientId?: string;
     userIp?: RuleIp;
+    ja4?: string;
     userId?: string;
 }
 export type { DeleteRuleFilters };

package/dist/rules/storage/filters/deleteRuleFilters.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deleteRuleFilters.d.ts","sourceRoot":"","sources":["../../../../src/rules/storage/filters/deleteRuleFilters.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEtD,UAAU,iBAAiB;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,YAAY,EAAE,iBAAiB,EAAE,CAAC"}
1	+ {"version":3,"file":"deleteRuleFilters.d.ts","sourceRoot":"","sources":["../../../../src/rules/storage/filters/deleteRuleFilters.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEtD,UAAU,iBAAiB;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,YAAY,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/rules/storage/filters/search/searchRuleFilters.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import type { IPAddress } from "@prosopo/types";
 interface SearchRuleFilters {
     userIpAddress?: IPAddress;
+    ja4?: string;
     userId?: string;
     clientId?: string;
 }

package/dist/rules/storage/filters/search/searchRuleFilters.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"searchRuleFilters.d.ts","sourceRoot":"","sources":["../../../../../src/rules/storage/filters/search/searchRuleFilters.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,UAAU,iBAAiB;IAC1B,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,YAAY,EAAE,iBAAiB,EAAE,CAAC"}
1	+ {"version":3,"file":"searchRuleFilters.d.ts","sourceRoot":"","sources":["../../../../../src/rules/storage/filters/search/searchRuleFilters.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,UAAU,iBAAiB;IAC1B,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,YAAY,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/tests/rules/ImageCaptchaConfigRulesResolver.test.js CHANGED Viewed

@@ -21,7 +21,7 @@ describe("ImageCaptchaConfigResolver", () => {
             solved: { count: 2 },
             unsolved: { count: 3 },
         };
-        const resolvedConfig = await resolver.resolveConfig(defaultConfig, new Address4("127.0.0.1"), "userId", "clientId");
+        const resolvedConfig = await resolver.resolveConfig(defaultConfig, new Address4("127.0.0.1"), "", "userId", "clientId");
         expect(resolvedConfig.solved.count).toBe(userAccessRuleRecord.config?.imageCaptcha?.solvedCount);
         expect(resolvedConfig.unsolved.count).toBe(userAccessRuleRecord.config?.imageCaptcha?.unsolvedCount);
     });
@@ -56,7 +56,7 @@ describe("ImageCaptchaConfigResolver", () => {
             solved: { count: 2 },
             unsolved: { count: 3 },
         };
-        const resolvedConfig = await resolver.resolveConfig(defaultConfig, new Address4("127.0.0.1"), "userId", "clientId");
+        const resolvedConfig = await resolver.resolveConfig(defaultConfig, new Address4("127.0.0.1"), "", "userId", "clientId");
         expect(resolvedConfig.solved.count).toBe(clientUserAccessRuleRecord.config?.imageCaptcha?.solvedCount);
         expect(resolvedConfig.unsolved.count).toBe(clientUserAccessRuleRecord.config?.imageCaptcha?.unsolvedCount);
     });
@@ -67,7 +67,7 @@ describe("ImageCaptchaConfigResolver", () => {
             solved: { count: 2 },
             unsolved: { count: 3 },
         };
-        const resolvedConfig = await resolver.resolveConfig(defaultConfig, new Address4("127.0.0.1"), "userId", "clientId");
+        const resolvedConfig = await resolver.resolveConfig(defaultConfig, new Address4("127.0.0.1"), "", "userId", "clientId");
         expect(resolvedConfig.solved.count).toBe(defaultConfig.solved.count);
         expect(resolvedConfig.unsolved.count).toBe(defaultConfig.unsolved.count);
     });

package/dist/tests/rules/ImageCaptchaConfigRulesResolver.test.js.map CHANGED Viewed

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

package/dist/tests/rules/blacklistRulesInspector.unit.test.js CHANGED Viewed

@@ -14,7 +14,7 @@ describe("BlacklistRulesInspector", () => {
             _id: "0",
         };
         const inspector = createInspector([accessRuleRecord]);
-        const shouldAbortRequest = () => inspector.isUserBlacklisted("", new Address4("127.0.0.1"), "");
+        const shouldAbortRequest = () => inspector.isUserBlacklisted("", new Address4("127.0.0.1"), "", "");
         expect(await shouldAbortRequest()).toBe(true);
     });
     it("blacklistedWhenAnyRuleFromRuleRecordsContainsBlockedFlag", async () => {
@@ -30,7 +30,7 @@ describe("BlacklistRulesInspector", () => {
             accessRuleRecordWithoutBlock,
             accessRuleRecordWithBlock,
         ]);
-        const shouldAbortRequest = () => inspector.isUserBlacklisted("", new Address4("127.0.0.1"), "");
+        const shouldAbortRequest = () => inspector.isUserBlacklisted("", new Address4("127.0.0.1"), "", "");
         expect(await shouldAbortRequest()).toBe(true);
     });
     it("notBlacklistedWhenRuleRecordsDoNotContainBlockedFlag", async () => {
@@ -46,12 +46,12 @@ describe("BlacklistRulesInspector", () => {
             accessRuleRecordWithoutBlock,
             accessRuleRecordWithBlock,
         ]);
-        const shouldAbortRequest = () => inspector.isUserBlacklisted("", new Address4("127.0.0.1"), "");
+        const shouldAbortRequest = () => inspector.isUserBlacklisted("", new Address4("127.0.0.1"), "", "");
         expect(await shouldAbortRequest()).toBe(false);
     });
     it("otBlacklistedWhenRuleRecordsMissing", async () => {
         const inspector = createInspector([]);
-        const shouldAbortRequest = () => inspector.isUserBlacklisted("", new Address4("127.0.0.1"), "");
+        const shouldAbortRequest = () => inspector.isUserBlacklisted("", new Address4("127.0.0.1"), "", "");
         expect(await shouldAbortRequest()).toBe(false);
     });
 });

package/dist/tests/rules/blacklistRulesInspector.unit.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"blacklistRulesInspector.unit.test.js","sourceRoot":"","sources":["../../../src/tests/rules/blacklistRulesInspector.unit.test.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAM,MAAM,QAAQ,CAAC;AAElD,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AAEjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACxC,SAAS,eAAe,CAAC,WAAyB;QACjD,MAAM,sBAAsB,GAAG,IAAI,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAEjE,OAAO,IAAI,uBAAuB,CACjC,sBAAsB,EACtB,oBAAoB,CACpB,CAAC;IACH,CAAC;IAED,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAE7D,MAAM,gBAAgB,GAAe;YACpC,aAAa,EAAE,IAAI;YACnB,GAAG,EAAE,GAAG;SACR,CAAC;QACF,MAAM,SAAS,GAAG,eAAe,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAGtD,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAC/B,SAAS,CAAC,iBAAiB,CAAC,EAAE,EAAE,IAAI,QAAQ,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;~~QAGhE~~,MAAM,CAAC,MAAM,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;QAEzE,MAAM,4BAA4B,GAAe;YAChD,aAAa,EAAE,KAAK;YACpB,GAAG,EAAE,GAAG;SACR,CAAC;QACF,MAAM,yBAAyB,GAAe;YAC7C,aAAa,EAAE,IAAI;YACnB,GAAG,EAAE,GAAG;SACR,CAAC;QACF,MAAM,SAAS,GAAG,eAAe,CAAC;YACjC,4BAA4B;YAC5B,yBAAyB;SACzB,CAAC,CAAC;QAGH,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAC/B,SAAS,CAAC,iBAAiB,CAAC,EAAE,EAAE,IAAI,QAAQ,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;~~QAGhE~~,MAAM,CAAC,MAAM,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QAErE,MAAM,4BAA4B,GAAe;YAChD,aAAa,EAAE,KAAK;YACpB,GAAG,EAAE,GAAG;SACR,CAAC;QACF,MAAM,yBAAyB,GAAe;YAC7C,aAAa,EAAE,KAAK;YACpB,GAAG,EAAE,GAAG;SACR,CAAC;QACF,MAAM,SAAS,GAAG,eAAe,CAAC;YACjC,4BAA4B;YAC5B,yBAAyB;SACzB,CAAC,CAAC;QAGH,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAC/B,SAAS,CAAC,iBAAiB,CAAC,EAAE,EAAE,IAAI,QAAQ,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;~~QAGhE~~,MAAM,CAAC,MAAM,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;QAEpD,MAAM,SAAS,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;QAGtC,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAC/B,SAAS,CAAC,iBAAiB,CAAC,EAAE,EAAE,IAAI,QAAQ,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;~~QAGhE~~,MAAM,CAAC,MAAM,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"blacklistRulesInspector.unit.test.js","sourceRoot":"","sources":["../../../src/tests/rules/blacklistRulesInspector.unit.test.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,11 +1,11 @@
 {
 	"name": "@prosopo/user-access-policy",
-	"version": "2.4.1",
+	"version": "2.5.0",
 	"main": "dist/index.js",
 	"type": "module",
 	"engines": {
 		"node": "20",
-		"npm": ">=9"
+		"npm": "10.8.2"
 	},
 	"exports": {
 		".": {
@@ -23,9 +23,9 @@
 		"storage:benchmark:mongoose:measure-find": "npm run storage:benchmark:mongoose -- measure-find --db-url=mongodb://localhost:27017 --target-ip-v4=0.0.136.184 --target-ip-v6=0000:0000:0000:0000:0000:0000:0000:7530"
 	},
 	"dependencies": {
-		"@prosopo/api-route": "2.4.1",
-		"@prosopo/common": "2.4.1",
-		"@prosopo/types": "2.4.1",
+		"@prosopo/api-route": "2.5.0",
+		"@prosopo/common": "2.5.0",
+		"@prosopo/types": "2.5.0",
 		"ip-address": "10.0.1",
 		"mongoose": "8.6.2",
 		"zod": "3.23.8"

package/vite.cjs.config.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright 2021-2024 Prosopo (UK) Ltd.
+// Copyright 2021-2025 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.

package/vite.test.config.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-// Copyright 2021-2024 Prosopo (UK) Ltd.
+// Copyright 2021-2025 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.