@ogcio/fastify-logging-wrapper 5.3.1 → 5.4.0

package/__tests__/fastify-logging-wrapper.errors.test.ts

@@ -1,12 +1,12 @@
 import { httpErrors } from "@fastify/sensible";
-import { assert, afterEach, describe, it } from "vitest";
+import { afterEach, assert, describe, it } from "vitest";
 import { LogErrorClasses } from "../src/logging-wrapper-entities.js";
 import {
-  DEFAULT_METHOD,
   checkExpectedApiTrackEntry,
   checkExpectedErrorEntry,
   checkExpectedRequestEntry,
   checkExpectedResponseEntry,
+  DEFAULT_METHOD,
   initializeServer,
   parseLogEntry,
   runErrorTest,

package/__tests__/fastify-logging-wrapper.test.ts

@@ -1,12 +1,12 @@
 import { REQUEST_ID_HEADER } from "@ogcio/shared-errors";
-import { assert, afterEach, describe, it } from "vitest";
+import { afterEach, assert, describe, it } from "vitest";
 import { LogMessages } from "../src/logging-wrapper-entities.js";
 import {
-  DEFAULT_METHOD,
-  DEFAULT_PATH,
   checkExpectedRequestEntry,
   checkExpectedResponseEntry,
   checkGenericEntryFields,
+  DEFAULT_METHOD,
+  DEFAULT_PATH,
   initializeServer,
   parseLogEntry,
 } from "./helpers/fastify-test-helpers.js";
@@ -121,3 +121,85 @@ describe("Additional logs are correctly written", () => {
     assert.ok(typeof parsedAdditional.request !== "undefined");
   });
 });
+
+describe("PseudoUser is included in logging context", () => {
+  it("should include pseudoUser in response and apiTrack entries", async () => {
+    const { server, loggingDestination } = initializeServer();
+    afterEach(() => server.close());
+
+    const response = await server.inject({
+      method: DEFAULT_METHOD,
+      url: "/with-pseudo-user",
+    });
+
+    assert.ok(typeof response !== "undefined");
+    assert.equal(response?.statusCode, 200);
+    const loggedRecords = loggingDestination.getLoggedRecords();
+    assert.equal(loggedRecords.length, 3);
+
+    // Request entry should NOT have pseudoUser (not yet set)
+    const requestEntry = parseLogEntry(loggedRecords[0]);
+    assert.ok(typeof requestEntry.pseudoUser === "undefined");
+
+    // Response entry should have pseudoUser
+    const responseEntry = parseLogEntry(loggedRecords[1]);
+    assert.ok(typeof responseEntry.pseudoUser !== "undefined");
+    assert.equal(responseEntry.pseudoUser.id, "pseudo-user-id");
+    assert.equal(responseEntry.pseudoUser.version, "v1");
+
+    // ApiTrack entry should have pseudoUser
+    const apiTrackEntry = parseLogEntry(loggedRecords[2]);
+    assert.ok(typeof apiTrackEntry.pseudoUser !== "undefined");
+    assert.equal(apiTrackEntry.pseudoUser.id, "pseudo-user-id");
+    assert.equal(apiTrackEntry.pseudoUser.version, "v1");
+  });
+
+  it("should not include pseudoUser when userData has invalid shape", async () => {
+    const { server, loggingDestination } = initializeServer();
+    afterEach(() => server.close());
+
+    const response = await server.inject({
+      method: DEFAULT_METHOD,
+      url: "/with-invalid-pseudo-user",
+    });
+
+    assert.ok(typeof response !== "undefined");
+    assert.equal(response?.statusCode, 200);
+    const loggedRecords = loggingDestination.getLoggedRecords();
+    assert.equal(loggedRecords.length, 3);
+
+    // pseudoUser should not be set when shape is invalid
+    const responseEntry = parseLogEntry(loggedRecords[1]);
+    assert.ok(typeof responseEntry.pseudoUser === "undefined");
+
+    const apiTrackEntry = parseLogEntry(loggedRecords[2]);
+    assert.ok(typeof apiTrackEntry.pseudoUser === "undefined");
+  });
+
+  it("should reset pseudoUser between requests", async () => {
+    const { server, loggingDestination } = initializeServer();
+    afterEach(() => server.close());
+
+    // First request with pseudoUser
+    await server.inject({
+      method: DEFAULT_METHOD,
+      url: "/with-pseudo-user",
+    });
+
+    // Second request without pseudoUser
+    await server.inject({
+      method: DEFAULT_METHOD,
+      url: DEFAULT_PATH,
+    });
+
+    const loggedRecords = loggingDestination.getLoggedRecords();
+    assert.equal(loggedRecords.length, 6);
+
+    // Second request's response should NOT have pseudoUser
+    const secondResponseEntry = parseLogEntry(loggedRecords[4]);
+    assert.ok(typeof secondResponseEntry.pseudoUser === "undefined");
+
+    const secondApiTrackEntry = parseLogEntry(loggedRecords[5]);
+    assert.ok(typeof secondApiTrackEntry.pseudoUser === "undefined");
+  });
+});

package/__tests__/helpers/build-fastify.ts

@@ -52,5 +52,19 @@ export const buildFastify = (loggerDestination?: DestinationStream) => {
     return { data: { message: logMessage } };
   });
 
+  server.get("/with-pseudo-user", async (request, _reply) => {
+    (request as unknown as { userData: unknown }).userData = {
+      pseudoUser: { id: "pseudo-user-id", version: "v1" },
+    };
+    return { data: "ok" };
+  });
+
+  server.get("/with-invalid-pseudo-user", async (request, _reply) => {
+    (request as unknown as { userData: unknown }).userData = {
+      pseudoUser: { id: 123 },
+    };
+    return { data: "ok" };
+  });
+
   return server;
 };

package/__tests__/helpers/fastify-test-helpers.ts

@@ -6,8 +6,8 @@ import {
 } from "../../src/logging-wrapper-entities.js";
 import { buildFastify } from "./build-fastify.js";
 import {
-  type TestingLoggerDestination,
   getTestingDestinationLogger,
+  type TestingLoggerDestination,
 } from "./build-logger.js";
 
 export const DEFAULT_HOSTNAME = "localhost";
@@ -33,8 +33,7 @@ export const initializeServer = (): {
   return { server, loggingDestination };
 };
 
-// biome-ignore lint/suspicious/noExplicitAny: <explanation>
-// biome-ignore lint/suspicious/noExplicitAny: <explanation>
+// biome-ignore lint/suspicious/noExplicitAny: Needed for testing purposes
 export const parseLogEntry = (logEntry: string): { [x: string]: any } =>
   JSON.parse(logEntry);
 

package/__tests__/logging-wrapper.test.ts

@@ -1,7 +1,8 @@
+import type { LogLevel } from "fastify";
 import { hostname } from "os";
 import { assert, describe, it } from "vitest";
-import { REDACTED_VALUE } from "../src/logging-wrapper-entities.js";
 import { getLoggerConfiguration } from "../src/logging-wrapper.js";
+import { REDACTED_VALUE } from "../src/logging-wrapper-entities.js";
 import { buildLogger } from "./helpers/build-logger.js";
 
 const getRandomFieldValue = () => Math.random().toString(36).slice(2);
@@ -59,7 +60,10 @@ const toRedactFields = {
   },
 };
 
-const methodsDataProvider = [
+const methodsDataProvider: {
+  method: LogLevel;
+  expected: { level: number; level_name: string };
+}[] = [
   {
     method: "trace",
     expected: {
@@ -121,7 +125,7 @@ describe("Basic format is the expected one", () => {
       parsed.timestamp > Date.now() - 2000,
       "the timestamp must be newer than 2 seconds ago",
     );
-    // biome-ignore lint/performance/noDelete: Would change behaviour of the test
+
     delete parsed.timestamp;
     assert.deepStrictEqual(parsed, {
       level: 20,
@@ -141,13 +145,10 @@ describe("Fields are redacted as expected", () => {
 
     const loggedRecords = loggedRecordsMethod();
     const parsed = JSON.parse(loggedRecords[0]);
-    // biome-ignore lint/performance/noDelete: Would change behaviour of the test
+
     delete parsed.hostname;
-    // biome-ignore lint/performance/noDelete: Would change behaviour of the test
     delete parsed.level;
-    // biome-ignore lint/performance/noDelete: Would change behaviour of the test
     delete parsed.level_name;
-    // biome-ignore lint/performance/noDelete: Would change behaviour of the test
     delete parsed.timestamp;
 
     assert.deepStrictEqual(parsed, toRedactFields.expected_output);

package/dist/fastify-logging-wrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fastify-logging-wrapper.d.ts","sourceRoot":"","sources":["../src/fastify-logging-wrapper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,eAAe,EACf,oBAAoB,EACpB,aAAa,EACd,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EACV,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,KAAK,iBAAiB,EAA4B,MAAM,MAAM,CAAC;AA6BxE,eAAO,MAAM,sBAAsB,GAAI,QAAQ,eAAe,KAAG,IAsChE,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,eACI;IACE,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,uBAAuB,CAAC,EAAE,KAAK,CAAC;CACjC,GACD;IACE,WAAW,CAAC,EAAE,KAAK,CAAC;IACpB,iBAAiB,CAAC,EAAE,KAAK,CAAC;IAC1B,uBAAuB,CAAC,EAAE,oBAAoB,CAAC,aAAa,CAAC,GAC3D,iBAAiB,CAAC;CACrB,KACJ,oBA8BF,CAAC"}
+{"version":3,"file":"fastify-logging-wrapper.d.ts","sourceRoot":"","sources":["../src/fastify-logging-wrapper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,eAAe,EAGf,oBAAoB,EACpB,aAAa,EACd,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EACV,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,KAAK,iBAAiB,EAA4B,MAAM,MAAM,CAAC;AA8BxE,eAAO,MAAM,sBAAsB,GAAI,QAAQ,eAAe,KAAG,IAiDhE,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAClC,eACI;IACE,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,uBAAuB,CAAC,EAAE,KAAK,CAAC;CACjC,GACD;IACE,WAAW,CAAC,EAAE,KAAK,CAAC;IACpB,iBAAiB,CAAC,EAAE,KAAK,CAAC;IAC1B,uBAAuB,CAAC,EAAE,oBAAoB,CAAC,aAAa,CAAC,GAC3D,iBAAiB,CAAC;CACrB,KACJ,oBA8BF,CAAC"}

package/dist/fastify-logging-wrapper.js

@@ -1,8 +1,8 @@
 import { REQUEST_ID_HEADER } from "@ogcio/shared-errors";
 import hyperid from "hyperid";
 import { pino } from "pino";
+import { getLoggerConfiguration, getLoggingContext, getLoggingContextError, getPartialLoggingContextError, parseFullLoggingRequest, resetLoggingContext, setLoggingContext, } from "./logging-wrapper.js";
 import { LogMessages, REQUEST_ID_LOG_LABEL, } from "./logging-wrapper-entities.js";
-import { getLoggerConfiguration, getLoggingContextError, getPartialLoggingContextError, parseFullLoggingRequest, resetLoggingContext, setLoggingContext, } from "./logging-wrapper.js";
 const hyperidInstance = hyperid({ fixedLength: true, urlSafe: true });
 const isObjectNotEmpty = (value) => {
     return (value &&
@@ -22,8 +22,13 @@ export const initializeLoggingHooks = (server) => {
         }
         done(null, payload);
     });
-    server.addHook("onResponse", (_req, reply, done) => {
-        setLoggingContext({ response: reply });
+    server.addHook("onResponse", (req, reply, done) => {
+        const contextParams = addPseudoUserToLoggingContextParams({
+            request: req,
+            reply,
+            setRequestInContext: false,
+        });
+        setLoggingContext(contextParams);
         reply.log.info(LogMessages.Response);
         // Include error in API Track if exists
         const error = getPartialLoggingContextError();
@@ -37,7 +42,12 @@ export const initializeLoggingHooks = (server) => {
         done();
     });
     server.addHook("onError", (request, _reply, error, done) => {
-        setLoggingContext({ error });
+        const contextParams = addPseudoUserToLoggingContextParams({
+            request,
+            error,
+            setRequestInContext: false,
+        });
+        setLoggingContext(contextParams);
         request.log.error({ error: getLoggingContextError() }, LogMessages.Error);
         done();
     });
@@ -69,4 +79,46 @@ export const getLoggingConfiguration = (customConfig) => {
         requestIdHeader: REQUEST_ID_HEADER,
     };
 };
+const getPseudoUser = (request) => {
+    const userData = "userData" in request && request.userData ? request.userData : undefined;
+    if (!userData || typeof userData !== "object") {
+        return undefined;
+    }
+    const pseudoUserData = "pseudoUser" in userData && userData.pseudoUser
+        ? userData.pseudoUser
+        : undefined;
+    if (!pseudoUserData || typeof pseudoUserData !== "object") {
+        return undefined;
+    }
+    if (!("id" in pseudoUserData) || typeof pseudoUserData.id !== "string") {
+        return undefined;
+    }
+    if (!("version" in pseudoUserData) ||
+        typeof pseudoUserData.version !== "string") {
+        return undefined;
+    }
+    return {
+        id: pseudoUserData.id,
+        version: pseudoUserData.version,
+    };
+};
+const addPseudoUserToLoggingContextParams = (params) => {
+    const loggingContextParams = {};
+    if (params.request && params.setRequestInContext) {
+        loggingContextParams.request = params.request;
+    }
+    if (params.reply) {
+        loggingContextParams.response = params.reply;
+    }
+    if (params.error) {
+        loggingContextParams.error = params.error;
+    }
+    if (!getLoggingContext({ includeError: false }).pseudoUser) {
+        const pseudoUser = getPseudoUser(params.request);
+        if (pseudoUser) {
+            loggingContextParams.pseudoUser = pseudoUser;
+        }
+    }
+    return loggingContextParams;
+};
 //# sourceMappingURL=fastify-logging-wrapper.js.map

package/dist/fastify-logging-wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"fastify-logging-wrapper.js","sourceRoot":"","sources":["../src/fastify-logging-wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAUzD,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAA8C,IAAI,EAAE,MAAM,MAAM,CAAC;AACxE,OAAO,EACL,WAAW,EACX,oBAAoB,GACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,6BAA6B,EAC7B,uBAAuB,EACvB,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,eAAe,GAAG,OAAO,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AAEtE,MAAM,gBAAgB,GAAG,CAAC,KAAyB,EAAE,EAAE;IACrD,OAAO,CACL,KAAK;QACL,OAAO,KAAK,KAAK,QAAQ;QACzB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACrB,MAAM,CAAC,IAAI,CACT,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAC1D,CACF,CAAC,MAAM,GAAG,CAAC,CACb,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,MAAuB,EAAQ,EAAE;IACtE,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC9D,iBAAiB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAE/B,MAAM,aAAa,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;QAEvD,IAAI,gBAAgB,CAAC,aAAa,CAAC,EAAE,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;QACvE,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC3C,CAAC;QAED,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACjD,iBAAiB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QACvC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACrC,uCAAuC;QAEvC,MAAM,KAAK,GAAG,6BAA6B,EAAE,CAAC;QAC9C,IAAI,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5B,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;QACzD,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC;QAED,mBAAmB,EAAE,CAAC;QACtB,IAAI,EAAE,CAAC;IACT,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACzD,iBAAiB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAE7B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,sBAAsB,EAAE,EAAE,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;QAE1E,IAAI,EAAE,CAAC;IACT,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,YAWK,EACiB,EAAE;IACxB,IAAI,YAAY,EAAE,WAAW,IAAI,YAAY,EAAE,iBAAiB;QAC9D,OAAO;YACL,cAAc,EAAE,IAAI,CAClB;gBACE,GAAG,sBAAsB,EAAE;gBAC3B,GAAG,CAAC,YAAY,EAAE,WAAW,IAAI,EAAE,CAAC;aACpB,EAClB,YAAY,EAAE,iBAAiB,CAChC;YACD,qBAAqB,EAAE,IAAI;YAC3B,QAAQ,EAAE,GAAG,EAAE,CAAC,eAAe,EAAE;YACjC,iBAAiB,EAAE,oBAAoB;YACvC,eAAe,EAAE,iBAAiB;SACnC,CAAC;IAEJ,IAAI,mBAAmB,GAAG,sBAAsB,EAAE,CAAC;IACnD,IAAI,YAAY,EAAE,uBAAuB,EAAE,CAAC;QAC1C,mBAAmB,GAAG;YACpB,GAAG,mBAAmB;YACtB,GAAG,YAAY,EAAE,uBAAuB;SACzC,CAAC;IACJ,CAAC;IACD,OAAO;QACL,MAAM,EAAE,mBAAmB;QAC3B,qBAAqB,EAAE,IAAI;QAC3B,QAAQ,EAAE,GAAG,EAAE,CAAC,eAAe,EAAE;QACjC,iBAAiB,EAAE,oBAAoB;QACvC,eAAe,EAAE,iBAAiB;KACnC,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"fastify-logging-wrapper.js","sourceRoot":"","sources":["../src/fastify-logging-wrapper.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export { getLoggingConfiguration, initializeLoggingHooks, } from "./fastify-logging-wrapper.js";
-export { toLoggingError, LogMessages, LoggingError, } from "./logging-wrapper-entities.js";
 export { getLoggingContextError, setLoggingContext, } from "./logging-wrapper.js";
+export { LoggingError, LogMessages, toLoggingError, } from "./logging-wrapper-entities.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,cAAc,EACd,WAAW,EACX,YAAY,GACb,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EACL,sBAAsB,EACtB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,sBAAsB,EACtB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,YAAY,EACZ,WAAW,EACX,cAAc,GACf,MAAM,+BAA+B,CAAC"}

package/dist/index.js

@@ -1,4 +1,4 @@
 export { getLoggingConfiguration, initializeLoggingHooks, } from "./fastify-logging-wrapper.js";
-export { toLoggingError, LogMessages, } from "./logging-wrapper-entities.js";
 export { getLoggingContextError, setLoggingContext, } from "./logging-wrapper.js";
+export { LogMessages, toLoggingError, } from "./logging-wrapper-entities.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,cAAc,EACd,WAAW,GAEZ,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EACL,sBAAsB,EACtB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,sBAAsB,EACtB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,WAAW,EACX,cAAc,GACf,MAAM,+BAA+B,CAAC"}

package/dist/logging-wrapper-entities.d.ts

@@ -1,12 +1,12 @@
-import type { FastifyError } from "fastify";
 import type { HttpError } from "@fastify/sensible";
+import type { FastifyError } from "fastify";
 export interface LoggingRequest {
     scheme: string;
     method: string;
     path: string | undefined;
     hostname: string;
     query_params: unknown;
-    port: number;
+    port: number | null;
     [key: string]: unknown;
 }
 export interface FullLoggingRequest extends LoggingRequest {
@@ -30,10 +30,15 @@ export interface LoggingError {
     };
     [key: string]: unknown;
 }
+export interface LoggingPseudoUser {
+    id: string;
+    version: string;
+}
 export interface LoggingContext {
     request?: LoggingRequest;
     response?: LoggingResponse;
     error?: LoggingError;
+    pseudoUser?: LoggingPseudoUser;
 }
 export declare enum LogMessages {
     NewRequest = "NEW_REQUEST",

package/dist/logging-wrapper-entities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logging-wrapper-entities.d.ts","sourceRoot":"","sources":["../src/logging-wrapper-entities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGnD,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACxD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,eAAe,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3D,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB;AAED,oBAAY,WAAW;IACrB,UAAU,gBAAgB;IAC1B,QAAQ,aAAa;IACrB,KAAK,UAAU;IACf,QAAQ,cAAc;CACvB;AAED,oBAAY,eAAe;IACzB,WAAW,iBAAiB;IAC5B,eAAe,qBAAqB;IACpC,YAAY,kBAAkB;IAC9B,YAAY,kBAAkB;IAC9B,YAAY,kBAAkB;CAC/B;AAED,eAAO,MAAM,cAAc,eAAe,CAAC;AAE3C,eAAO,MAAM,cAAc,UAO1B,CAAC;AAEF,eAAO,MAAM,WAAW,YAAY,CAAC;AAErC,eAAO,MAAM,oBAAoB,eAAe,CAAC;AAIjD,eAAO,MAAM,cAAc,GACzB,OAAO,SAAS,GAAG,YAAY,KAC9B,YAyBF,CAAC"}
+{"version":3,"file":"logging-wrapper-entities.d.ts","sourceRoot":"","sources":["../src/logging-wrapper-entities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG5C,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACxD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,eAAe,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3D,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC;AAED,oBAAY,WAAW;IACrB,UAAU,gBAAgB;IAC1B,QAAQ,aAAa;IACrB,KAAK,UAAU;IACf,QAAQ,cAAc;CACvB;AAED,oBAAY,eAAe;IACzB,WAAW,iBAAiB;IAC5B,eAAe,qBAAqB;IACpC,YAAY,kBAAkB;IAC9B,YAAY,kBAAkB;IAC9B,YAAY,kBAAkB;CAC/B;AAED,eAAO,MAAM,cAAc,eAAe,CAAC;AAE3C,eAAO,MAAM,cAAc,UAO1B,CAAC;AAEF,eAAO,MAAM,WAAW,YAAY,CAAC;AAErC,eAAO,MAAM,oBAAoB,eAAe,CAAC;AAIjD,eAAO,MAAM,cAAc,GACzB,OAAO,SAAS,GAAG,YAAY,KAC9B,YAyBF,CAAC"}

package/dist/logging-wrapper-entities.js.map

@@ -1 +1 @@
-{"version":3,"file":"logging-wrapper-entities.js","sourceRoot":"","sources":["../src/logging-wrapper-entities.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAsC1C,MAAM,CAAN,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,yCAA0B,CAAA;IAC1B,oCAAqB,CAAA;IACrB,8BAAe,CAAA;IACf,qCAAsB,CAAA;AACxB,CAAC,EALW,WAAW,KAAX,WAAW,QAKtB;AAED,MAAM,CAAN,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,+CAA4B,CAAA;IAC5B,uDAAoC,CAAA;IACpC,iDAA8B,CAAA;IAC9B,iDAA8B,CAAA;IAC9B,iDAA8B,CAAA;AAChC,CAAC,EANW,eAAe,KAAf,eAAe,QAM1B;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,YAAY,CAAC;AAE3C,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,mCAAmC;IACnC,wBAAwB;IACxB,4BAA4B;IAC5B,qBAAqB;IACrB,yBAAyB;IACzB,kCAAkC;CACnC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,SAAS,CAAC;AAErC,MAAM,CAAC,MAAM,oBAAoB,GAAG,YAAY,CAAC;AAEjD,MAAM,wBAAwB,GAAG,qBAAqB,CAAC;AAEvD,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,KAA+B,EACjB,EAAE;IAChB,MAAM,MAAM,GAAG;QACb,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC;QAC7B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,KAAK,EAAE,KAAK,CAAC,KAAK;KACnB,CAAC;IAEF,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,MAAM,CAAC;QACtD,MAAM,MAAM,GAAG,WAAW;YACxB,CAAC,CAAC,EAAE,MAAM,EAAE,oBAAoB,CAAC,WAAW,CAAC,EAAE;YAC/C,CAAC,CAAC,EAAE,CAAC;QAEP,OAAO;YACL,GAAG,MAAM;YACT,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,OAAO,EAAE,KAAK,CAAC,YAAY;YAC3B,GAAG,MAAM;SACV,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,MAAM;QACT,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,wBAAwB;KAC7C,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,KAA+B,EAAmB,EAAE;IAC3E,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACtB,OAAO,eAAe,CAAC,YAAY,CAAC;IACtC,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAE5C,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;QACvB,OAAO,eAAe,CAAC,YAAY,CAAC;IACtC,CAAC;IAED,IAAI,UAAU,IAAI,GAAG,EAAE,CAAC;QACtB,OAAO,eAAe,CAAC,WAAW,CAAC;IACrC,CAAC;IAED,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;QACvB,OAAO,eAAe,CAAC,eAAe,CAAC;IACzC,CAAC;IAED,IAAI,UAAU,IAAI,GAAG,EAAE,CAAC;QACtB,OAAO,eAAe,CAAC,YAAY,CAAC;IACtC,CAAC;IAED,OAAO,eAAe,CAAC,YAAY,CAAC;AACtC,CAAC,CAAC"}
+{"version":3,"file":"logging-wrapper-entities.js","sourceRoot":"","sources":["../src/logging-wrapper-entities.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AA4C1C,MAAM,CAAN,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,yCAA0B,CAAA;IAC1B,oCAAqB,CAAA;IACrB,8BAAe,CAAA;IACf,qCAAsB,CAAA;AACxB,CAAC,EALW,WAAW,KAAX,WAAW,QAKtB;AAED,MAAM,CAAN,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,+CAA4B,CAAA;IAC5B,uDAAoC,CAAA;IACpC,iDAA8B,CAAA;IAC9B,iDAA8B,CAAA;IAC9B,iDAA8B,CAAA;AAChC,CAAC,EANW,eAAe,KAAf,eAAe,QAM1B;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,YAAY,CAAC;AAE3C,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,mCAAmC;IACnC,wBAAwB;IACxB,4BAA4B;IAC5B,qBAAqB;IACrB,yBAAyB;IACzB,kCAAkC;CACnC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,SAAS,CAAC;AAErC,MAAM,CAAC,MAAM,oBAAoB,GAAG,YAAY,CAAC;AAEjD,MAAM,wBAAwB,GAAG,qBAAqB,CAAC;AAEvD,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,KAA+B,EACjB,EAAE;IAChB,MAAM,MAAM,GAAG;QACb,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC;QAC7B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,KAAK,EAAE,KAAK,CAAC,KAAK;KACnB,CAAC;IAEF,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,MAAM,CAAC;QACtD,MAAM,MAAM,GAAG,WAAW;YACxB,CAAC,CAAC,EAAE,MAAM,EAAE,oBAAoB,CAAC,WAAW,CAAC,EAAE;YAC/C,CAAC,CAAC,EAAE,CAAC;QAEP,OAAO;YACL,GAAG,MAAM;YACT,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,OAAO,EAAE,KAAK,CAAC,YAAY;YAC3B,GAAG,MAAM;SACV,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,MAAM;QACT,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,wBAAwB;KAC7C,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,KAA+B,EAAmB,EAAE;IAC3E,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACtB,OAAO,eAAe,CAAC,YAAY,CAAC;IACtC,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAE5C,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;QACvB,OAAO,eAAe,CAAC,YAAY,CAAC;IACtC,CAAC;IAED,IAAI,UAAU,IAAI,GAAG,EAAE,CAAC;QACtB,OAAO,eAAe,CAAC,WAAW,CAAC;IACrC,CAAC;IAED,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;QACvB,OAAO,eAAe,CAAC,eAAe,CAAC;IACzC,CAAC;IAED,IAAI,UAAU,IAAI,GAAG,EAAE,CAAC;QACtB,OAAO,eAAe,CAAC,YAAY,CAAC;IACtC,CAAC;IAED,OAAO,eAAe,CAAC,YAAY,CAAC;AACtC,CAAC,CAAC"}

package/dist/logging-wrapper.d.ts

@@ -1,7 +1,7 @@
 import type { HttpError } from "@fastify/sensible";
 import type { FastifyError, FastifyReply, FastifyRequest } from "fastify";
 import type { LogLevel, PinoLoggerOptions } from "fastify/types/logger.js";
-import { type FullLoggingRequest, type LoggingContext, type LoggingError } from "./logging-wrapper-entities.js";
+import { type FullLoggingRequest, type LoggingContext, type LoggingError, type LoggingPseudoUser } from "./logging-wrapper-entities.js";
 type INPUT_ERROR_TYPES = FastifyError | HttpError;
 export declare const getLoggingContext: (params: {
     includeError: boolean;
@@ -10,6 +10,7 @@ export declare const setLoggingContext: (params: {
     request?: FastifyRequest;
     response?: FastifyReply;
     error?: INPUT_ERROR_TYPES;
+    pseudoUser?: LoggingPseudoUser;
 }) => void;
 export declare const resetLoggingContext: () => void;
 export declare const getLoggingContextError: () => LoggingError | undefined;

package/dist/logging-wrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logging-wrapper.d.ts","sourceRoot":"","sources":["../src/logging-wrapper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,YAAY,EAOlB,MAAM,+BAA+B,CAAC;AAIvC,KAAK,iBAAiB,GAAG,YAAY,GAAG,SAAS,CAAC;AAElD,eAAO,MAAM,iBAAiB,GAAI,QAAQ;IACxC,YAAY,EAAE,OAAO,CAAC;CACvB,KAAG,cAGyC,CAAC;AAE9C,eAAO,MAAM,iBAAiB,GAAI,QAAQ;IACxC,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,KAAK,CAAC,EAAE,iBAAiB,CAAC;CAC3B,KAAG,IAUH,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAO,IAItC,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAAO,YAAY,GAAG,SACR,CAAC;AAElD,eAAO,MAAM,6BAA6B,QACtC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,GAC3B,SAGF,CAAC;AAcH,eAAO,MAAM,uBAAuB,GAClC,KAAK,cAAc,KAClB,kBAKD,CAAC;AAOH,eAAO,MAAM,sBAAsB,GACjC,eAAc,QAAkB,KAC/B,iBAmBD,CAAC"}
+{"version":3,"file":"logging-wrapper.d.ts","sourceRoot":"","sources":["../src/logging-wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE3E,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,iBAAiB,EAOvB,MAAM,+BAA+B,CAAC;AAIvC,KAAK,iBAAiB,GAAG,YAAY,GAAG,SAAS,CAAC;AAElD,eAAO,MAAM,iBAAiB,GAAI,QAAQ;IACxC,YAAY,EAAE,OAAO,CAAC;CACvB,KAAG,cAGyC,CAAC;AAE9C,eAAO,MAAM,iBAAiB,GAAI,QAAQ;IACxC,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAC1B,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC,KAAG,IAaH,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAO,IAKtC,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAAO,YAAY,GAAG,SACR,CAAC;AAElD,eAAO,MAAM,6BAA6B,QACtC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,GAC3B,SAGF,CAAC;AAcH,eAAO,MAAM,uBAAuB,GAClC,KAAK,cAAc,KAClB,kBAKD,CAAC;AAOH,eAAO,MAAM,sBAAsB,GACjC,eAAc,QAAkB,KAC/B,iBAmBD,CAAC"}

package/dist/logging-wrapper.js

@@ -14,11 +14,15 @@ export const setLoggingContext = (params) => {
     if (params.error !== undefined) {
         loggingContext.error = toLoggingError(params.error);
     }
+    if (params.pseudoUser !== undefined) {
+        loggingContext.pseudoUser = params.pseudoUser;
+    }
 };
 export const resetLoggingContext = () => {
     loggingContext.request = undefined;
     loggingContext.response = undefined;
     loggingContext.error = undefined;
+    loggingContext.pseudoUser = undefined;
 };
 export const getLoggingContextError = () => getLoggingContext({ includeError: true }).error;
 export const getPartialLoggingContextError = () => ({

package/dist/logging-wrapper.js.map

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

package/package.json

@@ -1,35 +1,37 @@
 {
-    "name": "@ogcio/fastify-logging-wrapper",
-    "version": "5.3.1",
-    "main": "dist/index.js",
-    "types": "dist/index.d.ts",
-    "type": "module",
-    "scripts": {
-        "build": "rm -rf dist tsconfig.prod.tsbuildinfo tsconfig.tsbuildinfo && tsc -p tsconfig.prod.json",
-        "test": "vitest run --coverage --outputFile=results.xml",
-        "prepublishOnly": "npm i && npm run build && npm run test"
-    },
-    "keywords": [],
-    "author": {
-        "name": "Samuele Salvatico",
-        "email": "samuele.salvatico@nearform.com"
-    },
-    "license": "ISC",
-    "description": "Enable standardized log entries for each request in fastify",
-    "dependencies": {
-        "@fastify/error": "^4.2.0",
-        "@fastify/sensible": "^6.0.4",
-        "@ogcio/shared-errors": "^1.1.1",
-        "fastify": "^5.7.4",
-        "hyperid": "^3.3.0"
-    },
-    "devDependencies": {
-        "@types/http-errors": "^2.0.5"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/ogcio/shared-node-utils.git",
-        "directory": "packages/fastify-logging-wrapper"
-    },
-    "homepage": "https://github.com/ogcio/shared-node-utils/tree/main/packages/fastify-logging-wrapper#readme"
+  "name": "@ogcio/fastify-logging-wrapper",
+  "version": "5.4.0",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "type": "module",
+  "scripts": {
+    "build": "rm -rf dist tsconfig.prod.tsbuildinfo tsconfig.tsbuildinfo && tsc -p tsconfig.prod.json",
+    "test": "vitest run --coverage --outputFile=results.xml",
+    "prepublishOnly": "npm i && npm run build && npm run test"
+  },
+  "keywords": [],
+  "author": {
+    "name": "Samuele Salvatico",
+    "email": "samuele.salvatico@nearform.com"
+  },
+  "license": "ISC",
+  "description": "Enable standardized log entries for each request in fastify",
+  "dependencies": {
+    "@fastify/error": "^4.2.0",
+    "@fastify/sensible": "^6.0.4",
+    "hyperid": "^3.3.0"
+  },
+  "peerDependencies": {
+    "fastify": "^5.8.4",
+    "@ogcio/shared-errors": "^1.1.1"
+  },
+  "devDependencies": {
+    "@types/http-errors": "^2.0.5"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ogcio/shared-node-utils.git",
+    "directory": "packages/fastify-logging-wrapper"
+  },
+  "homepage": "https://github.com/ogcio/shared-node-utils/tree/main/packages/fastify-logging-wrapper#readme"
 }

package/src/fastify-logging-wrapper.ts

@@ -1,6 +1,9 @@
 import { REQUEST_ID_HEADER } from "@ogcio/shared-errors";
 import type {
+  FastifyError,
   FastifyInstance,
+  FastifyReply,
+  FastifyRequest,
   FastifyServerOptions,
   RawServerBase,
 } from "fastify";
@@ -8,20 +11,22 @@ import type {
   FastifyLoggerOptions,
   PinoLoggerOptions,
 } from "fastify/types/logger.js";
+import type { HttpError } from "http-errors";
 import hyperid from "hyperid";
 import { type DestinationStream, type LoggerOptions, pino } from "pino";
-import {
-  LogMessages,
-  REQUEST_ID_LOG_LABEL,
-} from "./logging-wrapper-entities.js";
 import {
   getLoggerConfiguration,
+  getLoggingContext,
   getLoggingContextError,
   getPartialLoggingContextError,
   parseFullLoggingRequest,
   resetLoggingContext,
   setLoggingContext,
 } from "./logging-wrapper.js";
+import {
+  LogMessages,
+  REQUEST_ID_LOG_LABEL,
+} from "./logging-wrapper-entities.js";
 
 const hyperidInstance = hyperid({ fixedLength: true, urlSafe: true });
 
@@ -53,8 +58,14 @@ export const initializeLoggingHooks = (server: FastifyInstance): void => {
     done(null, payload);
   });
 
-  server.addHook("onResponse", (_req, reply, done) => {
-    setLoggingContext({ response: reply });
+  server.addHook("onResponse", (req, reply, done) => {
+    const contextParams = addPseudoUserToLoggingContextParams({
+      request: req,
+      reply,
+      setRequestInContext: false,
+    });
+    setLoggingContext(contextParams);
+
     reply.log.info(LogMessages.Response);
     // Include error in API Track if exists
 
@@ -70,7 +81,12 @@ export const initializeLoggingHooks = (server: FastifyInstance): void => {
   });
 
   server.addHook("onError", (request, _reply, error, done) => {
-    setLoggingContext({ error });
+    const contextParams = addPseudoUserToLoggingContextParams({
+      request,
+      error,
+      setRequestInContext: false,
+    });
+    setLoggingContext(contextParams);
 
     request.log.error({ error: getLoggingContextError() }, LogMessages.Error);
 
@@ -122,3 +138,64 @@ export const getLoggingConfiguration = (
     requestIdHeader: REQUEST_ID_HEADER,
   };
 };
+
+const getPseudoUser = (
+  request: FastifyRequest,
+): { id: string; version: string } | undefined => {
+  const userData =
+    "userData" in request && request.userData ? request.userData : undefined;
+  if (!userData || typeof userData !== "object") {
+    return undefined;
+  }
+
+  const pseudoUserData =
+    "pseudoUser" in userData && userData.pseudoUser
+      ? userData.pseudoUser
+      : undefined;
+  if (!pseudoUserData || typeof pseudoUserData !== "object") {
+    return undefined;
+  }
+
+  if (!("id" in pseudoUserData) || typeof pseudoUserData.id !== "string") {
+    return undefined;
+  }
+
+  if (
+    !("version" in pseudoUserData) ||
+    typeof pseudoUserData.version !== "string"
+  ) {
+    return undefined;
+  }
+
+  return {
+    id: pseudoUserData.id,
+    version: pseudoUserData.version,
+  };
+};
+
+const addPseudoUserToLoggingContextParams = (params: {
+  request: FastifyRequest;
+  reply?: FastifyReply;
+  error?: FastifyError | HttpError<number>;
+  setRequestInContext: boolean;
+}) => {
+  const loggingContextParams: Parameters<typeof setLoggingContext>[0] = {};
+  if (params.request && params.setRequestInContext) {
+    loggingContextParams.request = params.request;
+  }
+  if (params.reply) {
+    loggingContextParams.response = params.reply;
+  }
+  if (params.error) {
+    loggingContextParams.error = params.error;
+  }
+
+  if (!getLoggingContext({ includeError: false }).pseudoUser) {
+    const pseudoUser = getPseudoUser(params.request);
+    if (pseudoUser) {
+      loggingContextParams.pseudoUser = pseudoUser;
+    }
+  }
+
+  return loggingContextParams;
+};

package/src/index.ts

@@ -2,13 +2,12 @@ export {
   getLoggingConfiguration,
   initializeLoggingHooks,
 } from "./fastify-logging-wrapper.js";
-export {
-  toLoggingError,
-  LogMessages,
-  LoggingError,
-} from "./logging-wrapper-entities.js";
-
 export {
   getLoggingContextError,
   setLoggingContext,
 } from "./logging-wrapper.js";
+export {
+  LoggingError,
+  LogMessages,
+  toLoggingError,
+} from "./logging-wrapper-entities.js";

package/src/logging-wrapper-entities.ts

@@ -1,6 +1,6 @@
-import type { FastifyError } from "fastify";
-import { parseErrorForLogging } from "@ogcio/shared-errors";
 import type { HttpError } from "@fastify/sensible";
+import { parseErrorForLogging } from "@ogcio/shared-errors";
+import type { FastifyError } from "fastify";
 import { isHttpError } from "http-errors";
 
 export interface LoggingRequest {
@@ -9,7 +9,7 @@ export interface LoggingRequest {
   path: string | undefined;
   hostname: string;
   query_params: unknown;
-  port: number;
+  port: number | null;
   [key: string]: unknown;
 }
 
@@ -33,10 +33,16 @@ export interface LoggingError {
   [key: string]: unknown;
 }
 
+export interface LoggingPseudoUser {
+  id: string;
+  version: string;
+}
+
 export interface LoggingContext {
   request?: LoggingRequest;
   response?: LoggingResponse;
   error?: LoggingError;
+  pseudoUser?: LoggingPseudoUser;
 }
 
 export enum LogMessages {

package/src/logging-wrapper.ts

@@ -1,11 +1,12 @@
-import { hostname } from "os";
 import type { HttpError } from "@fastify/sensible";
 import type { FastifyError, FastifyReply, FastifyRequest } from "fastify";
 import type { LogLevel, PinoLoggerOptions } from "fastify/types/logger.js";
+import { hostname } from "os";
 import {
   type FullLoggingRequest,
   type LoggingContext,
   type LoggingError,
+  type LoggingPseudoUser,
   type LoggingRequest,
   type LoggingResponse,
   MESSAGE_KEY,
@@ -29,6 +30,7 @@ export const setLoggingContext = (params: {
   request?: FastifyRequest;
   response?: FastifyReply;
   error?: INPUT_ERROR_TYPES;
+  pseudoUser?: LoggingPseudoUser;
 }): void => {
   if (params.request !== undefined) {
     loggingContext.request = parseLoggingRequest(params.request);
@@ -39,12 +41,16 @@ export const setLoggingContext = (params: {
   if (params.error !== undefined) {
     loggingContext.error = toLoggingError(params.error);
   }
+  if (params.pseudoUser !== undefined) {
+    loggingContext.pseudoUser = params.pseudoUser;
+  }
 };
 
 export const resetLoggingContext = (): void => {
   loggingContext.request = undefined;
   loggingContext.response = undefined;
   loggingContext.error = undefined;
+  loggingContext.pseudoUser = undefined;
 };
 
 export const getLoggingContextError = (): LoggingError | undefined =>

package/tsconfig.json

@@ -1,12 +1,10 @@
 {
-    "extends": "../../tsconfig.base.json",
-    "compilerOptions": {
-      "composite": true,
-      "outDir": "dist",
-      "rootDir": "src"
-    },
-    "include": ["src"],
-    "references": [
-      { "path": "../shared-errors" }
-    ]
-  }
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "dist",
+    "rootDir": "src"
+  },
+  "include": ["src"],
+  "references": [{ "path": "../shared-errors" }, { "path": "../pii-utils" }]
+}