@hkdigital/lib-core 0.4.80 → 0.4.82

package/dist/network/loaders/base/SceneBase.svelte.js

@@ -29,16 +29,10 @@ const MAX_TIMEOUT_MS = 120000;
 export default class SceneBase {
   #state = new LoadingStateMachine();
 
-  // @note this exported state is set by onenter
+  // @note this exported state is set by #setState
   state = $state(STATE_INITIAL);
-
-  initial = $derived.by(() => {
-    return this.state === STATE_INITIAL;
-  });
-
-  loaded = $derived.by(() => {
-    return this.state === STATE_LOADED;
-  });
+  initial = $state(true);
+  loaded = $state(false);
 
   // aborted = $derived.by(() => {
   //   return this.state === STATE_ABORTED;
@@ -94,12 +88,23 @@ export default class SceneBase {
     };
   });
 
+  /**
+   * Internal state setter that updates all related state properties
+   *
+   * @param {string} newState - The new state value
+   */
+  #setState(newState) {
+    this.state = newState;
+    this.initial = newState === STATE_INITIAL;
+    this.loaded = newState === STATE_LOADED;
+  }
+
   /**
    * Construct SceneBase
    */
   constructor() {
     this.#state.onenter = (currentState) => {
-      console.debug('SceneBase:onenter', currentState);
+      // console.debug('SceneBase:onenter', currentState);
 
       if (currentState === STATE_LOADING) {
         this.#startLoading();
@@ -107,14 +112,14 @@ export default class SceneBase {
         this.#startAbort();
       }
 
-      this.state = currentState;
+      this.#setState(currentState);
     };
 
     $effect(() => {
       if (this.state === STATE_LOADING) {
         const { sourcesLoaded, numberOfSources } = this.progress;
 
-        console.debug( 'SceneBase:check-for-loaded', {sourcesLoaded, numberOfSources} );
+        // console.debug( 'SceneBase:check-for-loaded', {sourcesLoaded, numberOfSources} );
 
         if (sourcesLoaded === numberOfSources) {
           this.#state.send(LOADED);
@@ -287,16 +292,16 @@ export default class SceneBase {
       // 0 means no timeout, but actually we use max timeout
       const waitTimeout = timeoutMs > 0 ? timeoutMs : MAX_TIMEOUT_MS;
 
-      console.debug('SceneBase:waitForState:currentState', this.state);
+      // console.debug('SceneBase:waitForState:currentState', this.state);
 
       waitForState(() => {
         const ready = (
-          this.state === STATE_LOADED ||
+          this.loaded ||
           this.state === STATE_ABORTED ||
           this.state === STATE_ERROR
         );
 
-        console.debug( { loaded: this.loaded, state: this.state, ready } );
+        // console.debug( { loaded: this.loaded, state: this.state, ready } );
 
         return ready;
       }, waitTimeout)
@@ -393,7 +398,7 @@ export default class SceneBase {
       const loader = this.getLoaderFromSource(source);
 
       loader.load((completedLoader, finalState) => {
-        console.debug(`SceneBase:loader-finished [${completedLoader._url}] ${finalState}`);
+        // console.debug(`SceneBase:loader-finished [${completedLoader._url}] ${finalState}`);
 
         // Check for errors
         if (finalState === STATE_ERROR) {
@@ -404,18 +409,18 @@ export default class SceneBase {
         // Check for abort - don't count aborted loaders as completed
         if (finalState === STATE_ABORTED) {
           // Aborted loaders are handled by SceneBase's own abort logic
-          console.debug(`SceneBase:loader-aborted [${completedLoader._url}] - not counting toward completion`);
+          // console.debug(`SceneBase:loader-aborted [${completedLoader._url}] - not counting toward completion`);
           return;
         }
 
         // Only count successfully loaded loaders
         if (finalState === STATE_LOADED) {
           completedCount++;
-          console.debug(`SceneBase:loader-completed [${completedLoader._url}] (${completedCount}/${totalLoaders})`);
+          // console.debug(`SceneBase:loader-completed [${completedLoader._url}] (${completedCount}/${totalLoaders})`);
 
           // Check for completion
           if (completedCount === totalLoaders) {
-            console.debug('SceneBase:all-loaders-completed-via-callback');
+            // console.debug('SceneBase:all-loaders-completed-via-callback');
             this.#state.send(LOADED);
           }
         }

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

@@ -106,7 +106,7 @@ export default class NetworkLoader {
     this._url = url;
 
     this.#state.onenter = (currentState) => {
-      console.debug(`loader:onenter [${this._url}] ${currentState}`);
+      // console.debug(`loader:onenter [${this._url}] ${currentState}`);
       this.state = currentState;
 
       // Check if we've reached a terminal state
@@ -328,7 +328,7 @@ export default class NetworkLoader {
       const { bufferPromise, abort: abortLoadBody } = loadResponseBuffer(
         response,
         ({ bytesLoaded, size }) => {
-          console.debug(`loader:progress [${this._url}] ${bytesLoaded}/${size} bytes`);
+          // console.debug(`loader:progress [${this._url}] ${bytesLoaded}/${size} bytes`);
           this._bytesLoaded = bytesLoaded;
           this._size = size;
         }
@@ -349,11 +349,11 @@ export default class NetworkLoader {
 
       // Check if we've been aborted before sending LOADED
       if (this.#state.current === STATE_ABORTING || this.#state.current === STATE_ABORTED) {
-        console.debug(`loader:already-aborted [${this._url}] - not sending LOADED`);
+        // console.debug(`loader:already-aborted [${this._url}] - not sending LOADED`);
         return;
       }
       
-      console.debug(`loader:sending-LOADED [${this._url}]`);
+      // console.debug(`loader:sending-LOADED [${this._url}]`);
       this.#state.send(LOADED);
     } catch (e) {
       this.#state.send(ERROR, e);

package/package.json

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