@shapediver/viewer.session-engine.session-engine 1.8.14 → 1.10.5

package/dist/implementation/Session.js

@@ -12,19 +12,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Session = void 0;
 const tsyringe_1 = require("tsyringe");
 const viewer_shared_services_1 = require("@shapediver/viewer.shared.services");
-const api_geometry_api_dto_v1_1 = require("@shapediver/api.geometry-api-dto-v1");
 const OutputDelayException_1 = require("./OutputDelayException");
 const OutputLoader_1 = require("./OutputLoader");
 const SessionTreeNode_1 = require("./SessionTreeNode");
 const SessionData_1 = require("./SessionData");
+const sdk_geometry_api_sdk_v2_1 = require("@shapediver/sdk.geometry-api-sdk-v2");
 class Session {
     constructor(properties) {
         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._outputs = {};
-        this._parameters = {};
         this._parameterValues = {};
+        this._parameters = {};
         this._performanceEvaluator = tsyringe_1.container.resolve(viewer_shared_services_1.PerformanceEvaluator);
         this._sessionEngineId = tsyringe_1.container.resolve(viewer_shared_services_1.UuidGenerator).create();
         this._closed = false;
@@ -35,7 +35,6 @@ class Session {
             "X-ShapeDiver-BuildDate": ''
         };
         this._initialized = false;
-        this._settingsConfig = {};
         this._id = properties.id;
         this._ticket = properties.ticket;
         this._modelViewUrl = properties.modelViewUrl;
@@ -43,12 +42,8 @@ class Session {
         this._headers['X-ShapeDiver-BuildDate'] = properties.buildDate;
         this._headers['X-ShapeDiver-BuildVersion'] = properties.buildVersion;
         this._outputLoader = new OutputLoader_1.OutputLoader();
-    }
-    get authorTicket() {
-        return this._authorTicket;
-    }
-    set authorTicket(value) {
-        this._authorTicket = value;
+        this._sdk = sdk_geometry_api_sdk_v2_1.create(this._modelViewUrl, this._bearerToken);
+        this._sdk.setConfigurationValue(sdk_geometry_api_sdk_v2_1.ShapeDiverSdkConfigType.REQUEST_HEADERS, this._headers);
     }
     get bearerToken() {
         return this._bearerToken;
@@ -56,6 +51,15 @@ class Session {
     set bearerToken(value) {
         this._bearerToken = value;
     }
+    get canUploadGLTF() {
+        try {
+            this.checkAvailability('gltf-upload');
+            return true;
+        }
+        catch (e) {
+            return false;
+        }
+    }
     get exports() {
         return this._exports;
     }
@@ -71,43 +75,54 @@ class Session {
     get outputs() {
         return this._outputs;
     }
-    get parameters() {
-        return this._parameters;
-    }
     get parameterValues() {
         return this._parameterValues;
     }
+    get parameters() {
+        return this._parameters;
+    }
     set refreshBearerToken(value) {
         this._refreshBearerToken = value;
     }
-    get sessionResponse() {
-        return this._sessionResponse;
-    }
-    get settingsConfig() {
-        return this._settingsConfig;
-    }
     get ticket() {
         return this._ticket;
     }
-    close() {
-        var _a, _b;
+    get viewerSettings() {
+        return this._viewerSettings;
+    }
+    handleError(topic, scope, e) {
         return __awaiter(this, void 0, void 0, function* () {
-            this._closed = true;
-            if (this._initialized) {
+            if (e.status && e.status === 410) {
+                this._logger.warn(topic, `The session has been closed, trying to initialize.`);
                 try {
-                    yield this.sessionCommunication((_a = this._sessionResponse.actions) === null || _a === void 0 ? void 0 : _a.filter(v => v.name === 'close')[0].href, (_b = this._sessionResponse.actions) === null || _b === void 0 ? void 0 : _b.filter(v => v.name === 'close')[0].method, null, 'application/json');
+                    this._initialized = false;
+                    yield this.init(this.parameterValues);
                 }
                 catch (e) {
-                    if (e.response && e.response.status) {
-                        this._logger.httpError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, `Session.close: Session closing failed.`, e.response.status, false);
-                    }
-                    else {
-                        this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, `Session.close: Session closing failed.`, false);
-                    }
-                    return false;
+                    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);
                 }
             }
-            return true;
+            else if (e.status && e.status === 403) {
+                throw this._logger.handleError(topic, scope, e);
+            }
+            else {
+                throw this._logger.handleError(topic, scope, e);
+            }
+        });
+    }
+    close() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.checkAvailability('close');
+            try {
+                yield this._sdk.session.close(this._sessionId);
+                this._closed = true;
+                return true;
+            }
+            catch (e) {
+                throw yield this.handleError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.close', e);
+            }
         });
     }
     customize(cancelRequest) {
@@ -119,313 +134,237 @@ class Session {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             if (this._initialized === true) {
-                this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, new viewer_shared_services_1.SDError('Session.init: Session already initialized.'));
-                return;
+                const error = new viewer_shared_services_1.ShapeDiverViewerSessionError('Session.init: Session already initialized.');
+                throw this._logger.handleError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.init', error);
             }
             try {
-                let sessionResponse;
-                try {
-                    this._performanceEvaluator.startSection('sessionResponse');
-                    sessionResponse = (yield this.sessionCommunication(this._modelViewUrl + "/ticket/" + this._ticket, 'post', parameterValues || null)).data;
-                    this._performanceEvaluator.endSection('sessionResponse');
-                }
-                catch (e) {
-                    if (e.response && e.response.status) {
-                        throw this._logger.httpError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, `Session.init: Session init failed.`, e.response.status, true);
-                    }
-                    else {
-                        throw this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, `Session.init: Session init failed.`, true, false);
-                    }
-                }
-                this._settingsConfig = sessionResponse.config;
-                this._parameters = {};
-                this._outputs = {};
-                this._exports = {};
-                this._sessionResponse = this.mergeResponses(sessionResponse, sessionResponse, this._parameters, this._outputs, this._exports);
-                this._authorTicket = !!(((_a = this._sessionResponse.actions) === null || _a === void 0 ? void 0 : _a.filter(v => v.name === 'defaultparam')[0]) && ((_b = this._sessionResponse.actions) === null || _b === void 0 ? void 0 : _b.filter(v => v.name === 'configure')[0]));
+                this._performanceEvaluator.startSection('sessionResponse');
+                this._responseDto = yield this._sdk.session.init(this._ticket);
+                this._performanceEvaluator.endSection('sessionResponse');
+                this._viewerSettings = (_a = this._responseDto.viewer) === null || _a === void 0 ? void 0 : _a.config;
+                this._sessionId = this._responseDto.sessionId;
+                this._modelId = (_b = this._responseDto.model) === null || _b === void 0 ? void 0 : _b.id;
+                if (!this._sessionId)
+                    throw new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.init: Initialization of session failed. ResponseDto did not have a sessionId.`);
+                if (!this._modelId)
+                    throw new viewer_shared_services_1.ShapeDiverViewerSessionError(`Session.init: Initialization of session failed. ResponseDto did not have a model.id.`);
+                this.updateResponseDto(this._responseDto);
                 this._initialized = true;
+                if (parameterValues) {
+                    const responseDto = yield this._sdk.utils.submitAndWaitForCustomization(this._sdk, this._sessionId, parameterValues);
+                    this.updateResponseDto(responseDto);
+                }
             }
             catch (e) {
-                throw this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, 'Session.init: Something went wrong at session init.', true);
+                throw yield this.handleError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.init', e);
             }
         });
     }
-    mergeResponses(r1, r2, parameters, outputs, exports) {
-        if (!r1)
-            r1 = { version: r2.version };
-        if (r2.version)
-            r1.version = r2.version;
-        if (r2.collection)
-            r1.collection = r2.collection;
-        if (r2.actions) {
-            for (let i = 0, len = r2.actions.length; i < len; i++) {
-                r1.actions = r1.actions || [];
-                if (r1.actions.findIndex((value) => value.name === r2.actions[i].name) === -1)
-                    r1.actions.push(r2.actions[i]);
-            }
-        }
-        if (r2.templates) {
-            for (let i = 0, len = r2.templates.length; i < len; i++) {
-                r1.templates = r1.templates || [];
-                if (r1.templates.findIndex((value) => value.name === r2.actions[i].name) === -1)
-                    r1.templates.push(r2.templates[i]);
-            }
-        }
-        if (r2.config && !r1.config)
-            r1.config = r2.config;
-        if (r2.name && !r1.name)
-            r1.name = r2.name;
-        if (r2.parameters) {
-            for (let parameterId in r2.parameters) {
-                r1.parameters = r1.parameters || {};
-                r1.parameters[parameterId] = r1.parameters[parameterId] || r2.parameters[parameterId];
-            }
-        }
-        if (r2.outputs) {
-            for (let outputId in r2.outputs) {
-                r1.outputs = r1.outputs || {};
-                if ('version' in r2.outputs[outputId] || !(r1.outputs[outputId] && 'version' in r1.outputs[outputId]))
-                    r1.outputs[outputId] = r2.outputs[outputId];
-            }
-        }
-        if (r2.exports) {
-            for (let exportId in r2.exports) {
-                r1.exports = r1.exports || {};
-                if ('version' in r2.exports[exportId] || !(r1.exports[exportId] && 'version' in r1.exports[exportId]))
-                    r1.exports[exportId] = r2.exports[exportId];
-            }
-        }
-        if (parameters) {
-            for (let parameterId in r1.parameters) {
-                if (parameters[parameterId])
-                    continue;
-                parameters[parameterId] = r1.parameters[parameterId];
-                parameters[parameterId].id = parameterId;
-            }
-        }
-        if (exports) {
-            for (let exportId in r1.exports)
-                if (r1.exports[exportId].type === api_geometry_api_dto_v1_1.ShapeDiverResponseExportDefinitionType.EMAIL || r1.exports[exportId].type === api_geometry_api_dto_v1_1.ShapeDiverResponseExportDefinitionType.DOWNLOAD) {
-                    exports[exportId] = r1.exports[exportId];
-                    exports[exportId].id = exportId;
-                }
-        }
-        if (outputs) {
-            for (let outputId in r1.outputs) {
-                outputs[outputId] = r1.outputs[outputId];
-                outputs[outputId].id = outputId;
-            }
-        }
-        return r1;
-    }
-    saveDefaultParameters() {
-        var _a, _b, _c;
+    loadOutputs(cancelRequest = () => false) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!((_a = this._sessionResponse.actions) === null || _a === void 0 ? void 0 : _a.filter(v => v.name === 'defaultparam')[0])) {
-                this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, new viewer_shared_services_1.SDError('Session.saveDefaultParameters: Session has to be in edit mode to be able to save the settings.'));
-                return false;
-            }
+            this.checkAvailability();
+            const o = Object.assign({}, this._outputs);
             try {
-                yield this.sessionCommunication((_b = this._sessionResponse.actions) === null || _b === void 0 ? void 0 : _b.filter(v => v.name === 'defaultparam')[0].href, (_c = this._sessionResponse.actions) === null || _c === void 0 ? void 0 : _c.filter(v => v.name === 'defaultparam')[0].method, this._parameterValues, 'application/json');
-                return true;
+                const node = yield this._outputLoader.loadOutputs(this._responseDto, o, this.loadData.bind(this));
+                node.data.push(new SessionData_1.SessionData(this._responseDto));
+                return node;
             }
             catch (e) {
-                if (e.response && e.response.status) {
-                    this._logger.httpError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, `Session.saveDefaultParameters: Saving of default parameters failed.`, e.response.status, false);
+                if (e instanceof OutputDelayException_1.OutputDelayException) {
+                    yield this.timeout(e.delay);
                 }
                 else {
-                    this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, `Session.saveDefaultParameters: Saving of default parameters failed.`, false);
+                    throw yield this.handleError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.loadOutputs', e);
+                }
+                if (cancelRequest())
+                    return new SessionTreeNode_1.SessionTreeNode();
+                let outputMapping = {};
+                for (let output in o)
+                    outputMapping[output] = o[output].version;
+                try {
+                    const responseDto = yield this._sdk.output.getCache(this._sessionId, outputMapping);
+                    if (cancelRequest())
+                        return new SessionTreeNode_1.SessionTreeNode();
+                    this.updateResponseDto(responseDto);
+                    return yield this.loadOutputs(cancelRequest);
+                }
+                catch (e) {
+                    throw yield this.handleError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.loadOutputs', e);
                 }
-                return false;
             }
         });
     }
-    saveParameterProperties(parameters) {
-        var _a, _b, _c;
+    requestExport(exportId, parameters) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!((_a = this._sessionResponse.actions) === null || _a === void 0 ? void 0 : _a.filter(v => v.name === 'parameter-definition')[0])) {
-                this._logger.warn(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.saveParameterProperties: Session does not have the required action.');
-                return false;
+            this.checkAvailability('export');
+            try {
+                const responseDto = yield this._sdk.utils.submitAndWaitForExport(this._sdk, this._sessionId, { exports: { id: exportId }, parameters });
+                this.updateResponseDto(responseDto);
+                return this.exports[exportId];
+            }
+            catch (e) {
+                throw yield this.handleError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.requestExport', e);
             }
+        });
+    }
+    saveDefaultParameters() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.checkAvailability('defaultparam', true);
             try {
-                yield this.sessionCommunication((_b = this._sessionResponse.actions) === null || _b === void 0 ? void 0 : _b.filter(v => v.name === 'parameter-definition')[0].href, (_c = this._sessionResponse.actions) === null || _c === void 0 ? void 0 : _c.filter(v => v.name === 'parameter-definition')[0].method, parameters, 'application/json');
+                yield this._sdk.model.setDefaultParams(this._modelId, this._parameterValues);
                 return true;
             }
             catch (e) {
-                if (e.response && e.response.status) {
-                    this._logger.httpError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, `Session.saveParameterProperties: Saving of parameter properties failed.`, e.response.status, false);
-                }
-                else {
-                    this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, `Session.saveParameterProperties: Saving of parameter properties failed.`, false);
-                }
-                return false;
+                throw yield this.handleError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.saveDefaultParameters', e);
             }
         });
     }
     saveExportProperties(exports) {
-        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!((_a = this._sessionResponse.actions) === null || _a === void 0 ? void 0 : _a.filter(v => v.name === 'export-definition')[0])) {
-                this._logger.warn(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.saveExportProperties: Session does not have the required action.');
-                return false;
-            }
+            this.checkAvailability('export-definition', true);
             try {
-                yield this.sessionCommunication((_b = this._sessionResponse.actions) === null || _b === void 0 ? void 0 : _b.filter(v => v.name === 'export-definition')[0].href, (_c = this._sessionResponse.actions) === null || _c === void 0 ? void 0 : _c.filter(v => v.name === 'export-definition')[0].method, exports, 'application/json');
+                yield this._sdk.export.updateDefinitions(this._modelId, exports);
                 return true;
             }
             catch (e) {
-                if (e.response && e.response.status) {
-                    this._logger.httpError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, `Session.saveExportProperties: Saving of export properties failed.`, e.response.status, false);
-                }
-                else {
-                    this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, `Session.saveExportProperties: Saving of export properties failed.`, false);
-                }
-                return false;
+                throw yield this.handleError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.saveExportProperties', e);
             }
         });
     }
     saveOutputProperties(outputs) {
-        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!((_a = this._sessionResponse.actions) === null || _a === void 0 ? void 0 : _a.filter(v => v.name === 'output-definition')[0])) {
-                this._logger.warn(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.saveOutputProperties: Session does not have the required action.');
-                return false;
+            this.checkAvailability('output-definition', true);
+            try {
+                yield this._sdk.output.updateDefinitions(this._modelId, outputs);
+                return true;
             }
+            catch (e) {
+                throw yield this.handleError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.saveOutputProperties', e);
+            }
+        });
+    }
+    saveParameterProperties(parameters) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.checkAvailability('parameter-definition', true);
             try {
-                yield this.sessionCommunication((_b = this._sessionResponse.actions) === null || _b === void 0 ? void 0 : _b.filter(v => v.name === 'output-definition')[0].href, (_c = this._sessionResponse.actions) === null || _c === void 0 ? void 0 : _c.filter(v => v.name === 'output-definition')[0].method, outputs, 'application/json');
+                yield this._sdk.model.updateParameterDefinitions(this._modelId, parameters);
                 return true;
             }
             catch (e) {
-                if (e.response && e.response.status) {
-                    this._logger.httpError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, `Session.saveOutputProperties: Saving of output properties failed.`, e.response.status, false);
-                }
-                else {
-                    this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, `Session.saveOutputProperties: Saving of output properties failed.`, false);
-                }
-                return false;
+                throw yield this.handleError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.saveParameterProperties', e);
             }
         });
     }
     saveSettings(json) {
-        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            if (!((_a = this._sessionResponse.actions) === null || _a === void 0 ? void 0 : _a.filter(v => v.name === 'configure')[0])) {
-                this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, new viewer_shared_services_1.SDError('Session.saveSettings: Session has to be in edit mode to be able to save the settings.'));
-                return false;
-            }
+            this.checkAvailability('configure', true);
             try {
-                yield this.sessionCommunication((_b = this._sessionResponse.actions) === null || _b === void 0 ? void 0 : _b.filter(v => v.name === 'configure')[0].href, (_c = this._sessionResponse.actions) === null || _c === void 0 ? void 0 : _c.filter(v => v.name === 'configure')[0].method, json, 'application/json');
+                yield this._sdk.model.updateConfig(this._modelId, json);
                 return true;
             }
             catch (e) {
-                if (e.response && e.response.status) {
-                    this._logger.httpError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, `Session.saveSettings: Saving of settings failed.`, e.response.status, false);
+                throw yield this.handleError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.saveSettings', e);
+            }
+        });
+    }
+    uploadFile(parameterId, data, type) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.checkAvailability('upload');
+            try {
+                const responseDto = yield this._sdk.file.requestUpload(this._sessionId, {
+                    [parameterId]: { size: data.size, format: type }
+                });
+                if (responseDto && responseDto.asset && responseDto.asset.file && responseDto.asset.file[parameterId]) {
+                    const fileAsset = responseDto.asset.file[parameterId];
+                    yield this._sdk.utils.upload(fileAsset.href, yield data.arrayBuffer(), type);
+                    return fileAsset.id;
                 }
                 else {
-                    this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, `Session.saveSettings: Saving of settings failed.`, false);
+                    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.LOGGINGTOPIC.SESSION, 'Session.uploadFile', error);
                 }
-                return false;
+            }
+            catch (e) {
+                throw yield this.handleError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.uploadFile', e);
             }
         });
     }
-    sessionCommunication(href, method, data, contentType) {
+    uploadGLTF(blob, conversion = sdk_geometry_api_sdk_v2_1.ShapeDiverRequestGltfUploadQueryConversion.NONE) {
         return __awaiter(this, void 0, void 0, function* () {
-            let headers = this._bearerToken ? Object.assign({ "Authorization": this._bearerToken }, this._headers) : this._headers;
-            if (contentType)
-                headers = Object.assign({ "Content-Type": contentType }, this._headers);
-            method = method.toLowerCase();
-            if (method !== 'post' && method !== 'get' && method !== 'patch')
-                throw this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, new viewer_shared_services_1.SDError('Session: Method ' + method + ' not recognized.'));
+            this.checkAvailability('gltf-upload');
             try {
-                return yield this._httpClient[method](href, { data, headers });
+                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.LOGGINGTOPIC.SESSION, 'Session.uploadGLTF', error);
+                }
+                return responseDto.gltf.href;
             }
             catch (e) {
-                if (e.response && e.response.status && e.response.status === 403 && e.response.data && (e.response.data.error === 'SdJwtValidationError' || e.response.data.error === 'SdErrorUnauthorized')) {
-                    if (!this._refreshBearerToken) {
-                        this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, new viewer_shared_services_1.SDError('Session.sessionCommunication: Session request failed. Bearer Token invalid, please try to supply a valid token or assign the "refreshBearerToken" callback.'));
-                        throw e;
-                    }
-                    else {
-                        const bearerToken = this.bearerToken;
-                        const newToken = this._refreshBearerToken();
-                        if (bearerToken === newToken) {
-                            this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, new viewer_shared_services_1.SDError('Session.sessionCommunication: Session request failed. Bearer Token invalid, callback "refreshBearerToken" supplied the same token.'));
-                            throw e;
-                        }
-                        else {
-                            this.bearerToken = newToken;
-                            return this.sessionCommunication(href, method, data, contentType);
-                        }
-                    }
-                }
-                throw e;
+                throw yield this.handleError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.uploadGLTF', e);
             }
         });
     }
-    customizeSession(parameters, cancelRequest) {
+    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.LOGGINGTOPIC.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.LOGGINGTOPIC.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.LOGGINGTOPIC.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.LOGGINGTOPIC.SESSION, 'Session.checkAvailability', error);
+        }
+        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.LOGGINGTOPIC.SESSION, 'Session.checkAvailability', error);
+        }
+    }
+    customizeSession(parameters, cancelRequest) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._initialized === false) {
-                this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, new viewer_shared_services_1.SDError('Session.customizeSession: Session not initialized.'));
-                return new SessionTreeNode_1.SessionTreeNode();
-            }
+            this.checkAvailability('customize');
             try {
-                let responseCustomize;
-                try {
-                    this._performanceEvaluator.startSection('sessionResponse');
-                    responseCustomize = (yield this.sessionCommunication((_a = this._sessionResponse.actions) === null || _a === void 0 ? void 0 : _a.filter(v => v.name === 'customize')[0].href, 'post', parameters, 'application/json')).data;
-                    this._performanceEvaluator.endSection('sessionResponse');
-                    if (cancelRequest())
-                        return new SessionTreeNode_1.SessionTreeNode();
-                }
-                catch (e) {
-                    if (e.response && e.response.status) {
-                        if (e.response && e.response.status && e.response.status === 410 && !this._closed) {
-                            this._logger.info(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.customizeSession: Session customization failed. Session expired. Re-initializing session.');
-                            this._initialized = false;
-                            yield this.init(parameters);
-                            if (cancelRequest())
-                                return new SessionTreeNode_1.SessionTreeNode();
-                            return this.loadOutputs(parameters, cancelRequest);
-                        }
-                    }
-                    if (e.response && e.response.status) {
-                        throw this._logger.httpError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, `Session.customizeSession: Session customization failed.`, e.response.status, true);
-                    }
-                    else {
-                        throw this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, `Session.customizeSession: Session customization failed.`, true, false);
-                    }
-                }
-                this._sessionResponse = this.mergeResponses(this._sessionResponse, responseCustomize, this._parameters, this._outputs, this._exports);
-                return this.loadOutputs(parameters, cancelRequest);
+                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();
+                this.updateResponseDto(responseDto);
+                return this.loadOutputs(cancelRequest);
             }
             catch (e) {
-                throw this._logger.error(viewer_shared_services_1.LOGGINGTOPIC.SESSION, e, 'Session.customizeSession: Something went wrong at session customization.', true);
+                if (e.response && e.response.status) {
+                    if (e.response && e.response.status && e.response.status === 410 && !this._closed) {
+                        this._logger.info(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.customizeSession: Session customization failed. Session expired. Re-initializing session.');
+                        this._initialized = false;
+                        yield this.init(parameters);
+                        if (cancelRequest())
+                            return new SessionTreeNode_1.SessionTreeNode();
+                        return this.loadOutputs(cancelRequest);
+                    }
+                }
+                throw yield this.handleError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.customizeSession', e);
             }
         });
     }
-    loadOutputs(parameters, cancelRequest = () => false) {
-        var _a, _b;
+    loadData(href, config = { responseType: 'blob' }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const o = Object.assign({}, this._outputs);
+            this.checkAvailability();
             try {
-                const node = yield this._outputLoader.loadOutputs(this._sessionResponse, o);
-                node.data.push(new SessionData_1.SessionData(this._sessionResponse));
-                return node;
+                const response = yield this._httpClient.get(`${this.modelViewUrl}/api/v2/session/${this._sessionId}/image?url=${btoa(href)}`, config);
+                return response.data;
             }
             catch (e) {
-                if (e instanceof OutputDelayException_1.OutputDelayException)
-                    yield this.timeout(e.delay);
-                if (cancelRequest())
-                    return new SessionTreeNode_1.SessionTreeNode();
-                let outputMapping = {};
-                for (let output in o)
-                    outputMapping[output] = o[output].version;
-                let responseCache = (yield this.sessionCommunication((_a = this._sessionResponse.actions) === null || _a === void 0 ? void 0 : _a.filter(v => v.name === 'cache')[0].href, (_b = this._sessionResponse.actions) === null || _b === void 0 ? void 0 : _b.filter(v => v.name === 'cache')[0].method.toLowerCase(), outputMapping, 'application/json')).data;
-                if (cancelRequest())
-                    return new SessionTreeNode_1.SessionTreeNode();
-                this._sessionResponse = this.mergeResponses(this._sessionResponse, responseCache, this._parameters, this._outputs, this._exports);
-                return yield this.loadOutputs(parameters, cancelRequest);
+                throw yield this.handleError(viewer_shared_services_1.LOGGINGTOPIC.SESSION, 'Session.loadData', e);
             }
         });
     }
@@ -434,6 +373,47 @@ class Session {
             return new Promise(resolve => setTimeout(resolve, ms));
         });
     }
+    updateResponseDto(responseDto) {
+        if (!this._responseDto) {
+            this._responseDto = responseDto;
+            return;
+        }
+        if (responseDto.parameters) {
+            for (let parameterId in responseDto.parameters) {
+                this._responseDto.parameters = this._responseDto.parameters || {};
+                this._responseDto.parameters[parameterId] = this._responseDto.parameters[parameterId] || responseDto.parameters[parameterId];
+            }
+        }
+        if (responseDto.outputs) {
+            for (let outputId in responseDto.outputs) {
+                this._responseDto.outputs = this._responseDto.outputs || {};
+                if ('version' in responseDto.outputs[outputId] || !(this._responseDto.outputs[outputId] && 'version' in this._responseDto.outputs[outputId]))
+                    this._responseDto.outputs[outputId] = responseDto.outputs[outputId];
+            }
+        }
+        if (responseDto.exports) {
+            for (let exportId in responseDto.exports) {
+                this._responseDto.exports = this._responseDto.exports || {};
+                if ('version' in responseDto.exports[exportId] || !(this._responseDto.exports[exportId] && 'version' in this._responseDto.exports[exportId]))
+                    this._responseDto.exports[exportId] = responseDto.exports[exportId];
+            }
+        }
+        for (let parameterId in this._responseDto.parameters) {
+            if (this.parameters[parameterId])
+                continue;
+            this.parameters[parameterId] = this._responseDto.parameters[parameterId];
+            this.parameters[parameterId].id = parameterId;
+        }
+        for (let exportId in this._responseDto.exports)
+            if (this._responseDto.exports[exportId].type === sdk_geometry_api_sdk_v2_1.ShapeDiverResponseExportDefinitionType.EMAIL || this._responseDto.exports[exportId].type === sdk_geometry_api_sdk_v2_1.ShapeDiverResponseExportDefinitionType.DOWNLOAD) {
+                this.exports[exportId] = this._responseDto.exports[exportId];
+                this.exports[exportId].id = exportId;
+            }
+        for (let outputId in this._responseDto.outputs) {
+            this.outputs[outputId] = this._responseDto.outputs[outputId];
+            this.outputs[outputId].id = outputId;
+        }
+    }
 }
 exports.Session = Session;
 //# sourceMappingURL=Session.js.map