@prosopo/cli 2.1.10 → 2.1.12
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/RateLimiter.d.ts +10 -26
- package/dist/RateLimiter.d.ts.map +1 -1
- package/dist/RateLimiter.js +0 -16
- package/dist/RateLimiter.js.map +1 -1
- package/dist/argv.d.ts +1 -1
- package/dist/argv.d.ts.map +1 -1
- package/dist/argv.js +3 -2
- package/dist/argv.js.map +1 -1
- package/dist/bundle/provider.cli.bundle.js +13870 -13396
- package/dist/cli.js +4 -4
- package/dist/cli.js.map +1 -1
- package/dist/commands/addBlockRules.d.ts.map +1 -1
- package/dist/commands/addBlockRules.js +1 -1
- package/dist/commands/addBlockRules.js.map +1 -1
- package/dist/commands/index.d.ts +1 -0
- package/dist/commands/index.d.ts.map +1 -1
- package/dist/commands/index.js +1 -0
- package/dist/commands/index.js.map +1 -1
- package/dist/commands/siteKeyRegister.d.ts +8 -0
- package/dist/commands/siteKeyRegister.d.ts.map +1 -1
- package/dist/commands/siteKeyRegister.js +29 -3
- package/dist/commands/siteKeyRegister.js.map +1 -1
- package/dist/commands/{providerDeregister.d.ts → siteKeyRegisterApi.d.ts} +14 -4
- package/dist/commands/siteKeyRegisterApi.d.ts.map +1 -0
- package/dist/commands/siteKeyRegisterApi.js +67 -0
- package/dist/commands/siteKeyRegisterApi.js.map +1 -0
- package/dist/prosopo.config.d.ts +1 -1
- package/dist/prosopo.config.d.ts.map +1 -1
- package/dist/prosopo.config.js +18 -1
- package/dist/prosopo.config.js.map +1 -1
- package/dist/reloader.d.ts +2 -1
- package/dist/reloader.d.ts.map +1 -1
- package/dist/reloader.js +4 -3
- package/dist/reloader.js.map +1 -1
- package/dist/start.d.ts.map +1 -1
- package/dist/start.js +9 -7
- package/dist/start.js.map +1 -1
- package/dist/tests/bundle/bundle.unit.test.js +1 -1
- package/package.json +13 -12
- package/dist/commands/providerDeregister.d.ts.map +0 -1
- package/dist/commands/providerDeregister.js +0 -30
- package/dist/commands/providerDeregister.js.map +0 -1
package/dist/cli.js
CHANGED
|
@@ -13,7 +13,6 @@ async function main() {
|
|
|
13
13
|
solved: { count: 2 },
|
|
14
14
|
unsolved: { count: 0 },
|
|
15
15
|
});
|
|
16
|
-
log.info(config);
|
|
17
16
|
if (config.devOnlyWatchEvents) {
|
|
18
17
|
log.warn(`
|
|
19
18
|
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
|
|
@@ -22,19 +21,20 @@ async function main() {
|
|
|
22
21
|
`);
|
|
23
22
|
}
|
|
24
23
|
const pair = await getPairAsync(config.account.secret, config.account.address);
|
|
24
|
+
const authAccount = await getPairAsync(config.authAccount.secret, config.authAccount.address);
|
|
25
25
|
log.info(`Pair address: ${pair.address}`);
|
|
26
|
-
const processedArgs = await processArgs(process.argv, pair, config);
|
|
26
|
+
const processedArgs = await processArgs(process.argv, pair, authAccount, config);
|
|
27
27
|
log.info(`Processsed args: ${JSON.stringify(processedArgs, null, 4)}`);
|
|
28
28
|
if (processedArgs.api) {
|
|
29
29
|
if (process.env.NODE_ENV === "development") {
|
|
30
|
-
await new ReloadingAPI(envPath, config, pair, processedArgs)
|
|
30
|
+
await new ReloadingAPI(envPath, config, pair, authAccount, processedArgs)
|
|
31
31
|
.startDev()
|
|
32
32
|
.then(() => {
|
|
33
33
|
log.info("Reloading API started...");
|
|
34
34
|
});
|
|
35
35
|
}
|
|
36
36
|
else {
|
|
37
|
-
await new ReloadingAPI(envPath, config, pair, processedArgs)
|
|
37
|
+
await new ReloadingAPI(envPath, config, pair, authAccount, processedArgs)
|
|
38
38
|
.start()
|
|
39
39
|
.then(() => {
|
|
40
40
|
log.info("Reloading API started...");
|
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,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,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,
|
|
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,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,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,oBAAoB,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IACvE,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,IAAI,EAAE;SACJ,IAAI,CAAC,GAAG,EAAE;QACV,GAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACrC,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QAChB,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addBlockRules.d.ts","sourceRoot":"","sources":["../../src/commands/addBlockRules.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAGnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;+BAK/C,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBASX,IAAI;;;;;;;;;;;oBA6BC,kBAAkB;;;AAzC1C,
|
|
1
|
+
{"version":3,"file":"addBlockRules.d.ts","sourceRoot":"","sources":["../../src/commands/addBlockRules.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAGnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;+BAK/C,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBASX,IAAI;;;;;;;;;;;oBA6BC,kBAAkB;;;AAzC1C,wBAqEE"}
|
|
@@ -44,7 +44,7 @@ export default (pair, config, cmdArgs) => {
|
|
|
44
44
|
await tasks.clientTaskManager.addIPBlockRules(argv.ips, argv.global, argv.hardBlock, argv.dapp);
|
|
45
45
|
}
|
|
46
46
|
if (argv.users) {
|
|
47
|
-
await tasks.clientTaskManager.addUserBlockRules(argv.users, argv.hardBlock, argv.dapp);
|
|
47
|
+
await tasks.clientTaskManager.addUserBlockRules(argv.users, argv.hardBlock, argv.global, argv.dapp);
|
|
48
48
|
}
|
|
49
49
|
logger.info("IP Block rules added");
|
|
50
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addBlockRules.js","sourceRoot":"","sources":["../../src/commands/addBlockRules.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAe,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAM1C,eAAe,CACd,IAAiB,EACjB,MAA2B,EAC3B,OAA6B,EAC5B,EAAE;IACH,MAAM,MAAM,GACX,OAAO,EAAE,MAAM;QACf,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,2BAA2B,CAAC,CAAC;IAE5D,OAAO;QACN,OAAO,EAAE,iBAAiB;QAC1B,QAAQ,EAAE,kDAAkD;QAC5D,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACxB,KAAK;aACH,MAAM,CAAC,KAAK,EAAE;YACd,IAAI,EAAE,OAAgB;YACtB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,uBAAuB;SACpB,CAAC;aACV,MAAM,CAAC,OAAO,EAAE;YAChB,IAAI,EAAE,OAAgB;YACtB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,yBAAyB;SACtB,CAAC;aACV,MAAM,CAAC,MAAM,EAAE;YACf,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,yBAAyB;SACtB,CAAC;aACV,MAAM,CAAC,QAAQ,EAAE;YACjB,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,IAAI;YAClB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,iDAAiD;SAC9C,CAAC;aACV,MAAM,CAAC,WAAW,EAAE;YACpB,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,IAAI;YAClB,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,0DAA0D;SACvD,CAAC;QACb,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YAC3C,IAAI,CAAC;gBACJ,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBAClD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC7B,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;oBACd,MAAM,KAAK,CAAC,iBAAiB,CAAC,eAAe,CAC5C,IAAI,CAAC,GAA0B,EAC/B,IAAI,CAAC,MAAiB,EACtB,IAAI,CAAC,SAAoB,EACzB,IAAI,CAAC,IAAyB,CAC9B,CAAC;gBACH,CAAC;gBACD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBAChB,MAAM,KAAK,CAAC,iBAAiB,CAAC,iBAAiB,CAC9C,IAAI,CAAC,KAA4B,EACjC,IAAI,CAAC,SAAoB,EACzB,IAAI,CAAC,IAAyB,CAC9B,CAAC;gBACH,CAAC;gBACD,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YACrC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;QACF,CAAC;QACD,WAAW,EAAE,EAAE;KACf,CAAC;AACH,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"addBlockRules.js","sourceRoot":"","sources":["../../src/commands/addBlockRules.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAe,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAM1C,eAAe,CACd,IAAiB,EACjB,MAA2B,EAC3B,OAA6B,EAC5B,EAAE;IACH,MAAM,MAAM,GACX,OAAO,EAAE,MAAM;QACf,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,2BAA2B,CAAC,CAAC;IAE5D,OAAO;QACN,OAAO,EAAE,iBAAiB;QAC1B,QAAQ,EAAE,kDAAkD;QAC5D,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACxB,KAAK;aACH,MAAM,CAAC,KAAK,EAAE;YACd,IAAI,EAAE,OAAgB;YACtB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,uBAAuB;SACpB,CAAC;aACV,MAAM,CAAC,OAAO,EAAE;YAChB,IAAI,EAAE,OAAgB;YACtB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,yBAAyB;SACtB,CAAC;aACV,MAAM,CAAC,MAAM,EAAE;YACf,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,yBAAyB;SACtB,CAAC;aACV,MAAM,CAAC,QAAQ,EAAE;YACjB,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,IAAI;YAClB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,iDAAiD;SAC9C,CAAC;aACV,MAAM,CAAC,WAAW,EAAE;YACpB,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,IAAI;YAClB,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,0DAA0D;SACvD,CAAC;QACb,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YAC3C,IAAI,CAAC;gBACJ,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBAClD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC7B,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;oBACd,MAAM,KAAK,CAAC,iBAAiB,CAAC,eAAe,CAC5C,IAAI,CAAC,GAA0B,EAC/B,IAAI,CAAC,MAAiB,EACtB,IAAI,CAAC,SAAoB,EACzB,IAAI,CAAC,IAAyB,CAC9B,CAAC;gBACH,CAAC;gBACD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBAChB,MAAM,KAAK,CAAC,iBAAiB,CAAC,iBAAiB,CAC9C,IAAI,CAAC,KAA4B,EACjC,IAAI,CAAC,SAAoB,EACzB,IAAI,CAAC,MAAiB,EACtB,IAAI,CAAC,IAAyB,CAC9B,CAAC;gBACH,CAAC;gBACD,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YACrC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;QACF,CAAC;QACD,WAAW,EAAE,EAAE;KACf,CAAC;AACH,CAAC,CAAC"}
|
package/dist/commands/index.d.ts
CHANGED
|
@@ -3,4 +3,5 @@ export { default as commandProviderSetDataset } from "./providerSetDataset.js";
|
|
|
3
3
|
export { default as commandStoreCaptchasExternally } from "./storeCaptchasExternally.js";
|
|
4
4
|
export { default as commandVersion } from "./version.js";
|
|
5
5
|
export { default as commandSiteKeyRegister } from "./siteKeyRegister.js";
|
|
6
|
+
export { default as commandSiteKeyRegisterApi } from "./siteKeyRegisterApi.js";
|
|
6
7
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AACzF,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AACzF,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAC"}
|
package/dist/commands/index.js
CHANGED
|
@@ -3,4 +3,5 @@ export { default as commandProviderSetDataset } from "./providerSetDataset.js";
|
|
|
3
3
|
export { default as commandStoreCaptchasExternally } from "./storeCaptchasExternally.js";
|
|
4
4
|
export { default as commandVersion } from "./version.js";
|
|
5
5
|
export { default as commandSiteKeyRegister } from "./siteKeyRegister.js";
|
|
6
|
+
export { default as commandSiteKeyRegisterApi } from "./siteKeyRegisterApi.js";
|
|
6
7
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AACzF,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,EAAE,OAAO,IAAI,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AACzF,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAC"}
|
|
@@ -9,6 +9,14 @@ declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs
|
|
|
9
9
|
describe: string;
|
|
10
10
|
builder: (yargs: Argv) => Argv<{
|
|
11
11
|
sitekey: string;
|
|
12
|
+
} & {
|
|
13
|
+
captcha_type: string | undefined;
|
|
14
|
+
} & {
|
|
15
|
+
frictionless_threshold: number | undefined;
|
|
16
|
+
} & {
|
|
17
|
+
url: (string | number)[] | undefined;
|
|
18
|
+
} & {
|
|
19
|
+
pow_difficulty: number | undefined;
|
|
12
20
|
}>;
|
|
13
21
|
handler: (argv: ArgumentsCamelCase) => Promise<void>;
|
|
14
22
|
middlewares: ((argv: ArgumentsCamelCase) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"siteKeyRegister.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAGnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;+BAI/C,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI
|
|
1
|
+
{"version":3,"file":"siteKeyRegister.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAGnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;+BAI/C,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;;;;;;;;;oBA2BC,kBAAkB;;;;;AAtC1C,wBA+DE"}
|
|
@@ -7,18 +7,44 @@ export default (pair, config, cmdArgs) => {
|
|
|
7
7
|
return {
|
|
8
8
|
command: "site_key_register <sitekey>",
|
|
9
9
|
describe: "Register a Site Key",
|
|
10
|
-
builder: (yargs) => yargs
|
|
10
|
+
builder: (yargs) => yargs
|
|
11
|
+
.positional("sitekey", {
|
|
11
12
|
type: "string",
|
|
12
13
|
demandOption: true,
|
|
13
14
|
desc: "The AccountId of the application to register the Site Key with",
|
|
15
|
+
})
|
|
16
|
+
.option("captcha_type", {
|
|
17
|
+
type: "string",
|
|
18
|
+
demandOption: false,
|
|
19
|
+
desc: "Captcha type for settings",
|
|
20
|
+
})
|
|
21
|
+
.option("frictionless_threshold", {
|
|
22
|
+
type: "number",
|
|
23
|
+
demandOption: false,
|
|
24
|
+
desc: "Frictionless threshold for settings",
|
|
25
|
+
})
|
|
26
|
+
.option("url", {
|
|
27
|
+
type: "array",
|
|
28
|
+
demandOption: false,
|
|
29
|
+
desc: "URLs for settings",
|
|
30
|
+
})
|
|
31
|
+
.option("pow_difficulty", {
|
|
32
|
+
type: "number",
|
|
33
|
+
demandOption: false,
|
|
34
|
+
desc: "POW difficulty for settings",
|
|
14
35
|
}),
|
|
15
36
|
handler: async (argv) => {
|
|
16
37
|
try {
|
|
17
38
|
const env = new ProviderEnvironment(config, pair);
|
|
18
39
|
await env.isReady();
|
|
19
|
-
const
|
|
40
|
+
const { sitekey, captcha_type, frictionless_threshold, url, pow_difficulty, } = argv;
|
|
20
41
|
const tasks = new Tasks(env);
|
|
21
|
-
await tasks.clientTaskManager.registerSiteKey(
|
|
42
|
+
await tasks.clientTaskManager.registerSiteKey(sitekey, {
|
|
43
|
+
captchaType: captcha_type,
|
|
44
|
+
frictionlessThreshold: frictionless_threshold,
|
|
45
|
+
domains: url,
|
|
46
|
+
powDifficulty: pow_difficulty,
|
|
47
|
+
});
|
|
22
48
|
logger.info(`Site Key ${argv.sitekey} registered`);
|
|
23
49
|
}
|
|
24
50
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"siteKeyRegister.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAe,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,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,mBAAmB,CAAC,CAAC;IAEvE,OAAO;QACN,OAAO,EAAE,6BAA6B;QACtC,QAAQ,EAAE,qBAAqB;QAC/B,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACxB,KAAK,
|
|
1
|
+
{"version":3,"file":"siteKeyRegister.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAe,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,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,mBAAmB,CAAC,CAAC;IAEvE,OAAO;QACN,OAAO,EAAE,6BAA6B;QACtC,QAAQ,EAAE,qBAAqB;QAC/B,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACxB,KAAK;aACH,UAAU,CAAC,SAAS,EAAE;YACtB,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,IAAI;YAClB,IAAI,EAAE,gEAAgE;SAC7D,CAAC;aACV,MAAM,CAAC,cAAc,EAAE;YACvB,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,2BAA2B;SACxB,CAAC;aACV,MAAM,CAAC,wBAAwB,EAAE;YACjC,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,qCAAqC;SAClC,CAAC;aACV,MAAM,CAAC,KAAK,EAAE;YACd,IAAI,EAAE,OAAgB;YACtB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,mBAAmB;SAChB,CAAC;aACV,MAAM,CAAC,gBAAgB,EAAE;YACzB,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,6BAA6B;SAC1B,CAAC;QACb,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YAC3C,IAAI,CAAC;gBACJ,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBAClD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,EACL,OAAO,EACP,YAAY,EACZ,sBAAsB,EACtB,GAAG,EACH,cAAc,GACd,GAAG,IAAI,CAAC;gBACT,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC7B,MAAM,KAAK,CAAC,iBAAiB,CAAC,eAAe,CAAC,OAAiB,EAAE;oBAChE,WAAW,EAAE,YAAgD;oBAC7D,qBAAqB,EAAE,sBAAgC;oBACvD,OAAO,EAAE,GAAe;oBACxB,aAAa,EAAE,cAAwB;iBACvC,CAAC,CAAC;gBACH,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;YACpD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;QACF,CAAC;QACD,WAAW,EAAE,CAAC,eAAe,CAAC;KAC9B,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -2,18 +2,28 @@ import type { KeyringPair } from "@polkadot/keyring/types";
|
|
|
2
2
|
import { type Logger } from "@prosopo/common";
|
|
3
3
|
import type { ProsopoConfigOutput } from "@prosopo/types";
|
|
4
4
|
import type { ArgumentsCamelCase, Argv } from "yargs";
|
|
5
|
-
declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
|
|
5
|
+
declare const _default: (pair: KeyringPair, authAccount: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
|
|
6
6
|
logger?: Logger;
|
|
7
7
|
}) => {
|
|
8
8
|
command: string;
|
|
9
9
|
describe: string;
|
|
10
10
|
builder: (yargs: Argv) => Argv<{
|
|
11
|
-
|
|
11
|
+
sitekey: string;
|
|
12
|
+
} & {
|
|
13
|
+
url: string;
|
|
14
|
+
} & {
|
|
15
|
+
captcha_type: string | undefined;
|
|
16
|
+
} & {
|
|
17
|
+
frictionless_threshold: number | undefined;
|
|
18
|
+
} & {
|
|
19
|
+
domains: (string | number)[] | undefined;
|
|
20
|
+
} & {
|
|
21
|
+
pow_difficulty: number | undefined;
|
|
12
22
|
}>;
|
|
13
23
|
handler: (argv: ArgumentsCamelCase) => Promise<void>;
|
|
14
24
|
middlewares: ((argv: ArgumentsCamelCase) => {
|
|
15
|
-
|
|
25
|
+
sitekey: string;
|
|
16
26
|
})[];
|
|
17
27
|
};
|
|
18
28
|
export default _default;
|
|
19
|
-
//# sourceMappingURL=
|
|
29
|
+
//# sourceMappingURL=siteKeyRegisterApi.d.ts.map
|
|
@@ -0,0 +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;AAGnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;+BAI/C,WAAW,eACJ,WAAW,UAChB,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;;;;;;;;;;;oBAgCC,kBAAkB;;;;;AA5C1C,wBA8EE"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { ProviderApi } from "@prosopo/api";
|
|
2
|
+
import { LogLevel, getLogger } from "@prosopo/common";
|
|
3
|
+
import { ProviderEnvironment } from "@prosopo/env";
|
|
4
|
+
import { Tasks } from "@prosopo/provider";
|
|
5
|
+
import { u8aToHex } from "@prosopo/util";
|
|
6
|
+
import { validateSiteKey } from "./validators.js";
|
|
7
|
+
export default (pair, authAccount, config, cmdArgs) => {
|
|
8
|
+
const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, "cli.dapp_register");
|
|
9
|
+
return {
|
|
10
|
+
command: "site_key_register_api <sitekey> <url>",
|
|
11
|
+
describe: "Register a Site Key",
|
|
12
|
+
builder: (yargs) => yargs
|
|
13
|
+
.positional("sitekey", {
|
|
14
|
+
type: "string",
|
|
15
|
+
demandOption: true,
|
|
16
|
+
desc: "The AccountId of the application to register the Site Key with",
|
|
17
|
+
})
|
|
18
|
+
.option("url", {
|
|
19
|
+
type: "string",
|
|
20
|
+
demandOption: true,
|
|
21
|
+
desc: "URL to register the Site Key with",
|
|
22
|
+
})
|
|
23
|
+
.option("captcha_type", {
|
|
24
|
+
type: "string",
|
|
25
|
+
demandOption: false,
|
|
26
|
+
desc: "Captcha type for settings",
|
|
27
|
+
})
|
|
28
|
+
.option("frictionless_threshold", {
|
|
29
|
+
type: "number",
|
|
30
|
+
demandOption: false,
|
|
31
|
+
desc: "Frictionless threshold for settings",
|
|
32
|
+
})
|
|
33
|
+
.option("domains", {
|
|
34
|
+
type: "array",
|
|
35
|
+
demandOption: false,
|
|
36
|
+
desc: "URLs for settings",
|
|
37
|
+
})
|
|
38
|
+
.option("pow_difficulty", {
|
|
39
|
+
type: "number",
|
|
40
|
+
demandOption: false,
|
|
41
|
+
desc: "POW difficulty for settings",
|
|
42
|
+
}),
|
|
43
|
+
handler: async (argv) => {
|
|
44
|
+
try {
|
|
45
|
+
const env = new ProviderEnvironment(config, pair, authAccount);
|
|
46
|
+
await env.isReady();
|
|
47
|
+
const { sitekey, captcha_type, frictionless_threshold, url, domains, pow_difficulty, } = argv;
|
|
48
|
+
const tasks = new Tasks(env);
|
|
49
|
+
const api = new ProviderApi(url, pair.address);
|
|
50
|
+
const timestamp = new Date().getTime().toString();
|
|
51
|
+
const signature = u8aToHex(authAccount.sign(timestamp));
|
|
52
|
+
await api.registerSiteKey(sitekey, {
|
|
53
|
+
captchaType: captcha_type,
|
|
54
|
+
frictionlessThreshold: frictionless_threshold,
|
|
55
|
+
domains: domains,
|
|
56
|
+
powDifficulty: pow_difficulty,
|
|
57
|
+
}, timestamp, signature);
|
|
58
|
+
logger.info(`Site Key ${argv.sitekey} registered`);
|
|
59
|
+
}
|
|
60
|
+
catch (err) {
|
|
61
|
+
logger.error(err);
|
|
62
|
+
}
|
|
63
|
+
},
|
|
64
|
+
middlewares: [validateSiteKey],
|
|
65
|
+
};
|
|
66
|
+
};
|
|
67
|
+
//# sourceMappingURL=siteKeyRegisterApi.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"siteKeyRegisterApi.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegisterApi.ts"],"names":[],"mappings":"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"}
|
package/dist/prosopo.config.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { type ProsopoCaptchaCountConfigSchemaInput, type ProsopoCaptchaSolutionConfigSchema, type ProsopoConfigOutput } from "@prosopo/types";
|
|
2
|
-
export default function getConfig(captchaSolutionsConfig?: typeof ProsopoCaptchaSolutionConfigSchema, captchaServeConfig?: ProsopoCaptchaCountConfigSchemaInput, who?: string): ProsopoConfigOutput;
|
|
2
|
+
export default function getConfig(captchaSolutionsConfig?: typeof ProsopoCaptchaSolutionConfigSchema, captchaServeConfig?: ProsopoCaptchaCountConfigSchemaInput, who?: string, admin?: string): ProsopoConfigOutput;
|
|
3
3
|
//# sourceMappingURL=prosopo.config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prosopo.config.d.ts","sourceRoot":"","sources":["../src/prosopo.config.ts"],"names":[],"mappings":"AAeA,OAAO,EAGN,KAAK,oCAAoC,EACzC,KAAK,kCAAkC,EAEvC,KAAK,mBAAmB,EAExB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"prosopo.config.d.ts","sourceRoot":"","sources":["../src/prosopo.config.ts"],"names":[],"mappings":"AAeA,OAAO,EAGN,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,CA8DrB"}
|
package/dist/prosopo.config.js
CHANGED
|
@@ -13,7 +13,18 @@ function getMongoURI() {
|
|
|
13
13
|
const mongoURI = `${protocol}://${username}:${password}@${host}${port}/${retries}`;
|
|
14
14
|
return mongoURI;
|
|
15
15
|
}
|
|
16
|
-
|
|
16
|
+
const getLRules = () => {
|
|
17
|
+
if (!process.env.L_RULES) {
|
|
18
|
+
return {};
|
|
19
|
+
}
|
|
20
|
+
try {
|
|
21
|
+
return JSON.parse(process.env.L_RULES);
|
|
22
|
+
}
|
|
23
|
+
catch (e) {
|
|
24
|
+
return {};
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
export default function getConfig(captchaSolutionsConfig, captchaServeConfig, who = "PROVIDER", admin = "ADMIN") {
|
|
17
28
|
return ProsopoConfigSchema.parse({
|
|
18
29
|
logLevel: getLogLevel(),
|
|
19
30
|
defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT
|
|
@@ -68,6 +79,12 @@ export default function getConfig(captchaSolutionsConfig, captchaServeConfig, wh
|
|
|
68
79
|
schedule: process.env.CLIENT_LIST_SCHEDULE,
|
|
69
80
|
},
|
|
70
81
|
},
|
|
82
|
+
lRules: getLRules(),
|
|
83
|
+
authAccount: {
|
|
84
|
+
address: getAddress(admin),
|
|
85
|
+
password: getPassword(admin),
|
|
86
|
+
secret: getSecret(admin),
|
|
87
|
+
},
|
|
71
88
|
});
|
|
72
89
|
}
|
|
73
90
|
//# sourceMappingURL=prosopo.config.js.map
|
|
@@ -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,EAKtB,mBAAmB,GACnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEtE,SAAS,WAAW;IACnB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,SAAS,CAAC;IACpE,MAAM,QAAQ,GAAG,QAAQ,KAAK,aAAa,CAAC;IAC5C,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,MAAM,CAAC;IACjE,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,MAAM,CAAC;IACjE,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,WAAW,CAAC;IAC9D,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,KAAK,EAAE,CAAC;IAC9E,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/D,MAAM,QAAQ,GAAG,GAAG,QAAQ,MAAM,QAAQ,IAAI,QAAQ,IAAI,IAAI,GAAG,IAAI,IAAI,OAAO,EAAE,CAAC;IACnF,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,SAAS,CAChC,sBAAkE,EAClE,kBAAyD,EACzD,GAAG,GAAG,UAAU;
|
|
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
|
@@ -7,11 +7,12 @@ export default class ReloadingAPI {
|
|
|
7
7
|
private _envPath;
|
|
8
8
|
private _config;
|
|
9
9
|
private _pair;
|
|
10
|
+
private _authAccount;
|
|
10
11
|
private _processedArgs;
|
|
11
12
|
private api;
|
|
12
13
|
private _restarting;
|
|
13
14
|
private _env;
|
|
14
|
-
constructor(envPath: string, config: ProsopoConfigOutput, pair: KeyringPair, processedArgs: AwaitedProcessedArgs);
|
|
15
|
+
constructor(envPath: string, config: ProsopoConfigOutput, pair: KeyringPair, authAccount: KeyringPair, processedArgs: AwaitedProcessedArgs);
|
|
15
16
|
get env(): ProviderEnvironment | undefined;
|
|
16
17
|
start(reloadEnv?: boolean): Promise<void>;
|
|
17
18
|
startDev(): Promise<void>;
|
package/dist/reloader.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reloader.d.ts","sourceRoot":"","sources":["../src/reloader.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,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,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,aAAa,EAAE,oBAAoB;
|
|
1
|
+
{"version":3,"file":"reloader.d.ts","sourceRoot":"","sources":["../src/reloader.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,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;CAYvB"}
|
package/dist/reloader.js
CHANGED
|
@@ -5,10 +5,11 @@ import { ProviderEnvironment } from "@prosopo/env";
|
|
|
5
5
|
import { start, startDev } from "./start.js";
|
|
6
6
|
const log = getLogger(LogLevel.enum.info, "CLI");
|
|
7
7
|
export default class ReloadingAPI {
|
|
8
|
-
constructor(envPath, config, pair, processedArgs) {
|
|
8
|
+
constructor(envPath, config, pair, authAccount, processedArgs) {
|
|
9
9
|
this._envPath = envPath;
|
|
10
10
|
this._config = config;
|
|
11
11
|
this._pair = pair;
|
|
12
|
+
this._authAccount = authAccount;
|
|
12
13
|
this._processedArgs = processedArgs;
|
|
13
14
|
this._restarting = false;
|
|
14
15
|
}
|
|
@@ -20,7 +21,7 @@ export default class ReloadingAPI {
|
|
|
20
21
|
this._envWatcher = await this._watchEnv();
|
|
21
22
|
loadEnv();
|
|
22
23
|
if (!this._env && reloadEnv) {
|
|
23
|
-
const env = new ProviderEnvironment(this._config, this._pair);
|
|
24
|
+
const env = new ProviderEnvironment(this._config, this._pair, this._authAccount);
|
|
24
25
|
await env.isReady();
|
|
25
26
|
this._env = env;
|
|
26
27
|
}
|
|
@@ -30,7 +31,7 @@ export default class ReloadingAPI {
|
|
|
30
31
|
log.info("Starting API");
|
|
31
32
|
this._envWatcher = await this._watchEnv();
|
|
32
33
|
loadEnv();
|
|
33
|
-
const env = new ProviderEnvironment(this._config, this._pair);
|
|
34
|
+
const env = new ProviderEnvironment(this._config, this._pair, this._authAccount);
|
|
34
35
|
await env.isReady();
|
|
35
36
|
this.api = await startDev(env, !!this._processedArgs.adminApi);
|
|
36
37
|
}
|
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;AAGzB,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGnD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,YAAY;
|
|
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;AAGvC,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;AAGvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AA6DnD,wBAAsB,KAAK,CAC1B,GAAG,CAAC,EAAE,mBAAmB,EACzB,KAAK,CAAC,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,MAAM,mBAqCb;AAED,wBAAsB,QAAQ,CAAC,GAAG,CAAC,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,OAAO,mBAGxE"}
|
package/dist/start.js
CHANGED
|
@@ -2,7 +2,7 @@ import { getPairAsync } from "@prosopo/contract";
|
|
|
2
2
|
import { loadEnv } from "@prosopo/dotenv";
|
|
3
3
|
import { ProviderEnvironment } from "@prosopo/env";
|
|
4
4
|
import { i18nMiddleware } from "@prosopo/locale";
|
|
5
|
-
import { getClientList, prosopoAdminRouter, prosopoRouter, prosopoVerifyRouter, storeCaptchasExternally, } from "@prosopo/provider";
|
|
5
|
+
import { domainMiddleware, getClientList, headerCheckMiddleware, prosopoAdminRouter, prosopoRouter, prosopoVerifyRouter, publicRouter, storeCaptchasExternally, } from "@prosopo/provider";
|
|
6
6
|
import { authMiddleware, blockMiddleware } from "@prosopo/provider";
|
|
7
7
|
import cors from "cors";
|
|
8
8
|
import express from "express";
|
|
@@ -17,13 +17,14 @@ function startApi(env, admin = false, port) {
|
|
|
17
17
|
apiApp.use(cors());
|
|
18
18
|
apiApp.use(express.json({ limit: "50mb" }));
|
|
19
19
|
apiApp.use(i18nMiddleware({}));
|
|
20
|
+
apiApp.use("/v1/prosopo/provider/client/", headerCheckMiddleware(env));
|
|
20
21
|
apiApp.use(blockMiddleware(env));
|
|
21
|
-
apiApp.use(prosopoRouter(env));
|
|
22
22
|
apiApp.use(prosopoVerifyRouter(env));
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
23
|
+
apiApp.use("/v1/prosopo/provider/client/", domainMiddleware(env));
|
|
24
|
+
apiApp.use(prosopoRouter(env));
|
|
25
|
+
apiApp.use(publicRouter(env));
|
|
26
|
+
apiApp.use("/v1/prosopo/provider/admin", authMiddleware(env));
|
|
27
|
+
apiApp.use(prosopoAdminRouter(env));
|
|
27
28
|
const rateLimits = env.config.rateLimits;
|
|
28
29
|
for (const [path, limit] of Object.entries(rateLimits)) {
|
|
29
30
|
const enumPath = path;
|
|
@@ -43,7 +44,8 @@ export async function start(env, admin, port) {
|
|
|
43
44
|
unsolved: { count: 0 },
|
|
44
45
|
});
|
|
45
46
|
const pair = await getPairAsync(secret);
|
|
46
|
-
|
|
47
|
+
const authAccount = await getPairAsync(undefined, config.authAccount.address);
|
|
48
|
+
env = new ProviderEnvironment(config, pair, authAccount);
|
|
47
49
|
}
|
|
48
50
|
else {
|
|
49
51
|
env.logger.debug("Env already defined");
|
package/dist/start.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EACN,aAAa,
|
|
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(runErr.includes("Version:"));
|
|
12
12
|
}, 120000);
|
|
13
13
|
});
|
|
14
14
|
//# sourceMappingURL=bundle.unit.test.js.map
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/cli",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.12",
|
|
4
4
|
"description": "CLI for Prosopo Provider",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"engines": {
|
|
8
|
-
"node": "
|
|
8
|
+
"node": "20",
|
|
9
9
|
"npm": ">=9"
|
|
10
10
|
},
|
|
11
11
|
"exports": {
|
|
@@ -29,15 +29,16 @@
|
|
|
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/
|
|
33
|
-
"@prosopo/
|
|
34
|
-
"@prosopo/
|
|
35
|
-
"@prosopo/
|
|
36
|
-
"@prosopo/
|
|
37
|
-
"@prosopo/
|
|
38
|
-
"@prosopo/
|
|
39
|
-
"@prosopo/
|
|
40
|
-
"@prosopo/
|
|
32
|
+
"@prosopo/api": "2.1.12",
|
|
33
|
+
"@prosopo/config": "2.1.12",
|
|
34
|
+
"@prosopo/common": "2.1.12",
|
|
35
|
+
"@prosopo/contract": "2.1.12",
|
|
36
|
+
"@prosopo/dotenv": "2.1.12",
|
|
37
|
+
"@prosopo/env": "2.1.12",
|
|
38
|
+
"@prosopo/locale": "2.1.12",
|
|
39
|
+
"@prosopo/provider": "2.1.12",
|
|
40
|
+
"@prosopo/types": "2.1.12",
|
|
41
|
+
"@prosopo/util": "2.1.12",
|
|
41
42
|
"cors": "2.8.5",
|
|
42
43
|
"cron-parser": "4.9.0",
|
|
43
44
|
"dotenv": "16.4.5",
|
|
@@ -46,7 +47,7 @@
|
|
|
46
47
|
"zod": "3.23.8"
|
|
47
48
|
},
|
|
48
49
|
"devDependencies": {
|
|
49
|
-
"@prosopo/config": "2.1.
|
|
50
|
+
"@prosopo/config": "2.1.12",
|
|
50
51
|
"@types/cors": "2.8.17",
|
|
51
52
|
"@types/yargs": "17.0.33",
|
|
52
53
|
"@vitest/coverage-v8": "2.1.1",
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"providerDeregister.d.ts","sourceRoot":"","sources":["../../src/commands/providerDeregister.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAInE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;+BAI/C,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;oBAMC,kBAAkB;;;;;AAjB1C,wBAmCE"}
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
import { LogLevel, getLogger } from "@prosopo/common";
|
|
2
|
-
import { ProsopoEnvError } from "@prosopo/common";
|
|
3
|
-
import { ProviderEnvironment } from "@prosopo/env";
|
|
4
|
-
import { Tasks } from "@prosopo/provider";
|
|
5
|
-
import { validateAddress } from "./validators.js";
|
|
6
|
-
export default (pair, config, cmdArgs) => {
|
|
7
|
-
const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, "cli.provider_deregister");
|
|
8
|
-
return {
|
|
9
|
-
command: "provider_deregister",
|
|
10
|
-
describe: "Deregister a Provider",
|
|
11
|
-
builder: (yargs) => yargs.option("address", {
|
|
12
|
-
type: "string",
|
|
13
|
-
demand: true,
|
|
14
|
-
desc: "The AccountId of the Provider",
|
|
15
|
-
}),
|
|
16
|
-
handler: async (argv) => {
|
|
17
|
-
try {
|
|
18
|
-
const env = new ProviderEnvironment(config, pair);
|
|
19
|
-
await env.isReady();
|
|
20
|
-
const tasks = new Tasks(env);
|
|
21
|
-
throw new ProsopoEnvError("GENERAL.NOT_IMPLEMENTED");
|
|
22
|
-
}
|
|
23
|
-
catch (err) {
|
|
24
|
-
logger.error(err);
|
|
25
|
-
}
|
|
26
|
-
},
|
|
27
|
-
middlewares: [validateAddress],
|
|
28
|
-
};
|
|
29
|
-
};
|
|
30
|
-
//# sourceMappingURL=providerDeregister.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"providerDeregister.js","sourceRoot":"","sources":["../../src/commands/providerDeregister.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAe,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,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,yBAAyB,CAAC,CAAC;IAE7E,OAAO;QACN,OAAO,EAAE,qBAAqB;QAC9B,QAAQ,EAAE,uBAAuB;QACjC,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACxB,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE;YACvB,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,+BAA+B;SAC5B,CAAC;QACZ,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YAC3C,IAAI,CAAC;gBACJ,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBAClD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;gBAO7B,MAAM,IAAI,eAAe,CAAC,yBAAyB,CAAC,CAAC;YACtD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;QACF,CAAC;QACD,WAAW,EAAE,CAAC,eAAe,CAAC;KAC9B,CAAC;AACH,CAAC,CAAC"}
|