@prosopo/cli 3.1.0 → 3.1.1

package/dist/commands/validators.js

@@ -1,36 +1,41 @@
 import { ProsopoEnvError } from "@prosopo/common";
 import { encodeStringAddress } from "@prosopo/provider";
 import parser from "cron-parser";
-export const validateAddress = (argv) => {
-    const address = encodeStringAddress(argv.address);
-    return { address };
+const validateAddress = (argv) => {
+  const address = encodeStringAddress(argv.address);
+  return { address };
 };
-export const validateSiteKey = (argv) => {
-    const sitekey = encodeStringAddress(argv.sitekey);
-    return { sitekey };
+const validateSiteKey = (argv) => {
+  const sitekey = encodeStringAddress(argv.sitekey);
+  return { sitekey };
 };
-export const validateValue = (argv) => {
-    if (typeof argv.value !== "number") {
-        throw new ProsopoEnvError("CLI.PARAMETER_ERROR", {
-            context: { value: [argv.value] },
-        });
-    }
-    const value = argv.value;
-    return { value };
+const validateValue = (argv) => {
+  if (typeof argv.value !== "number") {
+    throw new ProsopoEnvError("CLI.PARAMETER_ERROR", {
+      context: { value: [argv.value] }
+    });
+  }
+  const value = argv.value;
+  return { value };
 };
-export const validateScheduleExpression = (argv) => {
-    if (typeof argv.schedule === "string") {
-        const result = parser.parseString(argv.schedule);
-        if (argv.schedule in result.errors) {
-            throw new ProsopoEnvError("CLI.PARAMETER_ERROR", {
-                context: {
-                    payee: [argv.shedule],
-                    failedFuncName: validateScheduleExpression.name,
-                },
-            });
+const validateScheduleExpression = (argv) => {
+  if (typeof argv.schedule === "string") {
+    const result = parser.parseString(argv.schedule);
+    if (argv.schedule in result.errors) {
+      throw new ProsopoEnvError("CLI.PARAMETER_ERROR", {
+        context: {
+          payee: [argv.shedule],
+          failedFuncName: validateScheduleExpression.name
         }
-        return { schedule: argv.schedule };
+      });
     }
-    return { schedule: null };
+    return { schedule: argv.schedule };
+  }
+  return { schedule: null };
+};
+export {
+  validateAddress,
+  validateScheduleExpression,
+  validateSiteKey,
+  validateValue
 };
-//# sourceMappingURL=validators.js.map

package/dist/commands/version.js

@@ -1,15 +1,17 @@
-import { LogLevel, getLogger } from "@prosopo/common";
+import { getLogger, LogLevel } 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: () => {
-            logger.info(() => ({
-                data: { version },
-            }));
-        },
-    };
+const commandVersion = (pair, config, cmdArgs) => {
+  const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, "cli.version");
+  return {
+    command: "version",
+    describe: "Return the version of the software",
+    handler: () => {
+      logger.info(() => ({
+        data: { version }
+      }));
+    }
+  };
+};
+export {
+  commandVersion as default
 };
-//# sourceMappingURL=version.js.map

package/dist/files.js

@@ -1,37 +1,39 @@
 import fs, { createWriteStream } from "node:fs";
 import { Readable } from "node:stream";
 import { ProsopoCliError } from "@prosopo/common";
-export function loadJSONFile(filePath) {
-    try {
-        return JSON.parse(fs.readFileSync(filePath, "utf8"));
-    }
-    catch (error) {
-        throw new ProsopoCliError("GENERAL.JSON_LOAD_FAILED", {
-            context: { error, filePath },
-        });
-    }
+function loadJSONFile(filePath) {
+  try {
+    return JSON.parse(fs.readFileSync(filePath, "utf8"));
+  } catch (error) {
+    throw new ProsopoCliError("GENERAL.JSON_LOAD_FAILED", {
+      context: { error, filePath }
+    });
+  }
 }
-export function writeJSONFile(filePath, jsonData) {
-    return new Promise((resolve, reject) => {
-        const writeStream = createWriteStream(filePath);
-        writeStream.setDefaultEncoding("utf-8");
-        writeStream.on("finish", () => {
-            resolve(true);
-        });
-        writeStream.on("error", (err) => {
-            reject(err);
-        });
-        const readable = Readable.from(JSON.stringify(jsonData));
-        readable.pipe(writeStream);
+function writeJSONFile(filePath, jsonData) {
+  return new Promise((resolve, reject) => {
+    const writeStream = createWriteStream(filePath);
+    writeStream.setDefaultEncoding("utf-8");
+    writeStream.on("finish", () => {
+      resolve(true);
+    });
+    writeStream.on("error", (err) => {
+      reject(err);
     });
+    const readable = Readable.from(JSON.stringify(jsonData));
+    readable.pipe(writeStream);
+  });
 }
-export async function readFile(filePath) {
-    return new Promise((resolve, reject) => {
-        fs.readFile(filePath, (err, data) => {
-            if (err)
-                reject(err);
-            resolve(data);
-        });
+async function readFile(filePath) {
+  return new Promise((resolve, reject) => {
+    fs.readFile(filePath, (err, data) => {
+      if (err) reject(err);
+      resolve(data);
     });
+  });
 }
-//# sourceMappingURL=files.js.map
+export {
+  loadJSONFile,
+  readFile,
+  writeJSONFile
+};

package/dist/index.js

@@ -1,7 +1,20 @@
-export * from "./argv.js";
-export * from "./cli.js";
-export * from "./start.js";
-export * from "./process.env.js";
-export * from "./files.js";
-export { default as defaultConfig } from "./prosopo.config.js";
-//# sourceMappingURL=index.js.map
+import { processArgs } from "./argv.js";
+import "./cli.js";
+import { start } from "./start.js";
+import { getAddress, getDB, getPairType, getPassword, getSecret, getSs58Format } from "./process.env.js";
+import { loadJSONFile, readFile, writeJSONFile } from "./files.js";
+import { default as default2 } from "./prosopo.config.js";
+export {
+  default2 as defaultConfig,
+  getAddress,
+  getDB,
+  getPairType,
+  getPassword,
+  getSecret,
+  getSs58Format,
+  loadJSONFile,
+  processArgs,
+  readFile,
+  start,
+  writeJSONFile
+};

package/dist/process.env.js

@@ -1,44 +1,45 @@
 import { ProsopoEnvError } from "@prosopo/common";
-export function getSs58Format() {
-    return Number.parseInt(process.env.SS58_FORMAT || "") || 42;
+function getSs58Format() {
+  return Number.parseInt(process.env.SS58_FORMAT || "") || 42;
 }
-export function getPairType() {
-    return (process.env.PROSOPO_PAIR_TYPE || "sr25519");
+function getPairType() {
+  return process.env.PROSOPO_PAIR_TYPE || "sr25519";
 }
-export function getAddress(who) {
-    if (!who) {
-        who = "PROVIDER";
-    }
-    else {
-        who = who.toUpperCase();
-    }
-    return process.env[`PROSOPO_${who}_ADDRESS`];
+function getAddress(who) {
+  if (!who) {
+    who = "PROVIDER";
+  } else {
+    who = who.toUpperCase();
+  }
+  return process.env[`PROSOPO_${who}_ADDRESS`];
 }
-export function getPassword(who) {
-    if (!who) {
-        who = "PROVIDER";
-    }
-    else {
-        who = who.toUpperCase();
-    }
-    return process.env[`PROSOPO_${who}_ACCOUNT_PASSWORD`];
+function getPassword(who) {
+  if (!who) {
+    who = "PROVIDER";
+  } else {
+    who = who.toUpperCase();
+  }
+  return process.env[`PROSOPO_${who}_ACCOUNT_PASSWORD`];
 }
-export function getSecret(who) {
-    if (!who) {
-        who = "PROVIDER";
-    }
-    else {
-        who = who.toUpperCase();
-    }
-    return (process.env[`PROSOPO_${who}_MNEMONIC`] ||
-        process.env[`PROSOPO_${who}_SEED`] ||
-        process.env[`PROSOPO_${who}_URI`] ||
-        process.env[`PROSOPO_${who}_JSON`]);
+function getSecret(who) {
+  if (!who) {
+    who = "PROVIDER";
+  } else {
+    who = who.toUpperCase();
+  }
+  return process.env[`PROSOPO_${who}_MNEMONIC`] || process.env[`PROSOPO_${who}_SEED`] || process.env[`PROSOPO_${who}_URI`] || process.env[`PROSOPO_${who}_JSON`];
 }
-export function getDB() {
-    if (!process.env.PROSOPO_DATABASE_HOST) {
-        throw new ProsopoEnvError("DATABASE.DATABASE_HOST_UNDEFINED");
-    }
-    return process.env.PROSOPO_DATABASE_HOST;
+function getDB() {
+  if (!process.env.PROSOPO_DATABASE_HOST) {
+    throw new ProsopoEnvError("DATABASE.DATABASE_HOST_UNDEFINED");
+  }
+  return process.env.PROSOPO_DATABASE_HOST;
 }
-//# sourceMappingURL=process.env.js.map
+export {
+  getAddress,
+  getDB,
+  getPairType,
+  getPassword,
+  getSecret,
+  getSs58Format
+};

package/dist/prosopo.config.js

@@ -1,97 +1,92 @@
 import { parseLogLevel } from "@prosopo/common";
-import { DatabaseTypes, EnvironmentTypesSchema, FrictionlessPenalties, ProsopoConfigSchema, } from "@prosopo/types";
+import { ProsopoConfigSchema, FrictionlessPenalties, DatabaseTypes, EnvironmentTypesSchema } from "@prosopo/types";
 import { getRateLimitConfig } from "./RateLimiter.js";
-import { getAddress, getPassword, getSecret } from "./process.env.js";
+import { getSecret, getPassword, getAddress } from "./process.env.js";
 function getMongoURI() {
-    const protocol = process.env.PROSOPO_DATABASE_PROTOCOL || "mongodb";
-    const mongoSrv = protocol === "mongodb+srv";
-    const password = process.env.PROSOPO_DATABASE_PASSWORD || "root";
-    const username = process.env.PROSOPO_DATABASE_USERNAME || "root";
-    const host = process.env.PROSOPO_DATABASE_HOST || "localhost";
-    const port = mongoSrv ? "" : `:${process.env.PROSOPO_DATABASE_PORT || 27017}`;
-    const retries = mongoSrv ? "?retryWrites=true&w=majority" : "";
-    const mongoURI = `${protocol}://${username}:${password}@${host}${port}/${retries}`;
-    return mongoURI;
+  const protocol = process.env.PROSOPO_DATABASE_PROTOCOL || "mongodb";
+  const mongoSrv = protocol === "mongodb+srv";
+  const password = process.env.PROSOPO_DATABASE_PASSWORD || "root";
+  const username = process.env.PROSOPO_DATABASE_USERNAME || "root";
+  const host = process.env.PROSOPO_DATABASE_HOST || "localhost";
+  const port = mongoSrv ? "" : `:${process.env.PROSOPO_DATABASE_PORT || 27017}`;
+  const retries = mongoSrv ? "?retryWrites=true&w=majority" : "";
+  const mongoURI = `${protocol}://${username}:${password}@${host}${port}/${retries}`;
+  return mongoURI;
 }
 const getLRules = () => {
-    if (!process.env.L_RULES) {
-        return {};
-    }
-    try {
-        return JSON.parse(process.env.L_RULES);
-    }
-    catch (e) {
-        return {};
-    }
+  if (!process.env.L_RULES) {
+    return {};
+  }
+  try {
+    return JSON.parse(process.env.L_RULES);
+  } catch (e) {
+    return {};
+  }
 };
-export default function getConfig(captchaSolutionsConfig, captchaServeConfig, who = "PROVIDER", admin = "ADMIN") {
-    return ProsopoConfigSchema.parse({
-        logLevel: parseLogLevel(process.env.PROSOPO_LOG_LEVEL, "info"),
-        defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT
-            ? EnvironmentTypesSchema.parse(process.env.PROSOPO_DEFAULT_ENVIRONMENT)
-            : EnvironmentTypesSchema.enum.development,
-        account: {
-            address: getAddress(who),
-            password: getPassword(who),
-            secret: getSecret(who),
-        },
-        database: {
-            development: {
-                type: DatabaseTypes.enum.provider,
-                endpoint: getMongoURI(),
-                dbname: process.env.PROSOPO_DATABASE_NAME,
-                authSource: process.env.PROSOPO_DATABASE_AUTH_SOURCE,
-            },
-            staging: {
-                type: DatabaseTypes.enum.provider,
-                endpoint: getMongoURI(),
-                dbname: process.env.PROSOPO_DATABASE_NAME,
-                authSource: process.env.PROSOPO_DATABASE_AUTH_SOURCE,
-            },
-            production: {
-                type: DatabaseTypes.enum.provider,
-                endpoint: getMongoURI(),
-                dbname: process.env.PROSOPO_DATABASE_NAME,
-                authSource: process.env.PROSOPO_DATABASE_AUTH_SOURCE,
-            },
-        },
-        server: {
-            baseURL: process.env.PROSOPO_API_BASE_URL || "http://localhost",
-            port: process.env.PROSOPO_API_PORT
-                ? Number.parseInt(process.env.PROSOPO_API_PORT)
-                : 9229,
-        },
-        captchaSolutions: captchaSolutionsConfig,
-        captchas: captchaServeConfig,
-        penalties: FrictionlessPenalties.parse({
-            PENALTY_OLD_TIMESTAMP: process.env.PENALTY_OLD_TIMESTAMP,
-            PENALTY_ACCESS_RULE: process.env.PENALTY_ACCESS_RULE,
-        }),
-        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: getRateLimitConfig(),
-        proxyCount: process.env.PROSOPO_PROXY_COUNT
-            ? Number.parseInt(process.env.PROSOPO_PROXY_COUNT)
-            : 0,
-        scheduledTasks: {
-            captchaScheduler: {
-                schedule: process.env.CAPTCHA_STORAGE_SCHEDULE,
-            },
-            clientListScheduler: {
-                schedule: process.env.CLIENT_LIST_SCHEDULE,
-            },
-        },
-        lRules: getLRules(),
-        authAccount: {
-            address: getAddress(admin),
-            password: getPassword(admin),
-            secret: getSecret(admin),
-        },
-    });
+function getConfig(captchaSolutionsConfig, captchaServeConfig, who = "PROVIDER", admin = "ADMIN") {
+  return ProsopoConfigSchema.parse({
+    logLevel: parseLogLevel(process.env.PROSOPO_LOG_LEVEL, "info"),
+    defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT ? EnvironmentTypesSchema.parse(process.env.PROSOPO_DEFAULT_ENVIRONMENT) : EnvironmentTypesSchema.enum.development,
+    account: {
+      address: getAddress(who),
+      password: getPassword(who),
+      secret: getSecret(who)
+    },
+    database: {
+      development: {
+        type: DatabaseTypes.enum.provider,
+        endpoint: getMongoURI(),
+        dbname: process.env.PROSOPO_DATABASE_NAME,
+        authSource: process.env.PROSOPO_DATABASE_AUTH_SOURCE
+      },
+      staging: {
+        type: DatabaseTypes.enum.provider,
+        endpoint: getMongoURI(),
+        dbname: process.env.PROSOPO_DATABASE_NAME,
+        authSource: process.env.PROSOPO_DATABASE_AUTH_SOURCE
+      },
+      production: {
+        type: DatabaseTypes.enum.provider,
+        endpoint: getMongoURI(),
+        dbname: process.env.PROSOPO_DATABASE_NAME,
+        authSource: process.env.PROSOPO_DATABASE_AUTH_SOURCE
+      }
+    },
+    server: {
+      baseURL: process.env.PROSOPO_API_BASE_URL || "http://localhost",
+      port: process.env.PROSOPO_API_PORT ? Number.parseInt(process.env.PROSOPO_API_PORT) : 9229
+    },
+    captchaSolutions: captchaSolutionsConfig,
+    captchas: captchaServeConfig,
+    penalties: FrictionlessPenalties.parse({
+      PENALTY_OLD_TIMESTAMP: process.env.PENALTY_OLD_TIMESTAMP,
+      PENALTY_ACCESS_RULE: process.env.PENALTY_ACCESS_RULE
+    }),
+    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: getRateLimitConfig(),
+    proxyCount: process.env.PROSOPO_PROXY_COUNT ? Number.parseInt(process.env.PROSOPO_PROXY_COUNT) : 0,
+    scheduledTasks: {
+      captchaScheduler: {
+        schedule: process.env.CAPTCHA_STORAGE_SCHEDULE
+      },
+      clientListScheduler: {
+        schedule: process.env.CLIENT_LIST_SCHEDULE
+      }
+    },
+    lRules: getLRules(),
+    authAccount: {
+      address: getAddress(admin),
+      password: getPassword(admin),
+      secret: getSecret(admin)
+    }
+  });
 }
-//# sourceMappingURL=prosopo.config.js.map
+export {
+  getConfig as default
+};

package/dist/reloader.js

@@ -1,56 +1,62 @@
 import fs from "node:fs";
-import { LogLevel, getLogger } from "@prosopo/common";
+import { getLogger, LogLevel } from "@prosopo/common";
 import { loadEnv } from "@prosopo/dotenv";
 import { ProviderEnvironment } from "@prosopo/env";
 import { start } from "./start.js";
 const log = getLogger(LogLevel.enum.info, "CLI");
-export default class ReloadingAPI {
-    constructor(envPath, config, pair, authAccount, processedArgs) {
-        this._envPath = envPath;
-        this._config = config;
-        this._pair = pair;
-        this._authAccount = authAccount;
-        this._processedArgs = processedArgs;
-        this._restarting = false;
+class ReloadingAPI {
+  constructor(envPath, config, pair, authAccount, processedArgs) {
+    this._envPath = envPath;
+    this._config = config;
+    this._pair = pair;
+    this._authAccount = authAccount;
+    this._processedArgs = processedArgs;
+    this._restarting = false;
+  }
+  get env() {
+    if (!this._env) {
+      throw new Error("Environment not initialized. Call start() first.");
     }
-    get env() {
-        if (!this._env) {
-            throw new Error("Environment not initialized. Call start() first.");
-        }
-        return this._env;
+    return this._env;
+  }
+  async start(reloadEnv = false) {
+    log.info(() => ({ msg: "Starting API" }));
+    this._envWatcher = await this._watchEnv();
+    loadEnv();
+    if (!this._env || reloadEnv) {
+      this._env = new ProviderEnvironment(
+        this._config,
+        this._pair,
+        this._authAccount
+      );
     }
-    async start(reloadEnv = false) {
-        log.info(() => ({ msg: "Starting API" }));
-        this._envWatcher = await this._watchEnv();
+    await this.env.isReady();
+    this.api = await start(this.env, !!this._processedArgs.adminApi);
+  }
+  async stop() {
+    log.info(() => ({ msg: "Stopping API" }));
+    return new Promise((resolve) => {
+      if (this.api) {
+        this.api.close(resolve);
+      }
+    });
+  }
+  async _watchEnv() {
+    return fs.watchFile(this._envPath, async () => {
+      log.info(() => ({
+        data: { restarting: this._restarting },
+        msg: "env file change detected. Restarting"
+      }));
+      if (!this._restarting) {
+        this._restarting = true;
+        await this.stop();
         loadEnv();
-        if (!this._env || reloadEnv) {
-            this._env = new ProviderEnvironment(this._config, this._pair, this._authAccount);
-        }
-        await this.env.isReady();
-        this.api = await start(this.env, !!this._processedArgs.adminApi);
-    }
-    async stop() {
-        log.info(() => ({ msg: "Stopping API" }));
-        return new Promise((resolve) => {
-            if (this.api) {
-                this.api.close(resolve);
-            }
-        });
-    }
-    async _watchEnv() {
-        return fs.watchFile(this._envPath, async () => {
-            log.info(() => ({
-                data: { restarting: this._restarting },
-                msg: "env file change detected. Restarting",
-            }));
-            if (!this._restarting) {
-                this._restarting = true;
-                await this.stop();
-                loadEnv();
-                await this.start(true);
-                this._restarting = false;
-            }
-        });
-    }
+        await this.start(true);
+        this._restarting = false;
+      }
+    });
+  }
 }
-//# sourceMappingURL=reloader.js.map
+export {
+  ReloadingAPI as default
+};