@hkdigital/lib-core 0.4.22 → 0.4.24

package/dist/auth/jwt/util.js

@@ -2,24 +2,32 @@
  * JWT utility functions
  *
  * @description
- * This module provides utility functions for JWT operations including 
+ * This module provides utility functions for JWT operations including
  * sign, verify and error casting.
  */
 
+// import jwt from 'jsonwebtoken';
+
+// import {
+//   TokenExpiredError as JwtTokenExpiredError,
+//   JsonWebTokenError as JwtJsonWebTokenError,
+//   NotBeforeError as JwtNotBeforeError
+// } from 'jsonwebtoken';
+
 import jwt from 'jsonwebtoken';
 
-import {
-  TokenExpiredError as JwtTokenExpiredError,
-  JsonWebTokenError as JwtJsonWebTokenError,
-  NotBeforeError as JwtNotBeforeError
-} from 'jsonwebtoken';
+const {
+  TokenExpiredError: JwtTokenExpiredError,
+  JsonWebTokenError: JwtJsonWebTokenError,
+  NotBeforeError: JwtNotBeforeError
+} = jwt;
 
 import * as expect from '../../util/expect.js';
 
 import {
   JWT_DEFAULT_EXPIRES_IN,
   DEFAULT_ALGORITHM,
-  VERIFY_OPTIONS 
+  VERIFY_OPTIONS
 } from './constants.js';
 
 import {
@@ -54,38 +62,28 @@ import {
  *
  * @returns {string} JsonWebToken
  */
-export function sign(
-  claims,
-  secretOrPrivateKey,
-  options={} )
-{
-  expect.object( claims );
-  expect.defined( secretOrPrivateKey );
-
-  if( options )
-  {
-    expect.object( options );
-  }
-  else {
+export function sign(claims, secretOrPrivateKey, options = {}) {
+  expect.object(claims);
+  expect.defined(secretOrPrivateKey);
+
+  if (options) {
+    expect.object(options);
+  } else {
     options = {};
   }
 
-  if( !('algorithm' in options) )
-  {
+  if (!('algorithm' in options)) {
     options.algorithm = DEFAULT_ALGORITHM;
   }
 
-  if( !('expiresIn' in options) )
-  {
+  if (!('expiresIn' in options)) {
     options.expiresIn = JWT_DEFAULT_EXPIRES_IN;
-  }
-  else if( !options.expiresIn )
-  {
+  } else if (!options.expiresIn) {
     delete options.expiresIn;
   }
 
   // @ts-ignore
-  return jwt.sign( claims, secretOrPrivateKey, options );
+  return jwt.sign(claims, secretOrPrivateKey, options);
 }
 
 /**
@@ -99,24 +97,20 @@ export function sign(
  *
  * @returns {import('./typedef.js').JwtPayload} claims - The decoded JWT payload
  */
-export function verify( token, secretOrPrivateKey, options=VERIFY_OPTIONS )
-{
-  expect.notEmptyString( token );
-  expect.defined( secretOrPrivateKey );
+export function verify(token, secretOrPrivateKey, options = VERIFY_OPTIONS) {
+  expect.notEmptyString(token);
+  expect.defined(secretOrPrivateKey);
 
-  if( !('algorithms' in options) )
-  {
+  if (!('algorithms' in options)) {
     options.algorithms = VERIFY_OPTIONS.algorithms;
   }
 
   try {
     // @ts-ignore
-    const decoded = jwt.verify( token, secretOrPrivateKey, options );
+    const decoded = jwt.verify(token, secretOrPrivateKey, options);
 
     return decoded;
-  }
-  catch( e )
-  {
+  } catch (e) {
     //
     // Cast internal jsonwebtoken errors to Error types defined in this lib
     //
@@ -135,18 +129,18 @@ export function castJwtError(error) {
   if (error instanceof JwtTokenExpiredError) {
     return new TokenExpiredError(error.message, error.expiredAt, error);
   }
-  
+
   if (error instanceof JwtNotBeforeError) {
     return new NotBeforeError(error.message, error.date, error);
   }
-  
+
   if (error instanceof JwtJsonWebTokenError) {
     if (error.message === 'invalid signature') {
       return new InvalidSignatureError(error.message, error, error);
     }
     return new JsonWebTokenError(error.message, error, error);
   }
-  
+
   // Return original error if not a known JWT error
   return error;
 }

package/dist/network/loaders/audio/AudioScene.svelte.js

@@ -1,6 +1,6 @@
 import * as expect from '../../../util/expect.js';
 
-import { LoadingStateMachine } from '../../../state/classes.js';
+import { LoadingStateMachine } from '../../../state/machines.js';
 
 import {
 	STATE_INITIAL,
@@ -11,7 +11,7 @@ import {
 	STATE_ERROR,
 	LOAD,
 	LOADED
-} from '../../../state/classes/loading-state-machine/constants.js';
+} from '../../../state/machines.js';
 
 import AudioLoader from './AudioLoader.svelte.js';
 

package/dist/network/loaders/image/ImageScene.svelte.js

@@ -2,7 +2,7 @@
 
 import * as expect from '../../../util/expect.js';
 
-import { LoadingStateMachine } from '../../../state/classes.js';
+import { LoadingStateMachine } from '../../../state/machines.js';
 
 import {
   STATE_INITIAL,
@@ -13,7 +13,7 @@ import {
   STATE_ERROR,
   LOAD,
   LOADED
-} from '../../../state/classes/loading-state-machine/constants.js';
+} from '../../../state/machines.js';
 
 import ImageLoader from './ImageLoader.svelte.js';
 
@@ -74,30 +74,28 @@ export default class ImageScene {
     };
   });
 
+  #sourcesLoaded = $derived( this.#progress.sourcesLoaded );
+  #numberOfSources = $derived( this.#progress.numberOfSources );
+
   /**
    * Construct ImageScene
    */
   constructor() {
     const state = this.#state;
 
-    $effect(() => {
+    $effect( () => {
       if (state.current === STATE_LOADING) {
-        // console.log(
-        //   'progress',
-        //   JSON.stringify($state.snapshot(this.#progress))
-        // );
-
-        const { sourcesLoaded, numberOfSources } = this.#progress;
-
-        if (sourcesLoaded === numberOfSources) {
-          // console.log(`All [${numberOfSources}] sources loaded`);
+        if (this.#sourcesLoaded === this.#numberOfSources) {
+          // console.log(`All [${this.#numberOfSources}] sources loaded`);
           this.#state.send(LOADED);
         }
       }
-    });
+    } );
 
-    $effect(() => {
-      switch (state.current) {
+    state.onenter = ( state ) => {
+      // console.log('onenter', state );
+
+      switch (state) {
         case STATE_LOADING:
           {
             // console.log('ImageScene:loading');
@@ -129,13 +127,13 @@ export default class ImageScene {
 
         case STATE_ERROR:
           {
-            console.log('ImageScene:error', state.error);
+            console.log('ImageScene:error', state);
           }
           break;
       } // end switch
 
-      this.state = state.current;
-    });
+      this.state = state;
+    };
   }
 
   destroy() {
@@ -166,22 +164,14 @@ export default class ImageScene {
    */
   load() {
     this.#state.send(LOAD);
+  }
 
-    // FIXME: in unit test when moved to startloading it hangs!
-
+  async #startLoading() {
     for (const { imageLoader } of this.#imageSources) {
       imageLoader.load();
     }
   }
 
-  async #startLoading() {
-    // console.log('#startLoading');
-    // FIXME: in unit test when moved to startloading it hangs!
-    // for (const { audioLoader } of this.#memorySources) {
-    //   audioLoader.load();
-    // }
-  }
-
   /**
    * Get Image source
    *

package/dist/network/states/NetworkLoader.svelte.d.ts

@@ -88,4 +88,4 @@ export default class NetworkLoader {
     getObjectURL(): string;
     #private;
 }
-import { LoadingStateMachine } from '../../state/classes.js';
+import { LoadingStateMachine } from '../../state/machines.js';

package/dist/network/states/NetworkLoader.svelte.js

@@ -1,6 +1,6 @@
 import { CONTENT_TYPE } from '../../constants/http.js';
 
-import { LoadingStateMachine } from '../../state/classes.js';
+import { LoadingStateMachine } from '../../state/machines.js';
 
 import {
   STATE_INITIAL,
@@ -14,7 +14,7 @@ import {
   LOADED,
   UNLOAD,
   INITIAL
-} from '../../state/classes/loading-state-machine/constants.js';
+} from '../../state/machines.js';
 
 import * as expect from '../../util/expect.js';
 

package/dist/services/README.md

@@ -259,6 +259,29 @@ manager.on(SERVICE_ERROR, async ({ service, error }) => {
 await manager.recoverService('database');
 ```
 
+### Log Event Forwarding
+
+Forward all service log events to a centralised logger:
+
+```javascript
+import { ServiceManager, SERVICE_LOG } from '$lib/services/index.js';
+import { createServerLogger } from '$lib/logging/index.js';
+
+const manager = new ServiceManager();
+const logger = createServerLogger('SystemLogger');
+
+// Listen to all log events and forward them to the logger
+manager.on(SERVICE_LOG, (logEvent) => {
+  logger.logFromEvent('manager:service:log', logEvent);
+});
+
+// Register services
+manager.register('database', DatabaseService, { ... });
+manager.register('auth', AuthService, { ... });
+
+await manager.startAll();
+```
+
 ## Plugins
 
 ServiceManager supports plugins e.g. to resolve service configurations dynamically.

package/dist/state/classes.d.ts

@@ -1,3 +1 @@
-export { default as FiniteStateMachine } from "./classes/finite-state-machine/FiniteStateMachine.svelte.js";
-export { default as LoadingStateMachine } from "./classes/loading-state-machine/LoadingStateMachine.svelte.js";
 export { default as SubscribersCount } from "./classes/subscribers-count/SubscribersCount.js";

package/dist/state/classes.js

@@ -1,3 +1 @@
-export { default as FiniteStateMachine } from './classes/finite-state-machine/FiniteStateMachine.svelte.js';
-export { default as LoadingStateMachine } from './classes/loading-state-machine/LoadingStateMachine.svelte.js';
 export { default as SubscribersCount } from './classes/subscribers-count/SubscribersCount.js';

package/dist/state/{classes → machines}/finite-state-machine/FiniteStateMachine.svelte.d.ts

@@ -3,6 +3,9 @@
  *
  * @see {@link https://runed.dev/docs/utilities/finite-state-machine}
  */
+/** @typedef {import('./typedef.js').StateTransitionMetadata} StateTransitionMetadata */
+/** @typedef {import('./typedef.js').OnEnterCallback} OnEnterCallback */
+/** @typedef {import('./typedef.js').OnExitCallback} OnExitCallback */
 /**
  * Check if the value is valid meta data
  *
@@ -29,6 +32,10 @@ export default class FiniteStateMachine {
             [key: string]: string | ((...args: any[]) => void);
         };
     };
+    /** @type {OnEnterCallback | null} */
+    onenter: OnEnterCallback | null;
+    /** @type {OnExitCallback | null} */
+    onexit: OnExitCallback | null;
     /**
      * Triggers a new event and returns the new state.
      *
@@ -48,3 +55,6 @@ export default class FiniteStateMachine {
     get current(): any;
     #private;
 }
+export type StateTransitionMetadata = import("./typedef.js").StateTransitionMetadata;
+export type OnEnterCallback = import("./typedef.js").OnEnterCallback;
+export type OnExitCallback = import("./typedef.js").OnExitCallback;

package/dist/state/{classes → machines}/finite-state-machine/FiniteStateMachine.svelte.js

@@ -4,6 +4,10 @@
  * @see {@link https://runed.dev/docs/utilities/finite-state-machine}
  */
 
+/** @typedef {import('./typedef.js').StateTransitionMetadata} StateTransitionMetadata */
+/** @typedef {import('./typedef.js').OnEnterCallback} OnEnterCallback */
+/** @typedef {import('./typedef.js').OnExitCallback} OnExitCallback */
+
 /**
  * Check if the value is valid meta data
  *
@@ -28,6 +32,12 @@ export default class FiniteStateMachine {
   states;
   #timeout = {};
 
+  /** @type {OnEnterCallback | null} */
+  onenter = null;
+
+  /** @type {OnExitCallback | null} */
+  onexit = null;
+
   /**
    * Constructor
    *
@@ -55,17 +65,25 @@ export default class FiniteStateMachine {
    * @param {any[]} [args]
    */
   #transition(newState, event, args) {
+    /** @type {StateTransitionMetadata} */
     const metadata = { from: this.#current, to: newState, event, args };
+
+    // Call onexit callback before leaving current state
+    this.onexit?.(this.#current, metadata);
+    
     this.#dispatch('_exit', metadata);
     this.#current = newState;
     this.#dispatch('_enter', metadata);
+    
+    // Call onenter callback after state change
+    this.onenter?.(newState, metadata);
   }
 
   /**
    * Dispatch an event
    *
    * @param {string} event
-   * @param {any[]} args
+   * @param {any} args
    */
   #dispatch(event, ...args) {
     const action =