@prosopo/cli 2.6.11 → 3.0.5

package/dist/cjs/cli.cjs

@@ -16,38 +16,35 @@ async function main() {
     unsolved: { count: 0 }
   });
   if (config.devOnlyWatchEvents) {
-    log.warn(
-      `
+    log.warn(() => ({
+      msg: `
         ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! 
         EVENT TRACKING ON. IF NOT DEVELOPMENT, PLEASE STOP, CHANGE THE ENVIRONMENT, AND RESTART
         ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! 
             `
-    );
+    }));
   }
-  const pair = await keyring.getPairAsync(
-    config.account.secret,
-    config.account.address
-  );
-  const authAccount = await keyring.getPairAsync(
+  const pair = keyring.getPair(config.account.secret, config.account.address);
+  const authAccount = keyring.getPair(
     config.authAccount.secret,
     config.authAccount.address
   );
-  log.info(`Pair address: ${pair.address}`);
+  log.info(() => ({ data: { pairAddress: pair.address } }));
   const processedArgs = await argv.processArgs(
     process.argv,
     pair,
     authAccount,
     config
   );
-  log.info({ cliArgs: processedArgs });
+  log.info(() => ({ data: { cliArgs: processedArgs } }));
   if (processedArgs.api) {
     if (process.env.NODE_ENV === "development") {
       await new reloader(envPath, config, pair, authAccount, processedArgs).startDev().then(() => {
-        log.info("Reloading API started...");
+        log.info(() => ({ msg: "Reloading API started..." }));
       });
     } else {
       await new reloader(envPath, config, pair, authAccount, processedArgs).start().then(() => {
-        log.info("Reloading API started...");
+        log.info(() => ({ msg: "Reloading API started..." }));
       });
     }
   } else {
@@ -57,9 +54,9 @@ async function main() {
 if (util.isMain(module, "provider")) {
   locale.loadI18next(true).then(() => {
     main().then(() => {
-      log.info("Running main process...");
+      log.info(() => ({ msg: "Running main process..." }));
     }).catch((error) => {
-      log.error(error);
+      log.error(() => ({ err: error }));
     });
   });
 }

package/dist/cjs/commands/providerSetDataset.cjs

@@ -38,11 +38,20 @@ const commandProviderSetDataset = (pair, config, cmdArgs) => {
         const tasks = new provider.Tasks(env$1);
         const file = z__namespace.string().parse(argv.file);
         const jsonFile = files.loadJSONFile(file);
-        logger.info(`Loaded JSON from ${file}`);
+        logger.info(() => ({
+          data: { file },
+          msg: "Loading JSON"
+        }));
         const result = await tasks.datasetManager.providerSetDatasetFromFile(jsonFile);
-        logger.info(JSON.stringify(result, null, 2));
+        logger.info(() => ({
+          data: { file },
+          msg: "Loaded JSON"
+        }));
       } catch (err) {
-        logger.error(err);
+        logger.error(() => ({
+          err,
+          msg: "Error loading JSON"
+        }));
       }
     },
     middlewares: []

package/dist/cjs/commands/siteKeyRegister.cjs

@@ -70,9 +70,15 @@ const commandSiteKeyRegister = (pair, config, cmdArgs) => {
           powDifficulty: pow_difficulty,
           imageThreshold: image_threshold
         });
-        logger.info(`Site Key ${argv.sitekey} registered`);
+        logger.info(() => ({
+          data: { sitekey },
+          msg: "Site Key registered"
+        }));
       } catch (err) {
-        logger.error(err);
+        logger.error(() => ({
+          err,
+          msg: "Error registering Site Key"
+        }));
       }
     },
     middlewares: [validators.validateSiteKey]

package/dist/cjs/commands/siteKeyRegisterApi.cjs

@@ -79,9 +79,15 @@ const commandSiteKeyRegisterApi = (pair, authAccount, config, cmdArgs) => {
           timestamp,
           signature
         );
-        logger.info(`Site Key ${argv.sitekey} registered`);
+        logger.info(() => ({
+          data: { sitekey },
+          msg: "Site Key registered"
+        }));
       } catch (err) {
-        logger.error(err);
+        logger.error(() => ({
+          err,
+          msg: "Error registering Site Key"
+        }));
       }
     },
     middlewares: [validators.validateSiteKey]

package/dist/cjs/commands/storeCaptchasExternally.cjs

@@ -13,10 +13,10 @@ const commandStoreCaptchasExternally = (pair, config, cmdArgs) => {
         await env$1.isReady();
         const tasks = new provider.Tasks(env$1);
         await tasks.clientTaskManager.storeCommitmentsExternal().catch((err) => {
-          env$1.logger.error(err);
+          env$1.logger.error(() => ({ err }));
         });
       } catch (err) {
-        logger.error(err);
+        logger.error(() => ({ err }));
       }
     },
     middlewares: []

package/dist/cjs/commands/version.cjs

@@ -7,7 +7,9 @@ const commandVersion = (pair, config, cmdArgs) => {
     command: "version",
     describe: "Return the version of the software",
     handler: () => {
-      logger.info(`Version: ${JSON.stringify(util.version)}`);
+      logger.info(() => ({
+        data: { version: util.version }
+      }));
     }
   };
 };

package/dist/cjs/prosopo.config.cjs

@@ -26,7 +26,7 @@ const getLRules = () => {
 };
 function getConfig(captchaSolutionsConfig, captchaServeConfig, who = "PROVIDER", admin = "ADMIN") {
   return types.ProsopoConfigSchema.parse({
-    logLevel: common.getLogLevel(),
+    logLevel: common.parseLogLevel(process.env.PROSOPO_LOG_LEVEL, "info"),
     defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT ? types.EnvironmentTypesSchema.parse(process.env.PROSOPO_DEFAULT_ENVIRONMENT) : types.EnvironmentTypesSchema.enum.development,
     account: {
       address: process_env.getAddress(who),
@@ -66,6 +66,10 @@ function getConfig(captchaSolutionsConfig, captchaServeConfig, who = "PROVIDER",
     mongoEventsUri: process.env.PROSOPO_MONGO_EVENTS_URI || "",
     mongoCaptchaUri: process.env.PROSOPO_MONGO_CAPTCHA_URI || "",
     mongoClientUri: process.env.PROSOPO_MONGO_CLIENT_URI || "",
+    redisConnection: {
+      url: process.env.REDIS_CONNECTION_URL || "",
+      password: process.env.REDIS_CONNECTION_PASSWORD || ""
+    },
     rateLimits: RateLimiter.getRateLimitConfig(),
     proxyCount: process.env.PROSOPO_PROXY_COUNT ? Number.parseInt(process.env.PROSOPO_PROXY_COUNT) : 0,
     scheduledTasks: {

package/dist/cjs/reloader.cjs

@@ -18,7 +18,7 @@ class ReloadingAPI {
     return this._env;
   }
   async start(reloadEnv = false) {
-    log.info("Starting API");
+    log.info(() => ({ msg: "Starting API" }));
     this._envWatcher = await this._watchEnv();
     dotenv.loadEnv();
     if (!this._env && reloadEnv) {
@@ -33,7 +33,7 @@ class ReloadingAPI {
     this.api = await start.start(this.env, !!this._processedArgs.adminApi);
   }
   async startDev() {
-    log.info("Starting API");
+    log.info(() => ({ msg: "Starting API" }));
     this._envWatcher = await this._watchEnv();
     dotenv.loadEnv();
     const env$1 = new env.ProviderEnvironment(
@@ -45,7 +45,7 @@ class ReloadingAPI {
     this.api = await start.startDev(env$1, !!this._processedArgs.adminApi);
   }
   async stop() {
-    log.info("Stopping API");
+    log.info(() => ({ msg: "Stopping API" }));
     return new Promise((resolve) => {
       if (this.api) {
         this.api.close(resolve);
@@ -54,7 +54,10 @@ class ReloadingAPI {
   }
   async _watchEnv() {
     return fs.watchFile(this._envPath, async () => {
-      log.info(`env file change detected. Restarting: ${this._restarting}`);
+      log.info(() => ({
+        data: { restarting: this._restarting },
+        msg: "env file change detected. Restarting"
+      }));
       if (!this._restarting) {
         this._restarting = true;
         await this.stop();

package/dist/cjs/start.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const apiExpressRouter = require("@prosopo/api-express-router");
+const common = require("@prosopo/common");
 const dotenv = require("@prosopo/dotenv");
 const env = require("@prosopo/env");
 const keyring = require("@prosopo/keyring");
@@ -20,31 +21,32 @@ const getClientApiPathsExcludingVerify = () => {
   return paths;
 };
 async function startApi(env2, admin = false, port) {
-  env2.logger.info("Starting Prosopo API");
+  env2.logger.info(() => ({ msg: "Starting Prosopo API" }));
   const apiApp = express();
   const apiPort = port || env2.config.server.port;
   const apiEndpointAdapter = apiExpressRouter.createApiExpressDefaultEndpointAdapter(
-    env2.config.logLevel
+    common.parseLogLevel(env2.config.logLevel)
   );
   const apiRuleRoutesProvider = userAccessPolicy.createApiRuleRoutesProvider(
     env2.getDb().getUserAccessRulesStorage()
   );
   const apiAdminRoutesProvider = provider.createApiAdminRoutesProvider(env2);
   const clientPathsExcludingVerify = getClientApiPathsExcludingVerify();
-  env2.logger.debug({
-    message: "Adding headerCheckMiddleware",
+  env2.logger.debug(() => ({
+    msg: "Adding headerCheckMiddleware",
     paths: clientPathsExcludingVerify
-  });
+  }));
   apiApp.set(
     "trust proxy",
     env2.config.proxyCount
   );
   apiApp.use(cors());
   apiApp.use(express.json({ limit: "50mb" }));
+  apiApp.use(provider.publicRouter());
   const i18Middleware = await locale.i18nMiddleware({});
   apiApp.use(provider.robotsMiddleware());
   apiApp.use(provider.ignoreMiddleware());
-  apiApp.use(provider.requestLoggerMiddleware(env2));
+  apiApp.use(apiExpressRouter.requestLoggerMiddleware(env2));
   apiApp.use(i18Middleware);
   apiApp.use(provider.ja4Middleware(env2));
   apiApp.use(provider.prosopoVerifyRouter(env2));
@@ -52,11 +54,18 @@ async function startApi(env2, admin = false, port) {
   apiApp.use(clientPathsExcludingVerify, provider.headerCheckMiddleware(env2));
   apiApp.use("/v1/prosopo/provider/client/", provider.domainMiddleware(env2));
   apiApp.use(provider.prosopoRouter(env2));
-  apiApp.use(provider.publicRouter(env2));
-  env2.logger.info("Enabling admin auth middleware");
-  apiApp.use("/v1/prosopo/provider/admin", provider.authMiddleware(env2));
-  apiApp.use(userAccessPolicy.apiRulePaths.INSERT_MANY, provider.authMiddleware(env2));
-  apiApp.use(userAccessPolicy.apiRulePaths.DELETE_MANY, provider.authMiddleware(env2));
+  env2.logger.info(() => ({ msg: "Enabling admin auth middleware" }));
+  apiApp.use(
+    "/v1/prosopo/provider/admin",
+    apiExpressRouter.authMiddleware(env2.pair, env2.authAccount)
+  );
+  const userAccessRuleRoutes = apiRuleRoutesProvider.getRoutes();
+  for (const userAccessRuleRoute of userAccessRuleRoutes) {
+    apiApp.use(
+      userAccessRuleRoute.path,
+      apiExpressRouter.authMiddleware(env2.pair, env2.authAccount)
+    );
+  }
   apiApp.use(
     apiExpressRouter.apiExpressRouterFactory.createRouter(
       apiRuleRoutesProvider,
@@ -67,7 +76,10 @@ async function startApi(env2, admin = false, port) {
     apiExpressRouter.apiExpressRouterFactory.createRouter(
       apiAdminRoutesProvider,
       // unlike the default one, it should have errorStatusCode as 400
-      apiExpressRouter.createApiExpressDefaultEndpointAdapter(env2.config.logLevel, 400)
+      apiExpressRouter.createApiExpressDefaultEndpointAdapter(
+        common.parseLogLevel(env2.config.logLevel),
+        400
+      )
     )
   );
   const configRateLimits = env2.config.rateLimits;
@@ -77,7 +89,10 @@ async function startApi(env2, admin = false, port) {
     apiApp.use(enumPath, rateLimit(limit));
   }
   return apiApp.listen(apiPort, () => {
-    env2.logger.info(`Prosopo app listening at http://localhost:${apiPort}`);
+    env2.logger.info(() => ({
+      data: { apiPort },
+      msg: "Prosopo app listening"
+    }));
   });
 }
 async function start(env$1, admin, port) {
@@ -89,14 +104,11 @@ async function start(env$1, admin, port) {
       solved: { count: 2 },
       unsolved: { count: 0 }
     });
-    const pair = await keyring.getPairAsync(secret);
-    const authAccount = await keyring.getPairAsync(
-      void 0,
-      config.authAccount.address
-    );
+    const pair = keyring.getPair(secret);
+    const authAccount = keyring.getPair(void 0, config.authAccount.address);
     env$1 = new env.ProviderEnvironment(config, pair, authAccount);
   } else {
-    env$1.logger.debug("Env already defined");
+    env$1.logger.debug(() => ({ msg: "Env already defined" }));
   }
   await env$1.isReady();
   env$1.cleanup();
@@ -112,7 +124,11 @@ async function start(env$1, admin, port) {
     const cronScheduleClient = env$1.config.scheduledTasks?.clientListScheduler?.schedule;
     if (cronScheduleClient) {
       provider.getClientList(env$1.pair, cronScheduleClient, env$1.config).catch((err) => {
-        console.error("Failed to get client list:", err);
+        env$1.logger.error(() => ({
+          msg: "Failed to start client list scheduler",
+          err,
+          context: { failedFuncName: provider.getClientList.name }
+        }));
       });
     }
   }

package/dist/cli.js

@@ -1,7 +1,7 @@
 import process from "node:process";
 import { LogLevel, getLogger } from "@prosopo/common";
 import { loadEnv } from "@prosopo/dotenv";
-import { getPairAsync } from "@prosopo/keyring";
+import { getPair } from "@prosopo/keyring";
 import { loadI18next } from "@prosopo/locale";
 import { isMain } from "@prosopo/util";
 import { processArgs } from "./argv.js";
@@ -15,30 +15,32 @@ async function main() {
         unsolved: { count: 0 },
     });
     if (config.devOnlyWatchEvents) {
-        log.warn(`
+        log.warn(() => ({
+            msg: `
         ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! 
         EVENT TRACKING ON. IF NOT DEVELOPMENT, PLEASE STOP, CHANGE THE ENVIRONMENT, AND RESTART
         ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! 
-            `);
+            `,
+        }));
     }
-    const pair = await getPairAsync(config.account.secret, config.account.address);
-    const authAccount = await getPairAsync(config.authAccount.secret, config.authAccount.address);
-    log.info(`Pair address: ${pair.address}`);
+    const pair = getPair(config.account.secret, config.account.address);
+    const authAccount = getPair(config.authAccount.secret, config.authAccount.address);
+    log.info(() => ({ data: { pairAddress: pair.address } }));
     const processedArgs = await processArgs(process.argv, pair, authAccount, config);
-    log.info({ cliArgs: processedArgs });
+    log.info(() => ({ data: { cliArgs: processedArgs } }));
     if (processedArgs.api) {
         if (process.env.NODE_ENV === "development") {
             await new ReloadingAPI(envPath, config, pair, authAccount, processedArgs)
                 .startDev()
                 .then(() => {
-                log.info("Reloading API started...");
+                log.info(() => ({ msg: "Reloading API started..." }));
             });
         }
         else {
             await new ReloadingAPI(envPath, config, pair, authAccount, processedArgs)
                 .start()
                 .then(() => {
-                log.info("Reloading API started...");
+                log.info(() => ({ msg: "Reloading API started..." }));
             });
         }
     }
@@ -50,10 +52,10 @@ if (isMain(import.meta.url, "provider")) {
     loadI18next(true).then(() => {
         main()
             .then(() => {
-            log.info("Running main process...");
+            log.info(() => ({ msg: "Running main process..." }));
         })
             .catch((error) => {
-            log.error(error);
+            log.error(() => ({ err: error }));
         });
     });
 }

package/dist/cli.js.map

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

package/dist/commands/providerSetDataset.d.ts

@@ -1,5 +1,5 @@
-import type { KeyringPair } from "@polkadot/keyring/types";
 import { type Logger } from "@prosopo/common";
+import type { KeyringPair } from "@prosopo/types";
 import type { ProsopoConfigOutput } from "@prosopo/types";
 import type { ArgumentsCamelCase, Argv } from "yargs";
 declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {

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

@@ -1 +1 @@
-{"version":3,"file":"providerSetDataset.d.ts","sourceRoot":"","sources":["../../src/commands/providerSetDataset.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;;;oBAMC,kBAAkB;;;AAlB1C,wBAmCE"}
+{"version":3,"file":"providerSetDataset.d.ts","sourceRoot":"","sources":["../../src/commands/providerSetDataset.ts"],"names":[],"mappings":"AAcA,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAGnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,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;;;oBAMC,kBAAkB;;;AAlB1C,wBA4CE"}

package/dist/commands/providerSetDataset.js

@@ -21,12 +21,21 @@ export default (pair, config, cmdArgs) => {
                 const tasks = new Tasks(env);
                 const file = z.string().parse(argv.file);
                 const jsonFile = loadJSONFile(file);
-                logger.info(`Loaded JSON from ${file}`);
+                logger.info(() => ({
+                    data: { file },
+                    msg: "Loading JSON",
+                }));
                 const result = await tasks.datasetManager.providerSetDatasetFromFile(jsonFile);
-                logger.info(JSON.stringify(result, null, 2));
+                logger.info(() => ({
+                    data: { file },
+                    msg: "Loaded JSON",
+                }));
             }
             catch (err) {
-                logger.error(err);
+                logger.error(() => ({
+                    err,
+                    msg: "Error loading JSON",
+                }));
             }
         },
         middlewares: [],

package/dist/commands/providerSetDataset.js.map

@@ -1 +1 @@
-{"version":3,"file":"providerSetDataset.js","sourceRoot":"","sources":["../../src/commands/providerSetDataset.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;AAG1C,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,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,uBAAuB;QAChC,QAAQ,EAAE,6BAA6B;QACvC,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACxB,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE;YACpB,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,sCAAsC;SACnC,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;gBAC7B,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACzC,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAS,CAAC;gBAC5C,MAAM,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;gBACxC,MAAM,MAAM,GACX,MAAM,KAAK,CAAC,cAAc,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC;gBACjE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YAC9C,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"}
+{"version":3,"file":"providerSetDataset.js","sourceRoot":"","sources":["../../src/commands/providerSetDataset.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;AAI1C,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,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,uBAAuB;QAChC,QAAQ,EAAE,6BAA6B;QACvC,OAAO,EAAE,CAAC,KAAW,EAAE,EAAE,CACxB,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE;YACpB,IAAI,EAAE,QAAiB;YACvB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,sCAAsC;SACnC,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;gBAC7B,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACzC,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAS,CAAC;gBAC5C,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;oBAClB,IAAI,EAAE,EAAE,IAAI,EAAE;oBACd,GAAG,EAAE,cAAc;iBACnB,CAAC,CAAC,CAAC;gBACJ,MAAM,MAAM,GACX,MAAM,KAAK,CAAC,cAAc,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC;gBACjE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;oBAClB,IAAI,EAAE,EAAE,IAAI,EAAE;oBACd,GAAG,EAAE,aAAa;iBAClB,CAAC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;oBACnB,GAAG;oBACH,GAAG,EAAE,oBAAoB;iBACzB,CAAC,CAAC,CAAC;YACL,CAAC;QACF,CAAC;QACD,WAAW,EAAE,EAAE;KACf,CAAC;AACH,CAAC,CAAC"}

package/dist/commands/siteKeyRegister.d.ts

@@ -1,5 +1,5 @@
-import type { KeyringPair } from "@polkadot/keyring/types";
 import { type Logger } from "@prosopo/common";
+import type { KeyringPair } from "@prosopo/types";
 import { type ProsopoConfigOutput, Tier } from "@prosopo/types";
 import type { ArgumentsCamelCase, Argv } from "yargs";
 import { z } from "zod";

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

@@ -1 +1 @@
-{"version":3,"file":"siteKeyRegister.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAGnE,OAAO,EAEN,KAAK,mBAAmB,EACxB,IAAI,EACJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;EAQzC,CAAC;+BAGI,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;;;;;;;;;;;;;oBAqCC,kBAAkB;;;;;AAhD1C,wBA4EE"}
+{"version":3,"file":"siteKeyRegister.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegister.ts"],"names":[],"mappings":"AAcA,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAGnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAEN,KAAK,mBAAmB,EACxB,IAAI,EACJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;;;EAQzC,CAAC;+BAGI,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;;;;;;;;;;;;;oBAqCC,kBAAkB;;;;;AAhD1C,wBAkFE"}

package/dist/commands/siteKeyRegister.js

@@ -67,10 +67,16 @@ export default (pair, config, cmdArgs) => {
                     powDifficulty: pow_difficulty,
                     imageThreshold: image_threshold,
                 });
-                logger.info(`Site Key ${argv.sitekey} registered`);
+                logger.info(() => ({
+                    data: { sitekey },
+                    msg: "Site Key registered",
+                }));
             }
             catch (err) {
-                logger.error(err);
+                logger.error(() => ({
+                    err,
+                    msg: "Error registering Site Key",
+                }));
             }
         },
         middlewares: [validateSiteKey],

package/dist/commands/siteKeyRegister.js.map

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

package/dist/commands/siteKeyRegisterApi.d.ts

@@ -1,5 +1,5 @@
-import type { KeyringPair } from "@polkadot/keyring/types";
 import { type Logger } from "@prosopo/common";
+import type { KeyringPair } from "@prosopo/types";
 import { type ProsopoConfigOutput, Tier } from "@prosopo/types";
 import type { ArgumentsCamelCase, Argv } from "yargs";
 declare const _default: (pair: KeyringPair, authAccount: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {

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

@@ -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;AAEnE,OAAO,EAEN,KAAK,mBAAmB,EACxB,IAAI,EACJ,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;+BAY/C,WAAW,eACJ,WAAW,UAChB,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;;;;;;;;;;;;;;;oBA0CC,kBAAkB;;;;;AAtD1C,wBA0FE"}
+{"version":3,"file":"siteKeyRegisterApi.d.ts","sourceRoot":"","sources":["../../src/commands/siteKeyRegisterApi.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAenE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAEN,KAAK,mBAAmB,EACxB,IAAI,EACJ,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;+BAY/C,WAAW,eACJ,WAAW,UAChB,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;qBAQX,IAAI;;;;;;;;;;;;;;;;;oBA0CC,kBAAkB;;;;;AAtD1C,wBAgGE"}

package/dist/commands/siteKeyRegisterApi.js

@@ -70,10 +70,16 @@ export default (pair, authAccount, config, cmdArgs) => {
                     powDifficulty: pow_difficulty,
                     imageThreshold: image_threshold,
                 }, timestamp, signature);
-                logger.info(`Site Key ${argv.sitekey} registered`);
+                logger.info(() => ({
+                    data: { sitekey },
+                    msg: "Site Key registered",
+                }));
             }
             catch (err) {
-                logger.error(err);
+                logger.error(() => ({
+                    err,
+                    msg: "Error registering Site Key",
+                }));
             }
         },
         middlewares: [validateSiteKey],

package/dist/commands/siteKeyRegisterApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"siteKeyRegisterApi.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegisterApi.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"siteKeyRegisterApi.js","sourceRoot":"","sources":["../../src/commands/siteKeyRegisterApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAe,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAenD,OAAO,EACN,eAAe,EAEf,IAAI,GACJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,iCAAiC,GAAG,8BAA8B,CAAC,MAAM,CAC9E;IACC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;CACf,CACD,CAAC;AAEF,eAAe,CACd,IAAiB,EACjB,WAAwB,EACxB,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,uCAAuC;QAChD,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,UAAU,CAAC,MAAM,EAAE;YACnB,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;YAC5B,YAAY,EAAE,IAAI;YAClB,IAAI,EAAE,yBAAyB;SACtB,CAAC;aACV,MAAM,CAAC,KAAK,EAAE;YACd,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,IAAI;YAClB,IAAI,EAAE,4CAA4C;SACzC,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,SAAS,EAAE;YAClB,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;aACV,MAAM,CAAC,iBAAiB,EAAE;YAC1B,IAAI,EAAE,QAAiB;YACvB,YAAY,EAAE,KAAK;YACnB,IAAI,EAAE,8BAA8B;SAC3B,CAAC;QACb,OAAO,EAAE,KAAK,EAAE,IAAwB,EAAE,EAAE;YAC3C,IAAI,CAAC;gBACJ,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;gBAC/D,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,EACL,OAAO,EACP,YAAY,EACZ,sBAAsB,EACtB,GAAG,EACH,OAAO,EACP,cAAc,EACd,eAAe,GACf,GAAG,iCAAiC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAClD,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,GAAa,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzD,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;gBAClD,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;gBACxD,MAAM,GAAG,CAAC,eAAe,CACxB,OAAiB,EACjB,IAAI,CAAC,IAAY,EACjB;oBACC,WAAW,EAAE,eAAe,CAAC,KAAK,CAAC,YAAY,CAAC;oBAChD,qBAAqB,EAAE,sBAAgC;oBACvD,OAAO,EAAE,OAAO,IAAI,EAAE;oBACtB,aAAa,EAAE,cAAwB;oBACvC,cAAc,EAAE,eAAyB;iBACzC,EACD,SAAS,EACT,SAAS,CACT,CAAC;gBACF,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;oBAClB,IAAI,EAAE,EAAE,OAAO,EAAE;oBACjB,GAAG,EAAE,qBAAqB;iBAC1B,CAAC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;oBACnB,GAAG;oBACH,GAAG,EAAE,4BAA4B;iBACjC,CAAC,CAAC,CAAC;YACL,CAAC;QACF,CAAC;QACD,WAAW,EAAE,CAAC,eAAe,CAAC;KAC9B,CAAC;AACH,CAAC,CAAC"}

package/dist/commands/storeCaptchasExternally.d.ts

@@ -1,5 +1,5 @@
-import type { KeyringPair } from "@polkadot/keyring/types";
 import { type Logger } from "@prosopo/common";
+import type { KeyringPair } from "@prosopo/types";
 import type { ProsopoConfigOutput } from "@prosopo/types";
 declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
     logger?: Logger;

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

@@ -1 +1 @@
-{"version":3,"file":"storeCaptchasExternally.d.ts","sourceRoot":"","sources":["../../src/commands/storeCaptchasExternally.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;+BAGnD,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;;;;AAH9B,wBA2BE"}
+{"version":3,"file":"storeCaptchasExternally.d.ts","sourceRoot":"","sources":["../../src/commands/storeCaptchasExternally.ts"],"names":[],"mappings":"AAcA,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAGnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;+BAGnD,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;;;;AAH9B,wBA2BE"}

package/dist/commands/storeCaptchasExternally.js

@@ -14,11 +14,11 @@ export default (pair, config, cmdArgs) => {
                 await tasks.clientTaskManager
                     .storeCommitmentsExternal()
                     .catch((err) => {
-                    env.logger.error(err);
+                    env.logger.error(() => ({ err }));
                 });
             }
             catch (err) {
-                logger.error(err);
+                logger.error(() => ({ err }));
             }
         },
         middlewares: [],

package/dist/commands/storeCaptchasExternally.js.map

@@ -1 +1 @@
-{"version":3,"file":"storeCaptchasExternally.js","sourceRoot":"","sources":["../../src/commands/storeCaptchasExternally.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;AAG1C,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,oBAAoB,CAAC,CAAC;IAExE,OAAO;QACN,OAAO,EAAE,gBAAgB;QACzB,QAAQ,EAAE,uDAAuD;QACjE,OAAO,EAAE,KAAK,IAAI,EAAE;YACnB,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,MAAM,KAAK,CAAC,iBAAiB;qBAC3B,wBAAwB,EAAE;qBAC1B,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBACd,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACvB,CAAC,CAAC,CAAC;YACL,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"}
+{"version":3,"file":"storeCaptchasExternally.js","sourceRoot":"","sources":["../../src/commands/storeCaptchasExternally.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;AAI1C,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,oBAAoB,CAAC,CAAC;IAExE,OAAO;QACN,OAAO,EAAE,gBAAgB;QACzB,QAAQ,EAAE,uDAAuD;QACjE,OAAO,EAAE,KAAK,IAAI,EAAE;YACnB,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,MAAM,KAAK,CAAC,iBAAiB;qBAC3B,wBAAwB,EAAE;qBAC1B,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;oBACd,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;gBACnC,CAAC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;YAC/B,CAAC;QACF,CAAC;QACD,WAAW,EAAE,EAAE;KACf,CAAC;AACH,CAAC,CAAC"}

package/dist/commands/version.d.ts

@@ -1,5 +1,5 @@
-import type { KeyringPair } from "@polkadot/keyring/types";
 import { type Logger } from "@prosopo/common";
+import type { KeyringPair } from "@prosopo/types";
 import type { ProsopoConfigOutput } from "@prosopo/types";
 declare const _default: (pair: KeyringPair, config: ProsopoConfigOutput, cmdArgs?: {
     logger?: Logger;

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,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AACnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;+BAInD,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;;;AAH9B,wBAeE"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAcnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;+BAInD,WAAW,UACT,mBAAmB,YACjB;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE;;;;;AAH9B,wBAiBE"}

package/dist/commands/version.js

@@ -6,7 +6,9 @@ export default (pair, config, cmdArgs) => {
         command: "version",
         describe: "Return the version of the software",
         handler: () => {
-            logger.info(`Version: ${JSON.stringify(version)}`);
+            logger.info(() => ({
+                data: { version },
+            }));
         },
     };
 };