@prosopo/api-express-router 3.1.50 → 3.1.51

package/dist/cjs/middlewares/requestLoggerMiddleware.cjs

@@ -1,63 +1,61 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const logger = require("@prosopo/logger");
-const uuid = require("uuid");
-const getHeaderValue = (req, headerName) => {
-  if (headerName in req.headers && req.headers[headerName]) {
-    return req.headers[headerName].toString();
-  }
-  return void 0;
+let _prosopo_logger = require("@prosopo/logger");
+let uuid = require("uuid");
+//#region src/middlewares/requestLoggerMiddleware.ts
+var getHeaderValue = (req, headerName) => {
+	if (headerName in req.headers && req.headers[headerName]) return req.headers[headerName].toString();
 };
-const HEALTH_CHECK_PATHS = /* @__PURE__ */ new Set(["/healthz", "/health", "/readyz"]);
+var HEALTH_CHECK_PATHS = /* @__PURE__ */ new Set([
+	"/healthz",
+	"/health",
+	"/readyz"
+]);
 function requestLoggerMiddleware(env) {
-  return (req, res, next) => {
-    const requestId = req.headers["x-request-id"] || `e-${uuid.v4()}`;
-    const user = getHeaderValue(req, "prosopo-user");
-    const siteKey = getHeaderValue(req, "prosopo-site-key");
-    const sessionId = req.body?.sessionId ? req.body.sessionId : void 0;
-    const logger$1 = logger.getLogger(
-      logger.parseLogLevel(env.config.logLevel),
-      "provider:request"
-    ).with({
-      requestId,
-      ...user ? { user } : {},
-      ...siteKey ? { siteKey } : {},
-      ...sessionId ? { sessionId } : {}
-    });
-    req.logger = logger$1;
-    req.requestId = requestId;
-    res.setHeader("x-request-id", requestId);
-    if (HEALTH_CHECK_PATHS.has(req.path)) {
-      next();
-      return;
-    }
-    const startNs = process.hrtime.bigint();
-    logger$1.info(() => ({
-      msg: "Request received",
-      data: {
-        method: req.method,
-        path: req.path
-      }
-    }));
-    let finished = false;
-    const emitFinish = (outcome) => {
-      if (finished) return;
-      finished = true;
-      const durationMs = Number(process.hrtime.bigint() - startNs) / 1e6;
-      logger$1.info(() => ({
-        msg: "Response sent",
-        data: {
-          method: req.method,
-          path: req.path,
-          status: res.statusCode,
-          durationMs,
-          outcome
-        }
-      }));
-    };
-    res.on("finish", () => emitFinish("finish"));
-    res.on("close", () => emitFinish("close"));
-    next();
-  };
+	return (req, res, next) => {
+		const requestId = req.headers["x-request-id"] || `e-${(0, uuid.v4)()}`;
+		const user = getHeaderValue(req, "prosopo-user");
+		const siteKey = getHeaderValue(req, "prosopo-site-key");
+		const sessionId = req.body?.sessionId ? req.body.sessionId : void 0;
+		const logger = (0, _prosopo_logger.getLogger)((0, _prosopo_logger.parseLogLevel)(env.config.logLevel), "provider:request").with({
+			requestId,
+			...user ? { user } : {},
+			...siteKey ? { siteKey } : {},
+			...sessionId ? { sessionId } : {}
+		});
+		req.logger = logger;
+		req.requestId = requestId;
+		res.setHeader("x-request-id", requestId);
+		if (HEALTH_CHECK_PATHS.has(req.path)) {
+			next();
+			return;
+		}
+		const startNs = process.hrtime.bigint();
+		logger.info(() => ({
+			msg: "Request received",
+			data: {
+				method: req.method,
+				path: req.path
+			}
+		}));
+		let finished = false;
+		const emitFinish = (outcome) => {
+			if (finished) return;
+			finished = true;
+			const durationMs = Number(process.hrtime.bigint() - startNs) / 1e6;
+			logger.info(() => ({
+				msg: "Response sent",
+				data: {
+					method: req.method,
+					path: req.path,
+					status: res.statusCode,
+					durationMs,
+					outcome
+				}
+			}));
+		};
+		res.on("finish", () => emitFinish("finish"));
+		res.on("close", () => emitFinish("close"));
+		next();
+	};
 }
+//#endregion
 exports.requestLoggerMiddleware = requestLoggerMiddleware;

package/dist/endpointAdapter/apiExpressDefaultEndpointAdapter.js

@@ -1,36 +1,29 @@
 import { ProsopoApiError } from "@prosopo/common";
 import { stringifyBigInts } from "@prosopo/util";
-class ApiExpressDefaultEndpointAdapter {
-  constructor(logLevel, errorStatusCode) {
-    this.logLevel = logLevel;
-    this.errorStatusCode = errorStatusCode;
-  }
-  async handleRequest(endpoint, request, response, next) {
-    let args;
-    try {
-      args = endpoint.getRequestArgsSchema()?.parse(request.body);
-    } catch (error) {
-      return next(
-        new ProsopoApiError("API.PARSE_ERROR", {
-          context: { code: 400, error }
-        })
-      );
-    }
-    try {
-      const apiEndpointResponse = await endpoint.processRequest(
-        args,
-        request.logger
-      );
-      const responseObject = stringifyBigInts(apiEndpointResponse);
-      response.json(responseObject);
-    } catch (error) {
-      request.logger.error(() => ({
-        err: error
-      }));
-      response.status(500).send("An internal server error occurred.");
-    }
-  }
-}
-export {
-  ApiExpressDefaultEndpointAdapter
+//#region src/endpointAdapter/apiExpressDefaultEndpointAdapter.ts
+var ApiExpressDefaultEndpointAdapter = class {
+	constructor(logLevel, errorStatusCode) {
+		this.logLevel = logLevel;
+		this.errorStatusCode = errorStatusCode;
+	}
+	async handleRequest(endpoint, request, response, next) {
+		let args;
+		try {
+			args = endpoint.getRequestArgsSchema()?.parse(request.body);
+		} catch (error) {
+			return next(new ProsopoApiError("API.PARSE_ERROR", { context: {
+				code: 400,
+				error
+			} }));
+		}
+		try {
+			const responseObject = stringifyBigInts(await endpoint.processRequest(args, request.logger));
+			response.json(responseObject);
+		} catch (error) {
+			request.logger.error(() => ({ err: error }));
+			response.status(500).send("An internal server error occurred.");
+		}
+	}
 };
+//#endregion
+export { ApiExpressDefaultEndpointAdapter };

package/dist/errorHandler.js

@@ -1,12 +1,12 @@
 import { unwrapError } from "@prosopo/common";
-const handleErrors = (err, request, response, next) => {
-  const { code, statusMessage, jsonError } = unwrapError(err, request.i18n);
-  response.statusMessage = statusMessage;
-  response.set("content-type", "application/json");
-  response.status(code);
-  response.send({ error: jsonError });
-  response.end();
-};
-export {
-  handleErrors
+//#region src/errorHandler.ts
+var handleErrors = (err, request, response, next) => {
+	const { code, statusMessage, jsonError } = unwrapError(err, request.i18n);
+	response.statusMessage = statusMessage;
+	response.set("content-type", "application/json");
+	response.status(code);
+	response.send({ error: jsonError });
+	response.end();
 };
+//#endregion
+export { handleErrors };

package/dist/index.js

@@ -1,17 +1,13 @@
+import "./_virtual/_rolldown/runtime.js";
+import { handleErrors } from "./errorHandler.js";
 import { ApiExpressRouterFactory } from "./apiExpressRouterFactory.js";
 import { ApiExpressDefaultEndpointAdapter } from "./endpointAdapter/apiExpressDefaultEndpointAdapter.js";
-import { handleErrors } from "./errorHandler.js";
 import { authMiddleware, verifySignature } from "./middlewares/authMiddleware.js";
 import { requestLoggerMiddleware } from "./middlewares/requestLoggerMiddleware.js";
-const apiExpressRouterFactory = new ApiExpressRouterFactory();
-const createApiExpressDefaultEndpointAdapter = (logLevel, errorStatusCode = 500) => {
-  return new ApiExpressDefaultEndpointAdapter(logLevel, errorStatusCode);
-};
-export {
-  apiExpressRouterFactory,
-  authMiddleware,
-  createApiExpressDefaultEndpointAdapter,
-  handleErrors,
-  requestLoggerMiddleware,
-  verifySignature
+//#region src/index.ts
+var apiExpressRouterFactory = new ApiExpressRouterFactory();
+var createApiExpressDefaultEndpointAdapter = (logLevel, errorStatusCode = 500) => {
+	return new ApiExpressDefaultEndpointAdapter(logLevel, errorStatusCode);
 };
+//#endregion
+export { apiExpressRouterFactory, authMiddleware, createApiExpressDefaultEndpointAdapter, handleErrors, requestLoggerMiddleware, verifySignature };

package/dist/middlewares/authMiddleware.js

@@ -1,61 +1,58 @@
+import { ProsopoApiError, ProsopoEnvError } from "@prosopo/common";
 import { hexToU8a } from "@polkadot/util";
-import { ProsopoEnvError, ProsopoApiError } from "@prosopo/common";
-const authMiddleware = (pair, authAccount) => {
-  return async (req, res, next) => {
-    try {
-      const jwt = extractJWT(req);
-      let error;
-      if (authAccount?.jwtVerify(jwt).isValid) {
-        next();
-        return;
-      }
-      if (pair?.jwtVerify(jwt).isValid) {
-        next();
-        return;
-      }
-      res.status(401).json({
-        error: new ProsopoEnvError(error || "API.UNAUTHORIZED", {
-          context: { i18n: req.i18n, code: 401 }
-        })
-      });
-      return;
-    } catch (err) {
-      req.logger.error(() => ({ err, msg: "Auth Middleware Error" }));
-      res.status(401).json({ error: "Unauthorized", message: err });
-      return;
-    }
-  };
+//#region src/middlewares/authMiddleware.ts
+var authMiddleware = (pair, authAccount) => {
+	return async (req, res, next) => {
+		try {
+			const jwt = extractJWT(req);
+			if (authAccount?.jwtVerify(jwt).isValid) {
+				next();
+				return;
+			}
+			if (pair?.jwtVerify(jwt).isValid) {
+				next();
+				return;
+			}
+			res.status(401).json({ error: new ProsopoEnvError("API.UNAUTHORIZED", { context: {
+				i18n: req.i18n,
+				code: 401
+			} }) });
+			return;
+		} catch (err) {
+			req.logger.error(() => ({
+				err,
+				msg: "Auth Middleware Error"
+			}));
+			res.status(401).json({
+				error: "Unauthorized",
+				message: err
+			});
+			return;
+		}
+	};
 };
-const extractJWT = (req) => {
-  const authHeader = req.headers.Authorization || req.headers.authorization;
-  if (!authHeader || typeof authHeader !== "string") {
-    throw new ProsopoApiError("GENERAL.MISSING_AUTH_HEADER", {
-      context: { error: "Missing Authorization header", code: 401 }
-    });
-  }
-  const jwt = authHeader.replace("Bearer ", "");
-  if (!jwt) {
-    throw new ProsopoApiError("GENERAL.INVALID_JWT", {
-      context: { error: "Missing JWT", code: 400 }
-    });
-  }
-  return jwt;
+var extractJWT = (req) => {
+	const authHeader = req.headers.Authorization || req.headers.authorization;
+	if (!authHeader || typeof authHeader !== "string") throw new ProsopoApiError("GENERAL.MISSING_AUTH_HEADER", { context: {
+		error: "Missing Authorization header",
+		code: 401
+	} });
+	const jwt = authHeader.replace("Bearer ", "");
+	if (!jwt) throw new ProsopoApiError("GENERAL.INVALID_JWT", { context: {
+		error: "Missing JWT",
+		code: 400
+	} });
+	return jwt;
 };
-const verifySignature = (signature, message, pair) => {
-  const u8Sig = hexToU8a(signature);
-  if (!pair.verify(message, u8Sig, pair.publicKey)) {
-    throw new ProsopoApiError("GENERAL.INVALID_SIGNATURE", {
-      context: {
-        error: "Signature verification failed",
-        code: 401,
-        account: pair.address,
-        message,
-        signature
-      }
-    });
-  }
-};
-export {
-  authMiddleware,
-  verifySignature
+var verifySignature = (signature, message, pair) => {
+	const u8Sig = hexToU8a(signature);
+	if (!pair.verify(message, u8Sig, pair.publicKey)) throw new ProsopoApiError("GENERAL.INVALID_SIGNATURE", { context: {
+		error: "Signature verification failed",
+		code: 401,
+		account: pair.address,
+		message,
+		signature
+	} });
 };
+//#endregion
+export { authMiddleware, verifySignature };

package/dist/middlewares/requestLoggerMiddleware.js

@@ -1,63 +1,61 @@
 import { getLogger, parseLogLevel } from "@prosopo/logger";
 import { v4 } from "uuid";
-const getHeaderValue = (req, headerName) => {
-  if (headerName in req.headers && req.headers[headerName]) {
-    return req.headers[headerName].toString();
-  }
-  return void 0;
+//#region src/middlewares/requestLoggerMiddleware.ts
+var getHeaderValue = (req, headerName) => {
+	if (headerName in req.headers && req.headers[headerName]) return req.headers[headerName].toString();
 };
-const HEALTH_CHECK_PATHS = /* @__PURE__ */ new Set(["/healthz", "/health", "/readyz"]);
+var HEALTH_CHECK_PATHS = /* @__PURE__ */ new Set([
+	"/healthz",
+	"/health",
+	"/readyz"
+]);
 function requestLoggerMiddleware(env) {
-  return (req, res, next) => {
-    const requestId = req.headers["x-request-id"] || `e-${v4()}`;
-    const user = getHeaderValue(req, "prosopo-user");
-    const siteKey = getHeaderValue(req, "prosopo-site-key");
-    const sessionId = req.body?.sessionId ? req.body.sessionId : void 0;
-    const logger = getLogger(
-      parseLogLevel(env.config.logLevel),
-      "provider:request"
-    ).with({
-      requestId,
-      ...user ? { user } : {},
-      ...siteKey ? { siteKey } : {},
-      ...sessionId ? { sessionId } : {}
-    });
-    req.logger = logger;
-    req.requestId = requestId;
-    res.setHeader("x-request-id", requestId);
-    if (HEALTH_CHECK_PATHS.has(req.path)) {
-      next();
-      return;
-    }
-    const startNs = process.hrtime.bigint();
-    logger.info(() => ({
-      msg: "Request received",
-      data: {
-        method: req.method,
-        path: req.path
-      }
-    }));
-    let finished = false;
-    const emitFinish = (outcome) => {
-      if (finished) return;
-      finished = true;
-      const durationMs = Number(process.hrtime.bigint() - startNs) / 1e6;
-      logger.info(() => ({
-        msg: "Response sent",
-        data: {
-          method: req.method,
-          path: req.path,
-          status: res.statusCode,
-          durationMs,
-          outcome
-        }
-      }));
-    };
-    res.on("finish", () => emitFinish("finish"));
-    res.on("close", () => emitFinish("close"));
-    next();
-  };
+	return (req, res, next) => {
+		const requestId = req.headers["x-request-id"] || `e-${v4()}`;
+		const user = getHeaderValue(req, "prosopo-user");
+		const siteKey = getHeaderValue(req, "prosopo-site-key");
+		const sessionId = req.body?.sessionId ? req.body.sessionId : void 0;
+		const logger = getLogger(parseLogLevel(env.config.logLevel), "provider:request").with({
+			requestId,
+			...user ? { user } : {},
+			...siteKey ? { siteKey } : {},
+			...sessionId ? { sessionId } : {}
+		});
+		req.logger = logger;
+		req.requestId = requestId;
+		res.setHeader("x-request-id", requestId);
+		if (HEALTH_CHECK_PATHS.has(req.path)) {
+			next();
+			return;
+		}
+		const startNs = process.hrtime.bigint();
+		logger.info(() => ({
+			msg: "Request received",
+			data: {
+				method: req.method,
+				path: req.path
+			}
+		}));
+		let finished = false;
+		const emitFinish = (outcome) => {
+			if (finished) return;
+			finished = true;
+			const durationMs = Number(process.hrtime.bigint() - startNs) / 1e6;
+			logger.info(() => ({
+				msg: "Response sent",
+				data: {
+					method: req.method,
+					path: req.path,
+					status: res.statusCode,
+					durationMs,
+					outcome
+				}
+			}));
+		};
+		res.on("finish", () => emitFinish("finish"));
+		res.on("close", () => emitFinish("close"));
+		next();
+	};
 }
-export {
-  requestLoggerMiddleware
-};
+//#endregion
+export { requestLoggerMiddleware };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/api-express-router",
-	"version": "3.1.50",
+	"version": "3.1.51",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"type": "module",
@@ -26,13 +26,13 @@
 	},
 	"dependencies": {
 		"@polkadot/util": "13.5.7",
-		"@prosopo/api-route": "2.6.52",
-		"@prosopo/common": "3.1.47",
-		"@prosopo/logger": "2.0.3",
-		"@prosopo/env": "3.6.19",
-		"@prosopo/locale": "3.2.7",
-		"@prosopo/types": "4.9.12",
-		"@prosopo/util": "3.3.4",
+		"@prosopo/api-route": "2.6.53",
+		"@prosopo/common": "3.1.48",
+		"@prosopo/logger": "2.0.4",
+		"@prosopo/env": "3.6.20",
+		"@prosopo/locale": "3.2.8",
+		"@prosopo/types": "4.10.0",
+		"@prosopo/util": "3.3.5",
 		"@prosopo/util-crypto": "13.5.30",
 		"dotenv": "16.4.5",
 		"express": "4.21.2",
@@ -41,9 +41,9 @@
 		"zod": "3.23.8"
 	},
 	"devDependencies": {
-		"@prosopo/config": "3.3.4",
+		"@prosopo/config": "3.3.5",
 		"@types/node": "22.10.2",
-		"vitest": "3.2.4"
+		"vitest": "4.1.10"
 	},
 	"author": "PROSOPO LIMITED <info@prosopo.io>",
 	"license": "Apache-2.0",