@prosopo/cli 1.0.2 → 2.0.0

package/dist/prosopo.config.js

@@ -1,17 +1,20 @@
-import { DatabaseTypes, EnvironmentTypesSchema, NetworkNamesSchema, ProsopoConfigSchema, } from '@prosopo/types';
-import { getAddress, getPassword, getSecret } from './process.env.js';
-import { getLogLevel } from '@prosopo/common';
+import { LogLevel, getLogLevel, getLogger } from "@prosopo/common";
+import { DatabaseTypes, EnvironmentTypesSchema, NetworkNamesSchema, ProsopoConfigSchema, } from "@prosopo/types";
+import { getRateLimitConfig } from "./RateLimiter.js";
+import { getAddress, getPassword, getSecret } from "./process.env.js";
+const logger = getLogger(LogLevel.enum.info, "Config");
 function getMongoURI() {
-    const protocol = process.env.PROSOPO_DATABASE_PROTOCOL || 'mongodb';
-    const mongoSrv = protocol === 'mongodb+srv';
-    const password = process.env.PROSOPO_DATABASE_PASSWORD || '';
-    const username = process.env.PROSOPO_DATABASE_USERNAME || '';
-    const host = process.env.PROSOPO_DATABASE_HOST || 'localhost';
-    const port = mongoSrv ? '' : `:${process.env.PROSOPO_DATABASE_PORT ? process.env.PROSOPO_DATABASE_PORT : 27017}`;
-    const retries = mongoSrv ? '?retryWrites=true&w=majority' : '';
-    return `${protocol}://${username}:${password}@${host}${port}/${retries}`;
+    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;
 }
-export default function getConfig(networksConfig, captchaSolutionsConfig, batchCommitConfig, captchaServeConfig, who = 'PROVIDER') {
+export default function getConfig(networksConfig, captchaSolutionsConfig, batchCommitConfig, captchaServeConfig, who = "PROVIDER") {
     return ProsopoConfigSchema.parse({
         logLevel: getLogLevel(),
         defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT
@@ -29,27 +32,42 @@ export default function getConfig(networksConfig, captchaSolutionsConfig, batchC
             development: {
                 type: DatabaseTypes.enum.mongo,
                 endpoint: getMongoURI(),
-                dbname: process.env.PROSOPO_DATABASE_NAME || '',
-                authSource: 'admin',
+                dbname: process.env.PROSOPO_DATABASE_NAME || "prosopo",
+                authSource: "admin",
+            },
+            staging: {
+                type: DatabaseTypes.enum.mongo,
+                endpoint: getMongoURI(),
+                dbname: process.env.PROSOPO_DATABASE_NAME || "prosopo",
+                authSource: "admin",
             },
             production: {
                 type: DatabaseTypes.enum.mongo,
                 endpoint: getMongoURI(),
-                dbname: process.env.PROSOPO_DATABASE_NAME || '',
-                authSource: 'admin',
+                dbname: process.env.PROSOPO_DATABASE_NAME || "prosopo",
+                authSource: "admin",
             },
         },
         server: {
-            baseURL: process.env.PROSOPO_API_BASE_URL || 'http://localhost',
-            port: process.env.PROSOPO_API_PORT ? parseInt(process.env.PROSOPO_API_PORT) : 9229,
+            baseURL: process.env.PROSOPO_API_BASE_URL || "http://localhost",
+            port: process.env.PROSOPO_API_PORT
+                ? Number.parseInt(process.env.PROSOPO_API_PORT)
+                : 9229,
         },
         networks: networksConfig,
         captchaSolutions: captchaSolutionsConfig,
         batchCommit: batchCommitConfig,
         captchas: captchaServeConfig,
-        devOnlyWatchEvents: process.env._DEV_ONLY_WATCH_EVENTS === 'true',
-        mongoEventsUri: process.env.PROSOPO_MONGO_EVENTS_URI || '',
-        mongoCaptchaUri: process.env.PROSOPO_MONGO_CAPTCHA_URI || '',
+        devOnlyWatchEvents: process.env._DEV_ONLY_WATCH_EVENTS === "true",
+        mongoEventsUri: process.env.PROSOPO_MONGO_EVENTS_URI || "",
+        mongoCaptchaUri: process.env.PROSOPO_MONGO_CAPTCHA_URI || "",
+        rateLimits: getRateLimitConfig(),
+        proxyCount: process.env.PROSOPO_PROXY_COUNT
+            ? Number.parseInt(process.env.PROSOPO_PROXY_COUNT)
+            : 0,
+        captchaScheduler: {
+            schedule: process.env.CAPTCHA_STORAGE_SCHEDULE,
+        },
     });
 }
 //# sourceMappingURL=prosopo.config.js.map

package/dist/prosopo.config.js.map

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

package/dist/reloader.d.ts

@@ -1,6 +1,6 @@
-import { AwaitedProcessedArgs } from './argv.js';
-import { KeyringPair } from '@polkadot/keyring/types';
-import { ProsopoConfigOutput } from '@prosopo/types';
+import type { KeyringPair } from "@polkadot/keyring/types";
+import type { ProsopoConfigOutput } from "@prosopo/types";
+import type { AwaitedProcessedArgs } from "./argv.js";
 export default class ReloadingAPI {
     private _envWatcher;
     private _envPath;

package/dist/reloader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reloader.d.ts","sourceRoot":"","sources":["../src/reloader.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AASpD,MAAM,CAAC,OAAO,OAAO,YAAY;IAC7B,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,KAAK,CAAa;IAC1B,OAAO,CAAC,cAAc,CAAsB;IAC5C,OAAO,CAAC,GAAG,CAAoB;IAC/B,OAAO,CAAC,WAAW,CAAS;gBAEhB,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,oBAAoB;IAQnG,KAAK;IAQL,IAAI;YASH,SAAS;CAY1B"}
+{"version":3,"file":"reloader.d.ts","sourceRoot":"","sources":["../src/reloader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAc1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAMtD,MAAM,CAAC,OAAO,OAAO,YAAY;IAEhC,OAAO,CAAC,WAAW,CAAM;IACzB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,GAAG,CAAqB;IAChC,OAAO,CAAC,WAAW,CAAU;gBAG5B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,WAAW,EACjB,aAAa,EAAE,oBAAoB;IASvB,KAAK;IASL,IAAI;YASH,SAAS;CAYvB"}

package/dist/reloader.js

@@ -1,9 +1,9 @@
-import { LogLevel, getLogger } from '@prosopo/common';
-import { ProviderEnvironment } from '@prosopo/env';
-import { loadEnv } from './env.js';
-import { start } from './start.js';
-import fs from 'fs';
-const log = getLogger(LogLevel.enum.info, 'CLI');
+import fs from "node:fs";
+import { LogLevel, getLogger } from "@prosopo/common";
+import { ProviderEnvironment } from "@prosopo/env";
+import { loadEnv } from "./env.js";
+import { start } from "./start.js";
+const log = getLogger(LogLevel.enum.info, "CLI");
 export default class ReloadingAPI {
     constructor(envPath, config, pair, processedArgs) {
         this._envPath = envPath;
@@ -13,14 +13,15 @@ export default class ReloadingAPI {
         this._restarting = false;
     }
     async start() {
-        log.info('Starting API');
+        log.info("Starting API");
         this._envWatcher = await this._watchEnv();
+        loadEnv();
         const env = new ProviderEnvironment(this._config, this._pair);
         await env.isReady();
         this.api = await start(env, !!this._processedArgs.adminApi);
     }
     async stop() {
-        log.info('Stopping API');
+        log.info("Stopping API");
         return new Promise((resolve) => {
             if (this.api) {
                 this.api.close(resolve);
@@ -29,6 +30,7 @@ export default class ReloadingAPI {
     }
     async _watchEnv() {
         return fs.watchFile(this._envPath, async () => {
+            log.info(`env file change detected. Restarting: ${this._restarting}`);
             if (!this._restarting) {
                 this._restarting = true;
                 await this.stop();

package/dist/reloader.js.map

@@ -1 +1 @@
-{"version":3,"file":"reloader.js","sourceRoot":"","sources":["../src/reloader.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;AAEhD,MAAM,CAAC,OAAO,OAAO,YAAY;IAS7B,YAAY,OAAe,EAAE,MAA2B,EAAE,IAAiB,EAAE,aAAmC;QAC5G,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;QACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,IAAI,CAAC,cAAc,GAAG,aAAa,CAAA;QACnC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAA;IAC5B,CAAC;IAEM,KAAK,CAAC,KAAK;QACd,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QACxB,IAAI,CAAC,WAAW,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QACzC,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;QAC7D,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;QACnB,IAAI,CAAC,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;IAC/D,CAAC;IAEM,KAAK,CAAC,IAAI;QACb,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QACxB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,IAAI,CAAC,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;aAC1B;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,KAAK,CAAC,SAAS;QACnB,OAAO,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAC1C,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;gBACnB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;gBACvB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;gBACjB,OAAO,EAAE,CAAA;gBAET,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;gBAClB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAA;aAC3B;QACL,CAAC,CAAC,CAAA;IACN,CAAC;CACJ"}
+{"version":3,"file":"reloader.js","sourceRoot":"","sources":["../src/reloader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AAGzB,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAgBnD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,YAAY;IAUhC,YACC,OAAe,EACf,MAA2B,EAC3B,IAAiB,EACjB,aAAmC;QAEnC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC1B,CAAC;IAEM,KAAK,CAAC,KAAK;QACjB,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QAC1C,OAAO,EAAE,CAAC;QACV,MAAM,GAAG,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9D,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;QACpB,IAAI,CAAC,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC7D,CAAC;IAEM,KAAK,CAAC,IAAI;QAChB,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACzB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC9B,IAAI,IAAI,CAAC,GAAG,EAAE;gBACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aACxB;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,SAAS;QACtB,OAAO,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAC7C,GAAG,CAAC,IAAI,CAAC,yCAAyC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YACtE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;gBACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;gBACxB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;gBAClB,OAAO,EAAE,CAAC;gBACV,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;aACzB;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;CACD"}

package/dist/start.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
-import { ProviderEnvironment } from '@prosopo/env';
-import { Server } from 'node:net';
+import type { Server } from "node:net";
+import { ProviderEnvironment } from "@prosopo/env";
 export declare function start(env?: ProviderEnvironment, admin?: boolean): Promise<Server>;
 //# sourceMappingURL=start.d.ts.map

package/dist/start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AA8BjC,wBAAsB,KAAK,CAAC,GAAG,CAAC,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,OAAO,mBA0BrE"}
+{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AA2DnD,wBAAsB,KAAK,CAAC,GAAG,CAAC,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,OAAO,mBA+BrE"}

package/dist/start.js

@@ -1,24 +1,31 @@
-import { ProviderEnvironment } from '@prosopo/env';
-import { getDB, getSecret } from './process.env.js';
-import { getPairAsync } from '@prosopo/contract';
-import { i18nMiddleware } from '@prosopo/common';
-import { loadEnv } from './env.js';
-import { prosopoAdminRouter, prosopoRouter, prosopoVerifyRouter, storeCaptchasExternally } from '@prosopo/provider';
-import cors from 'cors';
-import express from 'express';
-import getConfig from './prosopo.config.js';
+import { i18nMiddleware } from "@prosopo/common";
+import { getPairAsync } from "@prosopo/contract";
+import { ProviderEnvironment } from "@prosopo/env";
+import { prosopoAdminRouter, prosopoRouter, prosopoVerifyRouter, storeCaptchasExternally, } from "@prosopo/provider";
+import cors from "cors";
+import express from "express";
+import rateLimit from "express-rate-limit";
+import { loadEnv } from "./env.js";
+import { getDB, getSecret } from "./process.env.js";
+import getConfig from "./prosopo.config.js";
 function startApi(env, admin = false) {
-    env.logger.info(`Starting Prosopo API`);
+    env.logger.info("Starting Prosopo API");
     const apiApp = express();
     const apiPort = env.config.server.port;
+    apiApp.set("trust proxy", env.config.proxyCount);
     apiApp.use(cors());
-    apiApp.use(express.json({ limit: '50mb' }));
+    apiApp.use(express.json({ limit: "50mb" }));
     apiApp.use(i18nMiddleware({}));
     apiApp.use(prosopoRouter(env));
     apiApp.use(prosopoVerifyRouter(env));
     if (admin) {
         apiApp.use(prosopoAdminRouter(env));
     }
+    const rateLimits = env.config.rateLimits;
+    for (const [path, limit] of Object.entries(rateLimits)) {
+        const enumPath = path;
+        apiApp.use(enumPath, rateLimit(limit));
+    }
     return apiApp.listen(apiPort, () => {
         env.logger.info(`Prosopo app listening at http://localhost:${apiPort}`);
     });
@@ -32,13 +39,13 @@ export async function start(env, admin) {
             solved: { count: 2 },
             unsolved: { count: 0 },
         });
-        const pair = await getPairAsync(config.networks[config.defaultNetwork], secret, '');
+        const pair = await getPairAsync(config.networks[config.defaultNetwork], secret, "");
         env = new ProviderEnvironment(config, pair);
     }
     await env.isReady();
     if (env.pair) {
         storeCaptchasExternally(env.pair, env.config).catch((err) => {
-            console.error('Failed to start scheduler:', err);
+            console.error("Failed to start scheduler:", err);
         });
     }
     return startApi(env, admin);

package/dist/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AAClC,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AACnH,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,SAAS,MAAM,qBAAqB,CAAA;AAE3C,SAAS,QAAQ,CAAC,GAAwB,EAAE,KAAK,GAAG,KAAK;IACrD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;IACvC,MAAM,MAAM,GAAG,OAAO,EAAE,CAAA;IACxB,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAA;IAEtC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;IAClB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;IAC3C,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAA;IAC9B,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;IAC9B,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAA;IAEpC,IAAI,KAAK,EAAE;QACP,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAA;KACtC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE;QAC/B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,6CAA6C,OAAO,EAAE,CAAC,CAAA;IAC3E,CAAC,CAAC,CAAA;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,GAAyB,EAAE,KAAe;IAClE,IAAI,CAAC,GAAG,EAAE;QACN,OAAO,EAAE,CAAA;QAGT,KAAK,EAAE,CAAA;QAEP,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;QAC1B,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;YACtD,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;YACpB,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;SACzB,CAAC,CAAA;QAEF,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;QACnF,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;KAC9C;IACD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;IAGnB,IAAI,GAAG,CAAC,IAAI,EAAE;QACV,uBAAuB,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACxD,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;KACL;IAED,OAAO,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;AAC/B,CAAC"}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"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"}

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

@@ -1,14 +1,14 @@
-import { assert, describe, test } from 'vitest';
-import { exec } from 'child_process';
-import { getCliPkgDir } from '@prosopo/config';
-import { promisify } from 'util';
+import { exec } from "node:child_process";
+import { promisify } from "node:util";
+import { getCliPkgDir } from "@prosopo/config";
+import { assert, describe, test } from "vitest";
 const execPromise = promisify(exec);
-describe('provider bundle', () => {
-    test('bundle runs after bundling', async () => {
+describe("provider bundle", () => {
+    test("bundle runs after bundling", async () => {
         const rootDir = getCliPkgDir();
-        await execPromise(`cd ${rootDir} && npm run bundle:prod`);
+        await execPromise(`cd ${rootDir} && NODE_ENV=production npm run bundle`);
         const { stdout: runOut, stderr: runErr } = await execPromise(`cd ${rootDir} && node dist/bundle/provider.cli.bundle.js version`);
-        assert(runOut.includes('Version:'));
+        assert(runOut.includes("Version:"));
     }, 120000);
 });
 //# sourceMappingURL=bundle.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"bundle.test.js","sourceRoot":"","sources":["../../../src/tests/bundle/bundle.test.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAChC,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;AAEnC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,IAAI,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAE1C,MAAM,OAAO,GAAG,YAAY,EAAE,CAAA;QAG9B,MAAM,WAAW,CAAC,MAAM,OAAO,yBAAyB,CAAC,CAAA;QAGzD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,WAAW,CACxD,MAAM,OAAO,qDAAqD,CACrE,CAAA;QACD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAA;IACvC,CAAC,EAAE,MAAM,CAAC,CAAA;AACd,CAAC,CAAC,CAAA"}
+{"version":3,"file":"bundle.test.js","sourceRoot":"","sources":["../../../src/tests/bundle/bundle.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAc/C,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAChD,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAEpC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAChC,IAAI,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAE7C,MAAM,OAAO,GAAG,YAAY,EAAE,CAAC;QAG/B,MAAM,WAAW,CAAC,MAAM,OAAO,wCAAwC,CAAC,CAAC;QAGzE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,WAAW,CAC3D,MAAM,OAAO,qDAAqD,CAClE,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IACrC,CAAC,EAAE,MAAM,CAAC,CAAC;AACZ,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,64 +1,58 @@
 {
-    "name": "@prosopo/cli",
-    "version": "1.0.2",
-    "description": "CLI for Prosopo Provider",
-    "main": "dist/index.js",
-    "type": "module",
-    "engines": {
-        "node": ">=20",
-        "npm": ">=9"
-    },
-    "exports": {
-        ".": {
-            "import": "./dist/index.js",
-            "require": "./dist/cjs/index.cjs"
-        }
-    },
-    "scripts": {
-        "clean": "tsc --build --clean",
-        "build": "tsc --build --verbose",
-        "build:cjs": "npx vite --config vite.cjs.config.ts build",
-        "bundle:dev": "vite build --config vite.config.ts --mode development",
-        "bundle:prod": "vite build --config vite.config.ts --mode production",
-        "test": "npx vitest run --config ./vite.test.config.ts",
-        "cli": "node ./dist/cli.js",
-        "start": "node ./dist/cli.js --api",
-        "eslint": "npx eslint . --cache --cache-location ../../node_modules/.cache/eslint/.eslintcache --no-error-on-unmatched-pattern --ignore-path ../../.eslintignore --quiet",
-        "eslint:fix": "npm run eslint -- --fix",
-        "prettier": "npx prettier . --cache --cache-location ../../node_modules/.cache/prettier/.prettiercache --check --no-error-on-unmatched-pattern --ignore-path ../../.eslintignore",
-        "prettier:fix": "npm run prettier -- --write",
-        "lint": "npm run eslint && npm run prettier",
-        "lint:fix": "npm run eslint:fix && npm run prettier:fix"
-    },
-    "dependencies": {
-        "@polkadot/keyring": "12.6.2",
-        "@polkadot/types": "10.13.1",
-        "@polkadot/util": "12.6.2",
-        "@polkadot/util-crypto": "12.6.2",
-        "@prosopo/captcha-contract": "1.0.2",
-        "@prosopo/common": "1.0.2",
-        "@prosopo/contract": "1.0.2",
-        "@prosopo/env": "1.0.2",
-        "@prosopo/provider": "1.0.2",
-        "@prosopo/types": "1.0.2",
-        "@prosopo/util": "1.0.2",
-        "cors": "^2.8.5",
-        "cron-parser": "^4.9.0",
-        "dotenv": "^16.0.1",
-        "yargs": "^17.7.2",
-        "zod": "^3.22.4"
-    },
-    "devDependencies": {
-        "es-main": "^1.2.0",
-        "express": "^4.18.2",
-        "vite": "^5.1.7",
-        "vitest": "^1.3.1",
-        "@prosopo/config": "1.0.2",
-        "@types/cors": "^2.8.14",
-        "tslib": "2.6.2",
-        "typescript": "5.1.6"
-    },
-    "author": "Prosopo",
-    "license": "Apache-2.0",
-    "sideEffects": false
+	"name": "@prosopo/cli",
+	"version": "2.0.0",
+	"description": "CLI for Prosopo Provider",
+	"main": "dist/index.js",
+	"type": "module",
+	"engines": {
+		"node": ">=20",
+		"npm": ">=9"
+	},
+	"exports": {
+		".": {
+			"import": "./dist/index.js",
+			"require": "./dist/cjs/index.cjs"
+		}
+	},
+	"scripts": {
+		"clean": "tsc --build --clean",
+		"build": "tsc --build --verbose",
+		"build:cjs": "npx vite --config vite.cjs.config.ts build",
+		"bundle": "NODE_ENV=${NODE_ENV:-production}; vite build --config vite.config.ts --mode $NODE_ENV",
+		"test": "NODE_ENV=${NODE_ENV:-test}; npx vitest run --config ./vite.test.config.ts",
+		"cli": "node ./dist/cli.js",
+		"start": "node ./dist/cli.js --api"
+	},
+	"dependencies": {
+		"@polkadot/keyring": "12.6.2",
+		"@polkadot/util": "12.6.2",
+		"@polkadot/util-crypto": "12.6.2",
+
+		"@prosopo/common": "2.0.0",
+		"@prosopo/contract": "2.0.0",
+		"@prosopo/env": "2.0.0",
+		"@prosopo/provider": "2.0.0",
+		"@prosopo/types": "2.0.0",
+		"@prosopo/util": "2.0.0",
+		"cors": "^2.8.5",
+		"cron-parser": "^4.9.0",
+		"dotenv": "^16.0.1",
+		"express-rate-limit": "^7.3.1",
+		"yargs": "^17.7.2",
+		"zod": "^3.22.4"
+	},
+	"devDependencies": {
+		"@prosopo/config": "2.0.0",
+		"@types/cors": "^2.8.14",
+		"@types/yargs": "^17.0.32",
+		"es-main": "^1.2.0",
+		"express": "^4.18.2",
+		"tslib": "2.6.2",
+		"typescript": "5.1.6",
+		"vite": "^5.1.7",
+		"vitest": "^1.3.1"
+	},
+	"author": "Prosopo",
+	"license": "Apache-2.0",
+	"sideEffects": false
 }

package/vite.cjs.config.ts

@@ -1,3 +1,4 @@
+import path from "node:path";
 // Copyright 2021-2024 Prosopo (UK) Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,9 +12,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { ViteCommonJSConfig } from '@prosopo/config'
-import path from 'path'
+import { ViteCommonJSConfig } from "@prosopo/config";
 
 export default function () {
-    return ViteCommonJSConfig('cli', path.resolve('./tsconfig.cjs.json'))
+	return ViteCommonJSConfig("cli", path.resolve("./tsconfig.cjs.json"));
 }

package/vite.config.ts

@@ -11,37 +11,49 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import * as path from 'path'
-import { ViteBackendConfig } from '@prosopo/config'
-import { defineConfig } from 'vite'
-import { loadEnv } from '@prosopo/cli'
-import { version } from './package.json'
+import * as path from "node:path";
+import { loadEnv } from "@prosopo/cli";
+import { ViteBackendConfig } from "@prosopo/config";
+import { defineConfig } from "vite";
+import { version } from "./package.json";
 
 // load env using our util because vite loadEnv is not working for .env.development
-loadEnv()
+loadEnv();
 
 // Package specific config
-const packageName = '@prosopo/cli'
-const bundleName = 'provider'
-const dir = path.resolve()
-const entry = './src/cli.ts'
-const packageVersion = version
+const packageName = "@prosopo/cli";
+const bundleName = "provider";
+const dir = path.resolve();
+const entry = "./src/cli.ts";
+const packageVersion = version;
 
-process.env.TS_NODE_PROJECT = path.resolve('./tsconfig.json')
+process.env.TS_NODE_PROJECT = path.resolve("./tsconfig.json");
 
 // Merge with generic backend config
 export default defineConfig(async ({ command, mode }) => {
-    const backendConfig = await ViteBackendConfig(packageName, packageVersion, bundleName, dir, entry, command, mode)
-    return defineConfig({
-        define: {
-            ...backendConfig.define,
-            ...(process.env.PROSOPO_MONGO_EVENTS_URI && {
-                'process.env.PROSOPO_MONGO_EVENTS_URI': JSON.stringify(process.env.PROSOPO_MONGO_EVENTS_URI),
-            }),
-            ...(process.env._DEV_ONLY_WATCH_EVENTS && {
-                'process.env._DEV_ONLY_WATCH_EVENTS': JSON.stringify(process.env._DEV_ONLY_WATCH_EVENTS),
-            }),
-        },
-        ...backendConfig,
-    })
-})
+	const backendConfig = await ViteBackendConfig(
+		packageName,
+		packageVersion,
+		bundleName,
+		dir,
+		entry,
+		command,
+		mode,
+	);
+	return defineConfig({
+		define: {
+			...backendConfig.define,
+			...(process.env.PROSOPO_MONGO_EVENTS_URI && {
+				"process.env.PROSOPO_MONGO_EVENTS_URI": JSON.stringify(
+					process.env.PROSOPO_MONGO_EVENTS_URI,
+				),
+			}),
+			...(process.env._DEV_ONLY_WATCH_EVENTS && {
+				"process.env._DEV_ONLY_WATCH_EVENTS": JSON.stringify(
+					process.env._DEV_ONLY_WATCH_EVENTS,
+				),
+			}),
+		},
+		...backendConfig,
+	});
+});

package/vite.test.config.ts

@@ -1,3 +1,5 @@
+import fs from "node:fs";
+import path from "node:path";
 // Copyright 2021-2024 Prosopo (UK) Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,22 +13,20 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { ViteTestConfig } from '@prosopo/config'
-import dotenv from 'dotenv'
-import fs from 'fs'
-import path from 'path'
-process.env.NODE_ENV = 'test'
+import { ViteTestConfig } from "@prosopo/config";
+import dotenv from "dotenv";
+process.env.NODE_ENV = "test";
 // if .env.test exists at this level, use it, otherwise use the one at the root
-const envFile = `.env.${process.env.NODE_ENV || 'development'}`
-let envPath = envFile
+const envFile = `.env.${process.env.NODE_ENV || "development"}`;
+let envPath = envFile;
 if (fs.existsSync(envFile)) {
-    envPath = path.resolve(envFile)
+	envPath = path.resolve(envFile);
 } else if (fs.existsSync(`../../${envFile}`)) {
-    envPath = path.resolve(`../../${envFile}`)
+	envPath = path.resolve(`../../${envFile}`);
 } else {
-    throw new Error(`No ${envFile} file found`)
+	throw new Error(`No ${envFile} file found`);
 }
 
-dotenv.config({ path: envPath })
+dotenv.config({ path: envPath });
 
-export default ViteTestConfig
+export default ViteTestConfig;

package/dist/cjs/commands/batchCommit.cjs

@@ -1,42 +0,0 @@
-"use strict";
-const provider = require("@prosopo/provider");
-const common = require("@prosopo/common");
-const env = require("@prosopo/env");
-const validators = require("./validators.cjs");
-const commandBatchCommit = (pair, config, cmdArgs) => {
-  const logger = cmdArgs?.logger || common.getLogger(common.LogLevel.enum.info, "cli.batch_commit");
-  return {
-    command: "batch_commit",
-    describe: "Batch commit user solutions to contract",
-    builder: (yargs) => {
-      return yargs.option("schedule", {
-        type: "string",
-        demand: false,
-        desc: "A Recurring schedule expression"
-      });
-    },
-    handler: async (argv) => {
-      const env$1 = new env.ProviderEnvironment(config, pair);
-      await env$1.isReady();
-      if (argv.schedule) {
-        throw new common.ProsopoEnvError("GENERAL.NOT_IMPLEMENTED");
-      } else {
-        if (env$1.db) {
-          const batchCommitter = new provider.BatchCommitmentsTask(
-            env$1.config.batchCommit,
-            env$1.getContractInterface(),
-            env$1.db,
-            0n,
-            env$1.logger
-          );
-          const result = await batchCommitter.run();
-          logger.info(`Batch commit complete: ${result}`);
-        } else {
-          logger.error("No database configured");
-        }
-      }
-    },
-    middlewares: [validators.validateScheduleExpression]
-  };
-};
-module.exports = commandBatchCommit;