@prosopo/cli 3.0.10 → 3.1.1

package/dist/cjs/cli.cjs

@@ -11,10 +11,7 @@ const reloader = require("./reloader.cjs");
 const log = common.getLogger(common.LogLevel.enum.info, "CLI");
 async function main() {
   const envPath = dotenv.loadEnv();
-  const config = prosopo_config(void 0, {
-    solved: { count: 2 },
-    unsolved: { count: 0 }
-  });
+  const config = prosopo_config();
   if (config.devOnlyWatchEvents) {
     log.warn(() => ({
       msg: `
@@ -38,15 +35,9 @@ async function main() {
   );
   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(() => ({ msg: "Reloading API started..." }));
-      });
-    } else {
-      await new reloader(envPath, config, pair, authAccount, processedArgs).start().then(() => {
-        log.info(() => ({ msg: "Reloading API started..." }));
-      });
-    }
+    await new reloader(envPath, config, pair, authAccount, processedArgs).start().then(() => {
+      log.info(() => ({ msg: "Reloading API started..." }));
+    });
   } else {
     process.exit(0);
   }

package/dist/cjs/index.cjs

@@ -8,7 +8,6 @@ const files = require("./files.cjs");
 const prosopo_config = require("./prosopo.config.cjs");
 exports.processArgs = argv.processArgs;
 exports.start = start.start;
-exports.startDev = start.startDev;
 exports.getAddress = process_env.getAddress;
 exports.getDB = process_env.getDB;
 exports.getPairType = process_env.getPairType;

package/dist/cjs/reloader.cjs

@@ -15,35 +15,25 @@ class ReloadingAPI {
     this._restarting = false;
   }
   get env() {
+    if (!this._env) {
+      throw new Error("Environment not initialized. Call start() first.");
+    }
     return this._env;
   }
   async start(reloadEnv = false) {
     log.info(() => ({ msg: "Starting API" }));
     this._envWatcher = await this._watchEnv();
     dotenv.loadEnv();
-    if (!this._env && reloadEnv) {
-      const env$1 = new env.ProviderEnvironment(
+    if (!this._env || reloadEnv) {
+      this._env = new env.ProviderEnvironment(
         this._config,
         this._pair,
         this._authAccount
       );
-      await env$1.isReady();
-      this._env = env$1;
     }
+    await this.env.isReady();
     this.api = await start.start(this.env, !!this._processedArgs.adminApi);
   }
-  async startDev() {
-    log.info(() => ({ msg: "Starting API" }));
-    this._envWatcher = await this._watchEnv();
-    dotenv.loadEnv();
-    const env$1 = new env.ProviderEnvironment(
-      this._config,
-      this._pair,
-      this._authAccount
-    );
-    await env$1.isReady();
-    this.api = await start.startDev(env$1, !!this._processedArgs.adminApi);
-  }
   async stop() {
     log.info(() => ({ msg: "Stopping API" }));
     return new Promise((resolve) => {

package/dist/cjs/start.cjs

@@ -134,8 +134,4 @@ async function start(env$1, admin, port) {
   }
   return startApi(env$1, admin, port);
 }
-async function startDev(env2, admin) {
-  return await start(env2, admin);
-}
 exports.start = start;
-exports.startDev = startDev;

package/dist/cli.js

@@ -1,5 +1,5 @@
 import process from "node:process";
-import { LogLevel, getLogger } from "@prosopo/common";
+import { getLogger, LogLevel } from "@prosopo/common";
 import { loadEnv } from "@prosopo/dotenv";
 import { getPair } from "@prosopo/keyring";
 import { loadI18next } from "@prosopo/locale";
@@ -9,54 +9,44 @@ import getConfig from "./prosopo.config.js";
 import ReloadingAPI from "./reloader.js";
 const log = getLogger(LogLevel.enum.info, "CLI");
 async function main() {
-    const envPath = loadEnv();
-    const config = getConfig(undefined, {
-        solved: { count: 2 },
-        unsolved: { count: 0 },
-    });
-    if (config.devOnlyWatchEvents) {
-        log.warn(() => ({
-            msg: `
+  const envPath = loadEnv();
+  const config = getConfig();
+  if (config.devOnlyWatchEvents) {
+    log.warn(() => ({
+      msg: `
         ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! 
         EVENT TRACKING ON. IF NOT DEVELOPMENT, PLEASE STOP, CHANGE THE ENVIRONMENT, AND RESTART
         ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! 
-            `,
-        }));
-    }
-    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(() => ({ data: { cliArgs: processedArgs } }));
-    if (processedArgs.api) {
-        if (process.env.NODE_ENV === "development") {
-            await new ReloadingAPI(envPath, config, pair, authAccount, processedArgs)
-                .startDev()
-                .then(() => {
-                log.info(() => ({ msg: "Reloading API started..." }));
-            });
-        }
-        else {
-            await new ReloadingAPI(envPath, config, pair, authAccount, processedArgs)
-                .start()
-                .then(() => {
-                log.info(() => ({ msg: "Reloading API started..." }));
-            });
-        }
-    }
-    else {
-        process.exit(0);
-    }
+            `
+    }));
+  }
+  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(() => ({ data: { cliArgs: processedArgs } }));
+  if (processedArgs.api) {
+    await new ReloadingAPI(envPath, config, pair, authAccount, processedArgs).start().then(() => {
+      log.info(() => ({ msg: "Reloading API started..." }));
+    });
+  } else {
+    process.exit(0);
+  }
 }
 if (isMain(import.meta.url, "provider")) {
-    loadI18next(true).then(() => {
-        main()
-            .then(() => {
-            log.info(() => ({ msg: "Running main process..." }));
-        })
-            .catch((error) => {
-            log.error(() => ({ err: error }));
-        });
+  loadI18next(true).then(() => {
+    main().then(() => {
+      log.info(() => ({ msg: "Running main process..." }));
+    }).catch((error) => {
+      log.error(() => ({ err: error }));
     });
+  });
 }
-//# sourceMappingURL=cli.js.map

package/dist/commands/index.js

@@ -1,6 +1,12 @@
-export { default as commandProviderSetDataset } from "./providerSetDataset.js";
-export { default as commandStoreCaptchasExternally } from "./storeCaptchasExternally.js";
-export { default as commandVersion } from "./version.js";
-export { default as commandSiteKeyRegister } from "./siteKeyRegister.js";
-export { default as commandSiteKeyRegisterApi } from "./siteKeyRegisterApi.js";
-//# sourceMappingURL=index.js.map
+import { default as default2 } from "./providerSetDataset.js";
+import { default as default3 } from "./storeCaptchasExternally.js";
+import { default as default4 } from "./version.js";
+import { default as default5 } from "./siteKeyRegister.js";
+import { default as default6 } from "./siteKeyRegisterApi.js";
+export {
+  default2 as commandProviderSetDataset,
+  default5 as commandSiteKeyRegister,
+  default6 as commandSiteKeyRegisterApi,
+  default3 as commandStoreCaptchasExternally,
+  default4 as commandVersion
+};

package/dist/commands/providerSetDataset.js

@@ -1,44 +1,44 @@
-import { LogLevel, getLogger } from "@prosopo/common";
+import { getLogger, LogLevel } from "@prosopo/common";
 import { ProviderEnvironment } from "@prosopo/env";
 import { Tasks } from "@prosopo/provider";
 import * as z from "zod";
 import { loadJSONFile } from "../files.js";
-export default (pair, config, cmdArgs) => {
-    const logger = cmdArgs?.logger ||
-        getLogger(LogLevel.enum.info, "cli.provider_set_data_set");
-    return {
-        command: "provider_set_data_set",
-        describe: "Add a dataset as a Provider",
-        builder: (yargs) => yargs.option("file", {
-            type: "string",
-            demand: true,
-            desc: "The file path of a JSON dataset file",
-        }),
-        handler: async (argv) => {
-            try {
-                const env = new ProviderEnvironment(config, pair);
-                await env.isReady();
-                const tasks = new Tasks(env);
-                const file = z.string().parse(argv.file);
-                const jsonFile = loadJSONFile(file);
-                logger.info(() => ({
-                    data: { file },
-                    msg: "Loading JSON",
-                }));
-                const result = await tasks.datasetManager.providerSetDatasetFromFile(jsonFile);
-                logger.info(() => ({
-                    data: { file },
-                    msg: "Loaded JSON",
-                }));
-            }
-            catch (err) {
-                logger.error(() => ({
-                    err,
-                    msg: "Error loading JSON",
-                }));
-            }
-        },
-        middlewares: [],
-    };
+const commandProviderSetDataset = (pair, config, cmdArgs) => {
+  const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, "cli.provider_set_data_set");
+  return {
+    command: "provider_set_data_set",
+    describe: "Add a dataset as a Provider",
+    builder: (yargs) => yargs.option("file", {
+      type: "string",
+      demand: true,
+      desc: "The file path of a JSON dataset file"
+    }),
+    handler: async (argv) => {
+      try {
+        const env = new ProviderEnvironment(config, pair);
+        await env.isReady();
+        const tasks = new Tasks(env);
+        const file = z.string().parse(argv.file);
+        const jsonFile = loadJSONFile(file);
+        logger.info(() => ({
+          data: { file },
+          msg: "Loading JSON"
+        }));
+        const result = await tasks.datasetManager.providerSetDatasetFromFile(jsonFile);
+        logger.info(() => ({
+          data: { file },
+          msg: "Loaded JSON"
+        }));
+      } catch (err) {
+        logger.error(() => ({
+          err,
+          msg: "Error loading JSON"
+        }));
+      }
+    },
+    middlewares: []
+  };
+};
+export {
+  commandProviderSetDataset as default
 };
-//# sourceMappingURL=providerSetDataset.js.map

package/dist/commands/siteKeyRegister.js

@@ -1,85 +1,88 @@
-import { LogLevel, getLogger } from "@prosopo/common";
+import { getLogger, LogLevel } from "@prosopo/common";
 import { ProviderEnvironment } from "@prosopo/env";
 import { Tasks } from "@prosopo/provider";
-import { CaptchaTypeSpec, Tier, } from "@prosopo/types";
+import { CaptchaTypeSpec, Tier } from "@prosopo/types";
 import { z } from "zod";
 import { validateSiteKey } from "./validators.js";
-export const SiteKeyRegisterCommandArgsSpec = z.object({
-    sitekey: z.string(),
-    tier: z.nativeEnum(Tier),
-    captcha_type: CaptchaTypeSpec,
-    frictionless_threshold: z.number().max(1).min(0),
-    pow_difficulty: z.number(),
-    domains: z.array(z.string()),
-    image_threshold: z.number().max(1).min(0),
+const SiteKeyRegisterCommandArgsSpec = z.object({
+  sitekey: z.string(),
+  tier: z.nativeEnum(Tier),
+  captcha_type: CaptchaTypeSpec,
+  frictionless_threshold: z.number().max(1).min(0),
+  pow_difficulty: z.number(),
+  domains: z.array(z.string()),
+  image_threshold: z.number().max(1).min(0)
 });
-export default (pair, config, cmdArgs) => {
-    const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, "cli.dapp_register");
-    return {
-        command: "site_key_register <sitekey> <tier>",
-        describe: "Register a Site Key",
-        builder: (yargs) => yargs
-            .positional("sitekey", {
-            type: "string",
-            demandOption: true,
-            desc: "The AccountId of the application to register the Site Key with",
-        })
-            .option("tier", {
-            type: "string",
-            demandOption: false,
-            desc: "The AccountId of the application to register the Site Key with",
-        })
-            .option("captcha_type", {
-            type: "string",
-            demandOption: false,
-            desc: "Captcha type for settings",
-        })
-            .option("domains", {
-            type: "array",
-            demandOption: false,
-            desc: "Domains for settings",
-        })
-            .option("frictionless_threshold", {
-            type: "number",
-            demandOption: false,
-            desc: "Frictionless threshold for settings",
-        })
-            .option("pow_difficulty", {
-            type: "number",
-            demandOption: false,
-            desc: "POW difficulty for settings",
-        })
-            .option("image_threshold", {
-            type: "number",
-            demandOption: false,
-            desc: "Image threshold for settings",
-        }),
-        handler: async (argv) => {
-            try {
-                const env = new ProviderEnvironment(config, pair);
-                await env.isReady();
-                const { sitekey, tier, captcha_type, frictionless_threshold, pow_difficulty, domains, image_threshold, } = SiteKeyRegisterCommandArgsSpec.parse(argv);
-                const tasks = new Tasks(env);
-                await tasks.clientTaskManager.registerSiteKey(sitekey, tier, {
-                    captchaType: CaptchaTypeSpec.parse(captcha_type),
-                    frictionlessThreshold: frictionless_threshold,
-                    domains: domains || [],
-                    powDifficulty: pow_difficulty,
-                    imageThreshold: image_threshold,
-                });
-                logger.info(() => ({
-                    data: { sitekey },
-                    msg: "Site Key registered",
-                }));
-            }
-            catch (err) {
-                logger.error(() => ({
-                    err,
-                    msg: "Error registering Site Key",
-                }));
-            }
-        },
-        middlewares: [validateSiteKey],
-    };
+const commandSiteKeyRegister = (pair, config, cmdArgs) => {
+  const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, "cli.dapp_register");
+  return {
+    command: "site_key_register <sitekey> <tier>",
+    describe: "Register a Site Key",
+    builder: (yargs) => yargs.positional("sitekey", {
+      type: "string",
+      demandOption: true,
+      desc: "The AccountId of the application to register the Site Key with"
+    }).option("tier", {
+      type: "string",
+      demandOption: false,
+      desc: "The AccountId of the application to register the Site Key with"
+    }).option("captcha_type", {
+      type: "string",
+      demandOption: false,
+      desc: "Captcha type for settings"
+    }).option("domains", {
+      type: "array",
+      demandOption: false,
+      desc: "Domains for settings"
+    }).option("frictionless_threshold", {
+      type: "number",
+      demandOption: false,
+      desc: "Frictionless threshold for settings"
+    }).option("pow_difficulty", {
+      type: "number",
+      demandOption: false,
+      desc: "POW difficulty for settings"
+    }).option("image_threshold", {
+      type: "number",
+      demandOption: false,
+      desc: "Image threshold for settings"
+    }),
+    handler: async (argv) => {
+      try {
+        const env = new ProviderEnvironment(config, pair);
+        await env.isReady();
+        const {
+          sitekey,
+          tier,
+          captcha_type,
+          frictionless_threshold,
+          pow_difficulty,
+          domains,
+          image_threshold
+        } = SiteKeyRegisterCommandArgsSpec.parse(argv);
+        const tasks = new Tasks(env);
+        await tasks.clientTaskManager.registerSiteKey(sitekey, tier, {
+          captchaType: CaptchaTypeSpec.parse(captcha_type),
+          frictionlessThreshold: frictionless_threshold,
+          domains: domains || [],
+          powDifficulty: pow_difficulty,
+          imageThreshold: image_threshold
+        });
+        logger.info(() => ({
+          data: { sitekey },
+          msg: "Site Key registered"
+        }));
+      } catch (err) {
+        logger.error(() => ({
+          err,
+          msg: "Error registering Site Key"
+        }));
+      }
+    },
+    middlewares: [validateSiteKey]
+  };
+};
+export {
+  SiteKeyRegisterCommandArgsSpec,
+  commandSiteKeyRegister as default
 };
-//# sourceMappingURL=siteKeyRegister.js.map

package/dist/commands/siteKeyRegisterApi.js

@@ -1,88 +1,97 @@
 import { ProviderApi } from "@prosopo/api";
-import { LogLevel, getLogger } from "@prosopo/common";
+import { getLogger, LogLevel } from "@prosopo/common";
 import { ProviderEnvironment } from "@prosopo/env";
-import { CaptchaTypeSpec, Tier, } from "@prosopo/types";
+import { CaptchaTypeSpec, Tier } from "@prosopo/types";
 import { u8aToHex } from "@prosopo/util";
 import { z } from "zod";
 import { SiteKeyRegisterCommandArgsSpec } from "./siteKeyRegister.js";
 import { validateSiteKey } from "./validators.js";
-const SiteKeyRegisterApiCommandArgsSpec = SiteKeyRegisterCommandArgsSpec.extend({
-    url: z.string(),
-});
-export default (pair, authAccount, config, cmdArgs) => {
-    const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, "cli.dapp_register");
-    return {
-        command: "site_key_register_api <sitekey> <url>",
-        describe: "Register a Site Key",
-        builder: (yargs) => yargs
-            .positional("sitekey", {
-            type: "string",
-            demandOption: true,
-            desc: "The AccountId of the application to register the Site Key with",
-        })
-            .positional("tier", {
-            choices: Object.values(Tier),
-            demandOption: true,
-            desc: "The tier of the account",
-        })
-            .option("url", {
-            type: "string",
-            demandOption: true,
-            desc: "Provider URL to register the Site Key with",
-        })
-            .option("captcha_type", {
-            type: "string",
-            demandOption: false,
-            desc: "Captcha type for settings",
-        })
-            .option("frictionless_threshold", {
-            type: "number",
-            demandOption: false,
-            desc: "Frictionless threshold for settings",
-        })
-            .option("domains", {
-            type: "array",
-            demandOption: false,
-            desc: "URLs for settings",
-        })
-            .option("pow_difficulty", {
-            type: "number",
-            demandOption: false,
-            desc: "POW difficulty for settings",
-        })
-            .option("image_threshold", {
-            type: "number",
-            demandOption: false,
-            desc: "Image threshold for settings",
-        }),
-        handler: async (argv) => {
-            try {
-                const env = new ProviderEnvironment(config, pair, authAccount);
-                await env.isReady();
-                const { sitekey, captcha_type, frictionless_threshold, url, domains, pow_difficulty, image_threshold, } = SiteKeyRegisterApiCommandArgsSpec.parse(argv);
-                const api = new ProviderApi(url, pair.address);
-                const timestamp = new Date().getTime().toString();
-                const signature = u8aToHex(authAccount.sign(timestamp));
-                await api.registerSiteKey(sitekey, argv.tier, {
-                    captchaType: CaptchaTypeSpec.parse(captcha_type),
-                    frictionlessThreshold: frictionless_threshold,
-                    domains: domains || [],
-                    powDifficulty: pow_difficulty,
-                    imageThreshold: image_threshold,
-                }, timestamp, signature);
-                logger.info(() => ({
-                    data: { sitekey },
-                    msg: "Site Key registered",
-                }));
-            }
-            catch (err) {
-                logger.error(() => ({
-                    err,
-                    msg: "Error registering Site Key",
-                }));
-            }
-        },
-        middlewares: [validateSiteKey],
-    };
+const SiteKeyRegisterApiCommandArgsSpec = SiteKeyRegisterCommandArgsSpec.extend(
+  {
+    url: z.string()
+  }
+);
+const commandSiteKeyRegisterApi = (pair, authAccount, config, cmdArgs) => {
+  const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, "cli.dapp_register");
+  return {
+    command: "site_key_register_api <sitekey> <url>",
+    describe: "Register a Site Key",
+    builder: (yargs) => yargs.positional("sitekey", {
+      type: "string",
+      demandOption: true,
+      desc: "The AccountId of the application to register the Site Key with"
+    }).positional("tier", {
+      choices: Object.values(Tier),
+      demandOption: true,
+      desc: "The tier of the account"
+    }).option("url", {
+      type: "string",
+      demandOption: true,
+      desc: "Provider URL to register the Site Key with"
+    }).option("captcha_type", {
+      type: "string",
+      demandOption: false,
+      desc: "Captcha type for settings"
+    }).option("frictionless_threshold", {
+      type: "number",
+      demandOption: false,
+      desc: "Frictionless threshold for settings"
+    }).option("domains", {
+      type: "array",
+      demandOption: false,
+      desc: "URLs for settings"
+    }).option("pow_difficulty", {
+      type: "number",
+      demandOption: false,
+      desc: "POW difficulty for settings"
+    }).option("image_threshold", {
+      type: "number",
+      demandOption: false,
+      desc: "Image threshold for settings"
+    }),
+    handler: async (argv) => {
+      try {
+        const env = new ProviderEnvironment(config, pair, authAccount);
+        await env.isReady();
+        const {
+          sitekey,
+          captcha_type,
+          frictionless_threshold,
+          url,
+          domains,
+          pow_difficulty,
+          image_threshold
+        } = SiteKeyRegisterApiCommandArgsSpec.parse(argv);
+        const api = new ProviderApi(url, pair.address);
+        const timestamp = (/* @__PURE__ */ new Date()).getTime().toString();
+        const signature = u8aToHex(authAccount.sign(timestamp));
+        await api.registerSiteKey(
+          sitekey,
+          argv.tier,
+          {
+            captchaType: CaptchaTypeSpec.parse(captcha_type),
+            frictionlessThreshold: frictionless_threshold,
+            domains: domains || [],
+            powDifficulty: pow_difficulty,
+            imageThreshold: image_threshold
+          },
+          timestamp,
+          signature
+        );
+        logger.info(() => ({
+          data: { sitekey },
+          msg: "Site Key registered"
+        }));
+      } catch (err) {
+        logger.error(() => ({
+          err,
+          msg: "Error registering Site Key"
+        }));
+      }
+    },
+    middlewares: [validateSiteKey]
+  };
+};
+export {
+  commandSiteKeyRegisterApi as default
 };
-//# sourceMappingURL=siteKeyRegisterApi.js.map