@prosopo/types 3.0.4 → 3.0.6

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @prosopo/types
 
+## 3.0.6
+### Patch Changes
+
+- 828066d: remove empty test npm scripts, add missing npm test scripts
+- df4e030: Revising UAP rule getters
+- 91bbe87: configure typecheck before bundle for vue packages
+- 91bbe87: make typecheck script always recompile
+- 346e092: NODE_ENV default to "development"
+- 5d36e05: remove tsc --force
+- Updated dependencies [828066d]
+- Updated dependencies [91bbe87]
+- Updated dependencies [3ef4fd2]
+- Updated dependencies [91bbe87]
+- Updated dependencies [346e092]
+- Updated dependencies [5d36e05]
+  - @prosopo/common@3.1.2
+  - @prosopo/config@3.1.3
+  - @prosopo/locale@3.1.2
+
+## 3.0.5
+### Patch Changes
+
+- eb71691: configure typecheck before bundle for vue packages
+- eb71691: make typecheck script always recompile
+- Updated dependencies [eb71691]
+- Updated dependencies [eb71691]
+  - @prosopo/common@3.1.1
+  - @prosopo/locale@3.1.1
+  - @prosopo/config@3.1.2
+
 ## 3.0.4
 ### Patch Changes
 

package/dist/cjs/config/config.cjs

@@ -68,9 +68,12 @@ const ProsopoBasicConfigSchema = ProsopoBaseConfigSchema.merge(
     devOnlyWatchEvents: z.boolean().optional()
   })
 );
-const ProsopoImageServerConfigSchema = z.object({
+const ProsopoApiConfigSchema = z.object({
   baseURL: z.string().url(),
   port: z.number().optional().default(9229)
+}).default({
+  baseURL: "http://localhost",
+  port: 9229
 });
 const ProsopoCaptchaSolutionConfigSchema = z.object({
   requiredNumberOfSolutions: z.number().positive().min(2),
@@ -169,7 +172,10 @@ const ProsopoConfigSchema = ProsopoBasicConfigSchema.merge(
       solved: { count: api.DEFAULT_SOLVED_COUNT },
       unsolved: { count: api.DEFAULT_UNSOLVED_COUNT }
     }),
-    penalties: frictionless.FrictionlessPenalties,
+    penalties: frictionless.FrictionlessPenalties.optional().default({
+      PENALTY_OLD_TIMESTAMP: frictionless.PENALTY_OLD_TIMESTAMP_DEFAULT,
+      PENALTY_ACCESS_RULE: frictionless.PENALTY_ACCESS_RULE_DEFAULT
+    }),
     scheduledTasks: z.object({
       captchaScheduler: z.object({
         schedule: z.string().optional()
@@ -178,13 +184,17 @@ const ProsopoConfigSchema = ProsopoBasicConfigSchema.merge(
         schedule: z.string().optional()
       }).optional()
     }).optional(),
-    server: ProsopoImageServerConfigSchema,
+    server: ProsopoApiConfigSchema.optional(),
     mongoEventsUri: z.string().optional(),
     mongoCaptchaUri: z.string().optional(),
     mongoClientUri: z.string().optional(),
     redisConnection: z.object({
       url: z.string(),
-      password: z.string()
+      password: z.string(),
+      indexName: z.string().optional()
+    }).default({
+      url: "redis://localhost:6379",
+      password: "root"
     }),
     rateLimits: api.ApiPathRateLimits.default(api.ProviderDefaultRateLimits),
     proxyCount: z.number().optional().default(0),
@@ -205,10 +215,10 @@ exports.Mode = Mode;
 exports.ModeEnum = ModeEnum;
 exports.PolkadotSecretJSONSpec = PolkadotSecretJSONSpec;
 exports.ProcaptchaConfigSchema = ProcaptchaConfigSchema;
+exports.ProsopoApiConfigSchema = ProsopoApiConfigSchema;
 exports.ProsopoBaseConfigSchema = ProsopoBaseConfigSchema;
 exports.ProsopoBasicConfigSchema = ProsopoBasicConfigSchema;
 exports.ProsopoCaptchaSolutionConfigSchema = ProsopoCaptchaSolutionConfigSchema;
 exports.ProsopoClientConfigSchema = ProsopoClientConfigSchema;
 exports.ProsopoConfigSchema = ProsopoConfigSchema;
-exports.ProsopoImageServerConfigSchema = ProsopoImageServerConfigSchema;
 exports.ProsopoServerConfigSchema = ProsopoServerConfigSchema;

package/dist/cjs/config/frictionless.cjs

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const z = require("zod");
+const PENALTY_OLD_TIMESTAMP_DEFAULT = 0.2;
+const PENALTY_ACCESS_RULE_DEFAULT = 0.5;
 const FrictionlessPenalties = z.object({
-  PENALTY_OLD_TIMESTAMP: z.number().positive().optional().default(0.2),
-  PENALTY_ACCESS_RULE: z.number().positive().optional().default(0.5)
+  PENALTY_OLD_TIMESTAMP: z.number().positive().optional().default(PENALTY_OLD_TIMESTAMP_DEFAULT),
+  PENALTY_ACCESS_RULE: z.number().positive().optional().default(PENALTY_ACCESS_RULE_DEFAULT)
 });
 exports.FrictionlessPenalties = FrictionlessPenalties;
+exports.PENALTY_ACCESS_RULE_DEFAULT = PENALTY_ACCESS_RULE_DEFAULT;
+exports.PENALTY_OLD_TIMESTAMP_DEFAULT = PENALTY_OLD_TIMESTAMP_DEFAULT;

package/dist/cjs/config/index.cjs

@@ -13,12 +13,12 @@ exports.Mode = config.Mode;
 exports.ModeEnum = config.ModeEnum;
 exports.PolkadotSecretJSONSpec = config.PolkadotSecretJSONSpec;
 exports.ProcaptchaConfigSchema = config.ProcaptchaConfigSchema;
+exports.ProsopoApiConfigSchema = config.ProsopoApiConfigSchema;
 exports.ProsopoBaseConfigSchema = config.ProsopoBaseConfigSchema;
 exports.ProsopoBasicConfigSchema = config.ProsopoBasicConfigSchema;
 exports.ProsopoCaptchaSolutionConfigSchema = config.ProsopoCaptchaSolutionConfigSchema;
 exports.ProsopoClientConfigSchema = config.ProsopoClientConfigSchema;
 exports.ProsopoConfigSchema = config.ProsopoConfigSchema;
-exports.ProsopoImageServerConfigSchema = config.ProsopoImageServerConfigSchema;
 exports.ProsopoServerConfigSchema = config.ProsopoServerConfigSchema;
 exports.NetworkPairTypeSchema = network.NetworkPairTypeSchema;
 exports.DEFAULT_IMAGE_CAPTCHA_SOLUTION_TIMEOUT = timeouts.DEFAULT_IMAGE_CAPTCHA_SOLUTION_TIMEOUT;
@@ -30,3 +30,5 @@ exports.DEFAULT_POW_CAPTCHA_CACHED_TIMEOUT = timeouts.DEFAULT_POW_CAPTCHA_CACHED
 exports.DEFAULT_POW_CAPTCHA_SOLUTION_TIMEOUT = timeouts.DEFAULT_POW_CAPTCHA_SOLUTION_TIMEOUT;
 exports.DEFAULT_POW_CAPTCHA_VERIFIED_TIMEOUT = timeouts.DEFAULT_POW_CAPTCHA_VERIFIED_TIMEOUT;
 exports.FrictionlessPenalties = frictionless.FrictionlessPenalties;
+exports.PENALTY_ACCESS_RULE_DEFAULT = frictionless.PENALTY_ACCESS_RULE_DEFAULT;
+exports.PENALTY_OLD_TIMESTAMP_DEFAULT = frictionless.PENALTY_OLD_TIMESTAMP_DEFAULT;

package/dist/cjs/index.cjs

@@ -46,12 +46,12 @@ exports.Mode = config.Mode;
 exports.ModeEnum = config.ModeEnum;
 exports.PolkadotSecretJSONSpec = config.PolkadotSecretJSONSpec;
 exports.ProcaptchaConfigSchema = config.ProcaptchaConfigSchema;
+exports.ProsopoApiConfigSchema = config.ProsopoApiConfigSchema;
 exports.ProsopoBaseConfigSchema = config.ProsopoBaseConfigSchema;
 exports.ProsopoBasicConfigSchema = config.ProsopoBasicConfigSchema;
 exports.ProsopoCaptchaSolutionConfigSchema = config.ProsopoCaptchaSolutionConfigSchema;
 exports.ProsopoClientConfigSchema = config.ProsopoClientConfigSchema;
 exports.ProsopoConfigSchema = config.ProsopoConfigSchema;
-exports.ProsopoImageServerConfigSchema = config.ProsopoImageServerConfigSchema;
 exports.ProsopoServerConfigSchema = config.ProsopoServerConfigSchema;
 exports.NetworkPairTypeSchema = network.NetworkPairTypeSchema;
 exports.DEFAULT_IMAGE_CAPTCHA_SOLUTION_TIMEOUT = timeouts.DEFAULT_IMAGE_CAPTCHA_SOLUTION_TIMEOUT;
@@ -63,6 +63,8 @@ exports.DEFAULT_POW_CAPTCHA_CACHED_TIMEOUT = timeouts.DEFAULT_POW_CAPTCHA_CACHED
 exports.DEFAULT_POW_CAPTCHA_SOLUTION_TIMEOUT = timeouts.DEFAULT_POW_CAPTCHA_SOLUTION_TIMEOUT;
 exports.DEFAULT_POW_CAPTCHA_VERIFIED_TIMEOUT = timeouts.DEFAULT_POW_CAPTCHA_VERIFIED_TIMEOUT;
 exports.FrictionlessPenalties = frictionless.FrictionlessPenalties;
+exports.PENALTY_ACCESS_RULE_DEFAULT = frictionless.PENALTY_ACCESS_RULE_DEFAULT;
+exports.PENALTY_OLD_TIMESTAMP_DEFAULT = frictionless.PENALTY_OLD_TIMESTAMP_DEFAULT;
 exports.CaptchaItemSchema = captcha.CaptchaItemSchema;
 exports.CaptchaItemTypes = captcha.CaptchaItemTypes;
 exports.CaptchaSchema = captcha.CaptchaSchema;

package/dist/config/config.d.ts

@@ -180,7 +180,7 @@ export declare const ProsopoBasicConfigSchema: z.ZodObject<z.objectUtil.extendSh
 }>;
 export type ProsopoBasicConfigInput = input<typeof ProsopoBasicConfigSchema>;
 export type ProsopoBasicConfigOutput = output<typeof ProsopoBasicConfigSchema>;
-export declare const ProsopoImageServerConfigSchema: z.ZodObject<{
+export declare const ProsopoApiConfigSchema: z.ZodDefault<z.ZodObject<{
     baseURL: z.ZodString;
     port: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
 }, "strip", z.ZodTypeAny, {
@@ -189,7 +189,7 @@ export declare const ProsopoImageServerConfigSchema: z.ZodObject<{
 }, {
     baseURL: string;
     port?: number | undefined;
-}>;
+}>>;
 export declare const ProsopoCaptchaSolutionConfigSchema: z.ZodObject<{
     requiredNumberOfSolutions: z.ZodNumber;
     solutionWinningPercentage: z.ZodNumber;
@@ -847,7 +847,7 @@ export declare const ProsopoConfigSchema: z.ZodObject<z.objectUtil.extendShape<z
             count: number;
         } | undefined;
     }>>>;
-    penalties: z.ZodObject<{
+    penalties: z.ZodDefault<z.ZodOptional<z.ZodObject<{
         PENALTY_OLD_TIMESTAMP: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
         PENALTY_ACCESS_RULE: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
     }, "strip", z.ZodTypeAny, {
@@ -856,7 +856,7 @@ export declare const ProsopoConfigSchema: z.ZodObject<z.objectUtil.extendShape<z
     }, {
         PENALTY_OLD_TIMESTAMP?: number | undefined;
         PENALTY_ACCESS_RULE?: number | undefined;
-    }>;
+    }>>>;
     scheduledTasks: z.ZodOptional<z.ZodObject<{
         captchaScheduler: z.ZodOptional<z.ZodObject<{
             schedule: z.ZodOptional<z.ZodString>;
@@ -887,7 +887,7 @@ export declare const ProsopoConfigSchema: z.ZodObject<z.objectUtil.extendShape<z
             schedule?: string | undefined;
         } | undefined;
     }>>;
-    server: z.ZodObject<{
+    server: z.ZodOptional<z.ZodDefault<z.ZodObject<{
         baseURL: z.ZodString;
         port: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
     }, "strip", z.ZodTypeAny, {
@@ -896,20 +896,23 @@ export declare const ProsopoConfigSchema: z.ZodObject<z.objectUtil.extendShape<z
     }, {
         baseURL: string;
         port?: number | undefined;
-    }>;
+    }>>>;
     mongoEventsUri: z.ZodOptional<z.ZodString>;
     mongoCaptchaUri: z.ZodOptional<z.ZodString>;
     mongoClientUri: z.ZodOptional<z.ZodString>;
-    redisConnection: z.ZodObject<{
+    redisConnection: z.ZodDefault<z.ZodObject<{
         url: z.ZodString;
         password: z.ZodString;
+        indexName: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         password: string;
         url: string;
+        indexName?: string | undefined;
     }, {
         password: string;
         url: string;
-    }>;
+        indexName?: string | undefined;
+    }>>;
     rateLimits: z.ZodDefault<z.ZodObject<Record<import("../provider/api.js").CombinedApiPaths, z.ZodObject<{
         windowMs: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
         limit: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
@@ -1053,13 +1056,10 @@ export declare const ProsopoConfigSchema: z.ZodObject<z.objectUtil.extendShape<z
         PENALTY_OLD_TIMESTAMP: number;
         PENALTY_ACCESS_RULE: number;
     };
-    server: {
-        baseURL: string;
-        port: number;
-    };
     redisConnection: {
         password: string;
         url: string;
+        indexName?: string | undefined;
     };
     rateLimits: {
         "/v1/prosopo/provider/client/captcha/image": {
@@ -1132,6 +1132,10 @@ export declare const ProsopoConfigSchema: z.ZodObject<z.objectUtil.extendShape<z
             schedule?: string | undefined;
         } | undefined;
     } | undefined;
+    server?: {
+        baseURL: string;
+        port: number;
+    } | undefined;
     mongoEventsUri?: string | undefined;
     mongoCaptchaUri?: string | undefined;
     mongoClientUri?: string | undefined;
@@ -1142,18 +1146,6 @@ export declare const ProsopoConfigSchema: z.ZodObject<z.objectUtil.extendShape<z
         address?: string | undefined;
         password?: string | undefined;
     };
-    penalties: {
-        PENALTY_OLD_TIMESTAMP?: number | undefined;
-        PENALTY_ACCESS_RULE?: number | undefined;
-    };
-    server: {
-        baseURL: string;
-        port?: number | undefined;
-    };
-    redisConnection: {
-        password: string;
-        url: string;
-    };
     authAccount: {
         secret?: string | undefined;
         address?: string | undefined;
@@ -1176,6 +1168,10 @@ export declare const ProsopoConfigSchema: z.ZodObject<z.objectUtil.extendShape<z
         authSource?: string | undefined;
     }>> | undefined;
     devOnlyWatchEvents?: boolean | undefined;
+    penalties?: {
+        PENALTY_OLD_TIMESTAMP?: number | undefined;
+        PENALTY_ACCESS_RULE?: number | undefined;
+    } | undefined;
     scheduledTasks?: {
         captchaScheduler?: {
             schedule?: string | undefined;
@@ -1184,9 +1180,18 @@ export declare const ProsopoConfigSchema: z.ZodObject<z.objectUtil.extendShape<z
             schedule?: string | undefined;
         } | undefined;
     } | undefined;
+    server?: {
+        baseURL: string;
+        port?: number | undefined;
+    } | undefined;
     mongoEventsUri?: string | undefined;
     mongoCaptchaUri?: string | undefined;
     mongoClientUri?: string | undefined;
+    redisConnection?: {
+        password: string;
+        url: string;
+        indexName?: string | undefined;
+    } | undefined;
     rateLimits?: {
         "/v1/prosopo/provider/client/captcha/image": {
             windowMs?: number | undefined;

package/dist/config/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,KAAK,CAAC;AAIjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAGlC,OAAO,KAAK,EAAE,KAAK,IAAI,MAAM,EAAE,MAAM,KAAK,CAAC;AAC3C,OAAO,CAAc,MAAM,KAAK,CAAC;AA8BjC,eAAO,MAAM,aAAa,sEAMxB,CAAC;AAEH,eAAO,MAAM,sBAAsB,qDAIjC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAErE,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;GAQhC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AACrE,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAEvE,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAWlC,CAAC;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAajC,CAAC;AAEH,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEvE,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAKpC,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAC7E,MAAM,MAAM,wBAAwB,GAAG,MAAM,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE/E,eAAO,MAAM,8BAA8B;;;;;;;;;EAGzC,CAAC;AAEH,eAAO,MAAM,kCAAkC;;;;;;;;;;;;EAI7C,CAAC;AAEH,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQrC,CAAC;AAyBF,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCC,CAAC;AAEnC,MAAM,MAAM,mBAAmB,GAAG,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAErE,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAEvE,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAKrC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAC/E,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAC7C,OAAO,yBAAyB,CAChC,CAAC;AAEF,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAWrC,CAAC;AAEH,MAAM,MAAM,wBAAwB,GAAG,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAC/E,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAC7C,OAAO,yBAAyB,CAChC,CAAC;AAIF,oBAAY,QAAQ;IACnB,OAAO,YAAY;IACnB,SAAS,cAAc;CACvB;AACD,eAAO,MAAM,IAAI,kEAA2D,CAAC;AAC7E,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;AAE3C,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAOlC,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAC/E,MAAM,MAAM,4BAA4B,GAAG,MAAM,CAChD,OAAO,sBAAsB,CAC7B,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgC/B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AACnE,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"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"}

package/dist/config/config.js

@@ -1,7 +1,7 @@
 import { LanguageSchema } from "@prosopo/locale";
 import z, { enum as _enum, record, object, string, boolean, number, union, literal } from "zod";
 import "../provider/index.js";
-import { FrictionlessPenalties } from "./frictionless.js";
+import { FrictionlessPenalties, PENALTY_ACCESS_RULE_DEFAULT, PENALTY_OLD_TIMESTAMP_DEFAULT } from "./frictionless.js";
 import { DEFAULT_IMAGE_MAX_VERIFIED_TIME_CACHED, DEFAULT_IMAGE_CAPTCHA_VERIFIED_TIMEOUT, DEFAULT_IMAGE_CAPTCHA_SOLUTION_TIMEOUT, DEFAULT_IMAGE_CAPTCHA_TIMEOUT, DEFAULT_POW_CAPTCHA_CACHED_TIMEOUT, DEFAULT_POW_CAPTCHA_SOLUTION_TIMEOUT, DEFAULT_POW_CAPTCHA_VERIFIED_TIMEOUT, DEFAULT_MAX_VERIFIED_TIME_CONTRACT } from "./timeouts.js";
 import { ApiPathRateLimits, ProviderDefaultRateLimits, ProsopoCaptchaCountConfigSchema, DEFAULT_UNSOLVED_COUNT, DEFAULT_SOLVED_COUNT } from "../provider/api.js";
 const LogLevel = _enum([
@@ -66,9 +66,12 @@ const ProsopoBasicConfigSchema = ProsopoBaseConfigSchema.merge(
     devOnlyWatchEvents: boolean().optional()
   })
 );
-const ProsopoImageServerConfigSchema = object({
+const ProsopoApiConfigSchema = object({
   baseURL: string().url(),
   port: number().optional().default(9229)
+}).default({
+  baseURL: "http://localhost",
+  port: 9229
 });
 const ProsopoCaptchaSolutionConfigSchema = object({
   requiredNumberOfSolutions: number().positive().min(2),
@@ -167,7 +170,10 @@ const ProsopoConfigSchema = ProsopoBasicConfigSchema.merge(
       solved: { count: DEFAULT_SOLVED_COUNT },
       unsolved: { count: DEFAULT_UNSOLVED_COUNT }
     }),
-    penalties: FrictionlessPenalties,
+    penalties: FrictionlessPenalties.optional().default({
+      PENALTY_OLD_TIMESTAMP: PENALTY_OLD_TIMESTAMP_DEFAULT,
+      PENALTY_ACCESS_RULE: PENALTY_ACCESS_RULE_DEFAULT
+    }),
     scheduledTasks: object({
       captchaScheduler: object({
         schedule: string().optional()
@@ -176,13 +182,17 @@ const ProsopoConfigSchema = ProsopoBasicConfigSchema.merge(
         schedule: string().optional()
       }).optional()
     }).optional(),
-    server: ProsopoImageServerConfigSchema,
+    server: ProsopoApiConfigSchema.optional(),
     mongoEventsUri: string().optional(),
     mongoCaptchaUri: string().optional(),
     mongoClientUri: string().optional(),
     redisConnection: object({
       url: string(),
-      password: string()
+      password: string(),
+      indexName: string().optional()
+    }).default({
+      url: "redis://localhost:6379",
+      password: "root"
     }),
     rateLimits: ApiPathRateLimits.default(ProviderDefaultRateLimits),
     proxyCount: number().optional().default(0),
@@ -204,11 +214,11 @@ export {
   ModeEnum,
   PolkadotSecretJSONSpec,
   ProcaptchaConfigSchema,
+  ProsopoApiConfigSchema,
   ProsopoBaseConfigSchema,
   ProsopoBasicConfigSchema,
   ProsopoCaptchaSolutionConfigSchema,
   ProsopoClientConfigSchema,
   ProsopoConfigSchema,
-  ProsopoImageServerConfigSchema,
   ProsopoServerConfigSchema
 };

package/dist/config/frictionless.d.ts

@@ -1,3 +1,5 @@
+export declare const PENALTY_OLD_TIMESTAMP_DEFAULT = 0.2;
+export declare const PENALTY_ACCESS_RULE_DEFAULT = 0.5;
 export declare const FrictionlessPenalties: import("zod").ZodObject<{
     PENALTY_OLD_TIMESTAMP: import("zod").ZodDefault<import("zod").ZodOptional<import("zod").ZodNumber>>;
     PENALTY_ACCESS_RULE: import("zod").ZodDefault<import("zod").ZodOptional<import("zod").ZodNumber>>;

package/dist/config/frictionless.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"frictionless.d.ts","sourceRoot":"","sources":["../../src/config/frictionless.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,qBAAqB;;;;;;;;;EAGhC,CAAC"}
+{"version":3,"file":"frictionless.d.ts","sourceRoot":"","sources":["../../src/config/frictionless.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,6BAA6B,MAAM,CAAC;AACjD,eAAO,MAAM,2BAA2B,MAAM,CAAC;AAC/C,eAAO,MAAM,qBAAqB;;;;;;;;;EAShC,CAAC"}

package/dist/config/frictionless.js

@@ -1,8 +1,12 @@
 import { object, number } from "zod";
+const PENALTY_OLD_TIMESTAMP_DEFAULT = 0.2;
+const PENALTY_ACCESS_RULE_DEFAULT = 0.5;
 const FrictionlessPenalties = object({
-  PENALTY_OLD_TIMESTAMP: number().positive().optional().default(0.2),
-  PENALTY_ACCESS_RULE: number().positive().optional().default(0.5)
+  PENALTY_OLD_TIMESTAMP: number().positive().optional().default(PENALTY_OLD_TIMESTAMP_DEFAULT),
+  PENALTY_ACCESS_RULE: number().positive().optional().default(PENALTY_ACCESS_RULE_DEFAULT)
 });
 export {
-  FrictionlessPenalties
+  FrictionlessPenalties,
+  PENALTY_ACCESS_RULE_DEFAULT,
+  PENALTY_OLD_TIMESTAMP_DEFAULT
 };

package/dist/config/index.js

@@ -1,7 +1,7 @@
-import { AccountCreatorConfigSchema, CaptchaTimeoutSchema, DatabaseConfigSchema, DatabaseTypes, EnvironmentTypesSchema, Mode, ModeEnum, PolkadotSecretJSONSpec, ProcaptchaConfigSchema, ProsopoBaseConfigSchema, ProsopoBasicConfigSchema, ProsopoCaptchaSolutionConfigSchema, ProsopoClientConfigSchema, ProsopoConfigSchema, ProsopoImageServerConfigSchema, ProsopoServerConfigSchema } from "./config.js";
+import { AccountCreatorConfigSchema, CaptchaTimeoutSchema, DatabaseConfigSchema, DatabaseTypes, EnvironmentTypesSchema, Mode, ModeEnum, PolkadotSecretJSONSpec, ProcaptchaConfigSchema, ProsopoApiConfigSchema, ProsopoBaseConfigSchema, ProsopoBasicConfigSchema, ProsopoCaptchaSolutionConfigSchema, ProsopoClientConfigSchema, ProsopoConfigSchema, ProsopoServerConfigSchema } from "./config.js";
 import { NetworkPairTypeSchema } from "./network.js";
 import { DEFAULT_IMAGE_CAPTCHA_SOLUTION_TIMEOUT, DEFAULT_IMAGE_CAPTCHA_TIMEOUT, DEFAULT_IMAGE_CAPTCHA_VERIFIED_TIMEOUT, DEFAULT_IMAGE_MAX_VERIFIED_TIME_CACHED, DEFAULT_MAX_VERIFIED_TIME_CONTRACT, DEFAULT_POW_CAPTCHA_CACHED_TIMEOUT, DEFAULT_POW_CAPTCHA_SOLUTION_TIMEOUT, DEFAULT_POW_CAPTCHA_VERIFIED_TIMEOUT } from "./timeouts.js";
-import { FrictionlessPenalties } from "./frictionless.js";
+import { FrictionlessPenalties, PENALTY_ACCESS_RULE_DEFAULT, PENALTY_OLD_TIMESTAMP_DEFAULT } from "./frictionless.js";
 export {
   AccountCreatorConfigSchema,
   CaptchaTimeoutSchema,
@@ -20,13 +20,15 @@ export {
   Mode,
   ModeEnum,
   NetworkPairTypeSchema,
+  PENALTY_ACCESS_RULE_DEFAULT,
+  PENALTY_OLD_TIMESTAMP_DEFAULT,
   PolkadotSecretJSONSpec,
   ProcaptchaConfigSchema,
+  ProsopoApiConfigSchema,
   ProsopoBaseConfigSchema,
   ProsopoBasicConfigSchema,
   ProsopoCaptchaSolutionConfigSchema,
   ProsopoClientConfigSchema,
   ProsopoConfigSchema,
-  ProsopoImageServerConfigSchema,
   ProsopoServerConfigSchema
 };

package/dist/index.js

@@ -12,10 +12,10 @@ import { Tier, TierMonthlyLimits, TierSchema } from "./client/user.js";
 import { ClientSettingsSchema, captchaTypeDefault, domainsDefault, frictionlessThresholdDefault, imageThresholdDefault, powDifficultyDefault } from "./client/settings.js";
 import { CaptchaType, CaptchaTypeSchema } from "./client/captchaType/captchaType.js";
 import { CaptchaTypeSpec } from "./client/captchaType/captchaTypeSpec.js";
-import { AccountCreatorConfigSchema, CaptchaTimeoutSchema, DatabaseConfigSchema, DatabaseTypes, EnvironmentTypesSchema, Mode, ModeEnum, PolkadotSecretJSONSpec, ProcaptchaConfigSchema, ProsopoBaseConfigSchema, ProsopoBasicConfigSchema, ProsopoCaptchaSolutionConfigSchema, ProsopoClientConfigSchema, ProsopoConfigSchema, ProsopoImageServerConfigSchema, ProsopoServerConfigSchema } from "./config/config.js";
+import { AccountCreatorConfigSchema, CaptchaTimeoutSchema, DatabaseConfigSchema, DatabaseTypes, EnvironmentTypesSchema, Mode, ModeEnum, PolkadotSecretJSONSpec, ProcaptchaConfigSchema, ProsopoApiConfigSchema, ProsopoBaseConfigSchema, ProsopoBasicConfigSchema, ProsopoCaptchaSolutionConfigSchema, ProsopoClientConfigSchema, ProsopoConfigSchema, ProsopoServerConfigSchema } from "./config/config.js";
 import { NetworkPairTypeSchema } from "./config/network.js";
 import { DEFAULT_IMAGE_CAPTCHA_SOLUTION_TIMEOUT, DEFAULT_IMAGE_CAPTCHA_TIMEOUT, DEFAULT_IMAGE_CAPTCHA_VERIFIED_TIMEOUT, DEFAULT_IMAGE_MAX_VERIFIED_TIME_CACHED, DEFAULT_MAX_VERIFIED_TIME_CONTRACT, DEFAULT_POW_CAPTCHA_CACHED_TIMEOUT, DEFAULT_POW_CAPTCHA_SOLUTION_TIMEOUT, DEFAULT_POW_CAPTCHA_VERIFIED_TIMEOUT } from "./config/timeouts.js";
-import { FrictionlessPenalties } from "./config/frictionless.js";
+import { FrictionlessPenalties, PENALTY_ACCESS_RULE_DEFAULT, PENALTY_OLD_TIMESTAMP_DEFAULT } from "./config/frictionless.js";
 import { CaptchaItemSchema, CaptchaItemTypes, CaptchaSchema, CaptchaSolutionArraySchema, CaptchaSolutionSchema, CaptchaStates, CaptchaStatus, CaptchaTypes, CaptchasContainerSchema, CaptchasSchema, CaptchasWithNumericSolutionSchema, DappPayee, DataSchema, GovernanceStatus, HashedCaptchaItemSchema, LabelledDataSchema, LabelledItemSchema, LabelsContainerSchema, MaybeLabelledHashedItemSchema, POW_SEPARATOR, PowChallengeIdSchema, SelectAllCaptchaSchema, SelectAllCaptchaSchemaRaw, SelectAllCaptchaSchemaWithNumericSolution, StoredStatusNames, TimestampSchema } from "./datasets/captcha.js";
 import { DatasetSchema, DatasetWithIdsAndTreeSchema, DatasetWithIdsSchema, DatasetWithNumericSolutionSchema } from "./datasets/dataset.js";
 import { AdminApiPaths, ApiPathRateLimits, ApiPrefix, BlockRuleSpec, BlockRuleType, CaptchaRequestBody, CaptchaSolutionBody, ClientApiPaths, DEFAULT_SOLVED_COUNT, DEFAULT_UNSOLVED_COUNT, DappDomainRequestBody, GetFrictionlessCaptchaChallengeRequestBody, GetPowCaptchaChallengeRequestBody, ProsopoCaptchaCountConfigSchema, ProviderDefaultRateLimits, PublicApiPaths, RegisterSitekeyBody, ServerPowCaptchaVerifyRequestBody, SubmitPowCaptchaSolutionBody, UpdateDetectorKeyBody, VerifyPowCaptchaSolutionBody, VerifySolutionBody } from "./provider/api.js";
@@ -82,6 +82,8 @@ export {
   Mode,
   ModeEnum,
   NetworkPairTypeSchema,
+  PENALTY_ACCESS_RULE_DEFAULT,
+  PENALTY_OLD_TIMESTAMP_DEFAULT,
   POW_SEPARATOR,
   PolkadotSecretJSONSpec,
   PowChallengeIdSchema,
@@ -90,13 +92,13 @@ export {
   ProcaptchaResponse,
   ProcaptchaTokenCodec,
   ProcaptchaTokenSpec,
+  ProsopoApiConfigSchema,
   ProsopoBaseConfigSchema,
   ProsopoBasicConfigSchema,
   ProsopoCaptchaCountConfigSchema,
   ProsopoCaptchaSolutionConfigSchema,
   ProsopoClientConfigSchema,
   ProsopoConfigSchema,
-  ProsopoImageServerConfigSchema,
   ProsopoServerConfigSchema,
   ProviderDefaultRateLimits,
   PublicApiPaths,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/types",
-	"version": "3.0.4",
+	"version": "3.0.6",
 	"description": "Types for prosopo TypeScript packages",
 	"type": "module",
 	"main": "dist/index.js",
@@ -18,11 +18,10 @@
 	},
 	"scripts": {
 		"clean": "del-cli --verbose dist tsconfig.tsbuildinfo",
-		"build": "NODE_ENV=${NODE_ENV:-production}; vite build --config vite.esm.config.ts --mode $NODE_ENV",
+		"build": "NODE_ENV=${NODE_ENV:-development}; vite build --config vite.esm.config.ts --mode $NODE_ENV",
 		"build:tsc": "tsc --build --verbose",
-		"build:cjs": "NODE_ENV=${NODE_ENV:-production}; vite build --config vite.cjs.config.ts --mode $NODE_ENV",
-		"typecheck": "tsc --build --declaration --emitDeclarationOnly",
-		"test": "echo no tests"
+		"build:cjs": "NODE_ENV=${NODE_ENV:-development}; vite build --config vite.cjs.config.ts --mode $NODE_ENV",
+		"typecheck": "tsc --build --declaration --emitDeclarationOnly"
 	},
 	"repository": {
 		"type": "git",
@@ -36,8 +35,8 @@
 	"homepage": "https://github.com/prosopo/captcha#readme",
 	"dependencies": {
 		"@polkadot/extension-inject": "0.46.9",
-		"@prosopo/common": "3.1.0",
-		"@prosopo/locale": "3.1.0",
+		"@prosopo/common": "3.1.2",
+		"@prosopo/locale": "3.1.2",
 		"@typegoose/auto-increment": "4.13.0",
 		"axios": "1.10.0",
 		"esbuild": "0.25.6",
@@ -46,7 +45,7 @@
 		"openpgp": "5.11.3",
 		"scale-ts": "1.6.0",
 		"zod": "3.23.8",
-		"@prosopo/config": "3.1.1",
+		"@prosopo/config": "3.1.3",
 		"webpack-dev-server": "5.2.2"
 	},
 	"devDependencies": {