@prosopo/cli 2.3.2 → 2.4.2
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.
- package/dist/bundle/i18nBackend-D8EXN8yy.js +5264 -0
- package/dist/bundle/provider.cli.bundle.js +32521 -118274
- package/dist/cli.js +9 -6
- package/dist/cli.js.map +1 -1
- package/dist/commands/siteKeyRegister.d.ts +28 -3
- package/dist/commands/siteKeyRegister.d.ts.map +1 -1
- package/dist/commands/siteKeyRegister.js +25 -10
- package/dist/commands/siteKeyRegister.js.map +1 -1
- package/dist/commands/siteKeyRegisterApi.d.ts +3 -1
- package/dist/commands/siteKeyRegisterApi.d.ts.map +1 -1
- package/dist/commands/siteKeyRegisterApi.js +16 -7
- package/dist/commands/siteKeyRegisterApi.js.map +1 -1
- package/dist/prosopo.config.d.ts.map +1 -1
- package/dist/prosopo.config.js +5 -2
- package/dist/prosopo.config.js.map +1 -1
- package/dist/start.d.ts.map +1 -1
- package/dist/start.js +9 -4
- package/dist/start.js.map +1 -1
- package/package.json +15 -15
- package/vite.cjs.config.ts +1 -1
- package/vite.config.ts +1 -1
- package/vite.test.config.ts +1 -1
package/dist/cli.js
CHANGED
|
@@ -2,6 +2,7 @@ import process from "node:process";
|
|
|
2
2
|
import { LogLevel, getLogger } from "@prosopo/common";
|
|
3
3
|
import { loadEnv } from "@prosopo/dotenv";
|
|
4
4
|
import { getPairAsync } from "@prosopo/keyring";
|
|
5
|
+
import { loadI18next } from "@prosopo/locale";
|
|
5
6
|
import { isMain } from "@prosopo/util";
|
|
6
7
|
import { processArgs } from "./argv.js";
|
|
7
8
|
import getConfig from "./prosopo.config.js";
|
|
@@ -46,12 +47,14 @@ async function main() {
|
|
|
46
47
|
}
|
|
47
48
|
}
|
|
48
49
|
if (isMain(import.meta.url, "provider")) {
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
50
|
+
loadI18next(true).then(() => {
|
|
51
|
+
main()
|
|
52
|
+
.then(() => {
|
|
53
|
+
log.info("Running main process...");
|
|
54
|
+
})
|
|
55
|
+
.catch((error) => {
|
|
56
|
+
log.error(error);
|
|
57
|
+
});
|
|
55
58
|
});
|
|
56
59
|
}
|
|
57
60
|
//# sourceMappingURL=cli.js.map
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAaA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAaA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAC5C,OAAO,YAAY,MAAM,eAAe,CAAC;AAEzC,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAEjD,KAAK,UAAU,IAAI;IAClB,MAAM,OAAO,GAAG,OAAO,EAAE,CAAC;IAG1B,MAAM,MAAM,GAAwB,SAAS,CAAC,SAAS,EAAE;QACxD,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;QACpB,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;KACtB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,kBAAkB,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CACP;;;;aAIU,CACV,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,YAAY,CAC9B,MAAM,CAAC,OAAO,CAAC,MAAM,EACrB,MAAM,CAAC,OAAO,CAAC,OAAO,CACtB,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,YAAY,CACrC,MAAM,CAAC,WAAW,CAAC,MAAM,EACzB,MAAM,CAAC,WAAW,CAAC,OAAO,CAC1B,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAE1C,MAAM,aAAa,GAAG,MAAM,WAAW,CACtC,OAAO,CAAC,IAAI,EACZ,IAAI,EACJ,WAAW,EACX,MAAM,CACN,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;IACrC,IAAI,aAAa,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;YAC5C,MAAM,IAAI,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,CAAC;iBACvE,QAAQ,EAAE;iBACV,IAAI,CAAC,GAAG,EAAE;gBACV,GAAG,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACtC,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,CAAC;iBACvE,KAAK,EAAE;iBACP,IAAI,CAAC,GAAG,EAAE;gBACV,GAAG,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACtC,CAAC,CAAC,CAAC;QACL,CAAC;IACF,CAAC;SAAM,CAAC;QACP,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC;AACF,CAAC;AAGD,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,CAAC;IACzC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QAC3B,IAAI,EAAE;aACJ,IAAI,CAAC,GAAG,EAAE;YACV,GAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACrC,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YAChB,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,7 +1,30 @@
|
|
|
1
1
|
import type { KeyringPair } from "@polkadot/keyring/types";
|
|
2
2
|
import { type Logger } from "@prosopo/common";
|
|
3
|
-
import type
|
|
3
|
+
import { type ProsopoConfigOutput, Tier } from "@prosopo/types";
|
|
4
4
|
import type { ArgumentsCamelCase, Argv } from "yargs";
|
|
5
|
+
import { z } from "zod";
|
|
6
|
+
export declare const SiteKeyRegisterCommandArgsSpec: z.ZodObject<{
|
|
7
|
+
sitekey: z.ZodString;
|
|
8
|
+
tier: z.ZodNativeEnum<typeof Tier>;
|
|
9
|
+
captcha_type: z.ZodNativeEnum<typeof import("@prosopo/types").CaptchaType>;
|
|
10
|
+
frictionless_threshold: z.ZodNumber;
|
|
11
|
+
pow_difficulty: z.ZodNumber;
|
|
12
|
+
domains: z.ZodArray<z.ZodString, "many">;
|
|
13
|
+
}, "strip", z.ZodTypeAny, {
|
|
14
|
+
tier: Tier;
|
|
15
|
+
sitekey: string;
|
|
16
|
+
captcha_type: import("@prosopo/types").CaptchaType;
|
|
17
|
+
frictionless_threshold: number;
|
|
18
|
+
pow_difficulty: number;
|
|
19
|
+
domains: string[];
|
|
20
|
+
}, {
|
|
21
|
+
tier: Tier;
|
|
22
|
+
sitekey: string;
|
|
23
|
+
captcha_type: import("@prosopo/types").CaptchaType;
|
|
24
|
+
frictionless_threshold: number;
|
|
25
|
+
pow_difficulty: number;
|
|
26
|
+
domains: string[];
|
|
27
|
+
}>;
|
|
5
28
|
declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
|
|
6
29
|
logger?: Logger;
|
|
7
30
|
}) => {
|
|
@@ -9,12 +32,14 @@ declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs
|
|
|
9
32
|
describe: string;
|
|
10
33
|
builder: (yargs: Argv) => Argv<{
|
|
11
34
|
sitekey: string;
|
|
35
|
+
} & {
|
|
36
|
+
tier: string | undefined;
|
|
12
37
|
} & {
|
|
13
38
|
captcha_type: string | undefined;
|
|
14
39
|
} & {
|
|
15
|
-
|
|
40
|
+
domains: (string | number)[] | undefined;
|
|
16
41
|
} & {
|
|
17
|
-
|
|
42
|
+
frictionless_threshold: number | undefined;
|
|
18
43
|
} & {
|
|
19
44
|
pow_difficulty: number | undefined;
|
|
20
45
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"siteKeyRegister.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"siteKeyRegister.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAGnE,OAAO,EAEN,KAAK,mBAAmB,EACxB,IAAI,EACJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;EAOzC,CAAC;+BAGI,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;;;;;;;;;;;oBAgCC,kBAAkB;;;;;AA3C1C,wBAqEE"}
|
|
@@ -1,32 +1,47 @@
|
|
|
1
1
|
import { LogLevel, getLogger } from "@prosopo/common";
|
|
2
2
|
import { ProviderEnvironment } from "@prosopo/env";
|
|
3
3
|
import { Tasks } from "@prosopo/provider";
|
|
4
|
+
import { CaptchaTypeSpec, Tier, } from "@prosopo/types";
|
|
5
|
+
import { z } from "zod";
|
|
4
6
|
import { validateSiteKey } from "./validators.js";
|
|
7
|
+
export const SiteKeyRegisterCommandArgsSpec = z.object({
|
|
8
|
+
sitekey: z.string(),
|
|
9
|
+
tier: z.nativeEnum(Tier),
|
|
10
|
+
captcha_type: CaptchaTypeSpec,
|
|
11
|
+
frictionless_threshold: z.number().max(1).min(0),
|
|
12
|
+
pow_difficulty: z.number(),
|
|
13
|
+
domains: z.array(z.string()),
|
|
14
|
+
});
|
|
5
15
|
export default (pair, config, cmdArgs) => {
|
|
6
16
|
const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, "cli.dapp_register");
|
|
7
17
|
return {
|
|
8
|
-
command: "site_key_register <sitekey>",
|
|
18
|
+
command: "site_key_register <sitekey> <tier>",
|
|
9
19
|
describe: "Register a Site Key",
|
|
10
20
|
builder: (yargs) => yargs
|
|
11
21
|
.positional("sitekey", {
|
|
12
22
|
type: "string",
|
|
13
23
|
demandOption: true,
|
|
14
24
|
desc: "The AccountId of the application to register the Site Key with",
|
|
25
|
+
})
|
|
26
|
+
.option("tier", {
|
|
27
|
+
type: "string",
|
|
28
|
+
demandOption: false,
|
|
29
|
+
desc: "The AccountId of the application to register the Site Key with",
|
|
15
30
|
})
|
|
16
31
|
.option("captcha_type", {
|
|
17
32
|
type: "string",
|
|
18
33
|
demandOption: false,
|
|
19
34
|
desc: "Captcha type for settings",
|
|
35
|
+
})
|
|
36
|
+
.option("domains", {
|
|
37
|
+
type: "array",
|
|
38
|
+
demandOption: false,
|
|
39
|
+
desc: "Domains for settings",
|
|
20
40
|
})
|
|
21
41
|
.option("frictionless_threshold", {
|
|
22
42
|
type: "number",
|
|
23
43
|
demandOption: false,
|
|
24
44
|
desc: "Frictionless threshold for settings",
|
|
25
|
-
})
|
|
26
|
-
.option("url", {
|
|
27
|
-
type: "array",
|
|
28
|
-
demandOption: false,
|
|
29
|
-
desc: "URLs for settings",
|
|
30
45
|
})
|
|
31
46
|
.option("pow_difficulty", {
|
|
32
47
|
type: "number",
|
|
@@ -37,12 +52,12 @@ export default (pair, config, cmdArgs) => {
|
|
|
37
52
|
try {
|
|
38
53
|
const env = new ProviderEnvironment(config, pair);
|
|
39
54
|
await env.isReady();
|
|
40
|
-
const { sitekey, captcha_type, frictionless_threshold,
|
|
55
|
+
const { sitekey, tier, captcha_type, frictionless_threshold, pow_difficulty, domains, } = SiteKeyRegisterCommandArgsSpec.parse(argv);
|
|
41
56
|
const tasks = new Tasks(env);
|
|
42
|
-
await tasks.clientTaskManager.registerSiteKey(sitekey, {
|
|
43
|
-
captchaType: captcha_type,
|
|
57
|
+
await tasks.clientTaskManager.registerSiteKey(sitekey, tier, {
|
|
58
|
+
captchaType: CaptchaTypeSpec.parse(captcha_type),
|
|
44
59
|
frictionlessThreshold: frictionless_threshold,
|
|
45
|
-
domains:
|
|
60
|
+
domains: domains || [],
|
|
46
61
|
powDifficulty: pow_difficulty,
|
|
47
62
|
});
|
|
48
63
|
logger.info(`Site Key ${argv.sitekey} registered`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"siteKeyRegister.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"siteKeyRegister.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { KeyringPair } from "@polkadot/keyring/types";
|
|
2
2
|
import { type Logger } from "@prosopo/common";
|
|
3
|
-
import type
|
|
3
|
+
import { type ProsopoConfigOutput, Tier } from "@prosopo/types";
|
|
4
4
|
import type { ArgumentsCamelCase, Argv } from "yargs";
|
|
5
5
|
declare const _default: (pair: KeyringPair, authAccount: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
|
|
6
6
|
logger?: Logger;
|
|
@@ -9,6 +9,8 @@ declare const _default: (pair: KeyringPair, authAccount: KeyringPair, config: Pr
|
|
|
9
9
|
describe: string;
|
|
10
10
|
builder: (yargs: Argv) => Argv<{
|
|
11
11
|
sitekey: string;
|
|
12
|
+
} & {
|
|
13
|
+
tier: Tier;
|
|
12
14
|
} & {
|
|
13
15
|
url: string;
|
|
14
16
|
} & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"siteKeyRegisterApi.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegisterApi.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"siteKeyRegisterApi.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegisterApi.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAEN,KAAK,mBAAmB,EACxB,IAAI,EACJ,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;+BAY/C,WAAW,eACJ,WAAW,UAChB,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;;;;;;;;;;;;;oBAqCC,kBAAkB;;;;;AAjD1C,wBAmFE"}
|
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
import { ProviderApi } from "@prosopo/api";
|
|
2
2
|
import { LogLevel, getLogger } from "@prosopo/common";
|
|
3
3
|
import { ProviderEnvironment } from "@prosopo/env";
|
|
4
|
-
import {
|
|
4
|
+
import { CaptchaTypeSpec, Tier, } from "@prosopo/types";
|
|
5
5
|
import { u8aToHex } from "@prosopo/util";
|
|
6
|
+
import { z } from "zod";
|
|
7
|
+
import { SiteKeyRegisterCommandArgsSpec } from "./siteKeyRegister.js";
|
|
6
8
|
import { validateSiteKey } from "./validators.js";
|
|
9
|
+
const SiteKeyRegisterApiCommandArgsSpec = SiteKeyRegisterCommandArgsSpec.extend({
|
|
10
|
+
url: z.string(),
|
|
11
|
+
});
|
|
7
12
|
export default (pair, authAccount, config, cmdArgs) => {
|
|
8
13
|
const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, "cli.dapp_register");
|
|
9
14
|
return {
|
|
@@ -14,11 +19,16 @@ export default (pair, authAccount, config, cmdArgs) => {
|
|
|
14
19
|
type: "string",
|
|
15
20
|
demandOption: true,
|
|
16
21
|
desc: "The AccountId of the application to register the Site Key with",
|
|
22
|
+
})
|
|
23
|
+
.positional("tier", {
|
|
24
|
+
choices: Object.values(Tier),
|
|
25
|
+
demandOption: true,
|
|
26
|
+
desc: "The tier of the account",
|
|
17
27
|
})
|
|
18
28
|
.option("url", {
|
|
19
29
|
type: "string",
|
|
20
30
|
demandOption: true,
|
|
21
|
-
desc: "URL to register the Site Key with",
|
|
31
|
+
desc: "Provider URL to register the Site Key with",
|
|
22
32
|
})
|
|
23
33
|
.option("captcha_type", {
|
|
24
34
|
type: "string",
|
|
@@ -44,15 +54,14 @@ export default (pair, authAccount, config, cmdArgs) => {
|
|
|
44
54
|
try {
|
|
45
55
|
const env = new ProviderEnvironment(config, pair, authAccount);
|
|
46
56
|
await env.isReady();
|
|
47
|
-
const { sitekey, captcha_type, frictionless_threshold, url, domains, pow_difficulty, } = argv;
|
|
48
|
-
const tasks = new Tasks(env);
|
|
57
|
+
const { sitekey, captcha_type, frictionless_threshold, url, domains, pow_difficulty, } = SiteKeyRegisterApiCommandArgsSpec.parse(argv);
|
|
49
58
|
const api = new ProviderApi(url, pair.address);
|
|
50
59
|
const timestamp = new Date().getTime().toString();
|
|
51
60
|
const signature = u8aToHex(authAccount.sign(timestamp));
|
|
52
|
-
await api.registerSiteKey(sitekey, {
|
|
53
|
-
captchaType: captcha_type,
|
|
61
|
+
await api.registerSiteKey(sitekey, argv.tier, {
|
|
62
|
+
captchaType: CaptchaTypeSpec.parse(captcha_type),
|
|
54
63
|
frictionlessThreshold: frictionless_threshold,
|
|
55
|
-
domains: domains,
|
|
64
|
+
domains: domains || [],
|
|
56
65
|
powDifficulty: pow_difficulty,
|
|
57
66
|
}, timestamp, signature);
|
|
58
67
|
logger.info(`Site Key ${argv.sitekey} registered`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"siteKeyRegisterApi.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegisterApi.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAe,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,
|
|
1
|
+
{"version":3,"file":"siteKeyRegisterApi.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegisterApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prosopo.config.d.ts","sourceRoot":"","sources":["../src/prosopo.config.ts"],"names":[],"mappings":"AAeA,OAAO,
|
|
1
|
+
{"version":3,"file":"prosopo.config.d.ts","sourceRoot":"","sources":["../src/prosopo.config.ts"],"names":[],"mappings":"AAeA,OAAO,EAIN,KAAK,oCAAoC,EACzC,KAAK,kCAAkC,EAEvC,KAAK,mBAAmB,EAExB,MAAM,gBAAgB,CAAC;AA2BxB,MAAM,CAAC,OAAO,UAAU,SAAS,CAChC,sBAAsB,CAAC,EAAE,OAAO,kCAAkC,EAClE,kBAAkB,CAAC,EAAE,oCAAoC,EACzD,GAAG,SAAa,EAChB,KAAK,SAAU,GACb,mBAAmB,CAiErB"}
|
package/dist/prosopo.config.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getLogLevel } from "@prosopo/common";
|
|
2
|
-
import { DatabaseTypes, EnvironmentTypesSchema, ProsopoConfigSchema, } from "@prosopo/types";
|
|
2
|
+
import { DatabaseTypes, EnvironmentTypesSchema, FrictionlessPenalties, ProsopoConfigSchema, } from "@prosopo/types";
|
|
3
3
|
import { getRateLimitConfig } from "./RateLimiter.js";
|
|
4
4
|
import { getAddress, getPassword, getSecret } from "./process.env.js";
|
|
5
5
|
function getMongoURI() {
|
|
@@ -63,7 +63,10 @@ export default function getConfig(captchaSolutionsConfig, captchaServeConfig, wh
|
|
|
63
63
|
},
|
|
64
64
|
captchaSolutions: captchaSolutionsConfig,
|
|
65
65
|
captchas: captchaServeConfig,
|
|
66
|
-
|
|
66
|
+
penalties: FrictionlessPenalties.parse({
|
|
67
|
+
PENALTY_OLD_TIMESTAMP: process.env.PENALTY_OLD_TIMESTAMP,
|
|
68
|
+
PENALTY_ACCESS_RULE: process.env.PENALTY_ACCESS_RULE,
|
|
69
|
+
}),
|
|
67
70
|
mongoEventsUri: process.env.PROSOPO_MONGO_EVENTS_URI || "",
|
|
68
71
|
mongoCaptchaUri: process.env.PROSOPO_MONGO_CAPTCHA_URI || "",
|
|
69
72
|
mongoClientUri: process.env.PROSOPO_MONGO_CLIENT_URI || "",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prosopo.config.js","sourceRoot":"","sources":["../src/prosopo.config.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACN,aAAa,EACb,sBAAsB,
|
|
1
|
+
{"version":3,"file":"prosopo.config.js","sourceRoot":"","sources":["../src/prosopo.config.ts"],"names":[],"mappings":"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"}
|
package/dist/start.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAMvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAMvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AA2FnD,wBAAsB,KAAK,CAC1B,GAAG,CAAC,EAAE,mBAAmB,EACzB,KAAK,CAAC,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,MAAM,mBAwCb;AAED,wBAAsB,QAAQ,CAAC,GAAG,CAAC,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,OAAO,mBAGxE"}
|
package/dist/start.js
CHANGED
|
@@ -3,32 +3,36 @@ import { loadEnv } from "@prosopo/dotenv";
|
|
|
3
3
|
import { ProviderEnvironment } from "@prosopo/env";
|
|
4
4
|
import { getPairAsync } from "@prosopo/keyring";
|
|
5
5
|
import { i18nMiddleware } from "@prosopo/locale";
|
|
6
|
-
import {
|
|
6
|
+
import { createApiAdminRoutesProvider, domainMiddleware, getClientList, headerCheckMiddleware, prosopoRouter, prosopoVerifyRouter, publicRouter, storeCaptchasExternally, } from "@prosopo/provider";
|
|
7
7
|
import { authMiddleware, blockMiddleware } from "@prosopo/provider";
|
|
8
8
|
import { createApiRuleRoutesProvider, getExpressApiRuleRateLimits, } from "@prosopo/user-access-policy";
|
|
9
|
+
import { apiRulePaths } from "@prosopo/user-access-policy";
|
|
9
10
|
import cors from "cors";
|
|
10
11
|
import express from "express";
|
|
11
12
|
import rateLimit from "express-rate-limit";
|
|
12
13
|
import { getDB, getSecret } from "./process.env.js";
|
|
13
14
|
import getConfig from "./prosopo.config.js";
|
|
14
|
-
function startApi(env, admin = false, port) {
|
|
15
|
+
async function startApi(env, admin = false, port) {
|
|
15
16
|
env.logger.info("Starting Prosopo API");
|
|
16
17
|
const apiApp = express();
|
|
17
18
|
const apiPort = port || env.config.server.port;
|
|
18
19
|
const apiEndpointAdapter = createApiExpressDefaultEndpointAdapter(env.logger);
|
|
19
20
|
const apiRuleRoutesProvider = createApiRuleRoutesProvider(env.getDb().getUserAccessRulesStorage());
|
|
20
|
-
const apiAdminRoutesProvider =
|
|
21
|
+
const apiAdminRoutesProvider = createApiAdminRoutesProvider(env);
|
|
21
22
|
apiApp.set("trust proxy", env.config.proxyCount);
|
|
22
23
|
apiApp.use(cors());
|
|
23
24
|
apiApp.use(express.json({ limit: "50mb" }));
|
|
24
|
-
apiApp.use(i18nMiddleware({}));
|
|
25
|
+
apiApp.use(await i18nMiddleware({}));
|
|
25
26
|
apiApp.use("/v1/prosopo/provider/client/", headerCheckMiddleware(env));
|
|
26
27
|
apiApp.use(blockMiddleware(env));
|
|
27
28
|
apiApp.use(prosopoVerifyRouter(env));
|
|
28
29
|
apiApp.use("/v1/prosopo/provider/client/", domainMiddleware(env));
|
|
29
30
|
apiApp.use(prosopoRouter(env));
|
|
30
31
|
apiApp.use(publicRouter(env));
|
|
32
|
+
env.logger.info("Enabling admin auth middleware");
|
|
31
33
|
apiApp.use("/v1/prosopo/provider/admin", authMiddleware(env));
|
|
34
|
+
apiApp.use(apiRulePaths.INSERT_MANY, authMiddleware(env));
|
|
35
|
+
apiApp.use(apiRulePaths.DELETE_MANY, authMiddleware(env));
|
|
32
36
|
apiApp.use(apiExpressRouterFactory.createRouter(apiRuleRoutesProvider, apiEndpointAdapter));
|
|
33
37
|
apiApp.use(apiExpressRouterFactory.createRouter(apiAdminRoutesProvider, createApiExpressDefaultEndpointAdapter(env.logger, 400)));
|
|
34
38
|
const configRateLimits = env.config.rateLimits;
|
|
@@ -58,6 +62,7 @@ export async function start(env, admin, port) {
|
|
|
58
62
|
env.logger.debug("Env already defined");
|
|
59
63
|
}
|
|
60
64
|
await env.isReady();
|
|
65
|
+
env.cleanup();
|
|
61
66
|
if (env.pair) {
|
|
62
67
|
storeCaptchasExternally(env.pair, env.config).catch((err) => {
|
|
63
68
|
console.error("Failed to start scheduler:", err);
|
package/dist/start.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAeA,OAAO,EACN,uBAAuB,EACvB,sCAAsC,GACtC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EACN,
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/cli",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.2",
|
|
4
4
|
"description": "CLI for Prosopo Provider",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -29,18 +29,18 @@
|
|
|
29
29
|
"@polkadot/keyring": "12.6.2",
|
|
30
30
|
"@polkadot/types-codec": "10.13.1",
|
|
31
31
|
"@polkadot/util-crypto": "12.6.2",
|
|
32
|
-
"@prosopo/api": "2.
|
|
33
|
-
"@prosopo/api-express-router": "2.
|
|
34
|
-
"@prosopo/common": "2.
|
|
35
|
-
"@prosopo/config": "2.
|
|
36
|
-
"@prosopo/dotenv": "2.
|
|
37
|
-
"@prosopo/env": "2.
|
|
38
|
-
"@prosopo/keyring": "2.
|
|
39
|
-
"@prosopo/locale": "2.
|
|
40
|
-
"@prosopo/provider": "2.
|
|
41
|
-
"@prosopo/types": "2.
|
|
42
|
-
"@prosopo/user-access-policy": "2.
|
|
43
|
-
"@prosopo/util": "2.
|
|
32
|
+
"@prosopo/api": "2.4.2",
|
|
33
|
+
"@prosopo/api-express-router": "2.4.2",
|
|
34
|
+
"@prosopo/common": "2.4.2",
|
|
35
|
+
"@prosopo/config": "2.4.2",
|
|
36
|
+
"@prosopo/dotenv": "2.4.2",
|
|
37
|
+
"@prosopo/env": "2.4.2",
|
|
38
|
+
"@prosopo/keyring": "2.4.2",
|
|
39
|
+
"@prosopo/locale": "2.4.2",
|
|
40
|
+
"@prosopo/provider": "2.4.2",
|
|
41
|
+
"@prosopo/types": "2.4.2",
|
|
42
|
+
"@prosopo/user-access-policy": "2.4.2",
|
|
43
|
+
"@prosopo/util": "2.4.2",
|
|
44
44
|
"cors": "2.8.5",
|
|
45
45
|
"cron-parser": "4.9.0",
|
|
46
46
|
"dotenv": "16.4.5",
|
|
@@ -51,13 +51,13 @@
|
|
|
51
51
|
"zod": "3.23.8"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
|
-
"@prosopo/config": "2.
|
|
54
|
+
"@prosopo/config": "2.4.2",
|
|
55
55
|
"@types/cors": "2.8.17",
|
|
56
56
|
"@types/yargs": "17.0.33",
|
|
57
57
|
"@vitest/coverage-v8": "2.1.1",
|
|
58
58
|
"concurrently": "9.0.1",
|
|
59
59
|
"del-cli": "6.0.0",
|
|
60
|
-
"express": "4.21.
|
|
60
|
+
"express": "4.21.2",
|
|
61
61
|
"npm-run-all": "2.1.0",
|
|
62
62
|
"tslib": "2.7.0",
|
|
63
63
|
"tsx": "4.19.1",
|
package/vite.cjs.config.ts
CHANGED
package/vite.config.ts
CHANGED
package/vite.test.config.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
2
|
import path from "node:path";
|
|
3
|
-
// Copyright 2021-
|
|
3
|
+
// Copyright 2021-2025 Prosopo (UK) Ltd.
|
|
4
4
|
//
|
|
5
5
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
6
6
|
// you may not use this file except in compliance with the License.
|