@shapediver/viewer.session-engine.session-engine 2.7.10 → 2.8.0

package/dist/implementation/SessionEngine.js

@@ -22,7 +22,6 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var _SessionEngine_customizationProcess, _SessionEngine_parameterHistory, _SessionEngine_parameterHistoryCall, _SessionEngine_parameterHistoryForward;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SessionEngine = void 0;
-const tsyringe_1 = require("tsyringe");
 const viewer_shared_services_1 = require("@shapediver/viewer.shared.services");
 const OutputDelayException_1 = require("./OutputDelayException");
 const OutputLoader_1 = require("./OutputLoader");
@@ -46,21 +45,21 @@ class SessionEngine {
      */
     constructor(properties) {
         // #region Properties (40)
-        this._converter = tsyringe_1.container.resolve(viewer_shared_services_1.Converter);
-        this._eventEngine = tsyringe_1.container.resolve(viewer_shared_services_1.EventEngine);
+        this._converter = viewer_shared_services_1.Converter.instance;
+        this._eventEngine = viewer_shared_services_1.EventEngine.instance;
         this._exports = {};
-        this._httpClient = tsyringe_1.container.resolve(viewer_shared_services_1.HttpClient);
-        this._logger = tsyringe_1.container.resolve(viewer_shared_services_1.Logger);
+        this._httpClient = viewer_shared_services_1.HttpClient.instance;
+        this._logger = viewer_shared_services_1.Logger.instance;
         this._outputs = {};
         this._outputsFreeze = {};
         this._parameterValues = {};
         this._parameters = {};
-        this._performanceEvaluator = tsyringe_1.container.resolve(viewer_shared_services_1.PerformanceEvaluator);
-        this._sceneTree = tsyringe_1.container.resolve(viewer_shared_node_tree_1.Tree);
-        this._sessionEngineId = tsyringe_1.container.resolve(viewer_shared_services_1.UuidGenerator).create();
+        this._performanceEvaluator = viewer_shared_services_1.PerformanceEvaluator.instance;
+        this._sceneTree = viewer_shared_node_tree_1.Tree.instance;
+        this._sessionEngineId = (viewer_shared_services_1.UuidGenerator.instance).create();
         this._settingsEngine = new viewer_shared_services_1.SettingsEngine();
-        this._stateEngine = tsyringe_1.container.resolve(viewer_shared_services_1.StateEngine);
-        this._uuidGenerator = tsyringe_1.container.resolve(viewer_shared_services_1.UuidGenerator);
+        this._stateEngine = viewer_shared_services_1.StateEngine.instance;
+        this._uuidGenerator = viewer_shared_services_1.UuidGenerator.instance;
         this._automaticSceneUpdate = true;
         this._closeOnFailure = () => __awaiter(this, void 0, void 0, function* () { });
         this._closed = false;
@@ -68,7 +67,7 @@ class SessionEngine {
         this._dataCache = {};
         this._excludeViewports = [];
         this._headers = {
-            "X-ShapeDiver-Origin": tsyringe_1.container.resolve(viewer_shared_services_1.SystemInfo).origin,
+            "X-ShapeDiver-Origin": (viewer_shared_services_1.SystemInfo.instance).origin,
             "X-ShapeDiver-SessionEngineId": this._sessionEngineId,
             "X-ShapeDiver-BuildVersion": '',
             "X-ShapeDiver-BuildDate": ''
@@ -100,7 +99,7 @@ class SessionEngine {
     }
     set automaticSceneUpdate(value) {
         this._automaticSceneUpdate = value;
-        value ? this._sceneTree.addNode(this._node) : this._sceneTree.removeNode(this._node);
+        value ? this.addToSceneTree(this._node) : this.removeFromSceneTree(this._node);
     }
     get bearerToken() {
         return this._bearerToken;
@@ -182,129 +181,120 @@ class SessionEngine {
     // #endregion Public Accessors (23)
     // #region Public Methods (22)
     applySettings(response, sections) {
+        sections = sections || {};
+        if (sections.session === undefined) {
+            sections.session = {
+                parameter: { displayname: false, order: false, hidden: false },
+                export: { displayname: false, order: false, hidden: false }
+            };
+        }
+        if (sections.session.parameter === undefined)
+            sections.session.parameter = { displayname: false, order: false, hidden: false, value: false };
+        if (sections.session.export === undefined)
+            sections.session.export = { displayname: false, order: false, hidden: false };
+        if (sections.viewport === undefined)
+            sections.viewport = { ar: false, scene: false, camera: false, light: false, environment: false, general: false };
+        let config;
+        if (response.viewer !== undefined) {
+            config = response.viewer.config;
+        }
+        else {
+            throw new viewer_shared_services_1.ShapeDiverViewerSettingsError('Session.applySettings: No config object available.');
+        }
         try {
-            sections = sections || {};
-            if (sections.session === undefined) {
-                sections.session = {
-                    parameter: { displayname: false, order: false, hidden: false },
-                    export: { displayname: false, order: false, hidden: false }
-                };
-            }
-            if (sections.session.parameter === undefined)
-                sections.session.parameter = { displayname: false, order: false, hidden: false, value: false };
-            if (sections.session.export === undefined)
-                sections.session.export = { displayname: false, order: false, hidden: false };
-            if (sections.viewport === undefined)
-                sections.viewport = { ar: false, scene: false, camera: false, light: false, environment: false, general: false };
-            let config;
-            if (response.viewer !== undefined) {
-                config = response.viewer.config;
-            }
-            else {
-                const error = new viewer_shared_services_1.ShapeDiverViewerSettingsError('Session.applySettings: No config object available.');
-                throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SETTINGS, 'Session.applySettings', error);
-            }
-            try {
-                (0, viewer_settings_1.validate)(config);
-            }
-            catch (e) {
-                const error = new viewer_shared_services_1.ShapeDiverViewerSettingsError('Session.applySettings: Was not able to validate config object.');
-                throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SETTINGS, 'Session.applySettings', error);
-            }
-            const settings = (0, viewer_settings_1.convert)(config, viewer_settings_1.latestVersion);
-            const exportMappingUid = {};
-            if (sections.session.export.displayname || sections.session.export.order || sections.session.export.hidden)
-                if (response.exports)
-                    for (let exportId in response.exports)
-                        if (response.exports[exportId].uid !== undefined)
-                            exportMappingUid[response.exports[exportId].uid] = exportId;
-            const currentSettings = this._settingsEngine.settings;
-            // apply parameter settings
-            if (sections.session.parameter.displayname || sections.session.parameter.order || sections.session.parameter.hidden || sections.session.parameter.value) {
-                for (let p in this.parameters) {
-                    if (settings.session[p]) {
-                        if (sections.session.parameter.displayname)
-                            this.parameters[p].displayname = settings.session[p].displayname;
-                        if (sections.session.parameter.order)
-                            this.parameters[p].order = settings.session[p].order;
-                        if (sections.session.parameter.hidden)
-                            this.parameters[p].hidden = settings.session[p].hidden || false;
-                    }
-                    if (response.parameters && response.parameters[p]) {
-                        if (sections.session.parameter.value)
-                            this.parameters[p].value = response.parameters[p].defval !== undefined ? response.parameters[p].defval : this.parameters[p].value;
-                    }
+            (0, viewer_settings_1.validate)(config);
+        }
+        catch (e) {
+            throw new viewer_shared_services_1.ShapeDiverViewerSettingsError('Session.applySettings: Was not able to validate config object.');
+        }
+        const settings = (0, viewer_settings_1.convert)(config, viewer_settings_1.latestVersion);
+        const exportMappingUid = {};
+        if (sections.session.export.displayname || sections.session.export.order || sections.session.export.hidden)
+            if (response.exports)
+                for (let exportId in response.exports)
+                    if (response.exports[exportId].uid !== undefined)
+                        exportMappingUid[response.exports[exportId].uid] = exportId;
+        const currentSettings = this._settingsEngine.settings;
+        // apply parameter settings
+        if (sections.session.parameter.displayname || sections.session.parameter.order || sections.session.parameter.hidden || sections.session.parameter.value) {
+            for (let p in this.parameters) {
+                if (settings.session[p]) {
+                    if (sections.session.parameter.displayname)
+                        this.parameters[p].displayname = settings.session[p].displayname;
+                    if (sections.session.parameter.order)
+                        this.parameters[p].order = settings.session[p].order;
+                    if (sections.session.parameter.hidden)
+                        this.parameters[p].hidden = settings.session[p].hidden || false;
                 }
-            }
-            // apply export settings
-            if (sections.session.export.displayname || sections.session.export.order || sections.session.export.hidden) {
-                for (let p in this.exports) {
-                    let idForSettings = '';
-                    if (settings.session[p]) {
-                        idForSettings = p;
-                    }
-                    else {
-                        const uid = this.exports[p].uid;
-                        if (!uid)
-                            continue;
-                        if (!exportMappingUid[uid])
-                            continue;
-                        idForSettings = exportMappingUid[uid];
-                    }
-                    if (settings.session[idForSettings]) {
-                        if (sections.session.export.displayname)
-                            this.exports[p].displayname = settings.session[idForSettings].displayname;
-                        if (sections.session.export.order)
-                            this.exports[p].order = settings.session[idForSettings].order;
-                        if (sections.session.export.hidden)
-                            this.exports[p].hidden = settings.session[idForSettings].hidden || false;
-                    }
+                if (response.parameters && response.parameters[p]) {
+                    if (sections.session.parameter.value)
+                        this.parameters[p].value = response.parameters[p].defval !== undefined ? response.parameters[p].defval : this.parameters[p].value;
                 }
             }
-            // apply ar settings
-            if (sections.viewport.ar) {
-                currentSettings.ar = settings.ar;
-                currentSettings.general.transformation = settings.general.transformation;
-            }
-            // apply camera settings
-            if (sections.viewport.camera)
-                currentSettings.camera = settings.camera;
-            // apply light settings
-            if (sections.viewport.light)
-                currentSettings.light = settings.light;
-            // apply scene settings
-            if (sections.viewport.scene) {
-                currentSettings.environmentGeometry.gridColor = settings.environmentGeometry.gridColor;
-                currentSettings.environmentGeometry.gridVisibility = settings.environmentGeometry.gridVisibility;
-                currentSettings.environmentGeometry.groundPlaneColor = settings.environmentGeometry.groundPlaneColor;
-                currentSettings.environmentGeometry.groundPlaneVisibility = settings.environmentGeometry.groundPlaneVisibility;
-                currentSettings.environmentGeometry.groundPlaneColor = settings.environmentGeometry.groundPlaneColor;
-                currentSettings.environmentGeometry.groundPlaneShadowColor = settings.environmentGeometry.groundPlaneShadowColor;
-                currentSettings.rendering.shadows = settings.rendering.shadows;
-                currentSettings.rendering.ambientOcclusion = settings.rendering.ambientOcclusion;
-                currentSettings.rendering.automaticColorAdjustment = settings.rendering.automaticColorAdjustment;
-                currentSettings.rendering.textureEncoding = settings.rendering.textureEncoding;
-                currentSettings.rendering.outputEncoding = settings.rendering.outputEncoding;
-                currentSettings.rendering.physicallyCorrectLights = settings.rendering.physicallyCorrectLights;
-                currentSettings.rendering.toneMapping = settings.rendering.toneMapping;
-                currentSettings.rendering.toneMappingExposure = settings.rendering.toneMappingExposure;
-            }
-            if (sections.viewport.general) {
-                currentSettings.general.commitParameters = settings.general.commitParameters;
-                currentSettings.general.pointSize = settings.general.pointSize;
-            }
-            // apply environment settings
-            if (sections.viewport.environment) {
-                currentSettings.environment.clearAlpha = settings.environment.clearAlpha;
-                currentSettings.environment.clearColor = settings.environment.clearColor;
-                currentSettings.environment.map = settings.environment.map;
-                currentSettings.environment.mapAsBackground = settings.environment.mapAsBackground;
+        }
+        // apply export settings
+        if (sections.session.export.displayname || sections.session.export.order || sections.session.export.hidden) {
+            for (let p in this.exports) {
+                let idForSettings = '';
+                if (settings.session[p]) {
+                    idForSettings = p;
+                }
+                else {
+                    const uid = this.exports[p].uid;
+                    if (!uid)
+                        continue;
+                    if (!exportMappingUid[uid])
+                        continue;
+                    idForSettings = exportMappingUid[uid];
+                }
+                if (settings.session[idForSettings]) {
+                    if (sections.session.export.displayname)
+                        this.exports[p].displayname = settings.session[idForSettings].displayname;
+                    if (sections.session.export.order)
+                        this.exports[p].order = settings.session[idForSettings].order;
+                    if (sections.session.export.hidden)
+                        this.exports[p].hidden = settings.session[idForSettings].hidden || false;
+                }
             }
         }
-        catch (e) {
-            if (e instanceof viewer_shared_services_1.ShapeDiverViewerError || e instanceof sdk_geometry_api_sdk_v2_1.ShapeDiverError)
-                throw e;
-            throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.GENERAL, 'Session.applySettings', e);
+        // apply ar settings
+        if (sections.viewport.ar) {
+            currentSettings.ar = settings.ar;
+            currentSettings.general.transformation = settings.general.transformation;
+        }
+        // apply camera settings
+        if (sections.viewport.camera)
+            currentSettings.camera = settings.camera;
+        // apply light settings
+        if (sections.viewport.light)
+            currentSettings.light = settings.light;
+        // apply scene settings
+        if (sections.viewport.scene) {
+            currentSettings.environmentGeometry.gridColor = settings.environmentGeometry.gridColor;
+            currentSettings.environmentGeometry.gridVisibility = settings.environmentGeometry.gridVisibility;
+            currentSettings.environmentGeometry.groundPlaneColor = settings.environmentGeometry.groundPlaneColor;
+            currentSettings.environmentGeometry.groundPlaneVisibility = settings.environmentGeometry.groundPlaneVisibility;
+            currentSettings.environmentGeometry.groundPlaneColor = settings.environmentGeometry.groundPlaneColor;
+            currentSettings.environmentGeometry.groundPlaneShadowColor = settings.environmentGeometry.groundPlaneShadowColor;
+            currentSettings.rendering.shadows = settings.rendering.shadows;
+            currentSettings.rendering.ambientOcclusion = settings.rendering.ambientOcclusion;
+            currentSettings.rendering.automaticColorAdjustment = settings.rendering.automaticColorAdjustment;
+            currentSettings.rendering.textureEncoding = settings.rendering.textureEncoding;
+            currentSettings.rendering.outputEncoding = settings.rendering.outputEncoding;
+            currentSettings.rendering.physicallyCorrectLights = settings.rendering.physicallyCorrectLights;
+            currentSettings.rendering.toneMapping = settings.rendering.toneMapping;
+            currentSettings.rendering.toneMappingExposure = settings.rendering.toneMappingExposure;
+        }
+        if (sections.viewport.general) {
+            currentSettings.general.commitParameters = settings.general.commitParameters;
+            currentSettings.general.pointSize = settings.general.pointSize;
+        }
+        // apply environment settings
+        if (sections.viewport.environment) {
+            currentSettings.environment.clearAlpha = settings.environment.clearAlpha;
+            currentSettings.environment.clearColor = settings.environment.clearColor;
+            currentSettings.environment.map = settings.environment.map;
+            currentSettings.environment.mapAsBackground = settings.environment.mapAsBackground;
         }
     }
     canGoBack() {
@@ -322,11 +312,11 @@ class SessionEngine {
                 this._httpClient.removeDataLoading(this._sessionId);
                 yield this._sdk.session.close(this._sessionId);
                 if (this._automaticSceneUpdate)
-                    this._sceneTree.removeNode(this._node);
+                    this.removeFromSceneTree(this._node);
                 this._closed = true;
             }
             catch (e) {
-                yield this.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.close', e, retry);
+                yield this.handleError(e, retry);
                 return yield this.close(true);
             }
         });
@@ -355,7 +345,7 @@ class SessionEngine {
                 this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_START, eventStart);
                 const oldNode = this.node.cloneInstance();
                 __classPrivateFieldSet(this, _SessionEngine_customizationProcess, customizationId, "f");
-                this._logger.debugLow(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).customize: Customizing session.`);
+                this._logger.debugLow(`Session(${this.id}).customize: Customizing session.`);
                 for (let r in this._stateEngine.renderingEngines)
                     this._stateEngine.renderingEngines[r].busy.push(customizationId);
                 const eventFileUpload = { type: viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 0.1, data: { sessionId: this.id }, status: 'Uploading file parameters' };
@@ -370,7 +360,7 @@ class SessionEngine {
                             for (let r in this._stateEngine.renderingEngines)
                                 if (this._stateEngine.renderingEngines[r].busy.includes(customizationId))
                                     this._stateEngine.renderingEngines[r].busy.splice(this._stateEngine.renderingEngines[r].busy.indexOf(customizationId), 1);
-                            this._logger.debug(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).customize: Session customization was exceeded by other customization request.`);
+                            this._logger.debug(`Session(${this.id}).customize: Session customization was exceeded by other customization request.`);
                             const eventCancel1a = { type: viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 1, data: { sessionId: this.id }, status: 'Session customization was exceeded by other customization request' };
                             this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_CANCEL, eventCancel1a);
                             return new SessionTreeNode_1.SessionTreeNode();
@@ -384,7 +374,7 @@ class SessionEngine {
                             this._stateEngine.renderingEngines[r].busy.splice(this._stateEngine.renderingEngines[r].busy.indexOf(customizationId), 1);
                     const eventCancel1b = { type: viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 1, data: { sessionId: this.id }, status: 'Session customization was exceeded by other customization request' };
                     this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_CANCEL, eventCancel1b);
-                    this._logger.debug(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).customize: Session customization was exceeded by other customization request.`);
+                    this._logger.debug(`Session(${this.id}).customize: Session customization was exceeded by other customization request.`);
                     return new SessionTreeNode_1.SessionTreeNode();
                 }
                 // assign the uploaded parameters
@@ -401,7 +391,7 @@ class SessionEngine {
                 // update the session engine parameter values if everything succeeded
                 for (const parameterId in this.parameters)
                     this.parameterValues[parameterId] = parameterSet[parameterId].valueString;
-                this._logger.info(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).customize: Customizing session with parameters ${JSON.stringify(this.parameterValues)}.`);
+                this._logger.info(`Session(${this.id}).customize: Customizing session with parameters ${JSON.stringify(this.parameterValues)}.`);
                 const eventRequest = { type: viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 0.25, data: { sessionId: this.id }, status: 'Sending customization request' };
                 this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_PROCESS, eventRequest);
                 const newNode = yield this.customizeInternal(() => __classPrivateFieldGet(this, _SessionEngine_customizationProcess, "f") !== customizationId);
@@ -414,7 +404,7 @@ class SessionEngine {
                             this._stateEngine.renderingEngines[r].busy.splice(this._stateEngine.renderingEngines[r].busy.indexOf(customizationId), 1);
                     const eventCancel2 = { type: viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 1, data: { sessionId: this.id }, status: 'Session customization was exceeded by other customization request' };
                     this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_CANCEL, eventCancel2);
-                    this._logger.debug(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).customize: Session customization was exceeded by other customization request.`);
+                    this._logger.debug(`Session(${this.id}).customize: Session customization was exceeded by other customization request.`);
                     return newNode;
                 }
                 // if this is not a call by the goBack or goForward functions, add the parameter values to the history and delete the forward history
@@ -423,11 +413,11 @@ class SessionEngine {
                     __classPrivateFieldSet(this, _SessionEngine_parameterHistoryForward, [], "f");
                 }
                 if (this.automaticSceneUpdate)
-                    this._sceneTree.removeNode(this.node);
+                    this.removeFromSceneTree(this.node);
                 this._node = newNode;
                 if (this.automaticSceneUpdate)
-                    this._sceneTree.addNode(this.node);
-                this._logger.debug(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).customize: Customization request finished, updating geometry.`);
+                    this.addToSceneTree(this.node);
+                this._logger.debug(`Session(${this.id}).customize: Customization request finished, updating geometry.`);
                 // set the session values to the current ones in all parameters
                 for (const parameterId in this.parameters)
                     this.parameters[parameterId].sessionValue = parameterSet[parameterId].value;
@@ -444,7 +434,7 @@ class SessionEngine {
                 for (let r in this._stateEngine.renderingEngines)
                     if (this._stateEngine.renderingEngines[r].busy.includes(customizationId))
                         this._stateEngine.renderingEngines[r].busy.splice(this._stateEngine.renderingEngines[r].busy.indexOf(customizationId), 1);
-                this._logger.debug(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).customize: Session customized.`);
+                this._logger.debug(`Session(${this.id}).customize: Session customized.`);
                 this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.SESSION.SESSION_CUSTOMIZED, { sessionId: this.id });
                 const eventEnd = { type: viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 1, data: { sessionId: this.id }, status: 'Session customized' };
                 this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_END, eventEnd);
@@ -456,34 +446,25 @@ class SessionEngine {
                 for (let r in this._stateEngine.renderingEngines)
                     if (this._stateEngine.renderingEngines[r].busy.includes(customizationId))
                         this._stateEngine.renderingEngines[r].busy.splice(this._stateEngine.renderingEngines[r].busy.indexOf(customizationId), 1);
-                if (e instanceof viewer_shared_services_1.ShapeDiverViewerError || e instanceof sdk_geometry_api_sdk_v2_1.ShapeDiverError)
-                    throw e;
-                throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).customize`, e);
+                throw e;
             }
         });
     }
     customizeParallel(parameterValues) {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const parameterSet = {};
-                // create a set of the current validated parameter values
-                for (const parameterId in this.parameters)
-                    parameterSet[parameterId] = parameterValues[parameterId] !== undefined ? (' ' + parameterValues[parameterId]).slice(1) : this.parameters[parameterId].stringify();
-                const newNode = yield this.customizeSession(parameterSet, () => false, true);
-                newNode.excludeViewports = JSON.parse(JSON.stringify(this._excludeViewports));
-                return newNode;
-            }
-            catch (e) {
-                if (e instanceof viewer_shared_services_1.ShapeDiverViewerError || e instanceof sdk_geometry_api_sdk_v2_1.ShapeDiverError)
-                    throw e;
-                throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).customize`, e);
-            }
+            const parameterSet = {};
+            // create a set of the current validated parameter values
+            for (const parameterId in this.parameters)
+                parameterSet[parameterId] = parameterValues[parameterId] !== undefined ? (' ' + parameterValues[parameterId]).slice(1) : this.parameters[parameterId].stringify();
+            const newNode = yield this.customizeSession(parameterSet, () => false, true);
+            newNode.excludeViewports = JSON.parse(JSON.stringify(this._excludeViewports));
+            return newNode;
         });
     }
     goBack() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.canGoBack()) {
-                this._logger.debug(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).goBack: Cannot go further back.`);
+                this._logger.debug(`Session(${this.id}).goBack: Cannot go further back.`);
                 return new viewer_shared_node_tree_1.TreeNode();
             }
             // get the current parameter set and store it in the forward history later on
@@ -504,7 +485,7 @@ class SessionEngine {
     goForward() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.canGoForward()) {
-                this._logger.debug(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).goForward: Cannot go further forward.`);
+                this._logger.debug(`Session(${this.id}).goForward: Cannot go further forward.`);
                 return new viewer_shared_node_tree_1.TreeNode();
             }
             // get the last undone parameter set and apply the values to the parameters
@@ -528,10 +509,8 @@ class SessionEngine {
     init(parameterValues, retry = false) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._initialized === true) {
-                const error = new viewer_shared_services_1.ShapeDiverViewerSessionError('Session.init: Session already initialized.');
-                throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.init', error);
-            }
+            if (this._initialized === true)
+                throw new viewer_shared_services_1.ShapeDiverViewerSessionError('Session.init: Session already initialized.');
             try {
                 this._performanceEvaluator.startSection('sessionResponse');
                 const parameterSet = {};
@@ -556,7 +535,7 @@ class SessionEngine {
                 this._initialized = true;
             }
             catch (e) {
-                yield this.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.init', e, retry);
+                yield this.handleError(e, retry);
                 return yield this.init(parameterValues, true);
             }
         });
@@ -591,7 +570,7 @@ class SessionEngine {
                     yield this.timeout(e.delay);
                 }
                 else {
-                    yield this.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.loadOutputsParallel', e, retry);
+                    yield this.handleError(e, retry);
                     if (cancelRequest())
                         return new SessionTreeNode_1.SessionTreeNode();
                     return yield this.loadOutputsParallel(responseDto, cancelRequest, true);
@@ -609,7 +588,7 @@ class SessionEngine {
                     return yield this.loadOutputsParallel(responseDto, cancelRequest);
                 }
                 catch (e) {
-                    yield this.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.loadOutputsParallel', e, retry);
+                    yield this.handleError(e, retry);
                     if (cancelRequest())
                         return new SessionTreeNode_1.SessionTreeNode();
                     return yield this.loadOutputsParallel(responseDto, cancelRequest, true);
@@ -637,10 +616,10 @@ class SessionEngine {
                 if (cancelRequest())
                     return node;
                 if (this._automaticSceneUpdate)
-                    this._sceneTree.removeNode(this._node);
+                    this.removeFromSceneTree(this._node);
                 this._node = node;
                 if (this._automaticSceneUpdate)
-                    this._sceneTree.addNode(this._node);
+                    this.addToSceneTree(this._node);
                 this.node.excludeViewports = JSON.parse(JSON.stringify(this._excludeViewports));
                 return node;
             }
@@ -649,7 +628,7 @@ class SessionEngine {
                     yield this.timeout(e.delay);
                 }
                 else {
-                    yield this.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.loadOutputs', e, retry);
+                    yield this.handleError(e, retry);
                     if (cancelRequest())
                         return new SessionTreeNode_1.SessionTreeNode();
                     return yield this.loadOutputs(cancelRequest, true);
@@ -667,7 +646,7 @@ class SessionEngine {
                     return yield this.loadOutputs(cancelRequest);
                 }
                 catch (e) {
-                    yield this.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.loadOutputs', e, retry);
+                    yield this.handleError(e, retry);
                     if (cancelRequest())
                         return new SessionTreeNode_1.SessionTreeNode();
                     return yield this.loadOutputs(cancelRequest, true);
@@ -687,57 +666,40 @@ class SessionEngine {
                 return this.exports[exportId];
             }
             catch (e) {
-                yield this.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.requestExport', e, retry);
+                yield this.handleError(e, retry);
                 return yield this.requestExport(exportId, parameters, maxWaitTime, true);
             }
         });
     }
     resetSettings(sections) {
-        if (!this._responseDto) {
-            const error = new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.resetSettings: responseDto not available.`);
-            throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.resetSettings', error);
-        }
-        try {
-            sections = sections || {};
-            if (sections.session === undefined) {
-                sections.session = {
-                    parameter: { displayname: true, order: true, hidden: true },
-                    export: { displayname: true, order: true, hidden: true }
-                };
-            }
-            if (sections.session.parameter === undefined)
-                sections.session.parameter = { displayname: true, order: true, hidden: true, value: true };
-            if (sections.session.export === undefined)
-                sections.session.export = { displayname: true, order: true, hidden: true };
-            if (sections.viewport === undefined)
-                sections.viewport = { ar: true, scene: true, camera: true, light: true, environment: true, general: true };
-            return this.applySettings(this._responseDto, sections);
-        }
-        catch (e) {
-            if (e instanceof viewer_shared_services_1.ShapeDiverViewerError || e instanceof sdk_geometry_api_sdk_v2_1.ShapeDiverError)
-                throw e;
-            throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.GENERAL, 'Session.resetSettings', e);
+        if (!this._responseDto)
+            throw new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.resetSettings: responseDto not available.`);
+        sections = sections || {};
+        if (sections.session === undefined) {
+            sections.session = {
+                parameter: { displayname: true, order: true, hidden: true },
+                export: { displayname: true, order: true, hidden: true }
+            };
         }
+        if (sections.session.parameter === undefined)
+            sections.session.parameter = { displayname: true, order: true, hidden: true, value: true };
+        if (sections.session.export === undefined)
+            sections.session.export = { displayname: true, order: true, hidden: true };
+        if (sections.viewport === undefined)
+            sections.viewport = { ar: true, scene: true, camera: true, light: true, environment: true, general: true };
+        return this.applySettings(this._responseDto, sections);
     }
     saveDefaultParameterValues() {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                this._logger.debugLow(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).saveDefaultParameters: Saving default parameters.`);
-                const response = yield this.saveDefaultParameters();
-                if (response) {
-                    this._logger.debug(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).saveDefaultParameters: Saved default parameters.`);
-                }
-                else {
-                    const error = new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session(${this.id}).saveDefaultParameters: Could not save default parameters.`);
-                    throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).saveDefaultParameters`, error);
-                }
-                return response;
+            this._logger.debugLow(`Session(${this.id}).saveDefaultParameters: Saving default parameters.`);
+            const response = yield this.saveDefaultParameters();
+            if (response) {
+                this._logger.debug(`Session(${this.id}).saveDefaultParameters: Saved default parameters.`);
             }
-            catch (e) {
-                if (e instanceof viewer_shared_services_1.ShapeDiverViewerError || e instanceof sdk_geometry_api_sdk_v2_1.ShapeDiverError)
-                    throw e;
-                throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).saveDefaultParameters`, e);
+            else {
+                throw new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session(${this.id}).saveDefaultParameters: Could not save default parameters.`);
             }
+            return response;
         });
     }
     saveDefaultParameters(retry = false) {
@@ -748,7 +710,7 @@ class SessionEngine {
                 return true;
             }
             catch (e) {
-                yield this.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.saveDefaultParameters', e, retry);
+                yield this.handleError(e, retry);
                 return yield this.saveDefaultParameters(true);
             }
         });
@@ -767,7 +729,7 @@ class SessionEngine {
                 return true;
             }
             catch (e) {
-                yield this.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.saveExportProperties', e, retry);
+                yield this.handleError(e, retry);
                 return yield this.saveExportProperties(exports, true);
             }
         });
@@ -786,7 +748,7 @@ class SessionEngine {
                 return true;
             }
             catch (e) {
-                yield this.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.saveOutputProperties', e, retry);
+                yield this.handleError(e, retry);
                 return yield this.saveOutputProperties(outputs, true);
             }
         });
@@ -805,7 +767,7 @@ class SessionEngine {
                 return true;
             }
             catch (e) {
-                yield this.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.saveParameterProperties', e, retry);
+                yield this.handleError(e, retry);
                 return yield this.saveParameterProperties(parameters, true);
             }
         });
@@ -817,70 +779,62 @@ class SessionEngine {
                 (0, viewer_settings_1.validate)(json, this._viewerSettingsVersion);
             }
             catch (e) {
-                const error = new viewer_shared_services_1.ShapeDiverViewerSettingsError('Session.saveSettings: Settings could not be validated. ' + e.message, e);
-                throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SETTINGS, 'Session.applySettings', error);
+                throw new viewer_shared_services_1.ShapeDiverViewerSettingsError('Session.saveSettings: Settings could not be validated. ' + e.message, e);
             }
             try {
                 yield this._sdk.model.updateConfig(this._modelId, json);
                 return true;
             }
             catch (e) {
-                yield this.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.saveSettings', e, retry);
+                yield this.handleError(e, retry);
                 return yield this.saveSettings(json, true);
             }
         });
     }
     saveUiProperties(saveInSettings = true) {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                this._logger.debugLow(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).saveSessionProperties: Saving session properties.`);
-                // settings saving 
-                this._saveSessionSettings();
-                let properties = {};
-                for (let p in this.parameters) {
-                    properties[p] = {
-                        displayname: this.parameters[p].displayname !== undefined ? this.parameters[p].displayname : '',
-                        hidden: this.parameters[p].hidden !== undefined ? this.parameters[p].hidden : false,
-                        order: this.parameters[p].order !== undefined ? this.parameters[p].order : 0,
-                        tooltip: this.parameters[p].tooltip !== undefined ? this.parameters[p].tooltip : '',
-                    };
-                }
-                const responseP = Object.values(properties).length !== 0 ? yield this.saveParameterProperties(properties) : true;
-                properties = {};
-                for (let e in this.exports) {
-                    properties[e] = {
-                        displayname: this.exports[e].displayname !== undefined ? this.exports[e].displayname : '',
-                        hidden: this.exports[e].hidden !== undefined ? this.exports[e].hidden : false,
-                        order: this.exports[e].order !== undefined ? this.exports[e].order : 0,
-                        tooltip: this.exports[e].tooltip !== undefined ? this.exports[e].tooltip : '',
-                    };
-                }
-                const responseE = Object.values(properties).length !== 0 ? yield this.saveExportProperties(properties) : true;
-                properties = {};
-                for (let o in this.outputs) {
-                    properties[o] = {
-                        displayname: this.outputs[o].displayname !== undefined ? this.outputs[o].displayname : '',
-                        hidden: this.outputs[o].hidden !== undefined ? this.outputs[o].hidden : false,
-                        order: this.outputs[o].order !== undefined ? this.outputs[o].order : 0,
-                        tooltip: this.outputs[o].tooltip !== undefined ? this.outputs[o].tooltip : '',
-                    };
-                }
-                const responseO = Object.values(properties).length !== 0 ? yield this.saveOutputProperties(properties) : true;
-                // save partial settings
-                const response = saveInSettings ? yield this.saveSettings(this._settingsEngine.convertToTargetVersion()) : true;
-                if (response && responseP && responseO && responseE) {
-                    this._logger.debug(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).saveSessionProperties: Saved session properties.`);
-                }
-                else {
-                    this._logger.warn(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).saveSessionProperties: Could not save session properties.`);
-                }
-                return response && responseP && responseO && responseE;
+            this._logger.debugLow(`Session(${this.id}).saveSessionProperties: Saving session properties.`);
+            // settings saving 
+            this._saveSessionSettings();
+            let properties = {};
+            for (let p in this.parameters) {
+                properties[p] = {
+                    displayname: this.parameters[p].displayname !== undefined ? this.parameters[p].displayname : '',
+                    hidden: this.parameters[p].hidden !== undefined ? this.parameters[p].hidden : false,
+                    order: this.parameters[p].order !== undefined ? this.parameters[p].order : 0,
+                    tooltip: this.parameters[p].tooltip !== undefined ? this.parameters[p].tooltip : '',
+                };
             }
-            catch (e) {
-                if (e instanceof viewer_shared_services_1.ShapeDiverViewerError || e instanceof sdk_geometry_api_sdk_v2_1.ShapeDiverError)
-                    throw e;
-                throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).saveSessionProperties`, e);
+            const responseP = Object.values(properties).length !== 0 ? yield this.saveParameterProperties(properties) : true;
+            properties = {};
+            for (let e in this.exports) {
+                properties[e] = {
+                    displayname: this.exports[e].displayname !== undefined ? this.exports[e].displayname : '',
+                    hidden: this.exports[e].hidden !== undefined ? this.exports[e].hidden : false,
+                    order: this.exports[e].order !== undefined ? this.exports[e].order : 0,
+                    tooltip: this.exports[e].tooltip !== undefined ? this.exports[e].tooltip : '',
+                };
+            }
+            const responseE = Object.values(properties).length !== 0 ? yield this.saveExportProperties(properties) : true;
+            properties = {};
+            for (let o in this.outputs) {
+                properties[o] = {
+                    displayname: this.outputs[o].displayname !== undefined ? this.outputs[o].displayname : '',
+                    hidden: this.outputs[o].hidden !== undefined ? this.outputs[o].hidden : false,
+                    order: this.outputs[o].order !== undefined ? this.outputs[o].order : 0,
+                    tooltip: this.outputs[o].tooltip !== undefined ? this.outputs[o].tooltip : '',
+                };
+            }
+            const responseO = Object.values(properties).length !== 0 ? yield this.saveOutputProperties(properties) : true;
+            // save partial settings
+            const response = saveInSettings ? yield this.saveSettings(this._settingsEngine.convertToTargetVersion()) : true;
+            if (response && responseP && responseO && responseE) {
+                this._logger.debug(`Session(${this.id}).saveSessionProperties: Saved session properties.`);
+            }
+            else {
+                this._logger.warn(`Session(${this.id}).saveSessionProperties: Could not save session properties.`);
             }
+            return response && responseP && responseO && responseE;
         });
     }
     updateOutputs() {
@@ -891,7 +845,7 @@ class SessionEngine {
             this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_START, eventStart);
             const oldNode = this.node.cloneInstance();
             __classPrivateFieldSet(this, _SessionEngine_customizationProcess, customizationId, "f");
-            this._logger.debugLow(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).updateOutputs: Updating Outputs.`);
+            this._logger.debugLow(`Session(${this.id}).updateOutputs: Updating Outputs.`);
             for (let r in this._stateEngine.renderingEngines)
                 this._stateEngine.renderingEngines[r].busy.push(customizationId);
             const eventRequest = { type: viewer_shared_types_1.TASK_TYPE.SESSION_OUTPUTS_UPDATE, id: eventId, progress: 0.25, data: { sessionId: this.id }, status: 'Loading outputs' };
@@ -906,15 +860,15 @@ class SessionEngine {
                         this._stateEngine.renderingEngines[r].busy.splice(this._stateEngine.renderingEngines[r].busy.indexOf(customizationId), 1);
                 const eventCancel1 = { type: viewer_shared_types_1.TASK_TYPE.SESSION_OUTPUTS_UPDATE, id: eventId, progress: 1, data: { sessionId: this.id }, status: 'Output updating was exceeded by other customization request' };
                 this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_CANCEL, eventCancel1);
-                this._logger.debug(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).updateOutputs: Output updating was exceeded by other request.`);
+                this._logger.debug(`Session(${this.id}).updateOutputs: Output updating was exceeded by other request.`);
                 return newNode;
             }
             if (this.automaticSceneUpdate)
-                this._sceneTree.removeNode(this.node);
+                this.removeFromSceneTree(this.node);
             this._node = newNode;
             if (this.automaticSceneUpdate)
-                this._sceneTree.addNode(this.node);
-            this._logger.debug(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).updateOutputs: Updating outputs finished, updating geometry.`);
+                this.addToSceneTree(this.node);
+            this._logger.debug(`Session(${this.id}).updateOutputs: Updating outputs finished, updating geometry.`);
             if (this._updateCallback)
                 this._updateCallback(newNode, oldNode);
             // set the output content to what has been updated
@@ -929,7 +883,7 @@ class SessionEngine {
             for (let r in this._stateEngine.renderingEngines)
                 if (this._stateEngine.renderingEngines[r].busy.includes(customizationId))
                     this._stateEngine.renderingEngines[r].busy.splice(this._stateEngine.renderingEngines[r].busy.indexOf(customizationId), 1);
-            this._logger.debug(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `Session(${this.id}).updateOutputs: Updated outputs.`);
+            this._logger.debug(`Session(${this.id}).updateOutputs: Updated outputs.`);
             const eventEnd = { type: viewer_shared_types_1.TASK_TYPE.SESSION_OUTPUTS_UPDATE, id: eventId, progress: 1, data: { sessionId: this.id }, status: 'Outputs updated' };
             this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_END, eventEnd);
             return this.node;
@@ -948,12 +902,11 @@ class SessionEngine {
                     return fileAsset.id;
                 }
                 else {
-                    const error = new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.uploadFile: Upload reply has not the required format.`);
-                    throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.uploadFile', error);
+                    throw new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.uploadFile: Upload reply has not the required format.`);
                 }
             }
             catch (e) {
-                yield this.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.uploadFile', e, retry);
+                yield this.handleError(e, retry);
                 return yield this.uploadFile(parameterId, data, type, true);
             }
         });
@@ -963,14 +916,12 @@ class SessionEngine {
             this.checkAvailability('gltf-upload');
             try {
                 const responseDto = yield this._sdk.gltf.upload(this._sessionId, yield blob.arrayBuffer(), 'model/gltf-binary', conversion);
-                if (!responseDto || !responseDto.gltf || !responseDto.gltf.href) {
-                    const error = new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.uploadGLTF: Upload reply has not the required format.`);
-                    throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.uploadGLTF', error);
-                }
+                if (!responseDto || !responseDto.gltf || !responseDto.gltf.href)
+                    throw new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.uploadGLTF: Upload reply has not the required format.`);
                 return responseDto;
             }
             catch (e) {
-                yield this.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.uploadGLTF', e, retry);
+                yield this.handleError(e, retry);
                 return yield this.uploadGLTF(blob, conversion, true);
             }
         });
@@ -1021,7 +972,7 @@ class SessionEngine {
             if (this.outputs[outputId].status_computation && this.outputs[outputId].status_computation !== sdk_geometry_api_sdk_v2_1.ShapeDiverResponseModelComputationStatus.SUCCESS)
                 warning += `\n\t- status_computation is ${this.outputs[outputId].status_computation}`;
             if (warning)
-                this._logger.warn(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `\nOutput(${outputId}):${warning}`);
+                this._logger.warn(`\nOutput(${outputId}):${warning}`);
         }
         // set the export definitions
         for (const exportId in this.exports) {
@@ -1033,32 +984,22 @@ class SessionEngine {
             if (this.exports[exportId].status_computation && this.exports[exportId].status_computation !== sdk_geometry_api_sdk_v2_1.ShapeDiverResponseModelComputationStatus.SUCCESS)
                 warning += `\n\t- status_computation is ${this.exports[exportId].status_computation}`;
             if (warning)
-                this._logger.warn(viewer_shared_services_1.LOGGING_TOPIC.SESSION, `\nExport(${exportId}):${warning}`);
+                this._logger.warn(`\nExport(${exportId}):${warning}`);
         }
     }
     checkAvailability(action, checkForModelId = false) {
         var _a;
-        if (!this._responseDto) {
-            const error = new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.checkAvailability: responseDto not available.`);
-            throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.checkAvailability', error);
-        }
-        if (!this._sessionId) {
-            const error = new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.checkAvailability: sessionId not available.`);
-            throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.checkAvailability', error);
-        }
-        if (checkForModelId && !this._modelId) {
-            const error = new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.checkAvailability: modelId not available.`);
-            throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.checkAvailability', error);
-        }
-        if (action && !this._responseDto.actions) {
-            const error = new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.checkAvailability: actions not available.`);
-            throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.checkAvailability', error);
-        }
+        if (!this._responseDto)
+            throw new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.checkAvailability: responseDto not available.`);
+        if (!this._sessionId)
+            throw new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.checkAvailability: sessionId not available.`);
+        if (checkForModelId && !this._modelId)
+            throw new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.checkAvailability: modelId not available.`);
+        if (action && !this._responseDto.actions)
+            throw new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.checkAvailability: actions not available.`);
         const responseDtoAction = (_a = this._responseDto.actions) === null || _a === void 0 ? void 0 : _a.find(a => a.name === action);
-        if (action && !responseDtoAction) {
-            const error = new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.checkAvailability: action ${action} not available.`);
-            throw this._logger.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.checkAvailability', error);
-        }
+        if (action && !responseDtoAction)
+            throw new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.checkAvailability: action ${action} not available.`);
     }
     customizeInternal(cancelRequest) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -1079,41 +1020,34 @@ class SessionEngine {
                 return parallel === false ? this.loadOutputs(cancelRequest) : this.loadOutputsParallel(responseDto, cancelRequest);
             }
             catch (e) {
-                yield this.handleError(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Session.customizeSession', e, retry);
+                yield this.handleError(e, retry);
                 if (cancelRequest())
                     return new SessionTreeNode_1.SessionTreeNode();
                 return yield this.customizeSession(parameters, cancelRequest, parallel, true);
             }
         });
     }
-    handleError(topic, scope, e, retry = false) {
+    handleError(e, retry = false) {
         return __awaiter(this, void 0, void 0, function* () {
             if (e instanceof sdk_geometry_api_sdk_v2_1.ShapeDiverResponseError) {
                 if (e.error === sdk_geometry_api_sdk_v2_1.ShapeDiverResponseErrorType.SESSION_GONE_ERROR) {
                     // case 1: the session is no longer available
                     // we try to re-initialize the session 3 times, if that does not work, we close it
-                    this._logger.warn(topic, `The session has been closed, trying to re-initialize.`);
+                    this._logger.warn(`The session has been closed, trying to re-initialize.`);
                     if (this._retryCounter < 3) {
                         // we retry this 3 times, the `retry` option in the init function is set to true and passed on 
                         this._retryCounter = retry ? this._retryCounter + 1 : 1;
-                        try {
-                            this._initialized = false;
-                            yield this.init(this.parameterValues, true);
-                        }
-                        catch (e) {
-                            if (e instanceof viewer_shared_services_1.ShapeDiverViewerError || e instanceof sdk_geometry_api_sdk_v2_1.ShapeDiverError)
-                                throw e;
-                            throw this._logger.handleError(topic, scope, e);
-                        }
+                        this._initialized = false;
+                        yield this.init(this.parameterValues, true);
                     }
                     else {
                         // the retries were exceeded, we close the session
-                        this._logger.warn(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Tried to retry the connect multiple times, bearer token still not valid. Closing Session.');
+                        this._logger.warn('Tried to retry the connect multiple times, bearer token still not valid. Closing Session.');
                         try {
                             yield this._closeOnFailure();
                         }
                         catch (e) { }
-                        throw this._logger.handleError(topic, scope, e);
+                        throw e;
                     }
                 }
                 else if (e.error === sdk_geometry_api_sdk_v2_1.ShapeDiverResponseErrorType.JWT_VALIDATION_ERROR) {
@@ -1123,34 +1057,34 @@ class SessionEngine {
                         if (this._refreshBearerToken) {
                             this.bearerToken = yield this._refreshBearerToken();
                             this._retryCounter = retry ? this._retryCounter + 1 : 1;
-                            this._logger.warn(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Re-trying with new bearer token.');
+                            this._logger.warn('Re-trying with new bearer token.');
                         }
                         else {
                             // no bearer tokens are supplied, we close the session
-                            this._logger.warn(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'No retry possible, no new bearer token was supplied. Closing Session.');
+                            this._logger.warn('No retry possible, no new bearer token was supplied. Closing Session.');
                             try {
                                 yield this._closeOnFailure();
                             }
                             catch (e) { }
-                            throw this._logger.handleError(topic, scope, e);
+                            throw e;
                         }
                     }
                     else {
                         // the retries were exceeded, we close the session
-                        this._logger.warn(viewer_shared_services_1.LOGGING_TOPIC.SESSION, 'Tried to retry the connect multiple times, bearer token still not valid. Closing Session.');
+                        this._logger.warn('Tried to retry the connect multiple times, bearer token still not valid. Closing Session.');
                         try {
                             yield this._closeOnFailure();
                         }
                         catch (e) { }
-                        throw this._logger.handleError(topic, scope, e);
+                        throw e;
                     }
                 }
                 else {
-                    throw this._logger.handleError(topic, scope, e);
+                    throw e;
                 }
             }
             else {
-                throw this._logger.handleError(topic, scope, e);
+                throw e;
             }
         });
     }
@@ -1250,6 +1184,14 @@ class SessionEngine {
             }
         }
     }
+    addToSceneTree(node) {
+        this._sceneTree.addNode(node);
+        this._sceneTree.root.updateVersion();
+    }
+    removeFromSceneTree(node) {
+        this._sceneTree.removeNode(node);
+        this._sceneTree.root.updateVersion();
+    }
 }
 exports.SessionEngine = SessionEngine;
 _SessionEngine_customizationProcess = new WeakMap(), _SessionEngine_parameterHistory = new WeakMap(), _SessionEngine_parameterHistoryCall = new WeakMap(), _SessionEngine_parameterHistoryForward = new WeakMap();