@shapediver/viewer.session-engine.session-engine 2.11.0 → 2.12.1

package/dist/implementation/SessionEngine.js

@@ -19,7 +19,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _SessionEngine_customizationProcess, _SessionEngine_parameterHistory, _SessionEngine_parameterHistoryCall, _SessionEngine_parameterHistoryForward;
+var _SessionEngine_customizationBusyModes, _SessionEngine_customizationProcess, _SessionEngine_parameterHistory, _SessionEngine_parameterHistoryCall, _SessionEngine_parameterHistoryForward;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SessionEngine = void 0;
 const viewer_settings_1 = require("@shapediver/viewer.settings");
@@ -38,14 +38,14 @@ const SessionData_1 = require("./SessionData");
 const SessionTreeNode_1 = require("./SessionTreeNode");
 /* eslint-disable @typescript-eslint/no-empty-function */
 class SessionEngine {
-    // #endregion Properties (43)
+    // #endregion Properties (44)
     // #region Constructors (1)
     /**
      * Can be use to initialize a session with the ticket/guid and modelViewUrl and returns a scene graph node with the result.
      * Can be use to customize the session with updated parameters to get the updated scene graph node.
      */
     constructor(properties) {
-        // #region Properties (43)
+        // #region Properties (44)
         this._eventEngine = viewer_shared_services_1.EventEngine.instance;
         this._exports = {};
         this._httpClient = viewer_shared_services_1.HttpClient.instance;
@@ -60,6 +60,7 @@ class SessionEngine {
         this._settingsEngine = new viewer_shared_services_1.SettingsEngine();
         this._stateEngine = viewer_shared_services_1.StateEngine.instance;
         this._uuidGenerator = viewer_shared_services_1.UuidGenerator.instance;
+        _SessionEngine_customizationBusyModes.set(this, []);
         _SessionEngine_customizationProcess.set(this, void 0);
         _SessionEngine_parameterHistory.set(this, []);
         _SessionEngine_parameterHistoryCall.set(this, false);
@@ -185,7 +186,7 @@ class SessionEngine {
         return this._viewerSettings;
     }
     // #endregion Public Accessors (25)
-    // #region Public Methods (25)
+    // #region Public Methods (27)
     applySettings(response, sections) {
         sections = sections || {};
         if (sections.session === undefined) {
@@ -232,7 +233,7 @@ class SessionEngine {
                     if (sections.session.parameter.hidden)
                         this.parameters[p].hidden = settings.session[p].hidden || false;
                 }
-                if (response.parameters && response.parameters[p]) {
+                if (response.parameters && response.parameters[p] && !((this.parameters[p] instanceof FileParameter_1.FileParameter) || this.parameters[p].type.startsWith('s'))) {
                     if (sections.session.parameter.value)
                         this.parameters[p].value = response.parameters[p].defval !== undefined ? response.parameters[p].defval : this.parameters[p].value;
                 }
@@ -318,6 +319,18 @@ class SessionEngine {
     canGoForward() {
         return __classPrivateFieldGet(this, _SessionEngine_parameterHistoryForward, "f").length > 0;
     }
+    cancelCustomization() {
+        if (__classPrivateFieldGet(this, _SessionEngine_customizationProcess, "f"))
+            this.removeBusyMode(__classPrivateFieldGet(this, _SessionEngine_customizationProcess, "f"));
+        for (const busyId of __classPrivateFieldGet(this, _SessionEngine_customizationBusyModes, "f")) {
+            for (const r in this._stateEngine.renderingEngines) {
+                if (this._stateEngine.renderingEngines[r].busy.includes(busyId))
+                    this._stateEngine.renderingEngines[r].busy.splice(this._stateEngine.renderingEngines[r].busy.indexOf(busyId), 1);
+            }
+        }
+        __classPrivateFieldSet(this, _SessionEngine_customizationBusyModes, [], "f");
+        __classPrivateFieldSet(this, _SessionEngine_customizationProcess, undefined, "f");
+    }
     close(retry = false) {
         return __awaiter(this, void 0, void 0, function* () {
             this.checkAvailability('close');
@@ -359,9 +372,7 @@ class SessionEngine {
                 const oldNode = this.node.cloneInstance();
                 __classPrivateFieldSet(this, _SessionEngine_customizationProcess, customizationId, "f");
                 this._logger.debugLow(`Session(${this.id}).customize: Customizing session.`);
-                for (const r in this._stateEngine.renderingEngines)
-                    if (!this.excludeViewports.includes(r))
-                        this._stateEngine.renderingEngines[r].busy.push(customizationId);
+                this.addBusyMode(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' };
                 this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_PROCESS, eventFileUpload);
                 const fileParameterIds = {};
@@ -370,45 +381,15 @@ class SessionEngine {
                     if (this.parameters[parameterId] instanceof FileParameter_1.FileParameter) {
                         fileParameterIds[parameterId] = yield this.parameters[parameterId].upload();
                         // OPTION TO SKIP - PART 1a
-                        if (__classPrivateFieldGet(this, _SessionEngine_customizationProcess, "f") !== customizationId) {
-                            for (const 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(`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();
-                        }
-                        else if (this._closed === true) {
-                            for (const 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(`Session(${this.id}).customize: Session was closed during customization request.`);
-                            const eventCancel1a = { type: viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 1, data: { sessionId: this.id }, status: 'Session was closed during customization request' };
-                            this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_CANCEL, eventCancel1a);
-                            return new SessionTreeNode_1.SessionTreeNode();
-                        }
+                        const cancelResult = this.cancelProcess(customizationId, eventId, viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, 1, { sessionId: this.id });
+                        if (cancelResult)
+                            return cancelResult;
                     }
                 }
                 // OPTION TO SKIP - PART 1b
-                if (__classPrivateFieldGet(this, _SessionEngine_customizationProcess, "f") !== customizationId) {
-                    for (const 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);
-                    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(`Session(${this.id}).customize: Session customization was exceeded by other customization request.`);
-                    return new SessionTreeNode_1.SessionTreeNode();
-                }
-                else if (this._closed === true) {
-                    for (const 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(`Session(${this.id}).customize: Session was closed during customization request.`);
-                    const eventCancel1b = { type: viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 1, data: { sessionId: this.id }, status: 'Session was closed during customization request' };
-                    this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_CANCEL, eventCancel1b);
-                    return new SessionTreeNode_1.SessionTreeNode();
-                }
+                const cancelResult = this.cancelProcess(customizationId, eventId, viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, 1, { sessionId: this.id });
+                if (cancelResult)
+                    return cancelResult;
                 // assign the uploaded parameters
                 for (const parameterId in fileParameterIds)
                     this.parameters[parameterId].value = fileParameterIds[parameterId];
@@ -426,6 +407,7 @@ class SessionEngine {
                 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.1, data: { sessionId: this.id }, status: 'Sending customization request' };
                 this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_PROCESS, eventRequest);
+                const oldOutputVersions = this._outputLoader.getCurrentOutputVersions();
                 const newNode = yield this.customizeInternal(() => __classPrivateFieldGet(this, _SessionEngine_customizationProcess, "f") !== customizationId, {
                     eventId,
                     type: viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION,
@@ -435,26 +417,29 @@ class SessionEngine {
                     },
                     data: { sessionId: this.id }
                 });
+                // OPTION TO SKIP - PART 2
+                const cancelResult2 = this.cancelProcess(customizationId, eventId, viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, 1, { sessionId: this.id });
+                if (cancelResult2)
+                    return cancelResult2;
+                const newOutputVersions = this._outputLoader.getCurrentOutputVersions();
                 const eventSceneUpdate = { type: viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 0.9, data: { sessionId: this.id }, status: 'Updating scene' };
                 this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_PROCESS, eventSceneUpdate);
-                // OPTION TO SKIP - PART 2
-                if (__classPrivateFieldGet(this, _SessionEngine_customizationProcess, "f") !== customizationId) {
-                    for (const 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);
-                    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(`Session(${this.id}).customize: Session customization was exceeded by other customization request.`);
-                    return newNode;
-                }
-                else if (this._closed === true) { // I get a TS warning here that the type of _closed is "false", I think TS doesn't get that there is a promise inbetween
-                    for (const 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(`Session(${this.id}).customize: Session was closed during customization request.`);
-                    const eventCancel2 = { type: viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 1, data: { sessionId: this.id }, status: 'Session was closed during customization request' };
-                    this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_CANCEL, eventCancel2);
-                    return new SessionTreeNode_1.SessionTreeNode();
+                // call the update callbacks
+                if (waitForViewportUpdate === false) {
+                    for (const outputId in this.outputs) {
+                        if (oldOutputVersions[outputId] !== newOutputVersions[outputId]) {
+                            this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.OUTPUT.OUTPUT_UPDATED, {
+                                outputId: outputId,
+                                outputVersion: newOutputVersions[outputId],
+                                newNode: newNode.children.find(c => c.name === outputId),
+                                oldNode: oldNode.children.find(c => c.name === outputId)
+                            });
+                        }
+                    }
+                    yield this.waitForUpdateCallbacks(newOutputVersions, oldOutputVersions, newNode, oldNode);
+                    const cancelResult = this.cancelProcess(customizationId, eventId, viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, 1, { sessionId: this.id });
+                    if (cancelResult)
+                        return cancelResult;
                 }
                 // if this is not a call by the goBack or goForward functions, add the parameter values to the history and delete the forward history
                 if (!__classPrivateFieldGet(this, _SessionEngine_parameterHistoryCall, "f")) {
@@ -478,37 +463,50 @@ class SessionEngine {
                     this.exports[exportId].updateExport();
                 this._warningCreator();
                 this.node.excludeViewports = JSON.parse(JSON.stringify(this._excludeViewports));
-                for (const 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.removeBusyMode(customizationId);
                 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);
                 // update the viewports
-                if (waitForViewportUpdate)
+                if (waitForViewportUpdate) {
                     for (const r in this._stateEngine.renderingEngines)
                         if (!this.excludeViewports.includes(this._stateEngine.renderingEngines[r].id))
                             this._stateEngine.renderingEngines[r].update(`SessionEngine(${this.id}).customize`);
-                // call the update callback function on the session
-                if (this._updateCallback)
-                    this._updateCallback(newNode, oldNode);
-                // call the update callback functions on the outputs
-                for (const outputId in this.outputs)
-                    this.outputs[outputId].triggerUpdateCallback(newNode.children.find(c => c.name === outputId), oldNode.children.find(c => c.name === outputId));
+                    for (const outputId in this.outputs) {
+                        if (oldOutputVersions[outputId] !== newOutputVersions[outputId]) {
+                            this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.OUTPUT.OUTPUT_UPDATED, {
+                                outputId: outputId,
+                                outputVersion: newOutputVersions[outputId],
+                                newNode: newNode.children.find(c => c.name === outputId),
+                                oldNode: oldNode.children.find(c => c.name === outputId)
+                            });
+                        }
+                    }
+                    // call the update callbacks
+                    yield this.waitForUpdateCallbacks(newOutputVersions, oldOutputVersions, newNode, oldNode);
+                    const cancelResult = this.cancelProcess(customizationId, eventId, viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, 1, { sessionId: this.id });
+                    if (cancelResult)
+                        return cancelResult;
+                }
+                if (!waitForViewportUpdate) {
+                    setTimeout(() => {
+                        for (const r in this._stateEngine.renderingEngines)
+                            if (!this.excludeViewports.includes(this._stateEngine.renderingEngines[r].id))
+                                this._stateEngine.renderingEngines[r].update(`SessionEngine(${this.id}).customize`);
+                    }, 0);
+                }
                 return this.node;
             }
             catch (e) {
                 const eventCancel = { type: viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 1, data: { sessionId: this.id }, status: 'Session customization failed' };
                 this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_CANCEL, eventCancel);
-                for (const 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.removeBusyMode(customizationId);
                 throw this._httpClient.convertError(e);
             }
         });
     }
-    customizeParallel(parameterValues) {
+    customizeParallel(parameterValues, loadOutputs = true) {
         return __awaiter(this, void 0, void 0, function* () {
             const eventId = this._uuidGenerator.create();
             const eventStart = { type: viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 0, data: { sessionId: this.id }, status: 'Customizing session' };
@@ -517,7 +515,7 @@ class SessionEngine {
             // 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, {
+            const result = yield this.customizeSession(parameterSet, () => false, {
                 eventId,
                 type: viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION,
                 progressRange: {
@@ -525,11 +523,12 @@ class SessionEngine {
                     max: 1
                 },
                 data: { sessionId: this.id }
-            }, true);
-            newNode.excludeViewports = JSON.parse(JSON.stringify(this._excludeViewports));
+            }, true, loadOutputs);
+            if (result instanceof SessionTreeNode_1.SessionTreeNode)
+                result.excludeViewports = JSON.parse(JSON.stringify(this._excludeViewports));
             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);
-            return newNode;
+            return result;
         });
     }
     goBack() {
@@ -621,6 +620,55 @@ class SessionEngine {
             }
         });
     }
+    loadCachedOutputsParallel(outputMapping, taskEventInfo, retry = false) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            this.checkAvailability();
+            // if there is already task event info, use it
+            // this happens after a retry
+            const eventId = taskEventInfo ? taskEventInfo.eventId : this._uuidGenerator.create();
+            const eventType = taskEventInfo ? taskEventInfo.type : viewer_shared_types_1.TASK_TYPE.SESSION_OUTPUTS_LOADING;
+            const eventData = taskEventInfo ? taskEventInfo.data : { sessionId: this.id };
+            taskEventInfo = taskEventInfo ? taskEventInfo : {
+                eventId,
+                type: eventType,
+                progressRange: {
+                    min: 0,
+                    max: 1
+                },
+                data: eventData
+            };
+            try {
+                // send start event if this function was called initially
+                if (!taskEventInfo) {
+                    const eventStart = { type: eventType, id: eventId, progress: 0, data: eventData, status: 'Loading cached outputs' };
+                    this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_START, eventStart);
+                }
+                // get the cached outputs
+                const responseDto = yield this._sdk.output.getCache(this._sessionId, outputMapping);
+                // create atomic output api objects for them
+                const outputs = {};
+                for (const outputId in responseDto.outputs) {
+                    responseDto.outputs[outputId].id = outputId;
+                    outputs[outputId] = new Output_1.Output(responseDto.outputs[outputId], this);
+                }
+                // process the output data
+                const node = yield this._outputLoader.loadOutputs(((_a = this._responseDto.model) === null || _a === void 0 ? void 0 : _a.name) || 'model', outputs, {}, taskEventInfo, false);
+                // send the end event once done
+                const eventEnd = { type: eventType, id: eventId, progress: 1, data: eventData, status: 'Loaded cached outputs' };
+                this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_END, eventEnd);
+                // create a mapping with a dictionary for the id of the outputs
+                const outputNodeMapping = {};
+                for (const outputId in outputMapping)
+                    outputNodeMapping[outputId] = node.children.find(n => n.name === outputId);
+                return outputNodeMapping;
+            }
+            catch (e) {
+                yield this.handleError(e, retry);
+                return yield this.loadCachedOutputsParallel(outputMapping, taskEventInfo, true);
+            }
+        });
+    }
     /**
      * Load the outputs and return the scene graph node of the result.
      * In case the outputs have a delay property, another customization request with the parameter set is sent.
@@ -640,12 +688,7 @@ class SessionEngine {
                 node.data.push(new SessionData_1.SessionData(this._responseDto));
                 if (cancelRequest())
                     return node;
-                if (this._automaticSceneUpdate)
-                    this.removeFromSceneTree(this._node);
-                this._node = node;
-                if (this._automaticSceneUpdate && this._closed === false)
-                    this.addToSceneTree(this._node);
-                this.node.excludeViewports = JSON.parse(JSON.stringify(this._excludeViewports));
+                node.excludeViewports = JSON.parse(JSON.stringify(this._excludeViewports));
                 return node;
             }
             catch (e) {
@@ -963,11 +1006,10 @@ class SessionEngine {
             const oldNode = this.node.cloneInstance();
             __classPrivateFieldSet(this, _SessionEngine_customizationProcess, customizationId, "f");
             this._logger.debugLow(`Session(${this.id}).updateOutputs: Updating Outputs.`);
-            for (const r in this._stateEngine.renderingEngines)
-                if (!this.excludeViewports.includes(r))
-                    this._stateEngine.renderingEngines[r].busy.push(customizationId);
+            this.addBusyMode(customizationId);
             const eventRequest = { 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(viewer_shared_services_1.EVENTTYPE.TASK.TASK_PROCESS, eventRequest);
+            const oldOutputVersions = this._outputLoader.getCurrentOutputVersions();
             const newNode = yield this.loadOutputs(() => __classPrivateFieldGet(this, _SessionEngine_customizationProcess, "f") !== customizationId, {
                 eventId,
                 type: eventType,
@@ -977,26 +1019,30 @@ class SessionEngine {
                 },
                 data: eventData
             });
+            const newOutputVersions = this._outputLoader.getCurrentOutputVersions();
             const eventSceneUpdate = { 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(viewer_shared_services_1.EVENTTYPE.TASK.TASK_PROCESS, eventSceneUpdate);
             // OPTION TO SKIP - PART 1
-            if (__classPrivateFieldGet(this, _SessionEngine_customizationProcess, "f") !== customizationId) {
-                for (const 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);
-                const eventCancel1 = { 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(viewer_shared_services_1.EVENTTYPE.TASK.TASK_CANCEL, eventCancel1);
-                this._logger.debug(`Session(${this.id}).updateOutputs: Output updating was exceeded by other request.`);
-                return newNode;
-            }
-            else if (this._closed === true) {
-                for (const 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(`Session(${this.id}).customize: Session was closed during customization request.`);
-                const eventCancel1a = { type: viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 1, data: { sessionId: this.id }, status: 'Session was closed during customization request' };
-                this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_CANCEL, eventCancel1a);
-                return new SessionTreeNode_1.SessionTreeNode();
+            const cancelResult = this.cancelProcess(customizationId, eventId, eventType, taskEventInfo ? (taskEventInfo.progressRange.max - taskEventInfo.progressRange.min) * 1 + taskEventInfo.progressRange.min : 1, eventData, newNode);
+            if (cancelResult)
+                return cancelResult;
+            // call the update callbacks
+            if (waitForViewportUpdate === false) {
+                for (const outputId in this.outputs) {
+                    if (oldOutputVersions[outputId] !== newOutputVersions[outputId]) {
+                        this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.OUTPUT.OUTPUT_UPDATED, {
+                            outputId: outputId,
+                            outputVersion: newOutputVersions[outputId],
+                            newNode: newNode.children.find(c => c.name === outputId),
+                            oldNode: oldNode.children.find(c => c.name === outputId)
+                        });
+                    }
+                }
+                yield this.waitForUpdateCallbacks(newOutputVersions, oldOutputVersions, newNode, oldNode);
+                // OPTION TO SKIP - PART 2
+                const cancelResult = this.cancelProcess(customizationId, eventId, eventType, taskEventInfo ? (taskEventInfo.progressRange.max - taskEventInfo.progressRange.min) * 1 + taskEventInfo.progressRange.min : 1, eventData, newNode);
+                if (cancelResult)
+                    return cancelResult;
             }
             if (this.automaticSceneUpdate)
                 this.removeFromSceneTree(this.node);
@@ -1013,25 +1059,33 @@ class SessionEngine {
                 this.exports[exportId].updateExport();
             this._warningCreator();
             this.node.excludeViewports = JSON.parse(JSON.stringify(this._excludeViewports));
-            for (const 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.removeBusyMode(customizationId);
             this._logger.debug(`Session(${this.id}).updateOutputs: Updated outputs.`);
             if (!taskEventInfo) {
                 const eventEnd = { type: eventType, id: eventId, progress: 1, data: eventData, status: 'Outputs updated' };
                 this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_END, eventEnd);
             }
             // update the viewports
-            if (waitForViewportUpdate)
+            if (waitForViewportUpdate) {
                 for (const r in this._stateEngine.renderingEngines)
                     if (!this.excludeViewports.includes(this._stateEngine.renderingEngines[r].id))
                         this._stateEngine.renderingEngines[r].update(`SessionEngine(${this.id}).updateOutputs`);
-            // call the update callback function on the session
-            if (this._updateCallback)
-                this._updateCallback(newNode, oldNode);
-            // call the update callback functions on the outputs
-            for (const outputId in this.outputs)
-                this.outputs[outputId].triggerUpdateCallback(newNode.children.find(c => c.name === outputId), oldNode.children.find(c => c.name === outputId));
+                for (const outputId in this.outputs) {
+                    if (oldOutputVersions[outputId] !== newOutputVersions[outputId]) {
+                        this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.OUTPUT.OUTPUT_UPDATED, {
+                            outputId: outputId,
+                            outputVersion: newOutputVersions[outputId],
+                            newNode: newNode.children.find(c => c.name === outputId),
+                            oldNode: oldNode.children.find(c => c.name === outputId)
+                        });
+                    }
+                }
+                yield this.waitForUpdateCallbacks(newOutputVersions, oldOutputVersions, newNode, oldNode);
+                // OPTION TO SKIP - PART 3
+                const cancelResult = this.cancelProcess(customizationId, eventId, eventType, taskEventInfo ? (taskEventInfo.progressRange.max - taskEventInfo.progressRange.min) * 1 + taskEventInfo.progressRange.min : 1, eventData, newNode);
+                if (cancelResult)
+                    return cancelResult;
+            }
             return this.node;
         });
     }
@@ -1072,8 +1126,8 @@ class SessionEngine {
             }
         });
     }
-    // #endregion Public Methods (25)
-    // #region Private Methods (11)
+    // #endregion Public Methods (27)
+    // #region Private Methods (15)
     _saveSessionSettings() {
         const parameters = this.parameters;
         const exports = this.exports;
@@ -1133,10 +1187,40 @@ class SessionEngine {
                 this._logger.warn(`\nExport(${exportId}):${warning}`);
         }
     }
+    addBusyMode(busyId) {
+        for (const r in this._stateEngine.renderingEngines) {
+            if (!this.excludeViewports.includes(r)) {
+                this._stateEngine.renderingEngines[r].busy.push(busyId);
+                __classPrivateFieldGet(this, _SessionEngine_customizationBusyModes, "f").push(busyId);
+            }
+        }
+    }
     addToSceneTree(node) {
         this._sceneTree.addNode(node);
         this._sceneTree.root.updateVersion();
     }
+    cancelProcess(customizationId, eventId, eventType, eventProgress, eventData, newNode = new SessionTreeNode_1.SessionTreeNode()) {
+        if (__classPrivateFieldGet(this, _SessionEngine_customizationProcess, "f") !== customizationId) {
+            this.removeBusyMode(customizationId);
+            const eventCancel = {
+                type: eventType,
+                id: eventId,
+                progress: eventProgress,
+                data: eventData,
+                status: 'The request was exceeded by another customization request'
+            };
+            this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_CANCEL, eventCancel);
+            this._logger.debug(`Session(${this.id}).cancelProcess: The request was was exceeded by another request.`);
+            return newNode;
+        }
+        else if (this._closed === true) {
+            this.removeBusyMode(customizationId);
+            this._logger.debug(`Session(${this.id}).cancelProcess: The session was closed during the request.`);
+            const eventCancel = { type: viewer_shared_types_1.TASK_TYPE.SESSION_CUSTOMIZATION, id: eventId, progress: 1, data: { sessionId: this.id }, status: 'The session was closed during the request.' };
+            this._eventEngine.emitEvent(viewer_shared_services_1.EVENTTYPE.TASK.TASK_CANCEL, eventCancel);
+            return new SessionTreeNode_1.SessionTreeNode();
+        }
+    }
     checkAvailability(action, checkForModelId = false) {
         var _a;
         if (!this._responseDto)
@@ -1180,24 +1264,36 @@ class SessionEngine {
             return this.customizeSession(this._parameterValues, cancelRequest, taskEventInfo);
         });
     }
-    customizeSession(parameters, cancelRequest, taskEventInfo, parallel = false, retry = false) {
+    customizeSession(parameters, cancelRequest, taskEventInfo, parallel = false, loadOutputs = true, retry = false) {
         return __awaiter(this, void 0, void 0, function* () {
             this.checkAvailability('customize');
             try {
                 this._performanceEvaluator.startSection('sessionResponse');
                 const responseDto = yield this._sdk.utils.submitAndWaitForCustomization(this._sdk, this._sessionId, parameters);
                 this._performanceEvaluator.endSection('sessionResponse');
-                if (cancelRequest())
-                    return new SessionTreeNode_1.SessionTreeNode();
-                if (parallel === false)
-                    this.updateResponseDto(responseDto);
-                return parallel === false ? this.loadOutputs(cancelRequest, taskEventInfo) : this.loadOutputsParallel(responseDto, cancelRequest, taskEventInfo);
+                if (loadOutputs === true) {
+                    if (cancelRequest())
+                        return new SessionTreeNode_1.SessionTreeNode();
+                    if (parallel === true) {
+                        // special case, we load the outputs put don't add them to the scene
+                        return this.loadOutputsParallel(responseDto, cancelRequest, taskEventInfo);
+                    }
+                    else {
+                        // default case, we load the outputs and return the nodes
+                        this.updateResponseDto(responseDto);
+                        return this.loadOutputs(cancelRequest, taskEventInfo);
+                    }
+                }
+                else {
+                    // special case, we don't load the outputs and only return the responseDto
+                    return responseDto;
+                }
             }
             catch (e) {
                 yield this.handleError(e, retry);
                 if (cancelRequest())
                     return new SessionTreeNode_1.SessionTreeNode();
-                return yield this.customizeSession(parameters, cancelRequest, taskEventInfo, parallel, true);
+                return yield this.customizeSession(parameters, cancelRequest, taskEventInfo, parallel, loadOutputs, true);
             }
         });
     }
@@ -1267,6 +1363,14 @@ class SessionEngine {
             }
         });
     }
+    removeBusyMode(busyId) {
+        for (const r in this._stateEngine.renderingEngines) {
+            if (this._stateEngine.renderingEngines[r].busy.includes(busyId))
+                this._stateEngine.renderingEngines[r].busy.splice(this._stateEngine.renderingEngines[r].busy.indexOf(busyId), 1);
+            if (__classPrivateFieldGet(this, _SessionEngine_customizationBusyModes, "f").includes(busyId))
+                __classPrivateFieldGet(this, _SessionEngine_customizationBusyModes, "f").splice(__classPrivateFieldGet(this, _SessionEngine_customizationBusyModes, "f").indexOf(busyId), 1);
+        }
+    }
     removeFromSceneTree(node) {
         this._sceneTree.removeNode(node);
         this._sceneTree.root.updateVersion();
@@ -1381,7 +1485,22 @@ class SessionEngine {
             }
         }
     }
+    waitForUpdateCallbacks(newOutputVersions, oldOutputVersions, newNode, oldNode) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // call the update callback function on the session
+            if (this._updateCallback)
+                yield Promise.resolve(this._updateCallback(newNode, oldNode));
+            const promises = [];
+            // call the update callback functions on the outputs
+            for (const outputId in this.outputs) {
+                if (oldOutputVersions[outputId] !== newOutputVersions[outputId]) {
+                    promises.push(this.outputs[outputId].triggerUpdateCallback(newNode.children.find(c => c.name === outputId), oldNode.children.find(c => c.name === outputId)));
+                }
+            }
+            yield Promise.all(promises);
+        });
+    }
 }
 exports.SessionEngine = SessionEngine;
-_SessionEngine_customizationProcess = new WeakMap(), _SessionEngine_parameterHistory = new WeakMap(), _SessionEngine_parameterHistoryCall = new WeakMap(), _SessionEngine_parameterHistoryForward = new WeakMap();
+_SessionEngine_customizationBusyModes = new WeakMap(), _SessionEngine_customizationProcess = new WeakMap(), _SessionEngine_parameterHistory = new WeakMap(), _SessionEngine_parameterHistoryCall = new WeakMap(), _SessionEngine_parameterHistoryForward = new WeakMap();
 //# sourceMappingURL=SessionEngine.js.map