@hkdigital/lib-core 0.4.33 → 0.4.35

package/dist/logging/internal/adapters/console.js

@@ -212,7 +212,9 @@ export class ConsoleAdapter {
           message: details.message,
           stack: cleanedStack,
           errorType: formatErrorDisplay(errorMeta),
-          ...(relevantFrameIndex >= 0 && { relevantFrameIndex })
+          ...(relevantFrameIndex >= 0 && { relevantFrameIndex }),
+          ...('details' in details && { details: details.details }),
+          ...('status' in details && { status: details.status })
         };
       }
     } else if (details.error instanceof Error) {
@@ -233,7 +235,9 @@ export class ConsoleAdapter {
           message: details.error.message,
           stack: cleanedStack,
           errorType: formatErrorDisplay(errorMeta),
-          ...(relevantFrameIndex >= 0 && { relevantFrameIndex })
+          ...(relevantFrameIndex >= 0 && { relevantFrameIndex }),
+          ...('details' in details.error && { details: details.error.details }),
+          ...('status' in details.error && { status: details.error.status })
         };
       }
       // Include other details except the error

package/dist/logging/internal/logger/Logger.d.ts

@@ -1,3 +1,4 @@
+/** @typedef {import('../../typedef.js').LogLevel} LogLevel */
 /**
  * Logger class for consistent logging
  * @extends EventEmitter
@@ -7,19 +8,19 @@ export default class Logger extends EventEmitter {
      * Create a new Logger instance
      *
      * @param {string} name - Name of the service/component for this logger
-     * @param {string} [defaultLevel=INFO] - Initial log level threshold
+     * @param {LogLevel} [defaultLevel=INFO] - Initial log level threshold
      * @param {Object} [context={}] - Default context data for all logs
      */
-    constructor(name: string, defaultLevel?: string, context?: Object);
+    constructor(name: string, defaultLevel?: LogLevel, context?: Object);
     name: string;
-    level: string;
+    level: import("../../typedef.js").LogLevel;
     /**
      * Set the minimum log level threshold
      *
-     * @param {string} level - New log level (DEBUG, INFO, WARN, ERROR or NONE)
+     * @param {LogLevel} level - New log level (DEBUG, INFO, WARN, ERROR or NONE)
      * @returns {boolean} True if level was valid and set, false otherwise
      */
-    setLevel(level: string): boolean;
+    setLevel(level: LogLevel): boolean;
     /**
      * Log a debug message
      *
@@ -77,11 +78,11 @@ export default class Logger extends EventEmitter {
      * E.g. an event that was created by another Logger instance and should be
      * forwarded to this logger.
      *
-     * @param {string} eventName
      * @param {import('../../typedef.js').LogEventData} eventData
      */
-    logFromEvent(eventName: string, eventData: import("../../typedef.js").LogEventData): false | undefined;
+    logFromEvent(eventData: import("../../typedef.js").LogEventData): false | undefined;
     #private;
 }
 export type ErrorDetails = import("../../../generic/typedef.js").ErrorDetails;
+export type LogLevel = import("../../typedef.js").LogLevel;
 import { EventEmitter } from '../../../generic/events.js';

package/dist/logging/internal/logger/Logger.js

@@ -59,6 +59,8 @@ import { exportNotNullish } from '../../../util/object.js';
 import * as is from '../../../util/is.js';
 import { HttpError } from '../../../network/errors.js';
 
+/** @typedef {import('../../typedef.js').LogLevel} LogLevel */
+
 /**
  * Logger class for consistent logging
  * @extends EventEmitter
@@ -71,7 +73,7 @@ export default class Logger extends EventEmitter {
    * Create a new Logger instance
    *
    * @param {string} name - Name of the service/component for this logger
-   * @param {string} [defaultLevel=INFO] - Initial log level threshold
+   * @param {LogLevel} [defaultLevel=INFO] - Initial log level threshold
    * @param {Object} [context={}] - Default context data for all logs
    */
   constructor(name, defaultLevel = INFO, context = {}) {
@@ -86,7 +88,7 @@ export default class Logger extends EventEmitter {
   /**
    * Set the minimum log level threshold
    *
-   * @param {string} level - New log level (DEBUG, INFO, WARN, ERROR or NONE)
+   * @param {LogLevel} level - New log level (DEBUG, INFO, WARN, ERROR or NONE)
    * @returns {boolean} True if level was valid and set, false otherwise
    */
   setLevel(level) {
@@ -198,6 +200,10 @@ export default class Logger extends EventEmitter {
       // Log without message
       return this.#log(ERROR, errorObject.message, errorObject);
     }
+    // else if( message ) {
+    //   // Only log message, no Error object supplied
+    //   return this.#log(ERROR, message);
+    // }
     else {
       // Missing error like object
       // => invalid parameters supplied to logger.error
@@ -239,10 +245,9 @@ export default class Logger extends EventEmitter {
    * E.g. an event that was created by another Logger instance and should be
    * forwarded to this logger.
    *
-   * @param {string} eventName
    * @param {import('../../typedef.js').LogEventData} eventData
    */
-  logFromEvent(eventName, eventData) {
+  logFromEvent(eventData) {
     const level = eventData.level;
 
     // Check if this log level should be filtered
@@ -250,13 +255,13 @@ export default class Logger extends EventEmitter {
       return false; // Below threshold, don't emit
     }
 
-    this.#logEvent({ ...eventData, eventName });
+    this.#logEvent(eventData);
   }
 
   /**
    * Internal logging method
    *
-   * @param {string} level - Log level
+   * @param {LogLevel} level - Log level
    * @param {string} message - Log message
    * @param {*} [details] - Additional details to include in the log
    * @returns {boolean} True if the log was emitted, false if filtered
@@ -355,8 +360,10 @@ export default class Logger extends EventEmitter {
       if (reason instanceof Error) {
         return reason;
       }
+      // @ts-ignore
       else if ( is.object(reason) && reason?.message ) {
         // reason is  an object with message property
+        // @ts-ignore
         return new DetailedError(reason?.message, reason);
       }
       else if ( typeof reason === "string" ) {

package/dist/services/README.md

@@ -302,8 +302,8 @@ const manager = new ServiceManager();
 const logger = createServerLogger('SystemLogger');
 
 // Listen to all log events and forward them to the logger
-const unsubscribe = manager.onServiceLogEvent((logEvent) => {
-  logger.logFromEvent('manager:service:log', logEvent);
+const unsubscribe = manager.onLogEvent((logEvent) => {
+  logger.logFromEvent(logEvent);
 });
 
 // Register services

package/dist/services/service-manager/ServiceManager.js

@@ -66,8 +66,8 @@
 import { EventEmitter } from '../../generic/events.js';
 import { Logger, DEBUG, INFO } from '../../logging/index.js';
 
-import { 
-  SERVICE_LOG, 
+import {
+  SERVICE_LOG,
   STATE_CHANGED,
   HEALTH_CHANGED,
   ERROR,
@@ -298,9 +298,10 @@ export class ServiceManager extends EventEmitter {
         this.logger.debug(`Starting dependency '${dep}' for '${name}'`);
 
         const started = await this.startService(dep);
+
         if (!started) {
           this.logger.error(
-            `Failed to start dependency '${dep}' for '${name}'`
+            new Error(`Failed to start dependency '${dep}' for '${name}'`)
           );
           return false;
         }
@@ -396,14 +397,7 @@ export class ServiceManager extends EventEmitter {
       results.set(name, success);
 
       if (!success) {
-        this.logger.error(`Failed to start '${name}', stopping`);
-        // Mark remaining services as not started
-        for (const remaining of sorted) {
-          if (!results.has(remaining)) {
-            results.set(remaining, false);
-          }
-        }
-        break;
+        throw new Error(`Failed to start service [${name}], stopping`);
       }
     }
 
@@ -430,7 +424,7 @@ export class ServiceManager extends EventEmitter {
     const results = new Map();
 
     // Handle global timeout if specified
-    if (stopOptions.timeout > 0) {
+    if (stopOptions.timeout) {
       const timeoutPromise = new Promise((_, reject) =>
         setTimeout(
           () => reject(new Error('Global shutdown timeout')),
@@ -445,8 +439,10 @@ export class ServiceManager extends EventEmitter {
           timeoutPromise
         ]);
       } catch (error) {
-        if (error.message === 'Global shutdown timeout') {
-          this.logger.error('Global shutdown timeout reached');
+        if (
+          /** @type {Error} */ (error).message === 'Global shutdown timeout'
+        ) {
+          this.logger.error( new Error('Global shutdown timeout reached' ) );
           // Mark any remaining services as failed
           for (const name of sorted) {
             if (!results.has(name)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hkdigital/lib-core",
-	"version": "0.4.33",
+	"version": "0.4.35",
 	"author": {
 		"name": "HKdigital",
 		"url": "https://hkdigital.nl"