@shapediver/viewer.session-engine.session-engine 2.8.4 → 2.9.0

package/src/implementation/SessionEngine.ts

@@ -1,12 +1,11 @@
-import { HttpClient, HttpResponse, PerformanceEvaluator, UuidGenerator, SystemInfo, Logger, ShapeDiverViewerSessionError, ShapeDiverViewerError, Converter, SettingsEngine, EVENTTYPE, EventEngine, StateEngine, ShapeDiverViewerSettingsError } from '@shapediver/viewer.shared.services'
+import { HttpClient, HttpResponse, PerformanceEvaluator, UuidGenerator, SystemInfo, Logger, ShapeDiverViewerSessionError, ShapeDiverViewerError, Converter, SettingsEngine, EVENTTYPE, EventEngine, StateEngine, ShapeDiverViewerSettingsError, ShapeDiverGeometryBackendResponseError, ShapeDiverGeometryBackendRequestError } from '@shapediver/viewer.shared.services'
 
 import { OutputDelayException } from './OutputDelayException'
-import { OutputLoader } from './OutputLoader'
+import { OutputLoader, OutputLoaderTaskEventInfo } from './OutputLoader'
 import { SessionTreeNode } from './SessionTreeNode'
 import { ISessionEngine, ISettingsSections, PARAMETER_TYPE } from '../interfaces/ISessionEngine'
 import { SessionData } from './SessionData'
-import { create, ShapeDiverError as ShapeDiverBackendError, ShapeDiverResponseErrorType, ShapeDiverRequestGltfUploadQueryConversion, ShapeDiverResponseDto, ShapeDiverResponseError, ShapeDiverResponseExport, ShapeDiverResponseExportDefinitionType, ShapeDiverResponseOutput, ShapeDiverResponseParameter, ShapeDiverSdk, ShapeDiverSdkConfigType, ShapeDiverResponseModelComputationStatus } from '@shapediver/sdk.geometry-api-sdk-v2'
-import { AxiosRequestConfig } from 'axios'
+import { create, ShapeDiverError as ShapeDiverBackendError, ShapeDiverResponseErrorType, ShapeDiverRequestGltfUploadQueryConversion, ShapeDiverResponseDto, ShapeDiverResponseError, ShapeDiverResponseExport, ShapeDiverResponseExportDefinitionType, ShapeDiverResponseOutput, ShapeDiverResponseParameter, ShapeDiverSdk, ShapeDiverSdkConfigType, ShapeDiverResponseModelComputationStatus, ShapeDiverRequestError } from '@shapediver/sdk.geometry-api-sdk-v2'
 import { ISessionTreeNode } from '../interfaces/ISessionTreeNode'
 import { ITree, ITreeNode, Tree, TreeNode } from '@shapediver/viewer.shared.node-tree'
 import { ITaskEvent, TASK_TYPE } from '@shapediver/viewer.shared.types'
@@ -19,7 +18,7 @@ import { Parameter } from './dto/Parameter'
 import { vec3 } from 'gl-matrix'
 import { Export } from './dto/Export'
 import { Output } from './dto/Output'
-import { convert, ISettingsV3_3, latestVersion, validate, versions } from '@shapediver/viewer.settings'
+import { convert, ISettingsV3_4, latestVersion, validate, versions } from '@shapediver/viewer.settings'
 
 export class SessionEngine implements ISessionEngine {
     // #region Properties (40)
@@ -66,11 +65,12 @@ export class SessionEngine implements ISessionEngine {
     private _refreshBearerToken?: () => Promise<string>;
     private _responseDto?: ShapeDiverResponseDto;
     private _retryCounter = 0;
-    private _sdk: ShapeDiverSdk;
+    private _sdk!: ShapeDiverSdk;
     private _sessionId?: string;
     private _updateCallback: ((newNode: ITreeNode, oldNode: ITreeNode) => void) | null = null;
     private _viewerSettings?: object;
     private _viewerSettingsVersion: string = latestVersion;
+    private _viewerSettingsVersionBackend: string = latestVersion;
 
     #customizationProcess!: string;
     #parameterHistory: {
@@ -106,8 +106,12 @@ export class SessionEngine implements ISessionEngine {
         this._headers['X-ShapeDiver-BuildVersion'] = properties.buildVersion;
         this._outputLoader = new OutputLoader(this);
 
-        this._sdk = create(this._modelViewUrl, this._bearerToken);
-        this._sdk.setConfigurationValue(ShapeDiverSdkConfigType.REQUEST_HEADERS, this._headers);
+        try {
+            this._sdk = create(this._modelViewUrl, this._bearerToken);
+            this._sdk.setConfigurationValue(ShapeDiverSdkConfigType.REQUEST_HEADERS, this._headers);
+        } catch (e) {
+            throw this._httpClient.convertError(e);
+        }
     }
 
     // #endregion Constructors (1)
@@ -129,7 +133,11 @@ export class SessionEngine implements ISessionEngine {
 
     public set bearerToken(value: string | undefined) {
         this._bearerToken = value;
-        this._sdk.setConfigurationValue(ShapeDiverSdkConfigType.JWT_TOKEN, value);
+        try {
+            this._sdk.setConfigurationValue(ShapeDiverSdkConfigType.JWT_TOKEN, value);
+        } catch (e) {
+            throw this._httpClient.convertError(e);
+        }
     }
 
     public get canUploadGLTF(): boolean {
@@ -254,7 +262,7 @@ export class SessionEngine implements ISessionEngine {
                 throw new ShapeDiverViewerSettingsError('Session.applySettings: Was not able to validate config object.');
             }
 
-            const settings = <ISettingsV3_3>convert(config, latestVersion);
+            const settings = <ISettingsV3_4>convert(config, latestVersion);
 
             const exportMappingUid: { [key: string]: string | undefined } = {};
             if (sections.session.export.displayname || sections.session.export.order || sections.session.export.hidden)
@@ -335,6 +343,7 @@ export class SessionEngine implements ISessionEngine {
             }
 
             if (sections.viewport.general) {
+                currentSettings.general.defaultMaterialColor = settings.general.defaultMaterialColor;
                 currentSettings.general.commitParameters = settings.general.commitParameters;
                 currentSettings.general.pointSize = settings.general.pointSize;
             }
@@ -345,6 +354,9 @@ export class SessionEngine implements ISessionEngine {
                 currentSettings.environment.clearColor = settings.environment.clearColor;
                 currentSettings.environment.map = settings.environment.map;
                 currentSettings.environment.mapAsBackground = settings.environment.mapAsBackground;
+                currentSettings.environment.rotation = settings.environment.rotation;
+                currentSettings.environment.blurriness = settings.environment.blurriness;
+                currentSettings.environment.intensity = settings.environment.intensity;
             }
     }
 
@@ -464,12 +476,20 @@ export class SessionEngine implements ISessionEngine {
                 this.parameterValues[parameterId] = parameterSet[parameterId].valueString;
             this._logger.info(`Session(${this.id}).customize: Customizing session with parameters ${JSON.stringify(this.parameterValues)}.`);
 
-            const eventRequest: ITaskEvent = { type: TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 0.25, data: { sessionId: this.id }, status: 'Sending customization request' };
+            const eventRequest: ITaskEvent = { type: TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 0.1, data: { sessionId: this.id }, status: 'Sending customization request' };
             this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_PROCESS, eventRequest);
 
-            const newNode = await this.customizeInternal(() => this.#customizationProcess !== customizationId);
-
-            const eventSceneUpdate: ITaskEvent = { type: TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 0.75, data: { sessionId: this.id }, status: 'Updating scene' };
+            const newNode = await this.customizeInternal(() => this.#customizationProcess !== customizationId, {
+                eventId,
+                type: TASK_TYPE.SESSION_CUSTOMIZATION,
+                progressRange: {
+                    min: 0.1,
+                    max: 0.9
+                },
+                data: { sessionId: this.id }
+            });
+
+            const eventSceneUpdate: ITaskEvent = { type: TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 0.9, data: { sessionId: this.id }, status: 'Updating scene' };
             this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_PROCESS, eventSceneUpdate);
 
             // OPTION TO SKIP - PART 2
@@ -537,11 +557,16 @@ export class SessionEngine implements ISessionEngine {
                 if (this._stateEngine.renderingEngines[r].busy.includes(customizationId))
                     this._stateEngine.renderingEngines[r].busy.splice(this._stateEngine.renderingEngines[r].busy.indexOf(customizationId), 1);
 
-            throw e;
+            throw this._httpClient.convertError(e);
         }
     }
 
     public async customizeParallel(parameterValues: { [key: string]: string }): Promise<ITreeNode> {
+            const eventId = this._uuidGenerator.create();
+
+            const eventStart: ITaskEvent = { type: TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 0, data: { sessionId: this.id }, status: 'Customizing session' };
+            this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_START, eventStart);
+
             const parameterSet: {
                 [key: string]: string
             } = {};
@@ -550,8 +575,20 @@ export class SessionEngine implements ISessionEngine {
             for (const parameterId in this.parameters)
                 parameterSet[parameterId] = parameterValues[parameterId] !== undefined ? (' ' + parameterValues[parameterId]).slice(1) : this.parameters[parameterId].stringify()
 
-            const newNode = await this.customizeSession(parameterSet, () => false, true);
+            const newNode = await this.customizeSession(parameterSet, () => false, {
+                eventId,
+                type: TASK_TYPE.SESSION_CUSTOMIZATION,
+                progressRange: {
+                    min: 0.0,
+                    max: 1
+                },
+                data: { sessionId: this.id }
+            }, true);
             newNode.excludeViewports = JSON.parse(JSON.stringify(this._excludeViewports));
+
+            
+            const eventEnd: ITaskEvent = { type: TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 1, data: { sessionId: this.id }, status: 'Session customized' };
+            this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_END, eventEnd);
             return newNode;
     }
 
@@ -620,8 +657,7 @@ export class SessionEngine implements ISessionEngine {
             this._performanceEvaluator.endSection('sessionResponse');
 
             this._viewerSettings = this._responseDto.viewer?.config;
-            this._viewerSettingsVersion = this._responseDto.viewerSettingsVersion || latestVersion;
-            this._settingsEngine.loadSettings(this._viewerSettings);
+            this._viewerSettingsVersionBackend = this._responseDto.viewerSettingsVersion || latestVersion;
             this._sessionId = this._responseDto.sessionId;
             this._modelId = this._responseDto.model?.id;
             
@@ -630,6 +666,8 @@ export class SessionEngine implements ISessionEngine {
                 downloadTexture: this._sdk.asset.downloadImage.bind(this._sdk.asset),
             })
 
+            this._settingsEngine.loadSettings(this._viewerSettings);
+            
             if (!this._sessionId)
                 throw new ShapeDiverViewerSessionError(`Session.init: Initialization of session failed. ResponseDto did not have a sessionId.`)
             if (!this._modelId)
@@ -652,7 +690,7 @@ export class SessionEngine implements ISessionEngine {
      * @param outputs the outputs to load
      * @returns promise with a scene graph node
      */
-     public async loadOutputsParallel(responseDto: ShapeDiverResponseDto, cancelRequest: () => boolean = () => false, retry = false): Promise<ISessionTreeNode> {
+     public async loadOutputsParallel(responseDto: ShapeDiverResponseDto, cancelRequest: () => boolean = () => false, taskEventInfo: OutputLoaderTaskEventInfo, retry = false): Promise<ISessionTreeNode> {
         this.checkAvailability();
 
         let outputs: {
@@ -669,7 +707,7 @@ export class SessionEngine implements ISessionEngine {
         }
 
         try {
-            const node = await this._outputLoader.loadOutputs(this._responseDto!.model?.name || 'model', outputs, outputsFreeze);
+            const node = await this._outputLoader.loadOutputs(this._responseDto!.model?.name || 'model', outputs, outputsFreeze, taskEventInfo);
             node.data.push(new SessionData(responseDto));      
             return node;
         }
@@ -679,7 +717,7 @@ export class SessionEngine implements ISessionEngine {
             } else {
                 await this.handleError(e, retry);
                 if (cancelRequest()) return new SessionTreeNode();
-                return await this.loadOutputsParallel(responseDto, cancelRequest, true);
+                return await this.loadOutputsParallel(responseDto, cancelRequest, taskEventInfo, true);
             }
 
             if (cancelRequest()) return new SessionTreeNode();
@@ -691,11 +729,11 @@ export class SessionEngine implements ISessionEngine {
                 const responseDto = await this._sdk.output.getCache(this._sessionId!, outputMapping);
                 if (cancelRequest()) return new SessionTreeNode();
                 this.updateResponseDto(responseDto);
-                return await this.loadOutputsParallel(responseDto, cancelRequest);
+                return await this.loadOutputsParallel(responseDto, cancelRequest, taskEventInfo);
             } catch (e) {
                 await this.handleError(e, retry);
                 if (cancelRequest()) return new SessionTreeNode();
-                return await this.loadOutputsParallel(responseDto, cancelRequest, true);
+                return await this.loadOutputsParallel(responseDto, cancelRequest, taskEventInfo, true);
             }
         }
     }
@@ -708,13 +746,13 @@ export class SessionEngine implements ISessionEngine {
      * @param outputs the outputs to load
      * @returns promise with a scene graph node
      */
-    public async loadOutputs(cancelRequest: () => boolean = () => false, retry = false): Promise<ISessionTreeNode> {
+    public async loadOutputs(cancelRequest: () => boolean = () => false, taskEventInfo: OutputLoaderTaskEventInfo, retry = false): Promise<ISessionTreeNode> {
         this.checkAvailability();
 
         const o = Object.assign({}, this._outputs);
         const of = Object.assign({}, this._outputsFreeze);
         try {
-            const node = await this._outputLoader.loadOutputs(this._responseDto!.model?.name || 'model', o, of);
+            const node = await this._outputLoader.loadOutputs(this._responseDto!.model?.name || 'model', o, of, taskEventInfo);
             node.data.push(new SessionData(this._responseDto!));
 
             if (cancelRequest()) return node;            
@@ -733,7 +771,7 @@ export class SessionEngine implements ISessionEngine {
             } else {
                 await this.handleError(e, retry);
                 if (cancelRequest()) return new SessionTreeNode();
-                return await this.loadOutputs(cancelRequest, true);
+                return await this.loadOutputs(cancelRequest, taskEventInfo, true);
             }
 
             if (cancelRequest()) return new SessionTreeNode();
@@ -745,11 +783,11 @@ export class SessionEngine implements ISessionEngine {
                 const responseDto = await this._sdk.output.getCache(this._sessionId!, outputMapping);
                 if (cancelRequest()) return new SessionTreeNode();
                 this.updateResponseDto(responseDto);
-                return await this.loadOutputs(cancelRequest);
+                return await this.loadOutputs(cancelRequest, taskEventInfo);
             } catch (e) {
                 await this.handleError(e, retry);
                 if (cancelRequest()) return new SessionTreeNode();
-                return await this.loadOutputs(cancelRequest, true);
+                return await this.loadOutputs(cancelRequest, taskEventInfo, true);
             }
         }
     }
@@ -889,6 +927,11 @@ export class SessionEngine implements ISessionEngine {
         
         try {
             validate(json, <versions>this._viewerSettingsVersion)
+            
+            // if viewer settings version is higher than backend settings version
+            // convert to backend settings version
+            if(+this._viewerSettingsVersion > +this._viewerSettingsVersionBackend) 
+                json = convert(json, <versions>this._viewerSettingsVersionBackend)
         } catch (e) {
             throw new ShapeDiverViewerSettingsError('Session.saveSettings: Settings could not be validated. ' + (<Error>e).message, <Error>e);
         } 
@@ -949,7 +992,7 @@ export class SessionEngine implements ISessionEngine {
             const responseO = Object.values(properties).length !== 0 ? await this.saveOutputProperties(properties) : true;
 
             // save partial settings
-            const response = saveInSettings ? await this.saveSettings(this._settingsEngine.convertToTargetVersion()) : true;
+            const response = saveInSettings ? await this.saveSettings(this._settingsEngine.settings) : true;
 
             if (response && responseP && responseO && responseE) {
                 this._logger.debug(`Session(${this.id}).saveSessionProperties: Saved session properties.`);
@@ -959,12 +1002,17 @@ export class SessionEngine implements ISessionEngine {
             return response && responseP && responseO && responseE;
     }
 
-    public async updateOutputs(): Promise<ITreeNode> {
-        const eventId = this._uuidGenerator.create();
-        const customizationId = this._uuidGenerator.create();
-        const eventStart: ITaskEvent = { type: TASK_TYPE.SESSION_OUTPUTS_UPDATE, id: eventId, progress: 0, data: { sessionId: this.id }, status: 'Updating outputs' };
-        this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_START, eventStart);
+    public async updateOutputs(taskEventInfo?: OutputLoaderTaskEventInfo): Promise<ITreeNode> {
+        const eventId = taskEventInfo ? taskEventInfo.eventId : this._uuidGenerator.create();
+        const eventType = taskEventInfo ? taskEventInfo.type : TASK_TYPE.SESSION_OUTPUTS_UPDATE;
+        const eventData = taskEventInfo ? taskEventInfo.data : { sessionId: this.id };
+
+        if(!taskEventInfo) {
+            const eventStart: ITaskEvent = { type: eventType, id: eventId, progress: 0, data: eventData, status: 'Updating outputs' };
+            this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_START, eventStart);
+        }
 
+        const customizationId = this._uuidGenerator.create();
         const oldNode = this.node.cloneInstance();
         this.#customizationProcess = customizationId;
 
@@ -973,12 +1021,20 @@ export class SessionEngine implements ISessionEngine {
         for (let r in this._stateEngine.renderingEngines)
             this._stateEngine.renderingEngines[r].busy.push(customizationId);
 
-        const eventRequest: ITaskEvent = { type: TASK_TYPE.SESSION_OUTPUTS_UPDATE, id: eventId, progress: 0.25, data: { sessionId: this.id }, status: 'Loading outputs' };
+        const eventRequest: ITaskEvent = { type: eventType, id: eventId, progress: taskEventInfo ? (taskEventInfo.progressRange.max - taskEventInfo.progressRange.min) * 0.1 + taskEventInfo.progressRange.min : 0.1, data: eventData, status: 'Loading outputs' };
         this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_PROCESS, eventRequest);
 
-        const newNode = await this.loadOutputs(() => this.#customizationProcess !== customizationId);
-
-        const eventSceneUpdate: ITaskEvent = { type: TASK_TYPE.SESSION_OUTPUTS_UPDATE, id: eventId, progress: 0.75, data: { sessionId: this.id }, status: 'Updating scene' };
+        const newNode = await this.loadOutputs(() => this.#customizationProcess !== customizationId, {
+            eventId,
+            type: eventType,
+            progressRange: {
+                min: taskEventInfo ? (taskEventInfo.progressRange.max - taskEventInfo.progressRange.min) * 0.1 + taskEventInfo.progressRange.min : 0.1,
+                max: taskEventInfo ? (taskEventInfo.progressRange.max - taskEventInfo.progressRange.min) * 0.9 + taskEventInfo.progressRange.min : 0.9
+            },
+            data: eventData
+        });
+
+        const eventSceneUpdate: ITaskEvent = { type: eventType, id: eventId, progress: taskEventInfo ? (taskEventInfo.progressRange.max - taskEventInfo.progressRange.min) * 0.9 + taskEventInfo.progressRange.min : 0.9, data: eventData, status: 'Updating scene' };
         this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_PROCESS, eventSceneUpdate);
 
         // OPTION TO SKIP - PART 1
@@ -987,7 +1043,7 @@ export class SessionEngine implements ISessionEngine {
                 if (this._stateEngine.renderingEngines[r].busy.includes(customizationId))
                     this._stateEngine.renderingEngines[r].busy.splice(this._stateEngine.renderingEngines[r].busy.indexOf(customizationId), 1);
 
-            const eventCancel1: ITaskEvent = { type: TASK_TYPE.SESSION_OUTPUTS_UPDATE, id: eventId, progress: 1, data: { sessionId: this.id }, status: 'Output updating was exceeded by other customization request' };
+            const eventCancel1: ITaskEvent = { type: eventType, id: eventId, progress: taskEventInfo ? (taskEventInfo.progressRange.max - taskEventInfo.progressRange.min) * 1 + taskEventInfo.progressRange.min : 1, data: eventData, status: 'Output updating was exceeded by other customization request' };
             this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_CANCEL, eventCancel1);
             this._logger.debug(`Session(${this.id}).updateOutputs: Output updating was exceeded by other request.`);
             return newNode;
@@ -1021,9 +1077,11 @@ export class SessionEngine implements ISessionEngine {
                 this._stateEngine.renderingEngines[r].busy.splice(this._stateEngine.renderingEngines[r].busy.indexOf(customizationId), 1);
 
         this._logger.debug(`Session(${this.id}).updateOutputs: Updated outputs.`);
-
-        const eventEnd: ITaskEvent = { type: TASK_TYPE.SESSION_OUTPUTS_UPDATE, id: eventId, progress: 1, data: { sessionId: this.id }, status: 'Outputs updated' };
-        this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_END, eventEnd);
+        
+        if(!taskEventInfo) {
+            const eventEnd: ITaskEvent = { type: eventType, id: eventId, progress: 1, data: eventData, status: 'Outputs updated' };
+            this._eventEngine.emitEvent(EVENTTYPE.TASK.TASK_END, eventEnd);
+        }
 
         return this.node;
     }
@@ -1153,11 +1211,11 @@ export class SessionEngine implements ISessionEngine {
             throw new ShapeDiverViewerSessionError(`Session.checkAvailability: action ${action} not available.`);
     }
 
-    private async customizeInternal(cancelRequest: () => boolean): Promise<ISessionTreeNode> {
-        return this.customizeSession(this._parameterValues, cancelRequest);
+    private async customizeInternal(cancelRequest: () => boolean, taskEventInfo: OutputLoaderTaskEventInfo): Promise<ISessionTreeNode> {
+        return this.customizeSession(this._parameterValues, cancelRequest, taskEventInfo);
     }
 
-    private async customizeSession(parameters: { [key: string]: string }, cancelRequest: () => boolean, parallel = false, retry = false): Promise<ISessionTreeNode> {
+    private async customizeSession(parameters: { [key: string]: string }, cancelRequest: () => boolean, taskEventInfo: OutputLoaderTaskEventInfo, parallel = false, retry = false): Promise<ISessionTreeNode> {
         this.checkAvailability('customize');
         try {
             this._performanceEvaluator.startSection('sessionResponse');
@@ -1165,11 +1223,11 @@ export class SessionEngine implements ISessionEngine {
             this._performanceEvaluator.endSection('sessionResponse');
             if (cancelRequest()) return new SessionTreeNode();            
             if (parallel === false) this.updateResponseDto(responseDto);
-            return parallel === false ? this.loadOutputs(cancelRequest) : this.loadOutputsParallel(responseDto, cancelRequest);
+            return parallel === false ? this.loadOutputs(cancelRequest, taskEventInfo) : this.loadOutputsParallel(responseDto, cancelRequest, taskEventInfo);
         } catch (e) {
             await this.handleError(e, retry);
             if (cancelRequest()) return new SessionTreeNode();
-            return await this.customizeSession(parameters, cancelRequest, parallel, true);
+            return await this.customizeSession(parameters, cancelRequest, taskEventInfo, parallel, true);
         }
     }
 
@@ -1180,6 +1238,7 @@ export class SessionEngine implements ISessionEngine {
                 // we try to re-initialize the session 3 times, if that does not work, we close it
 
                 this._logger.warn(`The session has been closed, trying to re-initialize.`);
+                if(this._sessionId) this._httpClient.removeDataLoading(this._sessionId)
 
                 if (this._retryCounter < 3) {
                     // we retry this 3 times, the `retry` option in the init function is set to true and passed on 
@@ -1190,7 +1249,7 @@ export class SessionEngine implements ISessionEngine {
                     // the retries were exceeded, we close the session
                     this._logger.warn('Tried to retry the connect multiple times, bearer token still not valid. Closing Session.');
                     try { await this._closeOnFailure(); } catch (e) { }
-                    throw e;
+                    throw this._httpClient.convertError(e);
                 }
             } else if (e.error === ShapeDiverResponseErrorType.JWT_VALIDATION_ERROR) {
                 // if any of the above errors occur, we try to get a new bearer token
@@ -1204,19 +1263,19 @@ export class SessionEngine implements ISessionEngine {
                         // no bearer tokens are supplied, we close the session
                         this._logger.warn('No retry possible, no new bearer token was supplied. Closing Session.');
                         try { await this._closeOnFailure(); } catch (e) { }
-                        throw e;
+                        throw this._httpClient.convertError(e);
                     }
                 } else {
                     // the retries were exceeded, we close the session
                     this._logger.warn('Tried to retry the connect multiple times, bearer token still not valid. Closing Session.');
                     try { await this._closeOnFailure(); } catch (e) { }
-                    throw e;
+                    throw this._httpClient.convertError(e);
                 }
             } else {
-                throw e;
+                throw this._httpClient.convertError(e);
             }
         } else {
-            throw e;
+            throw this._httpClient.convertError(e);
         }
     }
 
@@ -1293,8 +1352,22 @@ export class SessionEngine implements ISessionEngine {
                     break;
             }
 
-            if(initialParameters && initialParameters[parameterId] !== undefined) 
-                this.parameters[parameterId].value = initialParameters[parameterId]
+            // we don't have to do larger restrictions for this as the backend would have already thrown an error if the values were not correct
+            if(initialParameters) {
+                // check if the id is within the initial parameters
+                if(initialParameters[parameterId] !== undefined) {
+                    this.parameters[parameterId].value = initialParameters[parameterId] 
+                } 
+                // check if the name is within the initial parameters
+                else if(initialParameters[this.parameters[parameterId].name] !== undefined) {
+                    this.parameters[parameterId].value = initialParameters[this.parameters[parameterId].name];
+                } 
+                // NOTE: At some point the checking may also be done with the displayname, this is the code for it
+                // // check if the displayname is within the initial parameters
+                // else if(this.parameters[parameterId].displayname && initialParameters[this.parameters[parameterId].displayname!] !== undefined) {
+                //     this.parameters[parameterId].value = initialParameters[this.parameters[parameterId].displayname!];
+                // }
+            }
 
             parameterSet[parameterId] = {
                 value: this.parameters[parameterId].value,

package/src/implementation/dto/Export.ts

@@ -1,5 +1,5 @@
 import { ShapeDiverResponseExport, ShapeDiverResponseExportContent, ShapeDiverResponseExportDefinitionType, ShapeDiverResponseExportResult, ShapeDiverResponseModelComputationStatus, ShapeDiverResponseParameterGroup } from "@shapediver/sdk.geometry-api-sdk-v2";
-import { EventEngine, EVENTTYPE, InputValidator, Logger, ShapeDiverBackendError, ShapeDiverViewerError, UuidGenerator } from "@shapediver/viewer.shared.services";
+import { EventEngine, EVENTTYPE, InputValidator, Logger, UuidGenerator } from "@shapediver/viewer.shared.services";
 import { ITaskEvent, TASK_TYPE } from "@shapediver/viewer.shared.types";
 import { IExport } from "../../interfaces/dto/IExport";
 import { SessionEngine } from "../SessionEngine";

package/src/implementation/dto/Output.ts

@@ -1,6 +1,6 @@
 import { ShapeDiverResponseModelComputationStatus, ShapeDiverResponseOutput } from "@shapediver/sdk.geometry-api-sdk-v2";
 import { ITreeNode, TreeNode } from "@shapediver/viewer.shared.node-tree";
-import { InputValidator, UuidGenerator, ShapeDiverViewerError, ShapeDiverBackendError, Logger } from "@shapediver/viewer.shared.services";
+import { InputValidator, UuidGenerator, Logger } from "@shapediver/viewer.shared.services";
 import { IOutput, ShapeDiverResponseOutputContent, ShapeDiverResponseOutputChunk } from "../../interfaces/dto/IOutput";
 import { SessionEngine } from "../SessionEngine";
 

package/src/interfaces/ISessionEngine.ts

@@ -1,6 +1,7 @@
 import { ShapeDiverRequestGltfUploadQueryConversion, ShapeDiverResponseDto, ShapeDiverResponseExport, ShapeDiverResponseOutput, ShapeDiverResponseParameter } from '@shapediver/sdk.geometry-api-sdk-v2';
 import { ITreeNode, TreeNode } from '@shapediver/viewer.shared.node-tree'
 import { SettingsEngine } from '@shapediver/viewer.shared.services';
+import { OutputLoaderTaskEventInfo } from '../implementation/OutputLoader';
 import { IExport } from './dto/IExport';
 import { IOutput } from './dto/IOutput';
 import { IParameter } from './dto/IParameter';
@@ -126,14 +127,14 @@ export interface ISessionEngine {
   goBack(): Promise<ITreeNode>;
   goForward(): Promise<ITreeNode>;
   init(parameterValues?: { [key: string]: string; }): Promise<void>;
-  loadOutputs(cancelRequest: () => boolean): Promise<ITreeNode>;
-  loadOutputsParallel(responseDto: ShapeDiverResponseDto, cancelRequest: () => boolean): Promise<ITreeNode>;
+  loadOutputs(cancelRequest: () => boolean, taskEventInfo: OutputLoaderTaskEventInfo): Promise<ITreeNode>;
+  loadOutputsParallel(responseDto: ShapeDiverResponseDto, cancelRequest: () => boolean, taskEventInfo: OutputLoaderTaskEventInfo): Promise<ITreeNode>;
   requestExport(exportId: string, parameters: { [key: string]: string }, maxWaitTime: number): Promise<ShapeDiverResponseExport>;
   resetSettings(sections?: ISettingsSections): void;
   saveDefaultParameterValues(): Promise<boolean>;
   saveSettings(viewportId?: string): Promise<boolean>;
   saveUiProperties(): Promise<boolean>;
-  updateOutputs(): Promise<ITreeNode>;
+  updateOutputs(taskEventInfo?: OutputLoaderTaskEventInfo): Promise<ITreeNode>;
   uploadFile(parameterId: string, data: File, type: string): Promise<string>;
   uploadGLTF(blob: Blob, conversion?: ShapeDiverRequestGltfUploadQueryConversion): Promise<ShapeDiverResponseDto>;