@hkdigital/lib-core 0.4.32 → 0.4.34

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

@@ -1,5 +1,5 @@
 import { dev } from '$app/environment';
-import { LEVELS } from '../../levels.js';
+import { LEVELS, DEBUG, INFO, WARN, ERROR } from '../../levels.js';
 import {
   findRelevantFrameIndex,
   detectErrorMeta,
@@ -164,13 +164,13 @@ export class ConsoleAdapter {
    */
   #getConsoleMethod(level) {
     switch (level) {
-      case 'debug':
+      case DEBUG:
         return 'debug';
-      case 'info':
+      case INFO:
         return 'info';
-      case 'warn':
+      case WARN:
         return 'warn';
-      case 'error':
+      case ERROR:
       case 'fatal':
         return 'error';
       default:

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

@@ -5,6 +5,7 @@ import pino from 'pino';
 import { dev } from '$app/environment';
 
 import { HkPromise } from '../../../generic/promises.js';
+import { ERROR } from '../../levels.js';
 
 import {
   detectErrorMeta,
@@ -240,7 +241,7 @@ export class PinoAdapter {
 
     while (this.#messageQueue.length > 0) {
       const queuedLog = this.#messageQueue.shift();
-      console[queuedLog.level === 'error' ? 'error' : 'log'](
+      console[queuedLog.level === ERROR ? 'error' : 'log'](
         `[${queuedLog.level.toUpperCase()}] ${queuedLog.message}`,
         queuedLog.data
       );

package/dist/logging/internal/factories/client.js

@@ -1,6 +1,6 @@
 import { Logger } from '../logger/index.js';
 import { ConsoleAdapter } from '../adapters/console.js';
-import { INFO } from '../../levels.js';
+import { INFO, LOG } from '../../levels.js';
 
 /**
  * Create a client-side logger with console adapter
@@ -15,7 +15,7 @@ export function createClientLogger(name, level = INFO, consoleOptions = {}) {
   const adapter = new ConsoleAdapter({ ...consoleOptions, level });
 
   // Connect adapter to logger events
-  logger.on('log', (logEvent) => adapter.handleLog(logEvent));
+  logger.on(LOG, (logEvent) => adapter.handleLog(logEvent));
 
   return logger;
 }

package/dist/logging/internal/factories/server.js

@@ -1,6 +1,6 @@
 import { Logger } from '../logger/index.js';
 import { PinoAdapter } from '../adapters/pino.js';
-import { INFO } from '../../levels.js';
+import { INFO, LOG } from '../../levels.js';
 // import { expectNoSSRContext } from '../../../util/ssr/index.js';
 
 /**
@@ -26,7 +26,7 @@ export function createServerLogger(name, level = INFO, pinoOptions = {}) {
   //   determination to fail
   //   -> Stop and start the dev server
   //
-  logger.on('log', (logEvent) => adapter.handleLog(logEvent));
+  logger.on(LOG, (logEvent) => adapter.handleLog(logEvent));
 
   return logger;
 }

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) {
@@ -239,10 +241,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 +251,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 +356,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.d.ts

@@ -140,6 +140,22 @@ export class ServiceManager extends EventEmitter {
      * @returns {Function} Unsubscribe function
      */
     onServiceLogEvent(listener: (logEvent: LogEvent) => void): Function;
+    /**
+     * Listen to log messages emitted by the ServiceManager itself
+     *
+     * @param {(logEvent: LogEvent) => void} listener - Log event handler
+     *
+     * @returns {Function} Unsubscribe function
+     */
+    onManagerLogEvent(listener: (logEvent: LogEvent) => void): Function;
+    /**
+     * Listen to all log messages (both manager and services)
+     *
+     * @param {(logEvent: LogEvent) => void} listener - Log event handler
+     *
+     * @returns {Function} Unsubscribe function
+     */
+    onLogEvent(listener: (logEvent: LogEvent) => void): Function;
     /**
      * Set log level for the ServiceManager itself
      *

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

@@ -66,7 +66,16 @@
 import { EventEmitter } from '../../generic/events.js';
 import { Logger, DEBUG, INFO } from '../../logging/index.js';
 
-import { SERVICE_LOG } from './constants.js';
+import { 
+  SERVICE_LOG, 
+  STATE_CHANGED,
+  HEALTH_CHANGED,
+  ERROR,
+  LOG,
+  SERVICE_STATE_CHANGED,
+  SERVICE_HEALTH_CHANGED,
+  SERVICE_ERROR
+} from './constants.js';
 import { parseServiceLogLevels } from './util.js';
 
 import {
@@ -503,6 +512,36 @@ export class ServiceManager extends EventEmitter {
     return this.on(SERVICE_LOG, listener);
   }
 
+  /**
+   * Listen to log messages emitted by the ServiceManager itself
+   *
+   * @param {(logEvent: LogEvent) => void} listener - Log event handler
+   *
+   * @returns {Function} Unsubscribe function
+   */
+  onManagerLogEvent(listener) {
+    return this.logger.on(LOG, listener);
+  }
+
+  /**
+   * Listen to all log messages (both manager and services)
+   *
+   * @param {(logEvent: LogEvent) => void} listener - Log event handler
+   *
+   * @returns {Function} Unsubscribe function
+   */
+  onLogEvent(listener) {
+    // Listen to both service and manager logs
+    const unsubscribeService = this.onServiceLogEvent(listener);
+    const unsubscribeManager = this.onManagerLogEvent(listener);
+
+    // Return combined unsubscribe function
+    return () => {
+      unsubscribeService();
+      unsubscribeManager();
+    };
+  }
+
   /**
    * Set log level for the ServiceManager itself
    *
@@ -587,21 +626,21 @@ export class ServiceManager extends EventEmitter {
    */
   _attachServiceEvents(name, instance) {
     // Forward service events
-    instance.on('stateChanged', (/** @type {StateChangeEvent} */ data) => {
-      this.emit('service:stateChanged', { service: name, data });
+    instance.on(STATE_CHANGED, (/** @type {StateChangeEvent} */ data) => {
+      this.emit(SERVICE_STATE_CHANGED, { service: name, data });
     });
 
-    instance.on('healthChanged', (/** @type {HealthChangeEvent} */ data) => {
-      this.emit('service:healthChanged', { service: name, data });
+    instance.on(HEALTH_CHANGED, (/** @type {HealthChangeEvent} */ data) => {
+      this.emit(SERVICE_HEALTH_CHANGED, { service: name, data });
     });
 
-    instance.on('error', (/** @type {ServiceErrorEvent} */ data) => {
-      this.emit('service:error', { service: name, data });
+    instance.on(ERROR, (/** @type {ServiceErrorEvent} */ data) => {
+      this.emit(SERVICE_ERROR, { service: name, data });
     });
 
     // Forward log events
-    instance.logger.on('log', (/** @type {LogEvent} */ logEvent) => {
-      this.emit('service:log', logEvent);
+    instance.logger.on(LOG, (/** @type {LogEvent} */ logEvent) => {
+      this.emit(SERVICE_LOG, logEvent);
     });
   }
 

package/dist/services/service-manager/constants.d.ts

@@ -1,5 +1,9 @@
-export const SERVICE_STATE_CHANGED: "service:state-changed";
-export const SERVICE_HEALTH_CHANGED: "service:health-changed";
+export const STATE_CHANGED: "stateChanged";
+export const HEALTH_CHANGED: "healthChanged";
+export const ERROR: "error";
+export const LOG: "log";
+export const SERVICE_STATE_CHANGED: "service:stateChanged";
+export const SERVICE_HEALTH_CHANGED: "service:healthChanged";
 export const SERVICE_ERROR: "service:error";
 export const SERVICE_LOG: "service:log";
 export const ANY_LOG_LEVEL: "*";

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

@@ -1,8 +1,15 @@
-// Log event names
-export const SERVICE_STATE_CHANGED = 'service:state-changed';
-export const SERVICE_HEALTH_CHANGED = 'service:health-changed';
+// Service event names (what services emit)
+export const STATE_CHANGED = 'stateChanged';
+export const HEALTH_CHANGED = 'healthChanged';
+export const ERROR = 'error';
+export const LOG = 'log';
+
+// Manager event names (what ServiceManager emits)
+export const SERVICE_STATE_CHANGED = 'service:stateChanged';
+export const SERVICE_HEALTH_CHANGED = 'service:healthChanged';
 export const SERVICE_ERROR = 'service:error';
 export const SERVICE_LOG = 'service:log';
 
+
 export const ANY_LOG_LEVEL = '*';
 export const ANY_SERVICE_NAME = '*';

package/dist/util/sveltekit/env/README.md

@@ -339,7 +339,6 @@ console.log(features);
 - `getAllEnv(options)` - Get combined environment variables (server only)
 - `getPublicEnvByPrefix(prefix, options)` - Get public variables by prefix
 - `getPrivateEnvByPrefix(prefix, options)` - Get private variables by prefix
-- `getAllEnvByPrefix(prefix, options)` - Get combined variables by prefix
 
 ### Raw Access
 
@@ -421,4 +420,4 @@ interface DatabaseConfig {
 }
 
 const { database }: { database: DatabaseConfig } = getPrivateEnv();
-```
+```

package/package.json

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