@navios/core 0.1.12 → 0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navios/core",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "author": {
     "name": "Oleksandr Hanzha",
     "email": "alex@granted.name"
@@ -15,7 +15,7 @@
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "peerDependencies": {
-    "@navios/common": "^0.1.3",
+    "@navios/common": "^0.1.5",
     "zod": "^3.23.8"
   },
   "exports": {
@@ -32,7 +32,7 @@
     "./package.json": "./package.json"
   },
   "devDependencies": {
-    "@navios/common": "^0.1.3",
+    "@navios/common": "^0.1.5",
     "tsx": "^4.19.4",
     "typescript": "^5.8.3",
     "zod": "^3.24.4"

package/src/logger/console-logger.service.mts

@@ -5,7 +5,8 @@ import { inspect } from 'util'
 import type { LogLevel } from './log-levels.mjs'
 import type { LoggerService } from './logger-service.interface.mjs'
 
-import { Injectable } from '../service-locator/index.mjs'
+import { getServiceLocator, Injectable } from '../service-locator/index.mjs'
+import { Request } from '../tokens/index.mjs'
 import {
   clc,
   isFunction,
@@ -36,6 +37,10 @@ export interface ConsoleLoggerOptions {
    * Note: This option is not used when `json` is enabled.
    */
   prefix?: string
+  /**
+   * If enabled, will add a request ID to the log message.
+   */
+  requestId?: boolean
   /**
    * If enabled, will print the log message in JSON format.
    */
@@ -128,6 +133,10 @@ export class ConsoleLogger implements LoggerService {
    * The context of the logger (can be set manually or automatically inferred).
    */
   protected context?: string
+  /**
+   * Request ID (if enabled).
+   */
+  protected requestId: string | null = null
   /**
    * The original context of the logger (set in the constructor).
    */
@@ -168,6 +177,24 @@ export class ConsoleLogger implements LoggerService {
       this.context = context
       this.originalContext = context
     }
+    if (opts?.requestId) {
+      const locator = getServiceLocator()
+      locator
+        .getEventBus()
+        .on(locator.getInstanceIdentifier(Request, undefined), 'create', () => {
+          const request = locator.getSyncInstance(Request, undefined)
+          this.requestId = request?.id ?? null
+        })
+      locator
+        .getEventBus()
+        .on(
+          locator.getInstanceIdentifier(Request, undefined),
+          'destroy',
+          () => {
+            this.requestId = null
+          },
+        )
+    }
   }
 
   /**
@@ -358,6 +385,7 @@ export class ConsoleLogger implements LoggerService {
       message: unknown
       context?: string
       stack?: unknown
+      requestId?: string
     }
 
     const logObject: JsonLogObject = {
@@ -374,6 +402,9 @@ export class ConsoleLogger implements LoggerService {
     if (options.errorStack) {
       logObject.stack = options.errorStack
     }
+    if (this.options.requestId && this.requestId) {
+      logObject.requestId = this.requestId
+    }
 
     const formattedMessage =
       !this.options.colors && this.inspectOptions.compact === true
@@ -383,7 +414,7 @@ export class ConsoleLogger implements LoggerService {
   }
 
   protected formatPid(pid: number) {
-    return `[${this.options.prefix}] ${pid}  - `
+    return `[${this.options.prefix}] ${pid} - `
   }
 
   protected formatContext(context: string): string {
@@ -406,7 +437,14 @@ export class ConsoleLogger implements LoggerService {
     const output = this.stringifyMessage(message, logLevel)
     pidMessage = this.colorize(pidMessage, logLevel)
     formattedLogLevel = this.colorize(formattedLogLevel, logLevel)
-    return `${pidMessage}${this.getTimestamp()} ${formattedLogLevel} ${contextMessage}${output}${timestampDiff}\n`
+    return `${pidMessage}${this.getRequestId()}${this.getTimestamp()} ${formattedLogLevel} ${contextMessage}${output}${timestampDiff}\n`
+  }
+
+  protected getRequestId() {
+    if (this.options.requestId && this.requestId) {
+      return `(${this.colorize(this.requestId, 'log')}) `
+    }
+    return ''
   }
 
   protected stringifyMessage(message: unknown, logLevel: LogLevel): string {

package/src/service-locator/service-locator.mts

@@ -65,6 +65,7 @@ export class ServiceLocator {
       destroyPromise: null,
       creationPromise: null,
     })
+    this.eventBus.emit(instanceName, 'create')
   }
 
   public removeInstance<Instance>(token: InjectionToken<Instance, undefined>) {

package/src/services/controller-adapter.service.mts

@@ -287,7 +287,7 @@ export class ControllerAdapterService {
             }
           }
         }
-        argument.body = requestSchema.parse(req)
+        argument.data = requestSchema.parse(req)
         const result =
           await controllerInstance[endpointMetadata.classMethod](argument)
         reply