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

package/src/implementation/dto/Export.ts

@@ -1,6 +1,5 @@
 import { ShapeDiverResponseExport, ShapeDiverResponseExportContent, ShapeDiverResponseExportDefinitionType, ShapeDiverResponseExportResult, ShapeDiverResponseModelComputationStatus, ShapeDiverResponseParameterGroup } from "@shapediver/sdk.geometry-api-sdk-v2";
-import { container } from "tsyringe";
-import { EventEngine, EVENTTYPE, InputValidator, Logger, LOGGING_TOPIC, ShapeDiverBackendError, ShapeDiverViewerError, UuidGenerator } from "@shapediver/viewer.shared.services";
+import { EventEngine, EVENTTYPE, InputValidator, Logger, ShapeDiverBackendError, ShapeDiverViewerError, UuidGenerator } from "@shapediver/viewer.shared.services";
 import { ITaskEvent, TASK_TYPE } from "@shapediver/viewer.shared.types";
 import { IExport } from "../../interfaces/dto/IExport";
 import { SessionEngine } from "../SessionEngine";
@@ -8,14 +7,14 @@ import { SessionEngine } from "../SessionEngine";
 export class Export implements IExport {
   // #region Properties (24)
 
-  readonly #eventEngine: EventEngine = <EventEngine>container.resolve(EventEngine);
+  readonly #eventEngine: EventEngine = EventEngine.instance;
   readonly #id: string;
-  readonly #inputValidator: InputValidator = <InputValidator>container.resolve(InputValidator);
-  readonly #logger: Logger = <Logger>container.resolve(Logger);
+  readonly #inputValidator: InputValidator = InputValidator.instance;
+  readonly #logger: Logger = Logger.instance;
   readonly #name: string;
   readonly #sessionEngine: SessionEngine;
   readonly #type: ShapeDiverResponseExportDefinitionType;
-  readonly #uuidGenerator: UuidGenerator = <UuidGenerator>container.resolve(UuidGenerator);
+  readonly #uuidGenerator: UuidGenerator = UuidGenerator.instance;
 
   #content?: ShapeDiverResponseExportContent[];
   #delay?: number;
@@ -157,14 +156,14 @@ export class Export implements IExport {
       const event: ITaskEvent = { type: TASK_TYPE.EXPORT_REQUEST, id: eventId, progress: 0, status: 'Requesting export' };
       this.#eventEngine.emitEvent(EVENTTYPE.TASK.TASK_START, event);
 
-      this.#logger.debugLow(LOGGING_TOPIC.EXPORT, `Export(${this.#id}).request: Sending export request.`);
+      this.#logger.debugLow(`Export(${this.#id}).request: Sending export request.`);
       const currentParameters = this.#sessionEngine.parameterValues;
       const exportParameters: { [key: string]: string } = {}
 
       for (let parameter in currentParameters)
         exportParameters[parameter] = parameters[parameter] || parameters[parameter] === '' ? parameters[parameter] : currentParameters[parameter];
 
-      this.#logger.info(LOGGING_TOPIC.EXPORT, `Export(${this.#id}).request: Sending export request with parameters ${JSON.stringify(exportParameters)}.`);
+      this.#logger.info(`Export(${this.#id}).request: Sending export request with parameters ${JSON.stringify(exportParameters)}.`);
 
       const exportDef = await this.#sessionEngine.requestExport(this.id, exportParameters, this.#maxWaitTime);
       this.updateExportDefinition(exportDef);
@@ -177,8 +176,7 @@ export class Export implements IExport {
       const eventEnd: ITaskEvent = { type: TASK_TYPE.EXPORT_REQUEST, id: eventId, progress: 1, status: 'Export request failed' };
       this.#eventEngine.emitEvent(EVENTTYPE.TASK.TASK_CANCEL, eventEnd);
 
-      if (e instanceof ShapeDiverViewerError || e instanceof ShapeDiverBackendError) throw e;
-      throw this.#logger.handleError(LOGGING_TOPIC.EXPORT, `Export(${this.#id}).request`, e);
+      throw e;
     }
   }
 

package/src/implementation/dto/FileParameter.ts

@@ -1,6 +1,5 @@
 import { ShapeDiverResponseParameter } from "@shapediver/sdk.geometry-api-sdk-v2";
-import { Logger, LOGGING_TOPIC, ShapeDiverViewerSessionError, UuidGenerator } from "@shapediver/viewer.shared.services";
-import { container } from "tsyringe";
+import { Logger, ShapeDiverViewerSessionError, UuidGenerator } from "@shapediver/viewer.shared.services";
 import { IFileParameter } from "../../interfaces/dto/IFileParameter";
 import { Parameter } from "./Parameter";
 import * as MimeTypeUtils from "@shapediver/viewer.utils.mime-type"
@@ -9,9 +8,9 @@ import { SessionEngine } from "../SessionEngine";
 export class FileParameter extends Parameter<File | Blob | string> implements IFileParameter {
     // #region Properties (5)
 
-    readonly #logger: Logger = <Logger>container.resolve(Logger);
+    readonly #logger: Logger = Logger.instance;
     readonly #sessionEngine: SessionEngine;
-    readonly #uuidGenerator: UuidGenerator = <UuidGenerator>container.resolve(UuidGenerator);
+    readonly #uuidGenerator: UuidGenerator = UuidGenerator.instance;
 
     // #endregion Properties (5)
 
@@ -57,12 +56,10 @@ export class FileParameter extends Parameter<File | Blob | string> implements IF
             }
         }
 
-        if (!allowedType) {
-            const error = new ShapeDiverViewerSessionError(`Parameter(${this.id}).upload: Error uploading FileParameter, type of data (${data.type}) is not a valid type. Has to be ${this.format}.`);
-            throw this.#logger.handleError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.id}).upload`, error);
-        }
+        if (!allowedType) 
+            throw new ShapeDiverViewerSessionError(`Parameter(${this.id}).upload: Error uploading FileParameter, type of data (${data.type}) is not a valid type. Has to be ${this.format}.`);
 
-        this.#logger.debug(LOGGING_TOPIC.PARAMETER, `Parameter(${this.id}).upload: Uploading FileParameter.`);
+        this.#logger.debug(`Parameter(${this.id}).upload: Uploading FileParameter.`);
 
         return await this.#sessionEngine.uploadFile(this.id, data, type!)
     }

package/src/implementation/dto/Output.ts

@@ -1,7 +1,6 @@
 import { ShapeDiverResponseModelComputationStatus, ShapeDiverResponseOutput } from "@shapediver/sdk.geometry-api-sdk-v2";
-import { container } from "tsyringe";
 import { ITreeNode, TreeNode } from "@shapediver/viewer.shared.node-tree";
-import { InputValidator, UuidGenerator, LOGGING_TOPIC, ShapeDiverViewerError, ShapeDiverBackendError, Logger } from "@shapediver/viewer.shared.services";
+import { InputValidator, UuidGenerator, ShapeDiverViewerError, ShapeDiverBackendError, Logger } from "@shapediver/viewer.shared.services";
 import { IOutput, ShapeDiverResponseOutputContent, ShapeDiverResponseOutputChunk } from "../../interfaces/dto/IOutput";
 import { SessionEngine } from "../SessionEngine";
 
@@ -9,11 +8,11 @@ export class Output implements IOutput {
   // #region Properties (23)
 
   readonly #id: string;
-  readonly #inputValidator: InputValidator = <InputValidator>container.resolve(InputValidator);
-  readonly #logger: Logger = <Logger>container.resolve(Logger);
+  readonly #inputValidator: InputValidator = InputValidator.instance;
+  readonly #logger: Logger = Logger.instance;
   readonly #name: string;
   readonly #sessionEngine: SessionEngine;
-  readonly #uuidGenerator: UuidGenerator = <UuidGenerator>container.resolve(UuidGenerator);
+  readonly #uuidGenerator: UuidGenerator = UuidGenerator.instance;
 
   #bbmax?: number[];
   #bbmin?: number[];
@@ -204,7 +203,7 @@ export class Output implements IOutput {
     this.#chunks = outputDef.chunks;
     this.#msg = outputDef.msg;
     if (this.#msg !== undefined)
-      this.#logger.warn(LOGGING_TOPIC.OUTPUT, `Output(${this.id}): ${this.#msg}`);
+      this.#logger.warn(`Output(${this.id}): ${this.#msg}`);
     this.#bbmin = outputDef.bbmin;
     this.#bbmax = outputDef.bbmax;
     this.#status_computation = outputDef.status_computation;

package/src/implementation/dto/Parameter.ts

@@ -1,6 +1,5 @@
 import { ShapeDiverResponseParameterStructure, ShapeDiverResponseParameterGroup, ShapeDiverResponseParameter } from "@shapediver/api.geometry-api-dto-v2";
-import { Converter, InputValidator, Logger, LOGGING_TOPIC, ShapeDiverBackendError, ShapeDiverViewerError, ShapeDiverViewerSessionError } from "@shapediver/viewer.shared.services";
-import { container } from "tsyringe";
+import { Converter, InputValidator, Logger, ShapeDiverViewerSessionError } from "@shapediver/viewer.shared.services";
 import { IParameter } from "../../interfaces/dto/IParameter";
 import { ISessionEngine, PARAMETER_TYPE, PARAMETER_VISUALIZATION } from "../../interfaces/ISessionEngine";
 import * as MimeTypeUtils from "@shapediver/viewer.utils.mime-type"
@@ -10,7 +9,7 @@ export class Parameter<T> implements IParameter<T> {
     // #region Properties (24)
 
     readonly #choices?: string[];
-    readonly #converter: Converter = <Converter>container.resolve(Converter);
+    readonly #converter: Converter = Converter.instance;
     readonly #decimalplaces?: number;
     readonly #defaultValue: T | string;
     readonly #defval: string;
@@ -18,8 +17,8 @@ export class Parameter<T> implements IParameter<T> {
     readonly #format?: string[];
     readonly #group?: ShapeDiverResponseParameterGroup;
     readonly #id: string;
-    readonly #inputValidator: InputValidator = <InputValidator>container.resolve(InputValidator);
-    readonly #logger: Logger = <Logger>container.resolve(Logger);
+    readonly #inputValidator: InputValidator = InputValidator.instance;
+    readonly #logger: Logger = Logger.instance;
     readonly #max?: number;
     readonly #min?: number;
     readonly #name: string;
@@ -201,77 +200,61 @@ export class Parameter<T> implements IParameter<T> {
         switch (true) {
             case this.type === PARAMETER_TYPE.BOOL:
                 if (typeof value === 'string') {
-                    if (!(value === 'true' || value === 'false')) {
-                        const error = new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${value} is a string that is neither true or false.`);
-                        throw this.#logger.handleError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.id}).value`, error, false);
-                    }
+                    if (!(value === 'true' || value === 'false')) 
+                        throw new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${value} is a string that is neither true or false.`);
                 } else {
-                    this.#inputValidator.validateAndError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.#id}).isValid`, value, 'boolean');
+                    this.#inputValidator.validateAndError(`Parameter(${this.#id}).isValid`, value, 'boolean');
                 }
                 break;
             case this.type === PARAMETER_TYPE.COLOR:
-                this.#inputValidator.validateAndError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.#id}).isValid`, value, 'color');
+                this.#inputValidator.validateAndError(`Parameter(${this.#id}).isValid`, value, 'color');
                 break;
             case this.type === PARAMETER_TYPE.FILE:
-                this.#inputValidator.validateAndError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.#id}).isValid`, value, 'file');
+                this.#inputValidator.validateAndError(`Parameter(${this.#id}).isValid`, value, 'file');
                 break;
             case this.type === PARAMETER_TYPE.EVEN || this.type === PARAMETER_TYPE.FLOAT || this.type === PARAMETER_TYPE.INT || this.type === PARAMETER_TYPE.ODD:
                 let temp: number = value;
                 if (typeof value === 'string')
                     temp = +value;
-                this.#inputValidator.validateAndError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.#id}).isValid`, temp, 'number');
+                this.#inputValidator.validateAndError(`Parameter(${this.#id}).isValid`, temp, 'number');
                 if (this.type === PARAMETER_TYPE.EVEN) {
-                    if (temp % 2 !== 0) {
-                        const error = new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${value} is not even.`);
-                        throw this.#logger.handleError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.id}).value`, error, false);
-                    }
+                    if (temp % 2 !== 0) 
+                        throw new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${value} is not even.`);
                 } else if (this.type === PARAMETER_TYPE.ODD) {
-                    if (temp % 2 === 0) {
-                        const error = new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${value} is not odd.`);
-                        throw this.#logger.handleError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.id}).value`, error, false);
-                    }
+                    if (temp % 2 === 0) 
+                        throw new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${value} is not odd.`);
                 } else if (this.type === PARAMETER_TYPE.INT) {
-                    if (!Number.isInteger(temp)) {
-                        const error = new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${value} is not an integer.`);
-                        throw this.#logger.handleError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.id}).value`, error, false);
-                    }
+                    if (!Number.isInteger(temp))
+                        throw new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${value} is not an integer.`);
                 }
                 if (this.min || this.min === 0)
-                    if (temp < this.min) {
-                        const error = new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${value} is smaller than the minimum ${this.min}.`);
-                        throw this.#logger.handleError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.id}).value`, error, false);
-                    }
+                    if (temp < this.min)
+                        throw new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${value} is smaller than the minimum ${this.min}.`);
 
                 if (this.max || this.max === 0)
-                    if (temp > this.max) {
-                        const error = new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${value} is larger than the maximum ${this.max}.`);
-                        throw this.#logger.handleError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.id}).value`, error, false);
-                    }
+                    if (temp > this.max)
+                        throw new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${value} is larger than the maximum ${this.max}.`);
 
                 if (this.decimalplaces || this.decimalplaces === 0) {
                     const numStr = temp + '';
                     let decimalplaces = 0;
                     if (numStr.includes('.'))
                         decimalplaces = numStr.split('.')[1].length;
-                    if (this.decimalplaces < decimalplaces) {
-                        const error = new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${value} has not the correct number of decimalplaces (${this.decimalplaces}).`);
-                        throw this.#logger.handleError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.id}).value`, error, false);
-                    }
+                    if (this.decimalplaces < decimalplaces)
+                        throw new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${value} has not the correct number of decimalplaces (${this.decimalplaces}).`);
                 }
 
                 break;
             case this.type === PARAMETER_TYPE.STRINGLIST:
-                this.#inputValidator.validateAndError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.#id}).isValid`, value, 'string');
+                this.#inputValidator.validateAndError(`Parameter(${this.#id}).isValid`, value, 'string');
                 const choicesChecker = (v: string) => {
                     // has to be a single value that is
                     // 1. convertible to number
                     // 2. between 0 and choices.length -1
                     const temp = +v;
-                    this.#inputValidator.validateAndError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.#id}).isValid`, temp, 'number');
-                    if (temp < 0 || temp > this.choices!.length - 1) {
-                        const error = new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${v} is not within the range of the defined number choices.`);
-                        throw this.#logger.handleError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.id}).value`, error, false);
-                    }
+                    this.#inputValidator.validateAndError(`Parameter(${this.#id}).isValid`, temp, 'number');
+                    if (temp < 0 || temp > this.choices!.length - 1)
+                        throw new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${v} is not within the range of the defined number choices.`);
                 }
 
                 if (this.visualization === PARAMETER_VISUALIZATION.CHECKLIST) {
@@ -279,10 +262,8 @@ export class Parameter<T> implements IParameter<T> {
                     if (value.includes(',')) {
                         const values: string[] = value.split(',');
                         for (let i = 0; i < values.length; i++) {
-                            if (values.filter(item => item === values[i]).length !== 1) {
-                                const error = new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${values[i]} exists multiple times, but should only exist once.`);
-                                throw this.#logger.handleError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.id}).value`, error, false);
-                            }
+                            if (values.filter(item => item === values[i]).length !== 1)
+                                throw new ShapeDiverViewerSessionError(`Parameter(${this.#id}).isValid: The value ${values[i]} exists multiple times, but should only exist once.`);
                             choicesChecker(values[i]);
                         }
                     } else {
@@ -290,7 +271,7 @@ export class Parameter<T> implements IParameter<T> {
                         let temp: number = value;
                         if (typeof value === 'string')
                             temp = +value;
-                        this.#inputValidator.validateAndError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.#id}).isValid`, temp, 'number');
+                        this.#inputValidator.validateAndError(`Parameter(${this.#id}).isValid`, temp, 'number');
                         choicesChecker(value);
                     }
                 } else {
@@ -298,12 +279,12 @@ export class Parameter<T> implements IParameter<T> {
                     let temp: number = value;
                     if (typeof value === 'string')
                         temp = +value;
-                    this.#inputValidator.validateAndError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.#id}).isValid`, temp, 'number');
+                    this.#inputValidator.validateAndError(`Parameter(${this.#id}).isValid`, temp, 'number');
                     choicesChecker(value);
                 }
                 break;
             default:
-                this.#inputValidator.validateAndError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.#id}).isValid`, value, 'string');
+                this.#inputValidator.validateAndError(`Parameter(${this.#id}).isValid`, value, 'string');
                 break;
         }
         return true;
@@ -324,10 +305,8 @@ export class Parameter<T> implements IParameter<T> {
             case this.type === PARAMETER_TYPE.COLOR:
                 return this.#converter.toHex8Color(this.value);
             case this.type === PARAMETER_TYPE.FILE:
-                if (typeof this.value !== 'string') {
-                    const error = new ShapeDiverViewerSessionError(`Parameter(${this.#id}).stringify: Error in stringify. Cannot stringify FileParameter that has not been uploaded yet.`);
-                    throw this.#logger.handleError(LOGGING_TOPIC.PARAMETER, `Parameter(${this.id}).value`, error);
-                }
+                if (typeof this.value !== 'string')
+                    throw new ShapeDiverViewerSessionError(`Parameter(${this.#id}).stringify: Error in stringify. Cannot stringify FileParameter that has not been uploaded yet.`);
                 return <string>this.value;
             case this.type === PARAMETER_TYPE.EVEN || this.type === PARAMETER_TYPE.FLOAT || this.type === PARAMETER_TYPE.INT || this.type === PARAMETER_TYPE.ODD:
                 if(typeof this.value === 'string') {