@prosopo/cli 2.6.12 → 3.0.5
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/CHANGELOG.md +164 -0
- package/dist/argv.d.ts +1 -1
- package/dist/argv.d.ts.map +1 -1
- package/dist/argv.js.map +1 -1
- package/dist/bundle/{i18nBackend-DMKzoSvT.js → i18nBackend-DDiD0rVZ.js} +35 -25
- package/dist/bundle/provider.cli.bundle.js +116197 -66284
- package/dist/cjs/cli.cjs +11 -14
- package/dist/cjs/commands/providerSetDataset.cjs +12 -3
- package/dist/cjs/commands/siteKeyRegister.cjs +8 -2
- package/dist/cjs/commands/siteKeyRegisterApi.cjs +8 -2
- package/dist/cjs/commands/storeCaptchasExternally.cjs +2 -2
- package/dist/cjs/commands/version.cjs +3 -1
- package/dist/cjs/prosopo.config.cjs +5 -1
- package/dist/cjs/reloader.cjs +7 -4
- package/dist/cjs/start.cjs +36 -20
- package/dist/cli.js +13 -11
- package/dist/cli.js.map +1 -1
- package/dist/commands/providerSetDataset.d.ts +1 -1
- package/dist/commands/providerSetDataset.d.ts.map +1 -1
- package/dist/commands/providerSetDataset.js +12 -3
- package/dist/commands/providerSetDataset.js.map +1 -1
- package/dist/commands/siteKeyRegister.d.ts +1 -1
- package/dist/commands/siteKeyRegister.d.ts.map +1 -1
- package/dist/commands/siteKeyRegister.js +8 -2
- package/dist/commands/siteKeyRegister.js.map +1 -1
- package/dist/commands/siteKeyRegisterApi.d.ts +1 -1
- package/dist/commands/siteKeyRegisterApi.d.ts.map +1 -1
- package/dist/commands/siteKeyRegisterApi.js +8 -2
- package/dist/commands/siteKeyRegisterApi.js.map +1 -1
- package/dist/commands/storeCaptchasExternally.d.ts +1 -1
- package/dist/commands/storeCaptchasExternally.d.ts.map +1 -1
- package/dist/commands/storeCaptchasExternally.js +2 -2
- package/dist/commands/storeCaptchasExternally.js.map +1 -1
- package/dist/commands/version.d.ts +1 -1
- package/dist/commands/version.d.ts.map +1 -1
- package/dist/commands/version.js +3 -1
- package/dist/commands/version.js.map +1 -1
- package/dist/process.env.d.ts +1 -1
- package/dist/process.env.d.ts.map +1 -1
- package/dist/process.env.js.map +1 -1
- package/dist/prosopo.config.d.ts.map +1 -1
- package/dist/prosopo.config.js +6 -2
- package/dist/prosopo.config.js.map +1 -1
- package/dist/reloader.d.ts +1 -1
- package/dist/reloader.d.ts.map +1 -1
- package/dist/reloader.js +7 -4
- package/dist/reloader.js.map +1 -1
- package/dist/start.d.ts.map +1 -1
- package/dist/start.js +30 -21
- package/dist/start.js.map +1 -1
- package/dist/tests/bundle/bundle.unit.test.js +1 -1
- package/dist/tests/bundle/bundle.unit.test.js.map +1 -1
- package/package.json +23 -19
- package/vite.test.config.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAe,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAgBnE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,eAAe,CACd,IAAiB,EACjB,MAA2B,EAC3B,OAA6B,EAC5B,EAAE;IACH,MAAM,MAAM,GACX,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAEjE,OAAO;QACN,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,oCAAoC;QAC9C,OAAO,EAAE,GAAG,EAAE;YACb,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;gBAClB,IAAI,EAAE,EAAE,OAAO,EAAE;aACjB,CAAC,CAAC,CAAC;QACL,CAAC;KACD,CAAC;AACH,CAAC,CAAC"}
|
package/dist/process.env.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { KeypairType } from "@
|
|
1
|
+
import type { KeypairType } from "@prosopo/util-crypto";
|
|
2
2
|
export declare function getSs58Format(): number;
|
|
3
3
|
export declare function getPairType(): KeypairType;
|
|
4
4
|
export declare function getAddress(who?: string): string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.env.d.ts","sourceRoot":"","sources":["../src/process.env.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process.env.d.ts","sourceRoot":"","sources":["../src/process.env.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAED,wBAAgB,WAAW,IAAI,WAAW,CAIzC;AAED,wBAAgB,UAAU,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO3D;AAED,wBAAgB,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO5D;AAED,wBAAgB,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAY1D;AAED,wBAAgB,KAAK,IAAI,MAAM,CAK9B"}
|
package/dist/process.env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.env.js","sourceRoot":"","sources":["../src/process.env.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"process.env.js","sourceRoot":"","sources":["../src/process.env.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGlD,MAAM,UAAU,aAAa;IAC5B,OAAO,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,WAAW;IAC1B,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,iBAAiC,IAAK,SAAyB,CAC5E,CAAC;AACH,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAY;IACtC,IAAI,CAAC,GAAG,EAAE,CAAC;QACV,GAAG,GAAG,UAAU,CAAC;IAClB,CAAC;SAAM,CAAC;QACP,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IACzB,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,UAAU,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAY;IACvC,IAAI,CAAC,GAAG,EAAE,CAAC;QACV,GAAG,GAAG,UAAU,CAAC;IAClB,CAAC;SAAM,CAAC;QACP,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IACzB,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,mBAAmB,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAY;IACrC,IAAI,CAAC,GAAG,EAAE,CAAC;QACV,GAAG,GAAG,UAAU,CAAC;IAClB,CAAC;SAAM,CAAC;QACP,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IACzB,CAAC;IACD,OAAO,CACN,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,WAAW,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,CAClC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,KAAK;IACpB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;QACxC,MAAM,IAAI,eAAe,CAAC,kCAAkC,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;AAC1C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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,CAqErB"}
|
package/dist/prosopo.config.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { parseLogLevel } from "@prosopo/common";
|
|
2
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";
|
|
@@ -26,7 +26,7 @@ const getLRules = () => {
|
|
|
26
26
|
};
|
|
27
27
|
export default function getConfig(captchaSolutionsConfig, captchaServeConfig, who = "PROVIDER", admin = "ADMIN") {
|
|
28
28
|
return ProsopoConfigSchema.parse({
|
|
29
|
-
logLevel:
|
|
29
|
+
logLevel: parseLogLevel(process.env.PROSOPO_LOG_LEVEL, "info"),
|
|
30
30
|
defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT
|
|
31
31
|
? EnvironmentTypesSchema.parse(process.env.PROSOPO_DEFAULT_ENVIRONMENT)
|
|
32
32
|
: EnvironmentTypesSchema.enum.development,
|
|
@@ -70,6 +70,10 @@ export default function getConfig(captchaSolutionsConfig, captchaServeConfig, wh
|
|
|
70
70
|
mongoEventsUri: process.env.PROSOPO_MONGO_EVENTS_URI || "",
|
|
71
71
|
mongoCaptchaUri: process.env.PROSOPO_MONGO_CAPTCHA_URI || "",
|
|
72
72
|
mongoClientUri: process.env.PROSOPO_MONGO_CLIENT_URI || "",
|
|
73
|
+
redisConnection: {
|
|
74
|
+
url: process.env.REDIS_CONNECTION_URL || "",
|
|
75
|
+
password: process.env.REDIS_CONNECTION_PASSWORD || "",
|
|
76
|
+
},
|
|
73
77
|
rateLimits: getRateLimitConfig(),
|
|
74
78
|
proxyCount: process.env.PROSOPO_PROXY_COUNT
|
|
75
79
|
? Number.parseInt(process.env.PROSOPO_PROXY_COUNT)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prosopo.config.js","sourceRoot":"","sources":["../src/prosopo.config.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"prosopo.config.js","sourceRoot":"","sources":["../src/prosopo.config.ts"],"names":[],"mappings":"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"}
|
package/dist/reloader.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { KeyringPair } from "@polkadot/keyring/types";
|
|
2
1
|
import { ProviderEnvironment } from "@prosopo/env";
|
|
2
|
+
import type { KeyringPair } from "@prosopo/types";
|
|
3
3
|
import type { ProsopoConfigOutput } from "@prosopo/types";
|
|
4
4
|
import type { AwaitedProcessedArgs } from "./argv.js";
|
|
5
5
|
export default class ReloadingAPI {
|
package/dist/reloader.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reloader.d.ts","sourceRoot":"","sources":["../src/reloader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reloader.d.ts","sourceRoot":"","sources":["../src/reloader.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAKtD,MAAM,CAAC,OAAO,OAAO,YAAY;IAEhC,OAAO,CAAC,WAAW,CAAM;IACzB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,GAAG,CAAqB;IAChC,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,IAAI,CAAkC;gBAG7C,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,oBAAoB;IAUpC,IAAI,GAAG,oCAEN;IAEY,KAAK,CAAC,SAAS,UAAQ;IAgBvB,QAAQ;IAaR,IAAI;YASH,SAAS;CAevB"}
|
package/dist/reloader.js
CHANGED
|
@@ -17,7 +17,7 @@ export default class ReloadingAPI {
|
|
|
17
17
|
return this._env;
|
|
18
18
|
}
|
|
19
19
|
async start(reloadEnv = false) {
|
|
20
|
-
log.info("Starting API");
|
|
20
|
+
log.info(() => ({ msg: "Starting API" }));
|
|
21
21
|
this._envWatcher = await this._watchEnv();
|
|
22
22
|
loadEnv();
|
|
23
23
|
if (!this._env && reloadEnv) {
|
|
@@ -28,7 +28,7 @@ export default class ReloadingAPI {
|
|
|
28
28
|
this.api = await start(this.env, !!this._processedArgs.adminApi);
|
|
29
29
|
}
|
|
30
30
|
async startDev() {
|
|
31
|
-
log.info("Starting API");
|
|
31
|
+
log.info(() => ({ msg: "Starting API" }));
|
|
32
32
|
this._envWatcher = await this._watchEnv();
|
|
33
33
|
loadEnv();
|
|
34
34
|
const env = new ProviderEnvironment(this._config, this._pair, this._authAccount);
|
|
@@ -36,7 +36,7 @@ export default class ReloadingAPI {
|
|
|
36
36
|
this.api = await startDev(env, !!this._processedArgs.adminApi);
|
|
37
37
|
}
|
|
38
38
|
async stop() {
|
|
39
|
-
log.info("Stopping API");
|
|
39
|
+
log.info(() => ({ msg: "Stopping API" }));
|
|
40
40
|
return new Promise((resolve) => {
|
|
41
41
|
if (this.api) {
|
|
42
42
|
this.api.close(resolve);
|
|
@@ -45,7 +45,10 @@ export default class ReloadingAPI {
|
|
|
45
45
|
}
|
|
46
46
|
async _watchEnv() {
|
|
47
47
|
return fs.watchFile(this._envPath, async () => {
|
|
48
|
-
log.info(
|
|
48
|
+
log.info(() => ({
|
|
49
|
+
data: { restarting: this._restarting },
|
|
50
|
+
msg: "env file change detected. Restarting",
|
|
51
|
+
}));
|
|
49
52
|
if (!this._restarting) {
|
|
50
53
|
this._restarting = true;
|
|
51
54
|
await this.stop();
|
package/dist/reloader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reloader.js","sourceRoot":"","sources":["../src/reloader.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"reloader.js","sourceRoot":"","sources":["../src/reloader.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;
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AASvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AA0InD,wBAAsB,KAAK,CAC1B,GAAG,CAAC,EAAE,mBAAmB,EACzB,KAAK,CAAC,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,MAAM,mBAmDb;AAED,wBAAsB,QAAQ,CAAC,GAAG,CAAC,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,OAAO,mBAGxE"}
|
package/dist/start.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { apiExpressRouterFactory, createApiExpressDefaultEndpointAdapter, } from "@prosopo/api-express-router";
|
|
1
|
+
import { apiExpressRouterFactory, authMiddleware, createApiExpressDefaultEndpointAdapter, requestLoggerMiddleware, } from "@prosopo/api-express-router";
|
|
2
|
+
import { parseLogLevel } from "@prosopo/common";
|
|
2
3
|
import { loadEnv } from "@prosopo/dotenv";
|
|
3
4
|
import { ProviderEnvironment } from "@prosopo/env";
|
|
4
|
-
import {
|
|
5
|
+
import { getPair } from "@prosopo/keyring";
|
|
5
6
|
import { i18nMiddleware } from "@prosopo/locale";
|
|
6
|
-
import { createApiAdminRoutesProvider, domainMiddleware, getClientList, headerCheckMiddleware, ignoreMiddleware, prosopoRouter, prosopoVerifyRouter, publicRouter,
|
|
7
|
-
import {
|
|
7
|
+
import { createApiAdminRoutesProvider, domainMiddleware, getClientList, headerCheckMiddleware, ignoreMiddleware, prosopoRouter, prosopoVerifyRouter, publicRouter, robotsMiddleware, storeCaptchasExternally, } from "@prosopo/provider";
|
|
8
|
+
import { blockMiddleware, ja4Middleware } from "@prosopo/provider";
|
|
8
9
|
import { ClientApiPaths } from "@prosopo/types";
|
|
9
10
|
import { createApiRuleRoutesProvider, getExpressApiRuleRateLimits, } from "@prosopo/user-access-policy";
|
|
10
|
-
import { apiRulePaths } from "@prosopo/user-access-policy";
|
|
11
11
|
import cors from "cors";
|
|
12
12
|
import express from "express";
|
|
13
13
|
import rateLimit from "express-rate-limit";
|
|
@@ -18,20 +18,21 @@ const getClientApiPathsExcludingVerify = () => {
|
|
|
18
18
|
return paths;
|
|
19
19
|
};
|
|
20
20
|
async function startApi(env, admin = false, port) {
|
|
21
|
-
env.logger.info("Starting Prosopo API");
|
|
21
|
+
env.logger.info(() => ({ msg: "Starting Prosopo API" }));
|
|
22
22
|
const apiApp = express();
|
|
23
23
|
const apiPort = port || env.config.server.port;
|
|
24
|
-
const apiEndpointAdapter = createApiExpressDefaultEndpointAdapter(env.config.logLevel);
|
|
24
|
+
const apiEndpointAdapter = createApiExpressDefaultEndpointAdapter(parseLogLevel(env.config.logLevel));
|
|
25
25
|
const apiRuleRoutesProvider = createApiRuleRoutesProvider(env.getDb().getUserAccessRulesStorage());
|
|
26
26
|
const apiAdminRoutesProvider = createApiAdminRoutesProvider(env);
|
|
27
27
|
const clientPathsExcludingVerify = getClientApiPathsExcludingVerify();
|
|
28
|
-
env.logger.debug({
|
|
29
|
-
|
|
28
|
+
env.logger.debug(() => ({
|
|
29
|
+
msg: "Adding headerCheckMiddleware",
|
|
30
30
|
paths: clientPathsExcludingVerify,
|
|
31
|
-
});
|
|
31
|
+
}));
|
|
32
32
|
apiApp.set("trust proxy", env.config.proxyCount);
|
|
33
33
|
apiApp.use(cors());
|
|
34
34
|
apiApp.use(express.json({ limit: "50mb" }));
|
|
35
|
+
apiApp.use(publicRouter());
|
|
35
36
|
const i18Middleware = await i18nMiddleware({});
|
|
36
37
|
apiApp.use(robotsMiddleware());
|
|
37
38
|
apiApp.use(ignoreMiddleware());
|
|
@@ -43,13 +44,14 @@ async function startApi(env, admin = false, port) {
|
|
|
43
44
|
apiApp.use(clientPathsExcludingVerify, headerCheckMiddleware(env));
|
|
44
45
|
apiApp.use("/v1/prosopo/provider/client/", domainMiddleware(env));
|
|
45
46
|
apiApp.use(prosopoRouter(env));
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
47
|
+
env.logger.info(() => ({ msg: "Enabling admin auth middleware" }));
|
|
48
|
+
apiApp.use("/v1/prosopo/provider/admin", authMiddleware(env.pair, env.authAccount));
|
|
49
|
+
const userAccessRuleRoutes = apiRuleRoutesProvider.getRoutes();
|
|
50
|
+
for (const userAccessRuleRoute of userAccessRuleRoutes) {
|
|
51
|
+
apiApp.use(userAccessRuleRoute.path, authMiddleware(env.pair, env.authAccount));
|
|
52
|
+
}
|
|
51
53
|
apiApp.use(apiExpressRouterFactory.createRouter(apiRuleRoutesProvider, apiEndpointAdapter));
|
|
52
|
-
apiApp.use(apiExpressRouterFactory.createRouter(apiAdminRoutesProvider, createApiExpressDefaultEndpointAdapter(env.config.logLevel, 400)));
|
|
54
|
+
apiApp.use(apiExpressRouterFactory.createRouter(apiAdminRoutesProvider, createApiExpressDefaultEndpointAdapter(parseLogLevel(env.config.logLevel), 400)));
|
|
53
55
|
const configRateLimits = env.config.rateLimits;
|
|
54
56
|
const rateLimits = { ...configRateLimits, ...getExpressApiRuleRateLimits() };
|
|
55
57
|
for (const [path, limit] of Object.entries(rateLimits)) {
|
|
@@ -57,7 +59,10 @@ async function startApi(env, admin = false, port) {
|
|
|
57
59
|
apiApp.use(enumPath, rateLimit(limit));
|
|
58
60
|
}
|
|
59
61
|
return apiApp.listen(apiPort, () => {
|
|
60
|
-
env.logger.info(
|
|
62
|
+
env.logger.info(() => ({
|
|
63
|
+
data: { apiPort },
|
|
64
|
+
msg: "Prosopo app listening",
|
|
65
|
+
}));
|
|
61
66
|
});
|
|
62
67
|
}
|
|
63
68
|
export async function start(env, admin, port) {
|
|
@@ -69,12 +74,12 @@ export async function start(env, admin, port) {
|
|
|
69
74
|
solved: { count: 2 },
|
|
70
75
|
unsolved: { count: 0 },
|
|
71
76
|
});
|
|
72
|
-
const pair =
|
|
73
|
-
const authAccount =
|
|
77
|
+
const pair = getPair(secret);
|
|
78
|
+
const authAccount = getPair(undefined, config.authAccount.address);
|
|
74
79
|
env = new ProviderEnvironment(config, pair, authAccount);
|
|
75
80
|
}
|
|
76
81
|
else {
|
|
77
|
-
env.logger.debug("Env already defined");
|
|
82
|
+
env.logger.debug(() => ({ msg: "Env already defined" }));
|
|
78
83
|
}
|
|
79
84
|
await env.isReady();
|
|
80
85
|
env.cleanup();
|
|
@@ -88,7 +93,11 @@ export async function start(env, admin, port) {
|
|
|
88
93
|
const cronScheduleClient = env.config.scheduledTasks?.clientListScheduler?.schedule;
|
|
89
94
|
if (cronScheduleClient) {
|
|
90
95
|
getClientList(env.pair, cronScheduleClient, env.config).catch((err) => {
|
|
91
|
-
|
|
96
|
+
env.logger.error(() => ({
|
|
97
|
+
msg: "Failed to start client list scheduler",
|
|
98
|
+
err,
|
|
99
|
+
context: { failedFuncName: getClientList.name },
|
|
100
|
+
}));
|
|
92
101
|
});
|
|
93
102
|
}
|
|
94
103
|
}
|
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,
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ describe("provider bundle", () => {
|
|
|
8
8
|
const rootDir = getCliPkgDir();
|
|
9
9
|
await execPromise(`cd ${rootDir} && NODE_ENV=production npm run bundle`);
|
|
10
10
|
const { stdout: runOut, stderr: runErr } = await execPromise(`cd ${rootDir} && node dist/bundle/provider.cli.bundle.js version`);
|
|
11
|
-
assert(
|
|
11
|
+
assert(/{"version":"\d+\.\d+\.\d+"}/.test(runOut));
|
|
12
12
|
}, 120000);
|
|
13
13
|
});
|
|
14
14
|
//# sourceMappingURL=bundle.unit.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.unit.test.js","sourceRoot":"","sources":["../../../src/tests/bundle/bundle.unit.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAc/C,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAChD,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAEpC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAChC,IAAI,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAE7C,MAAM,OAAO,GAAG,YAAY,EAAE,CAAC;QAG/B,MAAM,WAAW,CAAC,MAAM,OAAO,wCAAwC,CAAC,CAAC;QAGzE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,WAAW,CAC3D,MAAM,OAAO,qDAAqD,CAClE,CAAC;QACF,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"bundle.unit.test.js","sourceRoot":"","sources":["../../../src/tests/bundle/bundle.unit.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAc/C,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAChD,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAEpC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAChC,IAAI,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAE7C,MAAM,OAAO,GAAG,YAAY,EAAE,CAAC;QAG/B,MAAM,WAAW,CAAC,MAAM,OAAO,wCAAwC,CAAC,CAAC;QAGzE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,WAAW,CAC3D,MAAM,OAAO,qDAAqD,CAClE,CAAC;QACF,MAAM,CAAC,6BAA6B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACpD,CAAC,EAAE,MAAM,CAAC,CAAC;AACZ,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/cli",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.5",
|
|
4
4
|
"description": "CLI for Prosopo Provider",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -26,43 +26,47 @@
|
|
|
26
26
|
"start:dev": "node ./dist/cli.js --api --dev"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@polkadot/keyring": "12.6.2",
|
|
30
29
|
"@polkadot/types-codec": "10.13.1",
|
|
31
|
-
"@
|
|
32
|
-
"@prosopo/api": "
|
|
33
|
-
"@prosopo/
|
|
34
|
-
"@prosopo/
|
|
35
|
-
"@prosopo/
|
|
36
|
-
"@prosopo/
|
|
37
|
-
"@prosopo/
|
|
38
|
-
"@prosopo/
|
|
39
|
-
"@prosopo/
|
|
40
|
-
"@prosopo/
|
|
41
|
-
"@prosopo/
|
|
42
|
-
"@prosopo/
|
|
43
|
-
"@prosopo/util": "
|
|
30
|
+
"@prosopo/api": "3.0.5",
|
|
31
|
+
"@prosopo/api-express-router": "3.0.2",
|
|
32
|
+
"@prosopo/common": "3.0.2",
|
|
33
|
+
"@prosopo/config": "3.1.0",
|
|
34
|
+
"@prosopo/dotenv": "3.0.4",
|
|
35
|
+
"@prosopo/env": "3.0.5",
|
|
36
|
+
"@prosopo/keyring": "2.8.5",
|
|
37
|
+
"@prosopo/locale": "3.0.2",
|
|
38
|
+
"@prosopo/provider": "3.0.5",
|
|
39
|
+
"@prosopo/types": "3.0.2",
|
|
40
|
+
"@prosopo/user-access-policy": "3.1.4",
|
|
41
|
+
"@prosopo/util": "3.0.2",
|
|
42
|
+
"@prosopo/util-crypto": "13.5.1",
|
|
43
|
+
"@typegoose/auto-increment": "4.13.0",
|
|
44
|
+
"axios": "1.10.0",
|
|
44
45
|
"cors": "2.8.5",
|
|
45
46
|
"cron-parser": "4.9.0",
|
|
46
47
|
"dotenv": "16.4.5",
|
|
48
|
+
"esbuild": "0.25.6",
|
|
47
49
|
"express-rate-limit": "7.4.0",
|
|
48
50
|
"has-proto": "1.2.0",
|
|
49
51
|
"ip-address": "10.0.1",
|
|
52
|
+
"openpgp": "5.11.3",
|
|
53
|
+
"webpack-dev-server": "5.2.2",
|
|
50
54
|
"yargs": "17.7.2",
|
|
51
55
|
"zod": "3.23.8"
|
|
52
56
|
},
|
|
53
57
|
"devDependencies": {
|
|
54
|
-
"@prosopo/config": "
|
|
58
|
+
"@prosopo/config": "3.1.0",
|
|
55
59
|
"@types/cors": "2.8.17",
|
|
56
60
|
"@types/yargs": "17.0.33",
|
|
57
61
|
"@vitest/coverage-v8": "3.0.9",
|
|
58
62
|
"concurrently": "9.0.1",
|
|
59
63
|
"del-cli": "6.0.0",
|
|
60
64
|
"express": "4.21.2",
|
|
61
|
-
"npm-run-all": "
|
|
65
|
+
"npm-run-all": "4.1.5",
|
|
62
66
|
"tslib": "2.7.0",
|
|
63
|
-
"tsx": "4.
|
|
67
|
+
"tsx": "4.20.3",
|
|
64
68
|
"typescript": "5.6.2",
|
|
65
|
-
"vite": "6.
|
|
69
|
+
"vite": "6.3.5",
|
|
66
70
|
"vitest": "3.0.9"
|
|
67
71
|
},
|
|
68
72
|
"author": "Prosopo",
|
package/vite.test.config.ts
CHANGED