@prosopo/cli 3.1.6 → 3.4.6

package/dist/cjs/commands/migrateIpInCaptchaRecords/migrateIpField.cjs

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const provider = require("@prosopo/provider");
+const typesDatabase = require("@prosopo/types-database");
+const ipAddress = require("ip-address");
+const mongodb = require("mongodb");
+const MAX_IPV4_NUMERIC = 4294967295;
+const BATCH_SIZE = 1e5;
+const migrateIpField = async (db, collectionsToUpgrade, logger) => {
+  for (const collection of collectionsToUpgrade) {
+    await migrateV4Records(db, collection, logger);
+    await migrateV6Records(db, collection, logger);
+  }
+};
+const migrateV4Records = async (db, collection, logger) => {
+  const searchArgs = {
+    ipAddress: {
+      $type: "number",
+      $lte: Number(MAX_IPV4_NUMERIC)
+    }
+  };
+  let totalModified = 0;
+  let processed = 0;
+  const count = await db.collection(collection).countDocuments(searchArgs);
+  while (true) {
+    const docs = await db.collection(collection).find(searchArgs, { projection: { ipAddress: 1 } }).limit(BATCH_SIZE).toArray();
+    if (docs.length === 0) break;
+    const operations = docs.map((doc) => ({
+      updateOne: {
+        filter: { _id: doc._id },
+        update: {
+          $set: {
+            ipAddress: {
+              lower: doc.ipAddress,
+              type: typesDatabase.IpAddressType.v4
+            }
+          }
+        }
+      }
+    }));
+    const bulkResult = await db.collection(collection).bulkWrite(operations, { ordered: false });
+    totalModified += bulkResult?.modifiedCount || 0;
+    processed += docs.length;
+    logger.info(() => ({
+      msg: `Migrated v4 batch (${docs.length}) [${processed}/${count}] in "${collection}"`
+    }));
+  }
+  logger.info(() => ({
+    msg: `Migrated ${count} v4 records (${totalModified} modified) in "${collection}" collection`
+  }));
+};
+const migrateV6Records = async (db, collection, logger) => {
+  const searchArgs = {
+    ipAddress: {
+      $type: "number",
+      $gt: Number(MAX_IPV4_NUMERIC)
+    }
+  };
+  let totalModified = 0;
+  let processed = 0;
+  const count = await db.collection(collection).countDocuments(searchArgs);
+  while (true) {
+    const docs = await db.collection(collection).find(searchArgs, { projection: { ipAddress: 1 } }).limit(BATCH_SIZE).toArray();
+    if (docs.length === 0) break;
+    const operations = docs.map((doc) => {
+      const ipAddress$1 = ipAddress.Address6.fromBigInt(BigInt(doc.ipAddress));
+      const compositeIpAddress = provider.getCompositeIpAddress(ipAddress$1);
+      return {
+        updateOne: {
+          filter: { _id: doc._id },
+          update: {
+            $set: {
+              ipAddress: {
+                lower: mongodb.Decimal128.fromString(
+                  compositeIpAddress.lower.toString()
+                ),
+                upper: mongodb.Decimal128.fromString(
+                  (compositeIpAddress.upper || 0n).toString()
+                ),
+                type: typesDatabase.IpAddressType.v6
+              }
+            }
+          }
+        }
+      };
+    });
+    const bulkResult = await db.collection(collection).bulkWrite(operations, { ordered: false });
+    totalModified += bulkResult?.modifiedCount || 0;
+    processed += docs.length;
+    logger.info(() => ({
+      msg: `Migrated v6 batch (${docs.length}) [${processed}/${count}] in "${collection}"`
+    }));
+  }
+  logger.info(() => ({
+    msg: `Migrated ${count} v6 records (${totalModified} modified) in "${collection}"`
+  }));
+};
+exports.migrateIpField = migrateIpField;

package/dist/cjs/commands/migrateIpInCaptchaRecords/migrateIpInCaptchaRecords.cjs

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const common = require("@prosopo/common");
+const z = require("zod");
+const getDb = require("./getDb.cjs");
+const migrateIpField = require("./migrateIpField.cjs");
+function _interopNamespaceDefault(e) {
+  const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
+  if (e) {
+    for (const k in e) {
+      if (k !== "default") {
+        const d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: () => e[k]
+        });
+      }
+    }
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+const z__namespace = /* @__PURE__ */ _interopNamespaceDefault(z);
+const collectionsToUpgrade = [
+  "powcaptchas",
+  "usercommitments",
+  "frictionlesstokens",
+  "pendings"
+];
+const migrateIpInCaptchaRecordsCommand = (pair, config, logger) => {
+  logger = logger || common.getLogger(common.LogLevel.enum.info, "cli.migrate_ip_in_captcha_records");
+  return {
+    command: "migrateIpInCaptchaRecords",
+    describe: "Migrate IP addresses in captcha records",
+    builder: (yargs) => yargs.option("uri", {
+      type: "string",
+      desc: "DB Uri. When skipped, used the default connection based on the current environment"
+    }),
+    handler: async (argv) => {
+      const uri = z__namespace.string().parse(argv.uri || "");
+      try {
+        const db = await getDb.getDb(pair, config, uri, logger);
+        await migrateIpField.migrateIpField(db, collectionsToUpgrade, logger);
+        logger.info(() => ({
+          msg: "migration completed"
+        }));
+      } catch (err) {
+        logger.error(() => ({
+          err,
+          msg: "Error migrating captcha records"
+        }));
+      }
+    }
+  };
+};
+exports.migrateIpInCaptchaRecordsCommand = migrateIpInCaptchaRecordsCommand;

package/dist/cjs/prosopo.config.cjs

@@ -3,6 +3,7 @@ const common = require("@prosopo/common");
 const types = require("@prosopo/types");
 const RateLimiter = require("./RateLimiter.cjs");
 const process_env = require("./process.env.cjs");
+var _documentCurrentScript = typeof document !== "undefined" ? document.currentScript : null;
 function getMongoURI() {
   const protocol = process.env.PROSOPO_DATABASE_PROTOCOL || "mongodb";
   const mongoSrv = protocol === "mongodb+srv";
@@ -24,9 +25,14 @@ const getLRules = () => {
     return {};
   }
 };
+const getHost = () => {
+  const importMeta = { url: typeof document === "undefined" ? require("url").pathToFileURL(__filename).href : _documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === "SCRIPT" && _documentCurrentScript.src || new URL("prosopo.config.cjs", document.baseURI).href };
+  return process.env.CADDY_DOMAIN || importMeta.env?.VITE_CADDY_DOMAIN;
+};
 function getConfig(captchaSolutionsConfig, captchaServeConfig, who = "PROVIDER", admin = "ADMIN") {
   return types.ProsopoConfigSchema.parse({
     logLevel: common.parseLogLevel(process.env.PROSOPO_LOG_LEVEL, "info"),
+    host: getHost(),
     defaultEnvironment: process.env.PROSOPO_DEFAULT_ENVIRONMENT ? types.EnvironmentTypesSchema.parse(process.env.PROSOPO_DEFAULT_ENVIRONMENT) : types.EnvironmentTypesSchema.enum.development,
     account: {
       address: process_env.getAddress(who),
@@ -61,7 +67,8 @@ function getConfig(captchaSolutionsConfig, captchaServeConfig, who = "PROVIDER",
     captchas: captchaServeConfig,
     penalties: types.FrictionlessPenalties.parse({
       PENALTY_OLD_TIMESTAMP: process.env.PENALTY_OLD_TIMESTAMP,
-      PENALTY_ACCESS_RULE: process.env.PENALTY_ACCESS_RULE
+      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 || "",
@@ -85,6 +92,10 @@ function getConfig(captchaSolutionsConfig, captchaServeConfig, who = "PROVIDER",
       address: process_env.getAddress(admin),
       password: process_env.getPassword(admin),
       secret: process_env.getSecret(admin)
+    },
+    ipApi: {
+      apiKey: process.env.PROSOPO_IPAPI_KEY,
+      baseUrl: process.env.PROSOPO_IPAPI_URL
     }
   });
 }

package/dist/cjs/reloader.cjs

@@ -22,7 +22,6 @@ class ReloadingAPI {
   }
   async start(reloadEnv = false) {
     log.info(() => ({ msg: "Starting API" }));
-    this._envWatcher = await this._watchEnv();
     dotenv.loadEnv();
     if (!this._env || reloadEnv) {
       this._env = new env.ProviderEnvironment(
@@ -33,6 +32,9 @@ class ReloadingAPI {
     }
     await this.env.isReady();
     this.api = await start.start(this.env, !!this._processedArgs.adminApi);
+    if (process.env.NODE_ENV === "development") {
+      this._envWatcher = await this._watchEnv();
+    }
   }
   async stop() {
     log.info(() => ({ msg: "Stopping API" }));
@@ -43,7 +45,7 @@ class ReloadingAPI {
     });
   }
   async _watchEnv() {
-    return fs.watchFile(this._envPath, async () => {
+    return fs.watch(this._envPath, async () => {
       log.info(() => ({
         data: { restarting: this._restarting },
         msg: "env file change detected. Restarting"

package/dist/cjs/start.cjs

@@ -36,13 +36,10 @@ async function startApi(env2, admin = false, port) {
     msg: "Adding headerCheckMiddleware",
     paths: clientPathsExcludingVerify
   }));
-  apiApp.set(
-    "trust proxy",
-    env2.config.proxyCount
-  );
+  apiApp.set("trust proxy", 1);
   apiApp.use(cors());
   apiApp.use(express.json({ limit: "50mb" }));
-  apiApp.use(provider.publicRouter());
+  apiApp.use(provider.publicRouter(env2));
   const i18Middleware = await locale.i18nMiddleware({});
   apiApp.use(provider.robotsMiddleware());
   apiApp.use(provider.ignoreMiddleware());
@@ -50,15 +47,15 @@ async function startApi(env2, admin = false, port) {
   apiApp.use(i18Middleware);
   apiApp.use(provider.ja4Middleware(env2));
   apiApp.use(provider.prosopoVerifyRouter(env2));
-  apiApp.use(provider.blockMiddleware(env2));
   apiApp.use(clientPathsExcludingVerify, provider.headerCheckMiddleware(env2));
-  apiApp.use("/v1/prosopo/provider/client/", provider.domainMiddleware(env2));
-  apiApp.use(provider.prosopoRouter(env2));
   env2.logger.info(() => ({ msg: "Enabling admin auth middleware" }));
   apiApp.use(
     "/v1/prosopo/provider/admin",
     apiExpressRouter.authMiddleware(env2.pair, env2.authAccount)
   );
+  apiApp.use(provider.blockMiddleware(env2));
+  apiApp.use("/v1/prosopo/provider/client/", provider.domainMiddleware(env2));
+  apiApp.use(provider.prosopoRouter(env2));
   const userAccessRuleRoutes = apiRuleRoutesProvider.getRoutes();
   for (const userAccessRuleRoute of userAccessRuleRoutes) {
     apiApp.use(
@@ -111,7 +108,12 @@ async function start(env$1, admin, port) {
     }
     env$1 = new env.ProviderEnvironment(config, pair, authAccount);
   } else {
-    env$1.logger.debug(() => ({ msg: "Env already defined" }));
+    env$1.logger.debug(() => ({
+      msg: "Env already defined",
+      data: {
+        config: env$1?.config
+      }
+    }));
   }
   await env$1.isReady();
   env$1.cleanup();

package/dist/commands/ensureExternalIndexes.js

@@ -0,0 +1,29 @@
+import { getLogger, LogLevel } from "@prosopo/common";
+import { ProviderEnvironment } from "@prosopo/env";
+import { Tasks } from "@prosopo/provider";
+const commandEnsureExternalIndexes = (pair, config, cmdArgs) => {
+  const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, "cli.ensure_external_indexes");
+  return {
+    command: "ensure_external_indexes",
+    describe: "Ensure indexes for external database",
+    handler: async () => {
+      try {
+        const env = new ProviderEnvironment(config, pair);
+        await env.isReady();
+        const tasks = new Tasks(env);
+        if (!env.config.mongoCaptchaUri) {
+          throw new Error("mongoCaptchaUri not set in config");
+        }
+        await tasks.clientTaskManager.getCaptchaDB(env.config.mongoCaptchaUri).ensureIndexes().catch((err) => {
+          env.logger.error(() => ({ err }));
+        });
+      } catch (err) {
+        logger.error(() => ({ err }));
+      }
+    },
+    middlewares: []
+  };
+};
+export {
+  commandEnsureExternalIndexes as default
+};

package/dist/commands/ensureIndexes.js

@@ -0,0 +1,27 @@
+import { getLogger, LogLevel } from "@prosopo/common";
+import { ProviderEnvironment } from "@prosopo/env";
+import { Tasks } from "@prosopo/provider";
+const commandEnsureIndexes = (pair, config, cmdArgs) => {
+  const logger = cmdArgs?.logger || getLogger(LogLevel.enum.info, "cli.ensure_indexes");
+  return {
+    command: "ensure_indexes",
+    describe: "Ensure indexes for internal database",
+    handler: async () => {
+      try {
+        const env = new ProviderEnvironment(config, pair);
+        await env.isReady();
+        const tasks = new Tasks(env);
+        if (!env.config.mongoCaptchaUri) {
+          throw new Error("mongoCaptchaUri not set in config");
+        }
+        await tasks.db.ensureIndexes();
+      } catch (err) {
+        logger.error(() => ({ err }));
+      }
+    },
+    middlewares: []
+  };
+};
+export {
+  commandEnsureIndexes as default
+};

package/dist/commands/index.js

@@ -3,7 +3,11 @@ 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";
+import { default as default7 } from "./ensureExternalIndexes.js";
+import { default as default8 } from "./ensureIndexes.js";
 export {
+  default7 as commandEnsureExternalIndexes,
+  default8 as commandEnsureIndexes,
   default2 as commandProviderSetDataset,
   default5 as commandSiteKeyRegister,
   default6 as commandSiteKeyRegisterApi,

package/dist/commands/migrateIpInCaptchaRecords/getDb.js

@@ -0,0 +1,32 @@
+import { ProviderEnvironment } from "@prosopo/env";
+import mongoose from "mongoose";
+const getDb = async (pair, config, uri, logger) => {
+  let db;
+  if (uri) {
+    logger.info(() => ({
+      msg: "Using DB connection from the URI"
+    }));
+    db = await getByUri(uri);
+  } else {
+    logger.info(() => ({
+      msg: "Using DB connection from the config"
+    }));
+    db = await getByConfig(pair, config);
+  }
+  if (db) {
+    return db;
+  }
+  throw new Error("Db connection cannot be established");
+};
+const getByUri = async (uri) => {
+  await mongoose.connect(uri);
+  return mongoose.connection.db;
+};
+const getByConfig = async (pair, config) => {
+  const env = new ProviderEnvironment(config, pair);
+  await env.isReady();
+  return env.db?.getConnection()?.db;
+};
+export {
+  getDb
+};

package/dist/commands/migrateIpInCaptchaRecords/migrateIpField.js

@@ -0,0 +1,98 @@
+import { getCompositeIpAddress } from "@prosopo/provider";
+import { IpAddressType } from "@prosopo/types-database";
+import { Address6 } from "ip-address";
+import { Decimal128 } from "mongodb";
+const MAX_IPV4_NUMERIC = 4294967295;
+const BATCH_SIZE = 1e5;
+const migrateIpField = async (db, collectionsToUpgrade, logger) => {
+  for (const collection of collectionsToUpgrade) {
+    await migrateV4Records(db, collection, logger);
+    await migrateV6Records(db, collection, logger);
+  }
+};
+const migrateV4Records = async (db, collection, logger) => {
+  const searchArgs = {
+    ipAddress: {
+      $type: "number",
+      $lte: Number(MAX_IPV4_NUMERIC)
+    }
+  };
+  let totalModified = 0;
+  let processed = 0;
+  const count = await db.collection(collection).countDocuments(searchArgs);
+  while (true) {
+    const docs = await db.collection(collection).find(searchArgs, { projection: { ipAddress: 1 } }).limit(BATCH_SIZE).toArray();
+    if (docs.length === 0) break;
+    const operations = docs.map((doc) => ({
+      updateOne: {
+        filter: { _id: doc._id },
+        update: {
+          $set: {
+            ipAddress: {
+              lower: doc.ipAddress,
+              type: IpAddressType.v4
+            }
+          }
+        }
+      }
+    }));
+    const bulkResult = await db.collection(collection).bulkWrite(operations, { ordered: false });
+    totalModified += bulkResult?.modifiedCount || 0;
+    processed += docs.length;
+    logger.info(() => ({
+      msg: `Migrated v4 batch (${docs.length}) [${processed}/${count}] in "${collection}"`
+    }));
+  }
+  logger.info(() => ({
+    msg: `Migrated ${count} v4 records (${totalModified} modified) in "${collection}" collection`
+  }));
+};
+const migrateV6Records = async (db, collection, logger) => {
+  const searchArgs = {
+    ipAddress: {
+      $type: "number",
+      $gt: Number(MAX_IPV4_NUMERIC)
+    }
+  };
+  let totalModified = 0;
+  let processed = 0;
+  const count = await db.collection(collection).countDocuments(searchArgs);
+  while (true) {
+    const docs = await db.collection(collection).find(searchArgs, { projection: { ipAddress: 1 } }).limit(BATCH_SIZE).toArray();
+    if (docs.length === 0) break;
+    const operations = docs.map((doc) => {
+      const ipAddress = Address6.fromBigInt(BigInt(doc.ipAddress));
+      const compositeIpAddress = getCompositeIpAddress(ipAddress);
+      return {
+        updateOne: {
+          filter: { _id: doc._id },
+          update: {
+            $set: {
+              ipAddress: {
+                lower: Decimal128.fromString(
+                  compositeIpAddress.lower.toString()
+                ),
+                upper: Decimal128.fromString(
+                  (compositeIpAddress.upper || 0n).toString()
+                ),
+                type: IpAddressType.v6
+              }
+            }
+          }
+        }
+      };
+    });
+    const bulkResult = await db.collection(collection).bulkWrite(operations, { ordered: false });
+    totalModified += bulkResult?.modifiedCount || 0;
+    processed += docs.length;
+    logger.info(() => ({
+      msg: `Migrated v6 batch (${docs.length}) [${processed}/${count}] in "${collection}"`
+    }));
+  }
+  logger.info(() => ({
+    msg: `Migrated ${count} v6 records (${totalModified} modified) in "${collection}"`
+  }));
+};
+export {
+  migrateIpField
+};

package/dist/commands/migrateIpInCaptchaRecords/migrateIpInCaptchaRecords.js

@@ -0,0 +1,39 @@
+import { getLogger, LogLevel } from "@prosopo/common";
+import * as z from "zod";
+import { getDb } from "./getDb.js";
+import { migrateIpField } from "./migrateIpField.js";
+const collectionsToUpgrade = [
+  "powcaptchas",
+  "usercommitments",
+  "frictionlesstokens",
+  "pendings"
+];
+const migrateIpInCaptchaRecordsCommand = (pair, config, logger) => {
+  logger = logger || getLogger(LogLevel.enum.info, "cli.migrate_ip_in_captcha_records");
+  return {
+    command: "migrateIpInCaptchaRecords",
+    describe: "Migrate IP addresses in captcha records",
+    builder: (yargs) => yargs.option("uri", {
+      type: "string",
+      desc: "DB Uri. When skipped, used the default connection based on the current environment"
+    }),
+    handler: async (argv) => {
+      const uri = z.string().parse(argv.uri || "");
+      try {
+        const db = await getDb(pair, config, uri, logger);
+        await migrateIpField(db, collectionsToUpgrade, logger);
+        logger.info(() => ({
+          msg: "migration completed"
+        }));
+      } catch (err) {
+        logger.error(() => ({
+          err,
+          msg: "Error migrating captcha records"
+        }));
+      }
+    }
+  };
+};
+export {
+  migrateIpInCaptchaRecordsCommand
+};

package/dist/prosopo.config.js

@@ -23,9 +23,14 @@ const getLRules = () => {
     return {};
   }
 };
+const 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),
@@ -60,7 +65,8 @@ function getConfig(captchaSolutionsConfig, captchaServeConfig, who = "PROVIDER",
     captchas: captchaServeConfig,
     penalties: FrictionlessPenalties.parse({
       PENALTY_OLD_TIMESTAMP: process.env.PENALTY_OLD_TIMESTAMP,
-      PENALTY_ACCESS_RULE: process.env.PENALTY_ACCESS_RULE
+      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 || "",
@@ -84,6 +90,10 @@ function getConfig(captchaSolutionsConfig, captchaServeConfig, who = "PROVIDER",
       address: getAddress(admin),
       password: getPassword(admin),
       secret: getSecret(admin)
+    },
+    ipApi: {
+      apiKey: process.env.PROSOPO_IPAPI_KEY,
+      baseUrl: process.env.PROSOPO_IPAPI_URL
     }
   });
 }

package/dist/reloader.js

@@ -21,7 +21,6 @@ class ReloadingAPI {
   }
   async start(reloadEnv = false) {
     log.info(() => ({ msg: "Starting API" }));
-    this._envWatcher = await this._watchEnv();
     loadEnv();
     if (!this._env || reloadEnv) {
       this._env = new ProviderEnvironment(
@@ -32,6 +31,9 @@ class ReloadingAPI {
     }
     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" }));
@@ -42,7 +44,7 @@ class ReloadingAPI {
     });
   }
   async _watchEnv() {
-    return fs.watchFile(this._envPath, async () => {
+    return fs.watch(this._envPath, async () => {
       log.info(() => ({
         data: { restarting: this._restarting },
         msg: "env file change detected. Restarting"

package/dist/start.js

@@ -4,7 +4,7 @@ import { loadEnv } from "@prosopo/dotenv";
 import { ProviderEnvironment } from "@prosopo/env";
 import { getPair } from "@prosopo/keyring";
 import { i18nMiddleware } from "@prosopo/locale";
-import { createApiAdminRoutesProvider, publicRouter, robotsMiddleware, ignoreMiddleware, ja4Middleware, prosopoVerifyRouter, blockMiddleware, headerCheckMiddleware, domainMiddleware, prosopoRouter, storeCaptchasExternally, getClientList } from "@prosopo/provider";
+import { createApiAdminRoutesProvider, publicRouter, robotsMiddleware, ignoreMiddleware, ja4Middleware, prosopoVerifyRouter, headerCheckMiddleware, blockMiddleware, domainMiddleware, prosopoRouter, storeCaptchasExternally, getClientList } from "@prosopo/provider";
 import { ClientApiPaths } from "@prosopo/types";
 import { createApiRuleRoutesProvider, getExpressApiRuleRateLimits } from "@prosopo/user-access-policy";
 import cors from "cors";
@@ -34,13 +34,10 @@ async function startApi(env, admin = false, port) {
     msg: "Adding headerCheckMiddleware",
     paths: clientPathsExcludingVerify
   }));
-  apiApp.set(
-    "trust proxy",
-    env.config.proxyCount
-  );
+  apiApp.set("trust proxy", 1);
   apiApp.use(cors());
   apiApp.use(express.json({ limit: "50mb" }));
-  apiApp.use(publicRouter());
+  apiApp.use(publicRouter(env));
   const i18Middleware = await i18nMiddleware({});
   apiApp.use(robotsMiddleware());
   apiApp.use(ignoreMiddleware());
@@ -48,15 +45,15 @@ async function startApi(env, admin = false, port) {
   apiApp.use(i18Middleware);
   apiApp.use(ja4Middleware(env));
   apiApp.use(prosopoVerifyRouter(env));
-  apiApp.use(blockMiddleware(env));
   apiApp.use(clientPathsExcludingVerify, headerCheckMiddleware(env));
-  apiApp.use("/v1/prosopo/provider/client/", domainMiddleware(env));
-  apiApp.use(prosopoRouter(env));
   env.logger.info(() => ({ msg: "Enabling admin auth middleware" }));
   apiApp.use(
     "/v1/prosopo/provider/admin",
     authMiddleware(env.pair, env.authAccount)
   );
+  apiApp.use(blockMiddleware(env));
+  apiApp.use("/v1/prosopo/provider/client/", domainMiddleware(env));
+  apiApp.use(prosopoRouter(env));
   const userAccessRuleRoutes = apiRuleRoutesProvider.getRoutes();
   for (const userAccessRuleRoute of userAccessRuleRoutes) {
     apiApp.use(
@@ -109,7 +106,12 @@ async function start(env, admin, port) {
     }
     env = new ProviderEnvironment(config, pair, authAccount);
   } else {
-    env.logger.debug(() => ({ msg: "Env already defined" }));
+    env.logger.debug(() => ({
+      msg: "Env already defined",
+      data: {
+        config: env?.config
+      }
+    }));
   }
   await env.isReady();
   env.cleanup();