@prosopo/cli 3.6.74 → 3.6.76

package/dist/prosopo.config.js

@@ -1,140 +1,117 @@
-import { parseLogLevel } from "@prosopo/logger";
-import { ProsopoConfigSchema, FrictionlessPenalties, DatabaseTypes, EnvironmentTypesSchema } from "@prosopo/types";
 import { getRateLimitConfig } from "./RateLimiter.js";
-import { getSecret, getPassword, getAddress } from "./process.env.js";
+import { getAddress, getPassword, getSecret } from "./process.env.js";
+import { parseLogLevel } from "@prosopo/logger";
+import { DatabaseTypes, EnvironmentTypesSchema, FrictionlessPenalties, ProsopoConfigSchema } from "@prosopo/types";
+//#region src/prosopo.config.ts
 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";
+	return `${protocol}://${process.env.PROSOPO_DATABASE_USERNAME || "root"}:${password}@${process.env.PROSOPO_DATABASE_HOST || "localhost"}${mongoSrv ? "" : `:${process.env.PROSOPO_DATABASE_PORT || 27017}`}/${mongoSrv ? "?retryWrites=true&w=majority" : ""}`;
 }
-const getLRules = () => {
-  if (!process.env.L_RULES) {
-    return {};
-  }
-  try {
-    return JSON.parse(process.env.L_RULES);
-  } catch (e) {
-    return {};
-  }
+var getLRules = () => {
+	if (!process.env.L_RULES) return {};
+	try {
+		return JSON.parse(process.env.L_RULES);
+	} catch (e) {
+		return {};
+	}
 };
-const isStringArray = (value) => Array.isArray(value) && value.every((item) => typeof item === "string");
-const getDnsServers = () => {
-  if (!process.env.PROSOPO_DNS_SERVERS) {
-    return void 0;
-  }
-  try {
-    const parsed = JSON.parse(process.env.PROSOPO_DNS_SERVERS);
-    if (isStringArray(parsed)) {
-      return parsed;
-    }
-    return void 0;
-  } catch (e) {
-    return void 0;
-  }
+var isStringArray = (value) => Array.isArray(value) && value.every((item) => typeof item === "string");
+var getDnsServers = () => {
+	if (!process.env.PROSOPO_DNS_SERVERS) return;
+	try {
+		const parsed = JSON.parse(process.env.PROSOPO_DNS_SERVERS);
+		if (isStringArray(parsed)) return parsed;
+		return;
+	} catch (e) {
+		return;
+	}
 };
-const getSpamEmailDomainsUrls = () => {
-  if (!process.env.SPAM_EMAIL_DOMAINS_URLS) {
-    return void 0;
-  }
-  try {
-    const parsed = JSON.parse(process.env.SPAM_EMAIL_DOMAINS_URLS);
-    if (isStringArray(parsed)) {
-      return parsed;
-    }
-    return void 0;
-  } catch (e) {
-    return void 0;
-  }
+var getSpamEmailDomainsUrls = () => {
+	if (!process.env.SPAM_EMAIL_DOMAINS_URLS) return;
+	try {
+		const parsed = JSON.parse(process.env.SPAM_EMAIL_DOMAINS_URLS);
+		if (isStringArray(parsed)) return parsed;
+		return;
+	} catch (e) {
+		return;
+	}
 };
-const getHost = () => {
-  const importMeta = import.meta;
-  return process.env.CADDY_DOMAIN || importMeta.env?.VITE_CADDY_DOMAIN;
+var getHost = () => {
+	const importMeta = import.meta;
+	return process.env.CADDY_DOMAIN || importMeta.env?.VITE_CADDY_DOMAIN;
 };
 function getConfig(captchaSolutionsConfig, captchaServeConfig, who = "PROVIDER", admin = "ADMIN") {
-  return ProsopoConfigSchema.parse({
-    logLevel: parseLogLevel(process.env.PROSOPO_LOG_LEVEL, "info"),
-    host: getHost(),
-    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,
-      PENALTY_UNVERIFIED_HOST: process.env.PENALTY_UNVERIFIED_HOST
-    }),
-    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
-      },
-      clientEntropyScheduler: {
-        schedule: process.env.CLIENT_ENTROPY_SCHEDULE
-      },
-      spamEmailDomainsScheduler: {
-        schedule: process.env.SPAM_EMAIL_DOMAINS_SCHEDULE
-      }
-    },
-    lRules: getLRules(),
-    spamEmailDomainsUrls: getSpamEmailDomainsUrls(),
-    authAccount: {
-      address: getAddress(admin),
-      password: getPassword(admin),
-      secret: getSecret(admin)
-    },
-    ipApi: {
-      apiKey: process.env.PROSOPO_IPAPI_KEY,
-      baseUrl: process.env.PROSOPO_IPAPI_URL
-    },
-    maxmindDbPath: process.env.MAXMIND_DB_PATH,
-    dnsServers: getDnsServers()
-  });
+	return ProsopoConfigSchema.parse({
+		logLevel: parseLogLevel(process.env.PROSOPO_LOG_LEVEL, "info"),
+		host: getHost(),
+		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,
+			PENALTY_UNVERIFIED_HOST: process.env.PENALTY_UNVERIFIED_HOST
+		}),
+		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 },
+			clientEntropyScheduler: { schedule: process.env.CLIENT_ENTROPY_SCHEDULE },
+			spamEmailDomainsScheduler: { schedule: process.env.SPAM_EMAIL_DOMAINS_SCHEDULE }
+		},
+		lRules: getLRules(),
+		spamEmailDomainsUrls: getSpamEmailDomainsUrls(),
+		authAccount: {
+			address: getAddress(admin),
+			password: getPassword(admin),
+			secret: getSecret(admin)
+		},
+		ipApi: {
+			apiKey: process.env.PROSOPO_IPAPI_KEY,
+			baseUrl: process.env.PROSOPO_IPAPI_URL
+		},
+		maxmindDbPath: process.env.MAXMIND_DB_PATH,
+		dnsServers: getDnsServers()
+	});
 }
-export {
-  getConfig as default
-};
+//#endregion
+export { getConfig as default };

package/dist/reloader.js

@@ -1,64 +1,52 @@
+import { start } from "./start.js";
+import { LogLevel, getLogger } from "@prosopo/logger";
+import { ProviderEnvironment } from "@prosopo/env";
 import fs from "node:fs";
 import { loadEnv } from "@prosopo/dotenv";
-import { ProviderEnvironment } from "@prosopo/env";
-import { getLogger, LogLevel } from "@prosopo/logger";
-import { start } from "./start.js";
-const log = getLogger(LogLevel.enum.info, "cli");
-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.");
-    }
-    return this._env;
-  }
-  async start(reloadEnv = false) {
-    log.info(() => ({ msg: "Starting API" }));
-    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);
-    if (process.env.NODE_ENV === "development") {
-      this._envWatcher = await this._watchEnv();
-    }
-  }
-  async stop() {
-    log.info(() => ({ msg: "Stopping API" }));
-    return new Promise((resolve) => {
-      if (this.api) {
-        this.api.close(resolve);
-      }
-    });
-  }
-  async _watchEnv() {
-    return fs.watch(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;
-      }
-    });
-  }
-}
-export {
-  ReloadingAPI as default
+//#region src/reloader.ts
+var log = getLogger(LogLevel.enum.info, "cli");
+var ReloadingAPI = class {
+	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.");
+		return this._env;
+	}
+	async start(reloadEnv = false) {
+		log.info(() => ({ msg: "Starting API" }));
+		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);
+		if (process.env.NODE_ENV === "development") this._envWatcher = await this._watchEnv();
+	}
+	async stop() {
+		log.info(() => ({ msg: "Stopping API" }));
+		return new Promise((resolve) => {
+			if (this.api) this.api.close(resolve);
+		});
+	}
+	async _watchEnv() {
+		return fs.watch(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;
+			}
+		});
+	}
 };
+//#endregion
+export { ReloadingAPI as default };

package/dist/start.js

@@ -1,83 +1,61 @@
-import { loadEnv } from "@prosopo/dotenv";
-import { ProviderEnvironment } from "@prosopo/env";
-import { getPair } from "@prosopo/keyring";
-import { storeCaptchasExternally, getClientList, setClientEntropy, updateSpamEmailDomainsScheduler, startProviderApi } from "@prosopo/provider";
 import { getDB, getSecret } from "./process.env.js";
 import getConfig from "./prosopo.config.js";
+import { ProviderEnvironment } from "@prosopo/env";
+import { getClientList, setClientEntropy, startProviderApi, storeCaptchasExternally, updateSpamEmailDomainsScheduler } from "@prosopo/provider";
+import { loadEnv } from "@prosopo/dotenv";
+import { getPair } from "@prosopo/keyring";
+//#region src/start.ts
 async function start(env, admin, port) {
-  if (!env) {
-    loadEnv();
-    getDB();
-    const secret = getSecret();
-    const config = getConfig(void 0, {
-      solved: { count: 2 },
-      unsolved: { count: 0 }
-    });
-    const pair = getPair(secret);
-    let authAccount;
-    if (config.authAccount) {
-      authAccount = getPair(void 0, config.authAccount.address);
-    }
-    env = new ProviderEnvironment(config, pair, authAccount);
-  } else {
-    env.logger.debug(() => ({
-      msg: "Env already defined",
-      data: {
-        config: env?.config
-      }
-    }));
-  }
-  await env.isReady();
-  env.cleanup();
-  const maintenanceMode = process.env.MAINTENANCE_MODE?.toLowerCase() === "true";
-  if (env.pair && !maintenanceMode) {
-    const cronScheduleStorage = env.config.scheduledTasks?.captchaScheduler?.schedule;
-    if (cronScheduleStorage) {
-      storeCaptchasExternally(env.pair, cronScheduleStorage, env.config).catch(
-        (err) => {
-          console.error("Failed to start scheduler:", err);
-        }
-      );
-    }
-    const cronScheduleClient = env.config.scheduledTasks?.clientListScheduler?.schedule;
-    if (cronScheduleClient) {
-      getClientList(env.pair, cronScheduleClient, env.config).catch((err) => {
-        env.logger.error(() => ({
-          msg: "Failed to start client list scheduler",
-          err,
-          context: { failedFuncName: getClientList.name }
-        }));
-      });
-    }
-    const cronClientEntropySetter = env.config.scheduledTasks?.clientEntropyScheduler?.schedule;
-    if (cronClientEntropySetter) {
-      setClientEntropy(env.pair, cronClientEntropySetter, env.config).catch(
-        (err) => {
-          env.logger.error(() => ({
-            msg: "Failed to start client entropy scheduler",
-            err,
-            context: { failedFuncName: setClientEntropy.name }
-          }));
-        }
-      );
-    }
-    const cronSpamEmailDomains = env.config.scheduledTasks?.spamEmailDomainsScheduler?.schedule;
-    if (cronSpamEmailDomains) {
-      updateSpamEmailDomainsScheduler(
-        env.pair,
-        cronSpamEmailDomains,
-        env.config
-      ).catch((err) => {
-        env.logger.error(() => ({
-          msg: "Failed to start spam email domains scheduler",
-          err,
-          context: { failedFuncName: updateSpamEmailDomainsScheduler.name }
-        }));
-      });
-    }
-  }
-  return startProviderApi(env, admin, port);
+	if (!env) {
+		loadEnv();
+		getDB();
+		const secret = getSecret();
+		const config = getConfig(void 0, {
+			solved: { count: 2 },
+			unsolved: { count: 0 }
+		});
+		const pair = getPair(secret);
+		let authAccount;
+		if (config.authAccount) authAccount = getPair(void 0, config.authAccount.address);
+		env = new ProviderEnvironment(config, pair, authAccount);
+	} else env.logger.debug(() => ({
+		msg: "Env already defined",
+		data: { config: env?.config }
+	}));
+	await env.isReady();
+	env.cleanup();
+	const maintenanceMode = process.env.MAINTENANCE_MODE?.toLowerCase() === "true";
+	if (env.pair && !maintenanceMode) {
+		const cronScheduleStorage = env.config.scheduledTasks?.captchaScheduler?.schedule;
+		if (cronScheduleStorage) storeCaptchasExternally(env.pair, cronScheduleStorage, env.config).catch((err) => {
+			console.error("Failed to start scheduler:", err);
+		});
+		const cronScheduleClient = env.config.scheduledTasks?.clientListScheduler?.schedule;
+		if (cronScheduleClient) getClientList(env.pair, cronScheduleClient, env.config).catch((err) => {
+			env.logger.error(() => ({
+				msg: "Failed to start client list scheduler",
+				err,
+				context: { failedFuncName: getClientList.name }
+			}));
+		});
+		const cronClientEntropySetter = env.config.scheduledTasks?.clientEntropyScheduler?.schedule;
+		if (cronClientEntropySetter) setClientEntropy(env.pair, cronClientEntropySetter, env.config).catch((err) => {
+			env.logger.error(() => ({
+				msg: "Failed to start client entropy scheduler",
+				err,
+				context: { failedFuncName: setClientEntropy.name }
+			}));
+		});
+		const cronSpamEmailDomains = env.config.scheduledTasks?.spamEmailDomainsScheduler?.schedule;
+		if (cronSpamEmailDomains) updateSpamEmailDomainsScheduler(env.pair, cronSpamEmailDomains, env.config).catch((err) => {
+			env.logger.error(() => ({
+				msg: "Failed to start spam email domains scheduler",
+				err,
+				context: { failedFuncName: updateSpamEmailDomainsScheduler.name }
+			}));
+		});
+	}
+	return startProviderApi(env, admin, port);
 }
-export {
-  start
-};
+//#endregion
+export { start };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/cli",
-	"version": "3.6.74",
+	"version": "3.6.76",
 	"description": "CLI for Prosopo Provider",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -32,29 +32,29 @@
 	},
 	"dependencies": {
 		"@polkadot/types-codec": "16.4.9",
-		"@prosopo/api": "3.5.19",
-		"@prosopo/common": "3.1.47",
-		"@prosopo/logger": "2.0.3",
-		"@prosopo/dotenv": "3.0.49",
-		"@prosopo/env": "3.6.19",
-		"@prosopo/keyring": "2.9.60",
-		"@prosopo/locale": "3.2.7",
-		"@prosopo/provider": "4.15.14",
-		"@prosopo/types": "4.9.12",
-		"@prosopo/util": "3.3.4",
-		"@prosopo/workspace": "3.1.20",
+		"@prosopo/api": "3.5.21",
+		"@prosopo/common": "3.1.48",
+		"@prosopo/logger": "2.0.4",
+		"@prosopo/dotenv": "3.0.50",
+		"@prosopo/env": "3.6.21",
+		"@prosopo/keyring": "2.9.61",
+		"@prosopo/locale": "3.2.8",
+		"@prosopo/provider": "4.15.16",
+		"@prosopo/types": "4.10.0",
+		"@prosopo/util": "3.3.5",
+		"@prosopo/workspace": "3.2.0",
 		"cron-parser": "4.9.0",
 		"dotenv": "16.4.5",
 		"yargs": "17.7.2",
 		"zod": "3.23.8"
 	},
 	"devDependencies": {
-		"@prosopo/config": "3.3.4",
+		"@prosopo/config": "3.3.5",
 		"@polkadot-api/substrate-client": "0.1.4",
 		"@types/cors": "2.8.17",
 		"@types/node": "22.10.2",
 		"@types/yargs": "17.0.33",
-		"@vitest/coverage-v8": "3.2.4",
+		"@vitest/coverage-v8": "4.1.10",
 		"concurrently": "9.0.1",
 		"del-cli": "6.0.0",
 		"express": "4.21.2",
@@ -63,8 +63,8 @@
 		"tslib": "2.7.0",
 		"tsx": "4.20.3",
 		"typescript": "5.6.2",
-		"vite": "6.4.1",
-		"vitest": "3.2.4"
+		"vite": "8.1.5",
+		"vitest": "4.1.10"
 	},
 	"author": "Prosopo",
 	"license": "Apache-2.0",