@shapediver/viewer.shared.services 2.8.4 → 2.9.0

package/src/logger/ShapeDiverBackendErrors.ts

@@ -0,0 +1,30 @@
+import { ShapeDiverResponseErrorType } from "@shapediver/sdk.geometry-api-sdk-v2";
+import { ShapeDiverViewerError, ShapeDiverViewerErrorType } from "./ShapeDiverError";
+
+export class ShapeDiverGeometryBackendRequestError extends ShapeDiverViewerError {
+    // #region Constructors (1)
+
+    constructor(
+        message: string,
+        public readonly desc: string,
+    ) {
+        super(ShapeDiverViewerErrorType.GEOMETRY_BACKEND_REQUEST_ERROR, desc, message);
+    }
+
+    // #endregion Constructors (1)
+}
+
+export class ShapeDiverGeometryBackendResponseError extends ShapeDiverViewerError {
+    // #region Constructors (1)
+
+    constructor(
+        message: string,
+        public readonly status: number,
+        public readonly geometryBackendErrorType: ShapeDiverResponseErrorType,
+        public readonly desc: string,
+    ) {
+        super(ShapeDiverViewerErrorType.GEOMETRY_BACKEND_RESPONSE_ERROR, desc, message);
+    }
+
+    // #endregion Constructors (1)
+}

package/src/logger/ShapeDiverError.ts

@@ -1,6 +1,7 @@
-
 export enum ShapeDiverViewerErrorType {
     AR_ERROR = 'SdARError',
+    GEOMETRY_BACKEND_REQUEST_ERROR = 'SdGeometryBackendRequestError',
+    GEOMETRY_BACKEND_RESPONSE_ERROR = 'SdGeometryBackendResponseError',
     CAMERA_ERROR = 'SdCameraError',
     CONNECTION_ERROR = 'SdConnectionError',
     DATA_PROCESSING_ERROR = 'SdDataProcessingError',
@@ -14,10 +15,15 @@ export enum ShapeDiverViewerErrorType {
     WEBGL_ERROR = 'SdWebGLError',
     UNKNOWN = "",
 }
+
 export interface IShapeDiverViewerError {
-    error: ShapeDiverViewerErrorType;
+    // #region Properties (3)
+
     desc: string;
+    errorType: ShapeDiverViewerErrorType;
     message: string;
+
+    // #endregion Properties (3)
 }
 
 export class ShapeDiverError extends Error {
@@ -34,14 +40,14 @@ export class ShapeDiverViewerError extends ShapeDiverError implements IShapeDive
     // #region Constructors (1)
 
     constructor(
-        public readonly error: ShapeDiverViewerErrorType,
+        public readonly errorType: ShapeDiverViewerErrorType,
         public readonly desc: string,
         message: string
     ) {
         super(message)
 
-        this.error = (Object.values(ShapeDiverViewerErrorType).includes(error as any))
-            ? error as ShapeDiverViewerErrorType
+        this.errorType = (Object.values(ShapeDiverViewerErrorType).includes(errorType as any))
+            ? errorType as ShapeDiverViewerErrorType
             : ShapeDiverViewerErrorType.UNKNOWN
     }
 

package/src/settings-engine/SettingsEngine.ts

@@ -1,4 +1,4 @@
-import { convert, validate, DefaultsV3_3 as Defaults, ISettingsV3_3 as ISettings, versions, latestVersion } from '@shapediver/viewer.settings';
+import { convert, validate, DefaultsV3_4 as Defaults, ISettingsV3_4 as ISettings, versions, latestVersion } from '@shapediver/viewer.settings';
 
 import { EventEngine } from '../event-engine/EventEngine'
 import { Logger } from '../logger/Logger';
@@ -20,7 +20,6 @@ export class SettingsEngine {
     private readonly _logger: Logger = Logger.instance;
     private readonly _settings: ISettings = Defaults();
     private _settingsJson: any;
-    private _settings_version: versions = latestVersion;
 
     // #endregion Properties (8)
 
@@ -74,10 +73,6 @@ export class SettingsEngine {
 
     // #region Public Methods (4)
 
-    public convertToTargetVersion(): any {
-        return convert(this._settings, this._settings_version);
-    }
-
     public flatten() {
         const flattenObject = (ob: any) => {
             const toReturn: { [key: string]: any } = {};
@@ -102,13 +97,12 @@ export class SettingsEngine {
         this._settingsJson = json;
         if (JSON.stringify(json) !== JSON.stringify({})) {
 
-            const prevVersions = ['1.0', '2.0', '3.0', '3.1', '3.2'];
+            const prevVersions = ['1.0', '2.0', '3.0', '3.1', '3.2', '3.3'];
             for(let i = 0; i < prevVersions.length; i++) {
                 const v = prevVersions[i];
 
                 try { 
                     validate(json, v as versions);             
-                    this._settings_version = v as versions;       
                     (<any>this._settings) = convert(json, latestVersion);
                     this.cleanSettings(this._settings);
                     return;
@@ -117,7 +111,6 @@ export class SettingsEngine {
 
             try { 
                 validate(json, latestVersion);             
-                this._settings_version = latestVersion;       
                 (<any>this._settings) = convert(json, latestVersion);
                 this.cleanSettings(this._settings);
                 return;
@@ -125,14 +118,12 @@ export class SettingsEngine {
                 throw new ShapeDiverViewerSettingsError('SettingsEngine.loadSettings: Settings could not be validated. ' + (<Error>e).message, <Error>e);
             }
         } else {
-            this._settings_version = latestVersion;       
             (<any>this._settings) = Defaults();
             return;
         }
     }
 
     public reset() {
-        this._settings_version = latestVersion;       
         (<any>this._settings) = Defaults();
     }
 

package/src/system-info/SystemInfo.ts

@@ -101,6 +101,13 @@ export class SystemInfo {
         return this._isIframe;
     }
 
+    /**
+     * Check if we are running in an instagram browser
+     */
+    public get isInstagram(): boolean {
+        return this._parser.getBrowser().name === "Instagram";
+    }
+
     /**
      * Check if we are on a Mac OS device
      */