@prosopo/cli 2.0.3 → 2.1.0

package/dist/start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":";AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AA8CnD,wBAAsB,KAAK,CAAC,GAAG,CAAC,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,OAAO,mBA8BrE"}
+{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAkDnD,wBAAsB,KAAK,CAC1B,GAAG,CAAC,EAAE,mBAAmB,EACzB,KAAK,CAAC,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,MAAM,mBAiCb;AAED,wBAAsB,QAAQ,CAAC,GAAG,CAAC,EAAE,mBAAmB,EAAE,KAAK,CAAC,EAAE,OAAO,mBAGxE"}

package/dist/start.js

@@ -1,17 +1,17 @@
 import { i18nMiddleware } from "@prosopo/common";
 import { getPairAsync } from "@prosopo/contract";
+import { loadEnv } from "@prosopo/dotenv";
 import { ProviderEnvironment } from "@prosopo/env";
-import { prosopoAdminRouter, prosopoRouter, prosopoVerifyRouter, storeCaptchasExternally, } from "@prosopo/provider";
+import { getClientList, prosopoAdminRouter, prosopoRouter, prosopoVerifyRouter, storeCaptchasExternally, } from "@prosopo/provider";
 import cors from "cors";
 import express from "express";
 import rateLimit from "express-rate-limit";
-import { loadEnv } from "@prosopo/dotenv";
 import { getDB, getSecret } from "./process.env.js";
 import getConfig from "./prosopo.config.js";
-function startApi(env, admin = false) {
+function startApi(env, admin = false, port) {
     env.logger.info("Starting Prosopo API");
     const apiApp = express();
-    const apiPort = env.config.server.port;
+    const apiPort = port || env.config.server.port;
     apiApp.set("trust proxy", env.config.proxyCount);
     apiApp.use(cors());
     apiApp.use(express.json({ limit: "50mb" }));
@@ -30,24 +30,34 @@ function startApi(env, admin = false) {
         env.logger.info(`Prosopo app listening at http://localhost:${apiPort}`);
     });
 }
-export async function start(env, admin) {
+export async function start(env, admin, port) {
     if (!env) {
         loadEnv();
         getDB();
         const secret = getSecret();
-        const config = getConfig(undefined, undefined, {
+        const config = getConfig(undefined, {
             solved: { count: 2 },
             unsolved: { count: 0 },
         });
-        const pair = await getPairAsync(secret, "");
+        const pair = await getPairAsync(secret);
         env = new ProviderEnvironment(config, pair);
     }
+    else {
+        env.logger.debug("Env already defined");
+    }
     await env.isReady();
     if (env.pair) {
         storeCaptchasExternally(env.pair, env.config).catch((err) => {
             console.error("Failed to start scheduler:", err);
         });
+        getClientList(env.pair, env.config).catch((err) => {
+            console.error("Failed to get client list:", err);
+        });
     }
-    return startApi(env, admin);
+    return startApi(env, admin, port);
+}
+export async function startDev(env, admin) {
+    start(env, admin, 9238);
+    return await start(env, admin);
 }
 //# sourceMappingURL=start.js.map

package/dist/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,mBAAmB,EACnB,uBAAuB,GACxB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAE5C,SAAS,QAAQ,CAAC,GAAwB,EAAE,KAAK,GAAG,KAAK;IACvD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,OAAO,EAAE,CAAC;IACzB,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;IAEvC,MAAM,CAAC,GAAG,CACR,aAAa,EACb,GAAG,CAAC,MAAM,CAAC,UAAU,CACtB,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IACnB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAC5C,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/B,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/B,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC;IAErC,IAAI,KAAK,EAAE;QACT,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;KACrC;IAGD,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC;IACzC,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QACtD,MAAM,QAAQ,GAAG,IAAwB,CAAC;QAC1C,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;KACxC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE;QACjC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,6CAA6C,OAAO,EAAE,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,GAAyB,EAAE,KAAe;IACpE,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,EAAE,CAAC;QAGV,KAAK,EAAE,CAAC;QAER,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE;YAC7C,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;YACpB,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;SACvB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,MAAM,YAAY,CAC7B,MAAM,EACN,EAAE,CACH,CAAC;QACF,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;KAC7C;IAED,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;IAGpB,IAAI,GAAG,CAAC,IAAI,EAAE;QACZ,uBAAuB,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YAC1D,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../src/start.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,58 +1,63 @@
 {
-  "name": "@prosopo/cli",
-  "version": "2.0.3",
-  "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.3",
-    "@prosopo/contract": "2.0.3",
-    "@prosopo/dotenv": "2.0.3",
-    "@prosopo/env": "2.0.3",
-    "@prosopo/provider": "2.0.3",
-    "@prosopo/types": "2.0.3",
-    "@prosopo/util": "2.0.3",
-    "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.3",
-    "@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
+	"name": "@prosopo/cli",
+	"version": "2.1.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",
+		"start:dev": "node ./dist/cli.js --api --dev"
+	},
+	"dependencies": {
+		"@polkadot/keyring": "12.6.2",
+		"@polkadot/types-codec": "10.13.1",
+		"@polkadot/util-crypto": "12.6.2",
+		"@prosopo/common": "2.1.0",
+		"@prosopo/contract": "2.1.0",
+		"@prosopo/dotenv": "2.1.0",
+		"@prosopo/env": "2.1.0",
+		"@prosopo/provider": "2.1.0",
+		"@prosopo/types": "2.1.0",
+		"@prosopo/util": "2.1.0",
+		"cors": "2.8.5",
+		"cron-parser": "4.9.0",
+		"dotenv": "16.4.5",
+		"express-rate-limit": "7.4.0",
+		"yargs": "17.7.2",
+		"zod": "3.23.8"
+	},
+	"devDependencies": {
+		"@prosopo/config": "2.1.0",
+		"@types/cors": "2.8.17",
+		"@types/yargs": "17.0.33",
+		"@vitest/coverage-v8": "2.1.1",
+		"concurrently": "9.0.1",
+		"express": "4.21.0",
+		"npm-run-all": "4.1.5",
+		"rimraf": "6.0.1",
+		"tslib": "2.7.0",
+		"tsx": "4.19.1",
+		"typescript": "5.6.2",
+		"vite": "5.4.6",
+		"vitest": "2.1.1"
+	},
+	"author": "Prosopo",
+	"license": "Apache-2.0",
+	"sideEffects": false
 }

package/vite.config.ts

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import * as path from "node:path";
-import { loadEnv } from "@prosopo/dotenv";
 import { ViteBackendConfig } from "@prosopo/config";
+import { loadEnv } from "@prosopo/dotenv";
 import { defineConfig } from "vite";
 import { version } from "./package.json";
 
@@ -31,29 +31,29 @@ 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,
+	});
 });