@shapediver/viewer.shared.services 2.10.1-rc.0 → 2.12.0

package/src/http-client/HttpResponse.ts

@@ -1,4 +1,6 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 export interface HttpResponse<T = any> {
     data: T;
-    headers: any
+    headers: any,
+    size?: number
 }

package/src/index.ts

@@ -1,5 +1,5 @@
 import { EventEngine } from './event-engine/EventEngine'
-import { EVENTTYPE, EVENTTYPE_CAMERA, EVENTTYPE_INTERACTION, EVENTTYPE_RENDERING, EVENTTYPE_SCENE, EVENTTYPE_SESSION, EVENTTYPE_TASK, EVENTTYPE_VIEWPORT, MainEventTypes } from './event-engine/EventTypes'
+import { EVENTTYPE, EVENTTYPE_CAMERA, EVENTTYPE_INTERACTION, EVENTTYPE_OUTPUT, EVENTTYPE_RENDERING, EVENTTYPE_SCENE, EVENTTYPE_SESSION, EVENTTYPE_TASK, EVENTTYPE_VIEWPORT, MainEventTypes } from './event-engine/EventTypes'
 import { SettingsEngine } from './settings-engine/SettingsEngine'
 import { StateEngine } from './state-engine/StateEngine'
 import { SystemInfo } from './system-info/SystemInfo'
@@ -23,7 +23,7 @@ import { isViewerError, isViewerUnknownError, isViewerDataProcessingError, isVie
 
 export {
   EventEngine, EVENTTYPE, MainEventTypes, IEvent,
-  EVENTTYPE_CAMERA, EVENTTYPE_RENDERING, EVENTTYPE_SCENE, EVENTTYPE_SESSION, EVENTTYPE_VIEWPORT, EVENTTYPE_INTERACTION, EVENTTYPE_TASK
+  EVENTTYPE_CAMERA, EVENTTYPE_OUTPUT, EVENTTYPE_RENDERING, EVENTTYPE_SCENE, EVENTTYPE_SESSION, EVENTTYPE_VIEWPORT, EVENTTYPE_INTERACTION, EVENTTYPE_TASK
 }
 
 export {

package/src/performance-evaluator/PerformanceEvaluator.ts

@@ -8,6 +8,7 @@ export class PerformanceEvaluator {
         section: {
             [key: string]: {
                 start: number;
+                continued?: number;
                 end?: number;
                 duration?: number;
             };
@@ -26,7 +27,21 @@ export class PerformanceEvaluator {
 
     // #endregion Public Static Accessors (1)
 
-    // #region Public Methods (6)
+    // #region Public Methods (8)
+
+    /**
+     * Continue the performance evaluation.
+     * 
+     * @param id 
+     */
+    public continueSection(sectionId: string): void {
+        if (!this._eval) return;
+        if (this._eval.end) return;
+        if (!this._eval.section[sectionId]) return;
+        if (this._eval.section[sectionId].end) return;
+
+        this._eval.section[sectionId].continued = performance.now();
+    }
 
     /**
      * End the performance evaluation and calculate the duration.
@@ -54,7 +69,7 @@ export class PerformanceEvaluator {
 
         this._eval.section[sectionId].end = performance.now();
 
-        this._eval.section[sectionId].duration = this._eval.section[sectionId].end! - this._eval.section[sectionId].start;
+        this._eval.section[sectionId].duration = (this._eval.section[sectionId].duration || 0) + (this._eval.section[sectionId].end! - (this._eval.section[sectionId].continued || this._eval.section[sectionId].start));
     }
 
     /**
@@ -67,6 +82,7 @@ export class PerformanceEvaluator {
         section: {
             [key: string]: {
                 start: number,
+                continued?: number,
                 end?: number,
                 duration?: number
             }
@@ -87,6 +103,20 @@ export class PerformanceEvaluator {
         return `Performance Evaluation: ${e!.duration}ms\n`;
     }
 
+    /**
+     * Pause the performance evaluation.
+     * 
+     * @param id 
+     */
+    public pauseSection(sectionId: string): void {
+        if (!this._eval) return;
+        if (this._eval.end) return;
+        if (!this._eval.section[sectionId]) return;
+        if (this._eval.section[sectionId].end) return;
+
+        this._eval.section[sectionId].duration = (this._eval.section[sectionId].duration || 0) + performance.now() - (this._eval.section[sectionId].continued || this._eval.section[sectionId].start);
+    }
+
     /**
      * Start the evaluation with a specific id.
      * 
@@ -112,5 +142,5 @@ export class PerformanceEvaluator {
         }
     }
 
-    // #endregion Public Methods (6)
+    // #endregion Public Methods (8)
 }

package/src/settings-engine/SettingsEngine.ts

@@ -97,7 +97,7 @@ export class SettingsEngine {
         this._settingsJson = json;
         if (JSON.stringify(json) !== JSON.stringify({})) {
 
-            const prevVersions = ['1.0', '2.0', '3.0', '3.1', '3.2', '3.3', '3.4'];
+            const prevVersions = ['1.0', '2.0', '3.0', '3.1', '3.2', '3.3', '3.4', '4.0'];
             for(let i = 0; i < prevVersions.length; i++) {
                 const v = prevVersions[i];
 

package/src/state-engine/StateEngine.ts

@@ -19,6 +19,7 @@ export class StateEngine {
         [key: string]: {
             id: string,
             initialized: StatePromise<boolean>,
+            initialOutputsLoaded: StatePromise<boolean>,
             settingsRegistered: StatePromise<boolean>,
         }
     } = {};
@@ -67,6 +68,7 @@ export class StateEngine {
         [key: string]: {
             id: string,
             initialized: StatePromise<boolean>,
+            initialOutputsLoaded: StatePromise<boolean>,
             settingsRegistered: StatePromise<boolean>,
         }
     } {