@hkdigital/lib-sveltekit 0.2.15 → 0.2.17

package/dist/classes/logging/Logger.d.ts

@@ -64,15 +64,15 @@ export default class Logger extends EventEmitter {
      */
     context(namespace: string, additionalContext: any): Logger;
     /**
-     * Internal logging method
+     * Log an event from an event emitter of type LogEvent
      *
-     * @param {string} 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
-     * @private
+     * 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
      */
-    private _log;
+    logFromEvent(eventName: string, eventData: import("./typedef.js").LogEventData): boolean;
     #private;
 }
 import { EventEmitter } from '../events';

package/dist/classes/logging/Logger.js

@@ -84,7 +84,7 @@ export default class Logger extends EventEmitter {
    * @returns {boolean} True if the log was emitted
    */
   debug(message, details) {
-    return this._log(DEBUG, message, details);
+    return this.#log(DEBUG, message, details);
   }
 
   /**
@@ -95,7 +95,7 @@ export default class Logger extends EventEmitter {
    * @returns {boolean} True if the log was emitted
    */
   info(message, details) {
-    return this._log(INFO, message, details);
+    return this.#log(INFO, message, details);
   }
 
   /**
@@ -106,7 +106,7 @@ export default class Logger extends EventEmitter {
    * @returns {boolean} True if the log was emitted
    */
   warn(message, details) {
-    return this._log(WARN, message, details);
+    return this.#log(WARN, message, details);
   }
 
   /**
@@ -117,7 +117,7 @@ export default class Logger extends EventEmitter {
    * @returns {boolean} True if the log was emitted
    */
   error(message, details) {
-    return this._log(ERROR, message, details);
+    return this.#log(ERROR, message, details);
   }
 
   /**
@@ -143,6 +143,26 @@ export default class Logger extends EventEmitter {
     return new Logger(this.name, this.level, mergedContext);
   }
 
+  /**
+   * Log an event from an event emitter of type LogEvent
+   *
+   * 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 ) {
+    const level = eventData.level;
+
+    // Check if this log level should be filtered
+    if (LEVELS[level] < LEVELS[this.level]) {
+      return false; // Below threshold, don't emit
+    }
+
+    this.#logEvent( { ...eventData, eventName });
+  }
+
   /**
    * Internal logging method
    *
@@ -150,18 +170,18 @@ export default class Logger extends EventEmitter {
    * @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
-   * @private
    */
-  _log(level, message, details) {
+  #log(level, message, details) {
     // Check if this log level should be filtered
     if (LEVELS[level] < LEVELS[this.level]) {
       return false; // Below threshold, don't emit
     }
 
     const timestamp = new Date();
+
     const logEvent = {
       timestamp,
-      service: this.name,
+      source: this.name,
       level,
       message,
       context: this.#hasContext ? this.#defaultContext : null,
@@ -174,4 +194,17 @@ export default class Logger extends EventEmitter {
 
     return true;
   }
+
+  /**
+   * Internal event loggin method
+   *
+   * @param {import('./typedef.js').LogEvent} logEvent
+   */
+  #logEvent(logEvent) {
+    // Emit as both specific level event and generic 'log' event
+    this.emit(logEvent.level, logEvent);
+    this.emit('log', logEvent);
+
+    return true;
+  }
 }

package/dist/classes/logging/typedef.d.ts

@@ -0,0 +1,34 @@
+declare const _default: {};
+export default _default;
+export type LogEventData = {
+    /**
+     * - When the log event was created
+     */
+    timestamp: Date;
+    /**
+     * - Name of the source where the event came from
+     */
+    source: string;
+    /**
+     * - Log level (DEBUG, INFO, WARN, ERROR)
+     */
+    level: string;
+    /**
+     * - The log message
+     */
+    message: string;
+    /**
+     *   Default context data from the logger (null if no context)
+     */
+    context: any | null;
+    /**
+     * - Additional details provided with the log (optional)
+     */
+    details?: any;
+};
+/**
+ * eventName - Original event name if log came from an event (optional)
+ */
+export type LogEvent = LogEventData & {
+    eventName?: string;
+};

package/dist/classes/logging/typedef.js

@@ -0,0 +1,17 @@
+/**
+ * @typedef {Object} LogEventData
+ * @property {Date} timestamp - When the log event was created
+ * @property {string} source - Name of the source where the event came from
+ * @property {string} level - Log level (DEBUG, INFO, WARN, ERROR)
+ * @property {string} message - The log message
+ * @property {Object|null} context
+ *   Default context data from the logger (null if no context)
+ * @property {*} [details] - Additional details provided with the log (optional)
+ */
+
+/**
+ * @typedef {LogEventData & { eventName?: string }} LogEvent
+ * eventName - Original event name if log came from an event (optional)
+ */
+
+export default {};

package/dist/classes/services/ServiceBase.js

@@ -413,7 +413,7 @@ export class ServiceBase extends EventEmitter {
     this.state = newState;
 
     this.emit('stateChanged', {
-      service: this.name,
+      source: this.name,
       oldState,
       newState
     });
@@ -431,7 +431,7 @@ export class ServiceBase extends EventEmitter {
 
     if (wasHealthy !== healthy) {
       this.emit('healthChanged', {
-        service: this.name,
+        source: this.name,
         healthy
       });
     }
@@ -455,7 +455,7 @@ export class ServiceBase extends EventEmitter {
     });
 
     this.emit('error', {
-      service: this.name,
+      source: this.name,
       operation,
       error
     });

package/dist/classes/services/ServiceManager.js

@@ -551,20 +551,24 @@ export class ServiceManager extends EventEmitter {
   _attachServiceEvents(name, instance) {
     // Forward service events
     instance.on('stateChanged', (data) => {
-      this.emit('service:stateChanged', { ...data, service: name });
+      const eventName = 'service:stateChanged';
+      this.emit(eventName, { ...data, eventName, source: name });
     });
 
     instance.on('healthChanged', (data) => {
-      this.emit('service:healthChanged', { ...data, service: name });
+      const eventName = 'service:healthChanged';
+      this.emit(eventName, { ...data, eventName, source: name });
     });
 
     instance.on('error', (data) => {
-      this.emit('service:error', { ...data, service: name });
+      const eventName = 'service:error';
+      this.emit(eventName, { ...data, eventName, source: name });
     });
 
     // Forward log events
-    instance.logger.on('log', (logEvent) => {
-      this.emit('service:log', { ...logEvent, service: name });
+    instance.logger.on('log', (data) => {
+      const eventName = 'service:log';
+      this.emit(eventName, { ...data, eventName, source: name });
     });
   }
 

package/dist/classes/svelte/network-loader/NetworkLoader.svelte.js

@@ -86,7 +86,7 @@ export default class NetworkLoader {
     this._url = url;
 
     const state = this._state;
-    const progress = this.progress;
+    // const progress = this.progress;
 
     //
     // ISSUE: $effect is not triggered by  this._state changes,

package/dist/logging/adapters/console.d.ts

@@ -7,7 +7,8 @@ export class ConsoleAdapter {
      *
      * @param {Object} [options] - Browser configuration options
      * @param {string} [options.level] - Minimum log level
-     * @param {Object} [options.context] - Additional context data to include with all logs
+     * @param {Object} [options.context]
+     *   Additional context data to include with all logs
      */
     constructor(options?: {
         level?: string;

package/dist/logging/adapters/console.js

@@ -9,7 +9,8 @@ export class ConsoleAdapter {
    *
    * @param {Object} [options] - Browser configuration options
    * @param {string} [options.level] - Minimum log level
-   * @param {Object} [options.context] - Additional context data to include with all logs
+   * @param {Object} [options.context]
+   *   Additional context data to include with all logs
    */
   constructor(options = {}) {
     this.level = options.level || 'info';
@@ -23,7 +24,7 @@ export class ConsoleAdapter {
    */
   handleLog(logEvent) {
     // eslint-disable-next-line no-unused-vars
-    const { level, message, details, service, timestamp } = logEvent;
+    const { level, message, details, source, timestamp } = logEvent;
 
     // Filter by level
     if (LEVELS[level] < LEVELS[this.level]) {
@@ -32,7 +33,7 @@ export class ConsoleAdapter {
 
     // Use browser console styling
     const styles = this._getStyles(level);
-    const prefix = `%c[${service}]`;
+    const prefix = `%c[${source}]`;
 
     // Merge context with details
     const logData = details

package/dist/logging/adapters/pino.js

@@ -34,10 +34,10 @@ export class PinoAdapter {
    * @param {Object} logEvent - Log event from Logger
    */
   handleLog(logEvent) {
-    const { level, message, details, service, timestamp } = logEvent;
+    const { level, message, details, source, timestamp } = logEvent;
 
     const logData = {
-      service,
+      source,
       timestamp,
       ...(details && { details })
     };

package/dist/logging/factories/client.d.ts

@@ -1,10 +1,10 @@
 /**
  * Create a client-side logger with console adapter
  *
- * @param {string} serviceName - Name of the service
+ * @param {string} name
  * @param {string} [level=INFO] - Initial log level
  * @param {Object} [consoleOptions] - Additional console options
  * @returns {Logger} Configured logger instance
  */
-export function createClientLogger(serviceName: string, level?: string, consoleOptions?: any): Logger;
+export function createClientLogger(name: string, level?: string, consoleOptions?: any): Logger;
 import { Logger } from '../../classes/logging';

package/dist/logging/factories/client.js

@@ -5,13 +5,13 @@ import { INFO } from '../constants.js';
 /**
  * Create a client-side logger with console adapter
  *
- * @param {string} serviceName - Name of the service
+ * @param {string} name
  * @param {string} [level=INFO] - Initial log level
  * @param {Object} [consoleOptions] - Additional console options
  * @returns {Logger} Configured logger instance
  */
-export function createClientLogger(serviceName, level = INFO, consoleOptions = {}) {
-  const logger = new Logger(serviceName, level);
+export function createClientLogger(name, level = INFO, consoleOptions = {}) {
+  const logger = new Logger(name, level);
   const adapter = new ConsoleAdapter({ ...consoleOptions, level });
 
   // Connect adapter to logger events

package/dist/logging/factories/server.d.ts

@@ -1,10 +1,10 @@
 /**
  * Create a server-side logger with pino adapter
  *
- * @param {string} serviceName - Name of the service
+ * @param {string} name
  * @param {string} [level=INFO] - Initial log level
  * @param {Object} [pinoOptions] - Additional pino options
  * @returns {Logger} Configured logger instance
  */
-export function createServerLogger(serviceName: string, level?: string, pinoOptions?: any): Logger;
+export function createServerLogger(name: string, level?: string, pinoOptions?: any): Logger;
 import { Logger } from '../../classes/logging';

package/dist/logging/factories/server.js

@@ -6,13 +6,13 @@ import { INFO } from '../constants.js';
 /**
  * Create a server-side logger with pino adapter
  *
- * @param {string} serviceName - Name of the service
+ * @param {string} name
  * @param {string} [level=INFO] - Initial log level
  * @param {Object} [pinoOptions] - Additional pino options
  * @returns {Logger} Configured logger instance
  */
-export function createServerLogger(serviceName, level = INFO, pinoOptions = {}) {
-  const logger = new Logger(serviceName, level);
+export function createServerLogger(name, level = INFO, pinoOptions = {}) {
+  const logger = new Logger(name, level);
   const adapter = new PinoAdapter(pinoOptions);
 
   // Connect adapter to logger events

package/dist/logging/index.js

@@ -5,3 +5,4 @@ export { createServerLogger } from './factories/server.js';
 export { createClientLogger } from './factories/client.js';
 export { createLogger } from './factories/universal.js';
 
+export * from '../classes/logger/typedef.js';

package/dist/util/http/http-request.js

@@ -356,12 +356,12 @@ export async function httpRequest(options) {
       }
 
       // Create stale info
-      const staleInfo = {
-        isStale: false,
-        fresh: null,
-        timestamp: Date.now(),
-        expires
-      };
+      // const staleInfo = {
+      //   isStale: false,
+      //   fresh: null,
+      //   timestamp: Date.now(),
+      //   expires
+      // };
 
       // Store response in cache
       const cacheKeyParams = { url, ...headers };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hkdigital/lib-sveltekit",
-	"version": "0.2.15",
+	"version": "0.2.17",
 	"author": {
 		"name": "HKdigital",
 		"url": "https://hkdigital.nl"

package/dist/classes/services/_old/ServiceBase.d.ts

@@ -1,153 +0,0 @@
-/**
- * Base class for all services
- */
-export default class ServiceBase {
-    /**
-     * Create a new service
-     *
-     * @param {string} name - Service name
-     * @param {Object} [options] - Service options
-     * @param {string} [options.logLevel=INFO] - Initial log level
-     */
-    constructor(name: string, options?: {
-        logLevel?: string;
-    });
-    /**
-     * Service name
-     * @type {string}
-     */
-    name: string;
-    /**
-     * Event emitter for service events
-     * @type {EventEmitter}
-     */
-    events: EventEmitter;
-    /**
-     * Current service state
-     * @type {string}
-     */
-    state: string;
-    /**
-     * Last error that occurred
-     * @type {Error|null}
-     */
-    error: Error | null;
-    /**
-     * Last stable state before error
-     * @type {string|null}
-     * @private
-     */
-    private _preErrorState;
-    /**
-     * Service logger
-     * @type {Logger}
-     */
-    logger: Logger;
-    /**
-     * Set the service log level
-     *
-     * @param {string} level - New log level
-     * @returns {boolean} True if level was set, false if invalid
-     */
-    setLogLevel(level: string): boolean;
-    /**
-     * Initialize the service
-     *
-     * @param {Object} [config] - Service configuration
-     * @returns {Promise<boolean>} True if initialized successfully
-     */
-    initialize(config?: any): Promise<boolean>;
-    /**
-     * Start the service
-     *
-     * @returns {Promise<boolean>} True if started successfully
-     */
-    start(): Promise<boolean>;
-    /**
-     * Stop the service
-     *
-     * @returns {Promise<boolean>} True if stopped successfully
-     */
-    stop(): Promise<boolean>;
-    /**
-     * Recover the service
-     *
-     * @returns {Promise<boolean>} True if stopped successfully
-     */
-    recover(): Promise<boolean>;
-    /**
-     * Destroy the service
-     *
-     * @returns {Promise<boolean>} True if destroyed successfully
-     */
-    destroy(): Promise<boolean>;
-    /**
-     * Add an event listener
-     *
-     * @param {string} eventName - Event name
-     * @param {Function} handler - Event handler
-     * @returns {Function} Unsubscribe function
-     */
-    on(eventName: string, handler: Function): Function;
-    /**
-     * Emit an event
-     *
-     * @param {string} eventName - Event name
-     * @param {*} data - Event data
-     * @returns {boolean} True if event had listeners
-     */
-    emit(eventName: string, data: any): boolean;
-    /**
-     * Initialize the service (to be overridden)
-     *
-     * @protected
-     * @param {Object} config - Service configuration
-     * @returns {Promise<void>}
-     */
-    protected _init(config: any): Promise<void>;
-    /**
-     * Start the service (to be overridden)
-     *
-     * @protected
-     * @returns {Promise<void>}
-     */
-    protected _start(): Promise<void>;
-    /**
-     * Stop the service (to be overridden)
-     *
-     * @protected
-     * @returns {Promise<void>}
-     */
-    protected _stop(): Promise<void>;
-    /**
-     * Destroy the service (to be overridden)
-     *
-     * @protected
-     * @returns {Promise<void>}
-     */
-    protected _destroy(): Promise<void>;
-    /**
-     * Recover the service from an error (to be overridden)
-     *
-     * @protected
-     * @returns {Promise<void>}
-     */
-    protected _recover(): Promise<void>;
-    /**
-     * Set the service state
-     *
-     * @private
-     * @param {string} state - New state
-     */
-    private _setState;
-    /**
-     * Set an error state
-     *
-     * @private
-     * @param {string} operation - Operation that failed
-     * @param {Error} error - Error that occurred
-     */
-    private _setError;
-}
-import { EventEmitter } from '../../events';
-import { Logger } from '../../logging';