@prosopo/cli 0.3.4 → 0.3.36

package/dist/argv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"argv.d.ts","sourceRoot":"","sources":["../src/argv.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAoBpD,MAAM,MAAM,oBAAoB,GAAG;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,GAAG,EAAE,OAAO,CAAC;IAAC,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAA;AAE7G,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,mBAAmB;;;;;;;;;;;;GAqBzF"}
+{"version":3,"file":"argv.d.ts","sourceRoot":"","sources":["../src/argv.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAmBpD,MAAM,MAAM,oBAAoB,GAAG;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,GAAG,EAAE,OAAO,CAAC;IAAC,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAA;AAE7G,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,mBAAmB;;;;;;;;;;;;GAoBzF"}

package/dist/argv.js

@@ -1,5 +1,5 @@
 import { LogLevel, getLogger } from '@prosopo/common';
-import { commandBatchCommit, commandCalculateCaptchaSolutions, commandDappAccounts, commandDappDetails, commandDappRegister, commandDappUpdate, commandProviderAccounts, commandProviderDataset, commandProviderDeregister, commandProviderDetails, commandProviderRegister, commandProviderSetDataset, commandProviderUpdate, commandVersion, } from './commands/index.js';
+import { commandBatchCommit, commandDappAccounts, commandDappDetails, commandDappRegister, commandDappUpdate, commandProviderAccounts, commandProviderDataset, commandProviderDeregister, commandProviderDetails, commandProviderRegister, commandProviderSetDataset, commandProviderUpdate, commandVersion, } from './commands/index.js';
 import { hideBin } from 'yargs/helpers';
 import yargs from 'yargs';
 export function processArgs(args, pair, config) {
@@ -19,7 +19,6 @@ export function processArgs(args, pair, config) {
         .command(commandProviderDetails(pair, config, { logger }))
         .command(commandProviderDataset(pair, config, { logger }))
         .command(commandDappDetails(pair, config, { logger }))
-        .command(commandCalculateCaptchaSolutions(pair, config, { logger }))
         .command(commandBatchCommit(pair, config, { logger }))
         .command(commandVersion(pair, config, { logger }))
         .parse();

package/dist/argv.js.map

@@ -1 +1 @@
-{"version":3,"file":"argv.js","sourceRoot":"","sources":["../src/argv.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAErD,OAAO,EACH,kBAAkB,EAClB,gCAAgC,EAChC,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,EACjB,uBAAuB,EACvB,sBAAsB,EACtB,yBAAyB,EACzB,sBAAsB,EACtB,uBAAuB,EACvB,yBAAyB,EACzB,qBAAqB,EACrB,cAAc,GACjB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,MAAM,UAAU,WAAW,CAAC,IAAc,EAAE,IAAiB,EAAE,MAA2B;IACtF,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACnD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACtB,KAAK,CAAC,gDAAgD,CAAC;SACvD,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAW,CAAC;SAC1E,MAAM,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAW,CAAC;SAC/E,OAAO,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC1D,OAAO,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACxD,OAAO,CAAC,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC5D,OAAO,CAAC,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC5D,OAAO,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACtD,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACpD,OAAO,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC1D,OAAO,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACtD,OAAO,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACzD,OAAO,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACzD,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACrD,OAAO,CAAC,gCAAgC,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACnE,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACrD,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACjD,KAAK,EAAE,CAAA;AAChB,CAAC"}
+{"version":3,"file":"argv.js","sourceRoot":"","sources":["../src/argv.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAErD,OAAO,EACH,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,EACjB,uBAAuB,EACvB,sBAAsB,EACtB,yBAAyB,EACzB,sBAAsB,EACtB,uBAAuB,EACvB,yBAAyB,EACzB,qBAAqB,EACrB,cAAc,GACjB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,MAAM,UAAU,WAAW,CAAC,IAAc,EAAE,IAAiB,EAAE,MAA2B;IACtF,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACnD,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACtB,KAAK,CAAC,gDAAgD,CAAC;SACvD,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAW,CAAC;SAC1E,MAAM,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAW,CAAC;SAC/E,OAAO,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC1D,OAAO,CAAC,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACxD,OAAO,CAAC,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC5D,OAAO,CAAC,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC5D,OAAO,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACtD,OAAO,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACpD,OAAO,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SAC1D,OAAO,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACtD,OAAO,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACzD,OAAO,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACzD,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACrD,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACrD,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;SACjD,KAAK,EAAE,CAAA;AAChB,CAAC"}

package/dist/cjs/argv.cjs

@@ -15,11 +15,10 @@ const dappAccounts = require("./commands/dappAccounts.cjs");
 const providerDetails = require("./commands/providerDetails.cjs");
 const providerDataset = require("./commands/providerDataset.cjs");
 const dappDetails = require("./commands/dappDetails.cjs");
-const calculateCaptchaSolutions = require("./commands/calculateCaptchaSolutions.cjs");
 const batchCommit = require("./commands/batchCommit.cjs");
 const version = require("./commands/version.cjs");
 function processArgs(args, pair, config) {
   const logger = common.getLogger(common.LogLevel.enum.info, "CLI");
-  return yargs(helpers.hideBin(args)).usage("Usage: $0 [global options] <command> [options]").option("api", { demand: false, default: false, type: "boolean" }).option("adminApi", { demand: false, default: false, type: "boolean" }).command(providerRegister(pair, config, { logger })).command(providerUpdate(pair, config, { logger })).command(providerDeregister(pair, config, { logger })).command(providerSetDataset(pair, config, { logger })).command(dappRegister(pair, config, { logger })).command(dappUpdate(pair, config, { logger })).command(providerAccounts(pair, config, { logger })).command(dappAccounts(pair, config, { logger })).command(providerDetails(pair, config, { logger })).command(providerDataset(pair, config, { logger })).command(dappDetails(pair, config, { logger })).command(calculateCaptchaSolutions(pair, config, { logger })).command(batchCommit(pair, config, { logger })).command(version(pair, config, { logger })).parse();
+  return yargs(helpers.hideBin(args)).usage("Usage: $0 [global options] <command> [options]").option("api", { demand: false, default: false, type: "boolean" }).option("adminApi", { demand: false, default: false, type: "boolean" }).command(providerRegister(pair, config, { logger })).command(providerUpdate(pair, config, { logger })).command(providerDeregister(pair, config, { logger })).command(providerSetDataset(pair, config, { logger })).command(dappRegister(pair, config, { logger })).command(dappUpdate(pair, config, { logger })).command(providerAccounts(pair, config, { logger })).command(dappAccounts(pair, config, { logger })).command(providerDetails(pair, config, { logger })).command(providerDataset(pair, config, { logger })).command(dappDetails(pair, config, { logger })).command(batchCommit(pair, config, { logger })).command(version(pair, config, { logger })).parse();
 }
 exports.processArgs = processArgs;

package/dist/cjs/commands/index.cjs

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const batchCommit = require("./batchCommit.cjs");
-const calculateCaptchaSolutions = require("./calculateCaptchaSolutions.cjs");
 const dappAccounts = require("./dappAccounts.cjs");
 const dappDetails = require("./dappDetails.cjs");
 const dappUpdate = require("./dappUpdate.cjs");
@@ -15,7 +14,6 @@ const providerSetDataset = require("./providerSetDataset.cjs");
 const providerUpdate = require("./providerUpdate.cjs");
 const version = require("./version.cjs");
 exports.commandBatchCommit = batchCommit;
-exports.commandCalculateCaptchaSolutions = calculateCaptchaSolutions;
 exports.commandDappAccounts = dappAccounts;
 exports.commandDappDetails = dappDetails;
 exports.commandDappUpdate = dappUpdate;

package/dist/cjs/commands/version.cjs

@@ -1,13 +1,13 @@
 "use strict";
 const common = require("@prosopo/common");
+const util = require("@prosopo/util");
 const commandVersion = (pair, config, cmdArgs) => {
   const logger = cmdArgs?.logger || common.getLogger(common.LogLevel.enum.info, "cli.version");
   return {
     command: "version",
     describe: "Return the version of the software",
     handler: async () => {
-      const version = JSON.stringify(process.env.PROSOPO_PACKAGE_VERSION) || "dev";
-      logger.info(`Version: ${version}`);
+      logger.info(`Version: ${JSON.stringify(util.version)}`);
     }
   };
 };

package/dist/cjs/start.cjs

@@ -15,7 +15,7 @@ const handleErrors = (err, request, response, next) => {
   try {
     message = JSON.parse(err.message);
   } catch {
-    console.debug("Invalid JSON error message");
+    console.error(err);
   }
   return response.status(code).json({
     message,
@@ -30,10 +30,10 @@ function startApi(env2, admin = false) {
   apiApp.use(express.json({ limit: "50mb" }));
   apiApp.use(common.i18nMiddleware({}));
   apiApp.use(provider.prosopoRouter(env2));
+  apiApp.use(handleErrors);
   if (admin) {
     apiApp.use(provider.prosopoAdminRouter(env2));
   }
-  apiApp.use(handleErrors);
   return apiApp.listen(apiPort, () => {
     env2.logger.info(`Prosopo app listening at http://localhost:${apiPort}`);
   });

package/dist/commands/index.d.ts

@@ -1,5 +1,4 @@
 export { default as commandBatchCommit } from './batchCommit.js';
-export { default as commandCalculateCaptchaSolutions } from './calculateCaptchaSolutions.js';
 export { default as commandDappAccounts } from './dappAccounts.js';
 export { default as commandDappDetails } from './dappDetails.js';
 export { default as commandDappUpdate } from './dappUpdate.js';

package/dist/commands/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,OAAO,IAAI,gCAAgC,EAAE,MAAM,gCAAgC,CAAA;AAC5F,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAE,OAAO,IAAI,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAC1E,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AAC9E,OAAO,EAAE,OAAO,IAAI,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAC1E,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AAC9E,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AACtE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAE,OAAO,IAAI,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAC1E,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AAC9E,OAAO,EAAE,OAAO,IAAI,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAC1E,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AAC9E,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AACtE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,cAAc,CAAA"}

package/dist/commands/index.js

@@ -1,5 +1,4 @@
 export { default as commandBatchCommit } from './batchCommit.js';
-export { default as commandCalculateCaptchaSolutions } from './calculateCaptchaSolutions.js';
 export { default as commandDappAccounts } from './dappAccounts.js';
 export { default as commandDappDetails } from './dappDetails.js';
 export { default as commandDappUpdate } from './dappUpdate.js';

package/dist/commands/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,OAAO,IAAI,gCAAgC,EAAE,MAAM,gCAAgC,CAAA;AAC5F,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAE,OAAO,IAAI,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAC1E,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AAC9E,OAAO,EAAE,OAAO,IAAI,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAC1E,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AAC9E,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AACtE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,cAAc,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAE,OAAO,IAAI,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAC1E,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AAC9E,OAAO,EAAE,OAAO,IAAI,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AAC1E,OAAO,EAAE,OAAO,IAAI,yBAAyB,EAAE,MAAM,yBAAyB,CAAA;AAC9E,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AACtE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,cAAc,CAAA"}

package/dist/commands/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;+BAE9B,WAAW,UAAU,mBAAmB,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;;;AAA7F,wBAWC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAAa,MAAM,iBAAiB,CAAA;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;+BAG9B,WAAW,UAAU,mBAAmB,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;;;AAA7F,wBAUC"}

package/dist/commands/version.js

@@ -1,12 +1,12 @@
 import { LogLevel, getLogger } from '@prosopo/common';
+import { version } from '@prosopo/util';
 export default (pair, config, cmdArgs) => {
     const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, 'cli.version');
     return {
         command: 'version',
         describe: 'Return the version of the software',
         handler: async () => {
-            const version = JSON.stringify(process.env.PROSOPO_PACKAGE_VERSION) || 'dev';
-            logger.info(`Version: ${version}`);
+            logger.info(`Version: ${JSON.stringify(version)}`);
         },
     };
 };

package/dist/commands/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAG7D,eAAe,CAAC,IAAiB,EAAE,MAA2B,EAAE,OAA6B,EAAE,EAAE;IAC7F,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAA;IAE9E,OAAO;QACH,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,oCAAoC;QAC9C,OAAO,EAAE,KAAK,IAAI,EAAE;YAChB,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,KAAK,CAAA;YAC5E,MAAM,CAAC,IAAI,CAAC,YAAY,OAAO,EAAE,CAAC,CAAA;QACtC,CAAC;KACJ,CAAA;AACL,CAAC,CAAA"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,QAAQ,EAAU,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE7D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,eAAe,CAAC,IAAiB,EAAE,MAA2B,EAAE,OAA6B,EAAE,EAAE;IAC7F,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAA;IAE9E,OAAO;QACH,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,oCAAoC;QAC9C,OAAO,EAAE,KAAK,IAAI,EAAE;YAChB,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QACtD,CAAC;KACJ,CAAA;AACL,CAAC,CAAA"}

package/dist/start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,eAAe,EAAkB,MAAM,iBAAiB,CAAA;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAMjC,OAAO,OAAO,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAIlE,eAAO,MAAM,YAAY,QAChB,eAAe,GAAG,WAAW,WACzB,OAAO,YACN,QAAQ,QACZ,YAAY,+CAarB,CAAA;AAqBD,wBAAsB,KAAK,CAAC,GAAG,CAAC,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,OAAO,mBAiBrE"}
+{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,eAAe,EAAkB,MAAM,iBAAiB,CAAA;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAMjC,OAAO,OAAO,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAIlE,eAAO,MAAM,YAAY,QAChB,eAAe,GAAG,WAAW,WACzB,OAAO,YACN,QAAQ,QACZ,YAAY,+CAarB,CAAA;AAsBD,wBAAsB,KAAK,CAAC,GAAG,CAAC,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,OAAO,mBAiBrE"}

package/dist/start.js

@@ -14,7 +14,7 @@ export const handleErrors = (err, request, response, next) => {
         message = JSON.parse(err.message);
     }
     catch {
-        console.debug('Invalid JSON error message');
+        console.error(err);
     }
     return response.status(code).json({
         message,
@@ -29,10 +29,10 @@ function startApi(env, admin = false) {
     apiApp.use(express.json({ limit: '50mb' }));
     apiApp.use(i18nMiddleware({}));
     apiApp.use(prosopoRouter(env));
+    apiApp.use(handleErrors);
     if (admin) {
         apiApp.use(prosopoAdminRouter(env));
     }
-    apiApp.use(handleErrors);
     return apiApp.listen(apiPort, () => {
         env.logger.info(`Prosopo app listening at http://localhost:${apiPort}`);
     });

package/dist/start.js.map

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

package/dist/tests/bundle/bundle.test.js

@@ -1,12 +1,11 @@
 import { assert, describe, test } from 'vitest';
 import { exec } from 'child_process';
-import { getCurrentFileDirectory } from '@prosopo/util';
+import { getCliPkgDir } from '@prosopo/config';
 import { promisify } from 'util';
 const execPromise = promisify(exec);
 describe('provider bundle', () => {
     test('bundle runs after bundling', async () => {
-        const dir = getCurrentFileDirectory(import.meta.url);
-        const rootDir = dir.split('/').slice(0, -3).join('/');
+        const rootDir = getCliPkgDir();
         await execPromise(`cd ${rootDir} && npm run bundle:prod`);
         const { stdout: runOut, stderr: runErr } = await execPromise(`cd ${rootDir} && node dist/bundle/provider.cli.bundle.js version`);
         assert(runOut.includes('Version:'));

package/dist/tests/bundle/bundle.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundle.test.js","sourceRoot":"","sources":["../../../src/tests/bundle/bundle.test.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAChC,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;AAEnC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,IAAI,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAE1C,MAAM,GAAG,GAAG,uBAAuB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAGpD,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAGrD,MAAM,WAAW,CAAC,MAAM,OAAO,yBAAyB,CAAC,CAAA;QAGzD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,WAAW,CACxD,MAAM,OAAO,qDAAqD,CACrE,CAAA;QACD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAA;IACvC,CAAC,EAAE,MAAM,CAAC,CAAA;AACd,CAAC,CAAC,CAAA"}
+{"version":3,"file":"bundle.test.js","sourceRoot":"","sources":["../../../src/tests/bundle/bundle.test.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAChC,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;AAEnC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,IAAI,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAE1C,MAAM,OAAO,GAAG,YAAY,EAAE,CAAA;QAG9B,MAAM,WAAW,CAAC,MAAM,OAAO,yBAAyB,CAAC,CAAA;QAGzD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,WAAW,CACxD,MAAM,OAAO,qDAAqD,CACrE,CAAA;QACD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAA;IACvC,CAAC,EAAE,MAAM,CAAC,CAAA;AACd,CAAC,CAAC,CAAA"}

package/dist/tests/reloader.test.js

@@ -1,27 +1,40 @@
 import { describe, expect, test } from 'vitest';
-import { getCurrentFileDirectory } from '@prosopo/util';
+import { getCliPkgDir, getRootDir } from '@prosopo/config';
 import { promisify } from 'util';
 import { spawn } from 'child_process';
 import fs from 'fs';
 import path from 'path';
 describe('reloading api', () => {
     test('api reloads after changing .env file', () => {
-        const dir = getCurrentFileDirectory(import.meta.url);
-        const rootDir = dir.split('/').slice(0, -2).join('/');
+        const envFile = `.env.${process.env.NODE_ENV || 'development'}`;
+        console.log('env file ', envFile);
+        const rootDir = getRootDir();
+        const packageDir = getCliPkgDir();
+        const rootEnvPath = `${rootDir}/${envFile}`;
+        const packageEnvPath = `${packageDir}/${envFile}`;
+        let envPath = '';
+        if (fs.existsSync(rootEnvPath)) {
+            envPath = path.resolve(rootEnvPath);
+        }
+        else if (fs.existsSync(packageEnvPath)) {
+            envPath = path.resolve(packageEnvPath);
+        }
+        else {
+            throw new Error(`No ${envFile} file found`);
+        }
         const restoreEnv = async () => {
-            const envPath = path.resolve(`${rootDir}/.env.test`);
             const envContent = await promisify(fs.readFile)(envPath, 'utf8');
             const newEnvContent = envContent.replace('\nTEST=TEST', '');
             await promisify(fs.writeFile)(envPath, newEnvContent);
         };
         return new Promise((resolve, reject) => {
-            console.log('rootDir', rootDir);
+            console.log('packageDir', packageDir);
             const child = spawn(`npm`, ['run', 'cli', '--', '--api'], {
-                cwd: rootDir,
+                cwd: packageDir,
                 env: { ...process.env, NODE_ENV: 'test' },
             });
             let appended = false;
-            child.stdout.on('data', (data) => onData(data, rootDir, appended).then((result) => {
+            child.stdout.on('data', (data) => onData(data, packageDir, appended).then((result) => {
                 appended = result.appended;
                 const kill = result.kill;
                 if (kill) {

package/dist/tests/reloader.test.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@prosopo/cli",
-    "version": "0.3.4",
+    "version": "0.3.36",
     "description": "CLI for Prosopo Provider",
     "main": "dist/index.js",
     "type": "module",
@@ -20,6 +20,7 @@
         "build:cjs": "npx vite --config vite.cjs.config.ts build",
         "bundle:dev": "vite build --config vite.config.ts --mode development",
         "bundle:prod": "vite build --config vite.config.ts --mode production",
+        "test": "npx vitest run --config ./vite.test.config.ts",
         "cli": "node ./dist/cli.js",
         "start": "node ./dist/cli.js --api",
         "eslint": "npx eslint . --no-error-on-unmatched-pattern --ignore-path ../../.eslintignore",
@@ -34,13 +35,13 @@
         "@polkadot/types": "10.11.2",
         "@polkadot/util": "12.6.2",
         "@polkadot/util-crypto": "12.6.2",
-        "@prosopo/captcha-contract": "0.3.4",
-        "@prosopo/common": "0.3.4",
-        "@prosopo/contract": "0.3.4",
-        "@prosopo/env": "0.3.4",
-        "@prosopo/provider": "0.3.4",
-        "@prosopo/types": "0.3.4",
-        "@prosopo/util": "0.3.4",
+        "@prosopo/captcha-contract": "0.3.36",
+        "@prosopo/common": "0.3.36",
+        "@prosopo/contract": "0.3.36",
+        "@prosopo/env": "0.3.36",
+        "@prosopo/provider": "0.3.36",
+        "@prosopo/types": "0.3.36",
+        "@prosopo/util": "0.3.36",
         "cors": "^2.8.5",
         "cron-parser": "^4.9.0",
         "dotenv": "^16.0.1",
@@ -50,9 +51,9 @@
     "devDependencies": {
         "es-main": "^1.2.0",
         "express": "^4.18.2",
-        "vite": "^5.1.4",
+        "vite": "^5.1.7",
         "vitest": "^1.3.1",
-        "@prosopo/config": "0.3.4",
+        "@prosopo/config": "0.3.36",
         "@types/cors": "^2.8.14",
         "tslib": "2.6.2",
         "typescript": "5.1.6"

package/vite.test.config.ts

@@ -0,0 +1,32 @@
+// Copyright 2021-2024 Prosopo (UK) Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+import { ViteTestConfig } from '@prosopo/config'
+import dotenv from 'dotenv'
+import fs from 'fs'
+import path from 'path'
+process.env.NODE_ENV = 'test'
+// if .env.test exists at this level, use it, otherwise use the one at the root
+const envFile = `.env.${process.env.NODE_ENV || 'development'}`
+let envPath = envFile
+if (fs.existsSync(envFile)) {
+    envPath = path.resolve(envFile)
+} else if (fs.existsSync(`../../${envFile}`)) {
+    envPath = path.resolve(`../../${envFile}`)
+} else {
+    throw new Error(`No ${envFile} file found`)
+}
+
+dotenv.config({ path: envPath })
+
+export default ViteTestConfig

package/dist/cjs/commands/calculateCaptchaSolutions.cjs

@@ -1,32 +0,0 @@
-"use strict";
-const provider = require("@prosopo/provider");
-const common = require("@prosopo/common");
-const env = require("@prosopo/env");
-const validators = require("./validators.cjs");
-const commandCalculateCaptchaSolutions = (pair, config, cmdArgs) => {
-  const logger = cmdArgs?.logger || common.getLogger(common.LogLevel.enum.info, "cli.calculate_captcha_solutions");
-  return {
-    command: "calculate_captcha_solutions",
-    describe: "Calculate captcha solutions",
-    builder: (yargs) => {
-      return yargs.option("schedule", {
-        type: "string",
-        demand: false,
-        desc: "A Recurring schedule expression"
-      });
-    },
-    handler: async (argv) => {
-      const env$1 = new env.ProviderEnvironment(config, pair);
-      await env$1.isReady();
-      if (argv.schedule) {
-        throw new common.ProsopoEnvError("GENERAL.NOT_IMPLEMENTED");
-      } else {
-        const calculateSolutionsTask = new provider.CalculateSolutionsTask(env$1);
-        const result = await calculateSolutionsTask.run();
-        logger.info(`Updated ${result} captcha solutions`);
-      }
-    },
-    middlewares: [validators.validateScheduleExpression]
-  };
-};
-module.exports = commandCalculateCaptchaSolutions;

package/dist/commands/calculateCaptchaSolutions.d.ts

@@ -1,21 +0,0 @@
-import { ArgumentsCamelCase, Argv } from 'yargs';
-import { KeyringPair } from '@polkadot/keyring/types';
-import { Logger } from '@prosopo/common';
-import { ProsopoConfigOutput } from '@prosopo/types';
-declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
-    logger?: Logger;
-}) => {
-    command: string;
-    describe: string;
-    builder: (yargs: Argv) => Argv<{
-        schedule: string | undefined;
-    }>;
-    handler: (argv: ArgumentsCamelCase) => Promise<void>;
-    middlewares: ((argv: ArgumentsCamelCase) => {
-        schedule: string;
-    } | {
-        schedule: null;
-    })[];
-};
-export default _default;
-//# sourceMappingURL=calculateCaptchaSolutions.d.ts.map

package/dist/commands/calculateCaptchaSolutions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"calculateCaptchaSolutions.d.ts","sourceRoot":"","sources":["../../src/commands/calculateCaptchaSolutions.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAY,MAAM,EAA8B,MAAM,iBAAiB,CAAA;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;+BAI9B,WAAW,UAAU,mBAAmB,YAAY;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAMpE,IAAI;;;oBAOC,kBAAkB;;;;;;;AAbhD,wBA0BC"}

package/dist/commands/calculateCaptchaSolutions.js

@@ -1,32 +0,0 @@
-import { CalculateSolutionsTask } from '@prosopo/provider';
-import { LogLevel, ProsopoEnvError, getLogger } from '@prosopo/common';
-import { ProviderEnvironment } from '@prosopo/env';
-import { validateScheduleExpression } from './validators.js';
-export default (pair, config, cmdArgs) => {
-    const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, 'cli.calculate_captcha_solutions');
-    return {
-        command: 'calculate_captcha_solutions',
-        describe: 'Calculate captcha solutions',
-        builder: (yargs) => {
-            return yargs.option('schedule', {
-                type: 'string',
-                demand: false,
-                desc: 'A Recurring schedule expression',
-            });
-        },
-        handler: async (argv) => {
-            const env = new ProviderEnvironment(config, pair);
-            await env.isReady();
-            if (argv.schedule) {
-                throw new ProsopoEnvError('GENERAL.NOT_IMPLEMENTED');
-            }
-            else {
-                const calculateSolutionsTask = new CalculateSolutionsTask(env);
-                const result = await calculateSolutionsTask.run();
-                logger.info(`Updated ${result} captcha solutions`);
-            }
-        },
-        middlewares: [validateScheduleExpression],
-    };
-};
-//# sourceMappingURL=calculateCaptchaSolutions.js.map

package/dist/commands/calculateCaptchaSolutions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"calculateCaptchaSolutions.js","sourceRoot":"","sources":["../../src/commands/calculateCaptchaSolutions.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAE1D,OAAO,EAAE,QAAQ,EAAU,eAAe,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAA;AAE5D,eAAe,CAAC,IAAiB,EAAE,MAA2B,EAAE,OAA6B,EAAE,EAAE;IAC7F,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,iCAAiC,CAAC,CAAA;IAElG,OAAO;QACH,OAAO,EAAE,6BAA6B;QACtC,QAAQ,EAAE,6BAA6B;QACvC,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE;YACrB,OAAO,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE;gBAC5B,IAAI,EAAE,QAAiB;gBACvB,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,iCAAiC;aACjC,CAAC,CAAA;QACf,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YACxC,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;YACjD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;YACnB,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACf,MAAM,IAAI,eAAe,CAAC,yBAAyB,CAAC,CAAA;aACvD;iBAAM;gBACH,MAAM,sBAAsB,GAAG,IAAI,sBAAsB,CAAC,GAAG,CAAC,CAAA;gBAC9D,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,GAAG,EAAE,CAAA;gBACjD,MAAM,CAAC,IAAI,CAAC,WAAW,MAAM,oBAAoB,CAAC,CAAA;aACrD;QACL,CAAC;QACD,WAAW,EAAE,CAAC,0BAA0B,CAAC;KAC5C,CAAA;AACL,CAAC,CAAA"}