@prosopo/api-express-router 3.0.47 → 3.1.17

package/.turbo/turbo-build$colon$cjs.log

@@ -1,17 +1,19 @@
 
-> @prosopo/api-express-router@3.0.47 build:cjs
+> @prosopo/api-express-router@3.1.17 build:cjs
 > NODE_ENV=${NODE_ENV:-development}; vite build --config vite.cjs.config.ts --mode $NODE_ENV
 
 ViteCommonJSConfig: .
 {
   tsConfigPaths: [
     '/home/runner/work/captcha/captcha/packages/api-route/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/logger/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/util/tsconfig.json',
     '/home/runner/work/captcha/captcha/packages/common/tsconfig.json',
     '/home/runner/work/captcha/captcha/packages/locale/tsconfig.json',
     '/home/runner/work/captcha/captcha/packages/types/tsconfig.json',
-    '/home/runner/work/captcha/captcha/packages/util/tsconfig.json',
     '/home/runner/work/captcha/captcha/packages/util-crypto/tsconfig.json',
     '/home/runner/work/captcha/captcha/packages/env/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/ipinfo/tsconfig.json',
     '/home/runner/work/captcha/captcha/packages/database/tsconfig.json',
     '/home/runner/work/captcha/captcha/packages/types-database/tsconfig.json',
     '/home/runner/work/captcha/captcha/packages/user-access-policy/tsconfig.json',
@@ -24,12 +26,14 @@ ViteCommonJSConfig: .
 {
   externals: [
     '@prosopo/api-route',
+    '@prosopo/logger',
+    '@prosopo/util',
     '@prosopo/common',
     '@prosopo/locale',
     '@prosopo/types',
-    '@prosopo/util',
     '@prosopo/util-crypto',
     '@prosopo/env',
+    '@prosopo/ipinfo',
     '@prosopo/database',
     '@prosopo/types-database',
     '@prosopo/user-access-policy',
@@ -46,9 +50,9 @@ Build end
 ✓ 6 modules transformed.
 rendering chunks...
 dist/cjs/errorHandler.cjs                                      0.49 kB
-dist/cjs/middlewares/requestLoggerMiddleware.cjs               0.69 kB
 dist/cjs/apiExpressRouterFactory.cjs                           0.92 kB
-dist/cjs/endpointAdapter/apiExpressDefaultEndpointAdapter.cjs  1.09 kB
+dist/cjs/middlewares/requestLoggerMiddleware.cjs               1.06 kB
+dist/cjs/endpointAdapter/apiExpressDefaultEndpointAdapter.cjs  1.13 kB
 dist/cjs/index.cjs                                             1.16 kB
 dist/cjs/middlewares/authMiddleware.cjs                        1.86 kB
-✓ built in 118ms
+✓ built in 111ms

package/.turbo/turbo-build$colon$tsc.log

@@ -1,15 +1,17 @@
 
-> @prosopo/api-express-router@3.0.47 build:tsc
+> @prosopo/api-express-router@3.1.17 build:tsc
 > tsc --build --verbose
 
-4:57:39 PM - Projects in this build: 
+8:15:21 AM - Projects in this build: 
     * ../../dev/config/tsconfig.json
-    * ../locale/tsconfig.json
     * ../util/tsconfig.json
+    * ../logger/tsconfig.json
+    * ../api-route/tsconfig.json
+    * ../locale/tsconfig.json
     * ../util-crypto/tsconfig.json
     * ../types/tsconfig.json
     * ../common/tsconfig.json
-    * ../api-route/tsconfig.json
+    * ../ipinfo/tsconfig.json
     * ../redis-client/tsconfig.json
     * ../api/tsconfig.json
     * ../user-access-policy/tsconfig.json
@@ -20,37 +22,41 @@
     * ../env/tsconfig.json
     * tsconfig.json
 
-4:57:39 PM - Project '../../dev/config/tsconfig.json' is up to date because newest input '../../dev/config/src/dependencies.ts' is older than output '../../dev/config/tsconfig.tsbuildinfo'
+8:15:21 AM - Project '../../dev/config/tsconfig.json' is up to date because newest input '../../dev/config/src/webpack/webpack.config.ts' is older than output '../../dev/config/tsconfig.tsbuildinfo'
+
+8:15:21 AM - Project '../util/tsconfig.json' is up to date because newest input '../util/src/url.ts' is older than output '../util/tsconfig.tsbuildinfo'
+
+8:15:21 AM - Project '../logger/tsconfig.json' is up to date because newest input '../logger/src/index.ts' is older than output '../logger/tsconfig.tsbuildinfo'
 
-4:57:39 PM - Project '../locale/tsconfig.json' is up to date because newest input '../locale/src/translationKey.ts' is older than output '../locale/tsconfig.tsbuildinfo'
+8:15:21 AM - Project '../api-route/tsconfig.json' is up to date because newest input '../api-route/src/apiRoutes.ts' is older than output '../api-route/tsconfig.tsbuildinfo'
 
-4:57:39 PM - Project '../util/tsconfig.json' is up to date because newest input '../util/src/verifyRecency.ts' is older than output '../util/tsconfig.tsbuildinfo'
+8:15:21 AM - Project '../locale/tsconfig.json' is up to date because newest input '../locale/src/translationKey.ts' is older than output '../locale/tsconfig.tsbuildinfo'
 
-4:57:39 PM - Project '../util-crypto/tsconfig.json' is up to date because newest input '../util-crypto/src/types.ts' is older than output '../util-crypto/tsconfig.tsbuildinfo'
+8:15:21 AM - Project '../util-crypto/tsconfig.json' is up to date because newest input '../util-crypto/src/types.ts' is older than output '../util-crypto/tsconfig.tsbuildinfo'
 
-4:57:39 PM - Project '../types/tsconfig.json' is up to date because newest input '../types/src/procaptcha/api.ts' is older than output '../types/tsconfig.tsbuildinfo'
+8:15:21 AM - Project '../types/tsconfig.json' is up to date because newest input '../types/src/procaptcha/api.ts' is older than output '../types/tsconfig.tsbuildinfo'
 
-4:57:39 PM - Project '../common/tsconfig.json' is up to date because newest input '../common/src/logger.ts' is older than output '../common/tsconfig.tsbuildinfo'
+8:15:21 AM - Project '../common/tsconfig.json' is up to date because newest input '../common/src/error.ts' is older than output '../common/tsconfig.tsbuildinfo'
 
-4:57:39 PM - Project '../api-route/tsconfig.json' is up to date because newest input '../api-route/src/index.ts' is older than output '../api-route/tsconfig.tsbuildinfo'
+8:15:22 AM - Project '../ipinfo/tsconfig.json' is up to date because newest input '../ipinfo/src/IpInfoService.ts' is older than output '../ipinfo/tsconfig.tsbuildinfo'
 
-4:57:39 PM - Project '../redis-client/tsconfig.json' is up to date because newest input '../redis-client/src/index.ts' is older than output '../redis-client/tsconfig.tsbuildinfo'
+8:15:22 AM - Project '../redis-client/tsconfig.json' is up to date because newest input '../redis-client/src/index.ts' is older than output '../redis-client/tsconfig.tsbuildinfo'
 
-4:57:39 PM - Project '../api/tsconfig.json' is up to date because newest input '../api/src/index.ts' is older than output '../api/tsconfig.tsbuildinfo'
+8:15:22 AM - Project '../api/tsconfig.json' is up to date because newest input '../api/src/index.ts' is older than output '../api/tsconfig.tsbuildinfo'
 
-4:57:39 PM - Project '../user-access-policy/tsconfig.json' is up to date because newest input '../user-access-policy/src/transformRule.ts' is older than output '../user-access-policy/tsconfig.tsbuildinfo'
+8:15:22 AM - Project '../user-access-policy/tsconfig.json' is up to date because newest input '../user-access-policy/src/transformRule.ts' is older than output '../user-access-policy/tsconfig.tsbuildinfo'
 
-4:57:39 PM - Project '../types-database/tsconfig.json' is up to date because newest input '../types-database/src/index.ts' is older than output '../types-database/tsconfig.tsbuildinfo'
+8:15:22 AM - Project '../types-database/tsconfig.json' is up to date because newest input '../types-database/src/types/bannedDomain.ts' is older than output '../types-database/tsconfig.tsbuildinfo'
 
-4:57:39 PM - Project '../database/tsconfig.json' is up to date because newest input '../database/src/index.ts' is older than output '../database/tsconfig.tsbuildinfo'
+8:15:22 AM - Project '../database/tsconfig.json' is up to date because newest input '../database/src/tests/integration/ipInfoPersistence.integration.test.ts' is older than output '../database/tsconfig.tsbuildinfo'
 
-4:57:39 PM - Project '../keyring/tsconfig.json' is up to date because newest input '../keyring/src/index.ts' is older than output '../keyring/tsconfig.tsbuildinfo'
+8:15:22 AM - Project '../keyring/tsconfig.json' is up to date because newest input '../keyring/src/index.ts' is older than output '../keyring/tsconfig.tsbuildinfo'
 
-4:57:39 PM - Project '../types-env/tsconfig.json' is up to date because newest input '../types-env/src/env.ts' is older than output '../types-env/tsconfig.tsbuildinfo'
+8:15:22 AM - Project '../types-env/tsconfig.json' is up to date because newest input '../types-env/src/index.ts' is older than output '../types-env/tsconfig.tsbuildinfo'
 
-4:57:39 PM - Project '../env/tsconfig.json' is up to date because newest input '../env/src/env.ts' is older than output '../env/tsconfig.tsbuildinfo'
+8:15:22 AM - Project '../env/tsconfig.json' is up to date because newest input '../env/src/env.ts' is older than output '../env/tsconfig.tsbuildinfo'
 
-4:57:39 PM - Project 'tsconfig.json' is out of date because output file 'tsconfig.tsbuildinfo' does not exist
+8:15:22 AM - Project 'tsconfig.json' is out of date because output file 'tsconfig.tsbuildinfo' does not exist
 
-4:57:39 PM - Building project '/home/runner/work/captcha/captcha/packages/api-express-router/tsconfig.json'...
+8:15:22 AM - Building project '/home/runner/work/captcha/captcha/packages/api-express-router/tsconfig.json'...
 

package/.turbo/turbo-build.log

@@ -1,21 +1,23 @@
 
-> @prosopo/api-express-router@3.0.47 build
+> @prosopo/api-express-router@3.1.17 build
 > npm run build:cross-env -- --mode ${NODE_ENV:-development}
 
 
-> @prosopo/api-express-router@3.0.47 build:cross-env
+> @prosopo/api-express-router@3.1.17 build:cross-env
 > vite build --config vite.esm.config.ts --mode production
 
 ViteEsmConfig: .
 {
   tsConfigPaths: [
     '/home/runner/work/captcha/captcha/packages/api-route/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/logger/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/util/tsconfig.json',
     '/home/runner/work/captcha/captcha/packages/common/tsconfig.json',
     '/home/runner/work/captcha/captcha/packages/locale/tsconfig.json',
     '/home/runner/work/captcha/captcha/packages/types/tsconfig.json',
-    '/home/runner/work/captcha/captcha/packages/util/tsconfig.json',
     '/home/runner/work/captcha/captcha/packages/util-crypto/tsconfig.json',
     '/home/runner/work/captcha/captcha/packages/env/tsconfig.json',
+    '/home/runner/work/captcha/captcha/packages/ipinfo/tsconfig.json',
     '/home/runner/work/captcha/captcha/packages/database/tsconfig.json',
     '/home/runner/work/captcha/captcha/packages/types-database/tsconfig.json',
     '/home/runner/work/captcha/captcha/packages/user-access-policy/tsconfig.json',
@@ -28,12 +30,14 @@ ViteEsmConfig: .
 {
   externals: [
     '@prosopo/api-route',
+    '@prosopo/logger',
+    '@prosopo/util',
     '@prosopo/common',
     '@prosopo/locale',
     '@prosopo/types',
-    '@prosopo/util',
     '@prosopo/util-crypto',
     '@prosopo/env',
+    '@prosopo/ipinfo',
     '@prosopo/database',
     '@prosopo/types-database',
     '@prosopo/user-access-policy',
@@ -50,9 +54,9 @@ Build end
 ✓ 6 modules transformed.
 rendering chunks...
 dist/errorHandler.js                                      0.39 kB
-dist/middlewares/requestLoggerMiddleware.js               0.58 kB
 dist/index.js                                             0.78 kB
 dist/apiExpressRouterFactory.js                           0.78 kB
-dist/endpointAdapter/apiExpressDefaultEndpointAdapter.js  0.98 kB
+dist/middlewares/requestLoggerMiddleware.js               0.94 kB
+dist/endpointAdapter/apiExpressDefaultEndpointAdapter.js  1.02 kB
 dist/middlewares/authMiddleware.js                        1.73 kB
-✓ built in 205ms
+✓ built in 192ms

package/CHANGELOG.md

@@ -1,5 +1,330 @@
 # @prosopo/api-express-router
 
+## 3.1.17
+### Patch Changes
+
+- Updated dependencies [a1d60db]
+- Updated dependencies [2392aaf]
+- Updated dependencies [97cf7bd]
+- Updated dependencies [6ca1125]
+- Updated dependencies [32a591b]
+  - @prosopo/types@4.3.0
+  - @prosopo/logger@1.0.2
+  - @prosopo/common@3.1.38
+  - @prosopo/env@3.5.7
+  - @prosopo/api-route@2.6.46
+
+## 3.1.16
+### Patch Changes
+
+- Updated dependencies [6c26669]
+- Updated dependencies [f7f9ec5]
+  - @prosopo/types@4.2.1
+  - @prosopo/env@3.5.6
+
+## 3.1.15
+### Patch Changes
+
+- 0fd81af: Extract the logger into its own `@prosopo/logger` package, out of `@prosopo/common`. Consumers now import logger symbols from `@prosopo/logger`; `@prosopo/common` no longer re-exports them. Unused `@prosopo/common` dependencies pruned where the only usage was the logger.
+- Updated dependencies [0fd81af]
+  - @prosopo/api-route@2.6.45
+  - @prosopo/common@3.1.37
+  - @prosopo/env@3.5.5
+  - @prosopo/logger@1.0.1
+
+## 3.1.14
+### Patch Changes
+
+- Updated dependencies [20cae63]
+- Updated dependencies [4d9923e]
+  - @prosopo/types@4.2.0
+  - @prosopo/env@3.5.4
+
+## 3.1.13
+### Patch Changes
+
+- Updated dependencies [d351362]
+  - @prosopo/types@4.1.4
+  - @prosopo/env@3.5.3
+
+## 3.1.12
+### Patch Changes
+
+- Updated dependencies [e2711ae]
+- Updated dependencies [5786629]
+  - @prosopo/types@4.1.3
+  - @prosopo/locale@3.2.4
+  - @prosopo/common@3.1.36
+  - @prosopo/env@3.5.2
+  - @prosopo/api-route@2.6.44
+
+## 3.1.11
+### Patch Changes
+
+  - @prosopo/types@4.1.2
+  - @prosopo/env@3.5.1
+
+## 3.1.10
+### Patch Changes
+
+- Updated dependencies [53bfd45]
+- Updated dependencies [91958da]
+  - @prosopo/locale@3.2.3
+  - @prosopo/env@3.5.0
+  - @prosopo/types@4.1.1
+  - @prosopo/common@3.1.35
+  - @prosopo/api-route@2.6.43
+
+## 3.1.9
+### Patch Changes
+
+- Updated dependencies [6a741ce]
+  - @prosopo/types@4.1.0
+  - @prosopo/env@3.4.9
+
+## 3.1.8
+### Patch Changes
+
+- Updated dependencies [3c0be68]
+- Updated dependencies [f9ea09d]
+- Updated dependencies [4aae4e6]
+- Updated dependencies [d865319]
+- Updated dependencies [753304b]
+- Updated dependencies [8bb7286]
+- Updated dependencies [f9ea09d]
+- Updated dependencies [4aae4e6]
+- Updated dependencies [4993813]
+  - @prosopo/types@4.0.0
+  - @prosopo/locale@3.2.2
+  - @prosopo/common@3.1.34
+  - @prosopo/env@3.4.8
+  - @prosopo/api-route@2.6.42
+
+## 3.1.7
+### Patch Changes
+
+- Updated dependencies [819ed95]
+  - @prosopo/types@3.16.1
+  - @prosopo/env@3.4.7
+
+## 3.1.6
+### Patch Changes
+
+  - @prosopo/env@3.4.6
+
+## 3.1.5
+### Patch Changes
+
+  - @prosopo/env@3.4.5
+
+## 3.1.4
+### Patch Changes
+
+  - @prosopo/env@3.4.4
+
+## 3.1.3
+### Patch Changes
+
+- Updated dependencies [f6a4402]
+- Updated dependencies [99dfb44]
+  - @prosopo/types@3.16.0
+  - @prosopo/env@3.4.3
+
+## 3.1.2
+### Patch Changes
+
+- Updated dependencies [3e54c0a]
+  - @prosopo/types@3.15.0
+  - @prosopo/env@3.4.2
+
+## 3.1.1
+### Patch Changes
+
+- Updated dependencies [946a8ba]
+- Updated dependencies [5614814]
+- Updated dependencies [b94890c]
+  - @prosopo/types@3.14.1
+  - @prosopo/locale@3.2.1
+  - @prosopo/common@3.1.33
+  - @prosopo/env@3.4.1
+  - @prosopo/api-route@2.6.41
+
+## 3.1.0
+### Minor Changes
+
+- 42650db: Add better spam rules and move ipinfo service to local instead of external
+
+### Patch Changes
+
+- Updated dependencies [fc514dd]
+- Updated dependencies [42650db]
+  - @prosopo/locale@3.2.0
+  - @prosopo/types@3.14.0
+  - @prosopo/env@3.4.0
+  - @prosopo/common@3.1.32
+  - @prosopo/api-route@2.6.40
+
+## 3.0.70
+### Patch Changes
+
+- Updated dependencies [4a9c518]
+  - @prosopo/common@3.1.31
+  - @prosopo/api-route@2.6.39
+  - @prosopo/env@3.3.15
+
+## 3.0.69
+### Patch Changes
+
+  - @prosopo/types@3.13.3
+  - @prosopo/env@3.3.14
+
+## 3.0.68
+### Patch Changes
+
+  - @prosopo/types@3.13.2
+  - @prosopo/env@3.3.13
+
+## 3.0.67
+### Patch Changes
+
+  - @prosopo/types@3.13.1
+  - @prosopo/env@3.3.12
+
+## 3.0.66
+### Patch Changes
+
+- Updated dependencies [e6d9553]
+  - @prosopo/types@3.13.0
+  - @prosopo/env@3.3.11
+
+## 3.0.65
+### Patch Changes
+
+- Updated dependencies [d5082a9]
+- Updated dependencies [e1ea65f]
+- Updated dependencies [c316257]
+  - @prosopo/types@3.12.3
+  - @prosopo/env@3.3.10
+
+## 3.0.64
+### Patch Changes
+
+- Updated dependencies [adb89a6]
+  - @prosopo/locale@3.1.29
+  - @prosopo/types@3.12.2
+  - @prosopo/env@3.3.9
+  - @prosopo/common@3.1.30
+  - @prosopo/api-route@2.6.38
+
+## 3.0.63
+### Patch Changes
+
+- Updated dependencies [c5ee492]
+- Updated dependencies [a90eb54]
+  - @prosopo/common@3.1.29
+  - @prosopo/types@3.12.1
+  - @prosopo/api-route@2.6.37
+  - @prosopo/env@3.3.8
+
+## 3.0.62
+### Patch Changes
+
+- Updated dependencies [676c5f2]
+- Updated dependencies [feaca02]
+  - @prosopo/types@3.12.0
+  - @prosopo/env@3.3.7
+
+## 3.0.61
+### Patch Changes
+
+- Updated dependencies [8148587]
+  - @prosopo/types@3.11.1
+  - @prosopo/env@3.3.6
+
+## 3.0.60
+### Patch Changes
+
+  - @prosopo/env@3.3.5
+
+## 3.0.59
+### Patch Changes
+
+- ca7f4ad: Attach site key and user to logger earlier
+- Updated dependencies [7f6ffc5]
+  - @prosopo/types@3.11.0
+  - @prosopo/env@3.3.4
+
+## 3.0.58
+### Patch Changes
+
+- Updated dependencies [93fa086]
+  - @prosopo/types@3.10.2
+  - @prosopo/env@3.3.3
+
+## 3.0.57
+### Patch Changes
+
+- Updated dependencies [cde7550]
+  - @prosopo/types@3.10.1
+  - @prosopo/env@3.3.2
+
+## 3.0.56
+### Patch Changes
+
+- Updated dependencies [ad6d622]
+  - @prosopo/types@3.10.0
+  - @prosopo/env@3.3.1
+
+## 3.0.55
+### Patch Changes
+
+- Updated dependencies [ff58a70]
+  - @prosopo/types@3.9.0
+  - @prosopo/env@3.3.0
+
+## 3.0.54
+### Patch Changes
+
+  - @prosopo/env@3.2.42
+
+## 3.0.53
+### Patch Changes
+
+- Updated dependencies [d2431cd]
+  - @prosopo/types@3.8.4
+  - @prosopo/env@3.2.41
+
+## 3.0.52
+### Patch Changes
+
+  - @prosopo/env@3.2.40
+
+## 3.0.51
+### Patch Changes
+
+- Updated dependencies [bd6995b]
+  - @prosopo/types@3.8.3
+  - @prosopo/env@3.2.39
+
+## 3.0.50
+### Patch Changes
+
+- Updated dependencies [9633e58]
+  - @prosopo/types@3.8.2
+  - @prosopo/env@3.2.38
+
+## 3.0.49
+### Patch Changes
+
+- Updated dependencies [f52a5c1]
+  - @prosopo/types@3.8.1
+  - @prosopo/env@3.2.37
+
+## 3.0.48
+### Patch Changes
+
+  - @prosopo/env@3.2.36
+
 ## 3.0.47
 ### Patch Changes
 

package/dist/cjs/endpointAdapter/apiExpressDefaultEndpointAdapter.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const common = require("@prosopo/common");
+const logger = require("@prosopo/logger");
 class ApiExpressDefaultEndpointAdapter {
   constructor(logLevel, errorStatusCode) {
     this.logLevel = logLevel;
@@ -22,7 +23,7 @@ class ApiExpressDefaultEndpointAdapter {
         args,
         request.logger
       );
-      const responseObject = common.stringifyBigInts(apiEndpointResponse);
+      const responseObject = logger.stringifyBigInts(apiEndpointResponse);
       response.json(responseObject);
     } catch (error) {
       request.logger.error(() => ({

package/dist/cjs/middlewares/requestLoggerMiddleware.cjs

@@ -1,19 +1,29 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const common = require("@prosopo/common");
+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;
+};
 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 : null;
-    const logger = common.getLogger(
-      common.parseLogLevel(env.config.logLevel),
+    const logger$1 = logger.getLogger(
+      logger.parseLogLevel(env.config.logLevel),
       "request-logger"
     ).with({
       requestId,
+      ...user ? { user } : {},
+      ...siteKey ? { siteKey } : {},
       ...sessionId ? { sessionId } : {}
     });
-    req.logger = logger;
+    req.logger = logger$1;
     req.requestId = requestId;
     next();
   };

package/dist/endpointAdapter/apiExpressDefaultEndpointAdapter.d.ts

@@ -1,5 +1,5 @@
 import type { ApiEndpoint } from "@prosopo/api-route";
-import { type LogLevel } from "@prosopo/common";
+import { type LogLevel } from "@prosopo/logger";
 import type { NextFunction, Request, Response } from "express";
 import type { ZodType } from "zod";
 import type { ApiExpressEndpointAdapter } from "./apiExpressEndpointAdapter.js";

package/dist/endpointAdapter/apiExpressDefaultEndpointAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiExpressDefaultEndpointAdapter.d.ts","sourceRoot":"","sources":["../../src/endpointAdapter/apiExpressDefaultEndpointAdapter.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACN,KAAK,QAAQ,EAGb,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AACnC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAEhF,cAAM,gCAAiC,YAAW,yBAAyB;IAEzE,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBADf,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,MAAM;IAG5B,aAAa,CACzB,QAAQ,EAAE,WAAW,CAAC,OAAO,GAAG,SAAS,CAAC,EAC1C,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,YAAY,GAChB,OAAO,CAAC,IAAI,CAAC;CA8BhB;AAED,OAAO,EAAE,gCAAgC,EAAE,CAAC"}
+{"version":3,"file":"apiExpressDefaultEndpointAdapter.d.ts","sourceRoot":"","sources":["../../src/endpointAdapter/apiExpressDefaultEndpointAdapter.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,KAAK,QAAQ,EAAoB,MAAM,iBAAiB,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AACnC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAEhF,cAAM,gCAAiC,YAAW,yBAAyB;IAEzE,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;gBADf,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,MAAM;IAG5B,aAAa,CACzB,QAAQ,EAAE,WAAW,CAAC,OAAO,GAAG,SAAS,CAAC,EAC1C,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,YAAY,GAChB,OAAO,CAAC,IAAI,CAAC;CA8BhB;AAED,OAAO,EAAE,gCAAgC,EAAE,CAAC"}

package/dist/endpointAdapter/apiExpressDefaultEndpointAdapter.js

@@ -1,4 +1,5 @@
-import { ProsopoApiError, stringifyBigInts } from "@prosopo/common";
+import { ProsopoApiError } from "@prosopo/common";
+import { stringifyBigInts } from "@prosopo/logger";
 class ApiExpressDefaultEndpointAdapter {
   constructor(logLevel, errorStatusCode) {
     this.logLevel = logLevel;

package/dist/endpointAdapter/apiExpressDefaultEndpointAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"apiExpressDefaultEndpointAdapter.js","sourceRoot":"","sources":["../../src/endpointAdapter/apiExpressDefaultEndpointAdapter.ts"],"names":[],"mappings":"AAeA,OAAO,EAEN,eAAe,EACf,gBAAgB,GAChB,MAAM,iBAAiB,CAAC;AAKzB,MAAM,gCAAgC;IACrC,YACkB,QAAkB,EAClB,eAAuB;QADvB,aAAQ,GAAR,QAAQ,CAAU;QAClB,oBAAe,GAAf,eAAe,CAAQ;IACtC,CAAC;IAEG,KAAK,CAAC,aAAa,CACzB,QAA0C,EAC1C,OAAgB,EAChB,QAAkB,EAClB,IAAkB;QAElB,IAAI,IAAa,CAAC;QAClB,IAAI,CAAC;YACJ,IAAI,GAAG,QAAQ,CAAC,oBAAoB,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,IAAI,CACV,IAAI,eAAe,CAAC,iBAAiB,EAAE;gBACtC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE;aACpC,CAAC,CACF,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,mBAAmB,GAAG,MAAM,QAAQ,CAAC,cAAc,CACxD,IAAI,EACJ,OAAO,CAAC,MAAM,CACd,CAAC;YAGF,MAAM,cAAc,GAAG,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;YAE7D,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC/B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBAC3B,GAAG,EAAE,KAAK;aACV,CAAC,CAAC,CAAC;YAEJ,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;QACjE,CAAC;IACF,CAAC;CACD;AAED,OAAO,EAAE,gCAAgC,EAAE,CAAC"}
+{"version":3,"file":"apiExpressDefaultEndpointAdapter.js","sourceRoot":"","sources":["../../src/endpointAdapter/apiExpressDefaultEndpointAdapter.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAiB,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAKlE,MAAM,gCAAgC;IACrC,YACkB,QAAkB,EAClB,eAAuB;QADvB,aAAQ,GAAR,QAAQ,CAAU;QAClB,oBAAe,GAAf,eAAe,CAAQ;IACtC,CAAC;IAEG,KAAK,CAAC,aAAa,CACzB,QAA0C,EAC1C,OAAgB,EAChB,QAAkB,EAClB,IAAkB;QAElB,IAAI,IAAa,CAAC;QAClB,IAAI,CAAC;YACJ,IAAI,GAAG,QAAQ,CAAC,oBAAoB,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,IAAI,CACV,IAAI,eAAe,CAAC,iBAAiB,EAAE;gBACtC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE;aACpC,CAAC,CACF,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,mBAAmB,GAAG,MAAM,QAAQ,CAAC,cAAc,CACxD,IAAI,EACJ,OAAO,CAAC,MAAM,CACd,CAAC;YAGF,MAAM,cAAc,GAAG,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;YAE7D,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC/B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBAC3B,GAAG,EAAE,KAAK;aACV,CAAC,CAAC,CAAC;YAEJ,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;QACjE,CAAC;IACF,CAAC;CACD;AAED,OAAO,EAAE,gCAAgC,EAAE,CAAC"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import type { LogLevel } from "@prosopo/common";
+import type { LogLevel } from "@prosopo/logger";
 import { ApiExpressRouterFactory } from "./apiExpressRouterFactory.js";
 import type { ApiExpressEndpointAdapter } from "./endpointAdapter/apiExpressEndpointAdapter.js";
 declare const apiExpressRouterFactory: ApiExpressRouterFactory;

package/dist/middlewares/requestLoggerMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requestLoggerMiddleware.d.ts","sourceRoot":"","sources":["../../src/middlewares/requestLoggerMiddleware.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG/D,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,mBAAmB,SAClD,OAAO,OAAO,QAAQ,QAAQ,YAAY,UAqBvD"}
+{"version":3,"file":"requestLoggerMiddleware.d.ts","sourceRoot":"","sources":["../../src/middlewares/requestLoggerMiddleware.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAa/D,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,mBAAmB,SAClD,OAAO,OAAO,QAAQ,QAAQ,YAAY,UAwBvD"}

package/dist/middlewares/requestLoggerMiddleware.js

@@ -1,14 +1,24 @@
-import { getLogger, parseLogLevel } from "@prosopo/common";
+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;
+};
 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 : null;
     const logger = getLogger(
       parseLogLevel(env.config.logLevel),
       "request-logger"
     ).with({
       requestId,
+      ...user ? { user } : {},
+      ...siteKey ? { siteKey } : {},
       ...sessionId ? { sessionId } : {}
     });
     req.logger = logger;

package/dist/middlewares/requestLoggerMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestLoggerMiddleware.js","sourceRoot":"","sources":["../../src/middlewares/requestLoggerMiddleware.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAG3D,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,MAAM,UAAU,uBAAuB,CAAC,GAAwB;IAC/D,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAC1D,MAAM,SAAS,GACb,GAAG,CAAC,OAAO,CAAC,cAAc,CAAY,IAAI,KAAK,MAAM,EAAE,EAAE,CAAC;QAE5D,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;QAElE,MAAM,MAAM,GAAG,SAAS,CACvB,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAClC,gBAAgB,CAChB,CAAC,IAAI,CAAC;YACN,SAAS;YACT,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnC,CAAC,CAAC;QAGH,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;QACpB,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC;QAG1B,IAAI,EAAE,CAAC;IACR,CAAC,CAAC;AACH,CAAC"}
+{"version":3,"file":"requestLoggerMiddleware.js","sourceRoot":"","sources":["../../src/middlewares/requestLoggerMiddleware.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE3D,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,MAAM,cAAc,GAAG,CACtB,GAAY,EACZ,UAAkB,EACG,EAAE;IACvB,IAAI,UAAU,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1D,OAAO,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC3C,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,UAAU,uBAAuB,CAAC,GAAwB;IAC/D,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QAC1D,MAAM,SAAS,GACb,GAAG,CAAC,OAAO,CAAC,cAAc,CAAY,IAAI,KAAK,MAAM,EAAE,EAAE,CAAC;QAC5D,MAAM,IAAI,GAAG,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;QACjD,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;QACxD,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;QAElE,MAAM,MAAM,GAAG,SAAS,CACvB,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAClC,gBAAgB,CAChB,CAAC,IAAI,CAAC;YACN,SAAS;YACT,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzB,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/B,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnC,CAAC,CAAC;QAGH,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;QACpB,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC;QAG1B,IAAI,EAAE,CAAC;IACR,CAAC,CAAC;AACH,CAAC"}

package/dist/tests/unit/middlewares/authMiddleware.unit.test.js

@@ -1,5 +1,6 @@
 import { hexToU8a, isHex } from "@polkadot/util";
-import { ProsopoEnvError, getLogger } from "@prosopo/common";
+import { ProsopoEnvError } from "@prosopo/common";
+import { getLogger } from "@prosopo/logger";
 import { describe, expect, it, vi } from "vitest";
 import { authMiddleware } from "../../../middlewares/authMiddleware.js";
 const loggerOuter = getLogger("info", import.meta.url);