@colijnit/configurator 262.1.8 → 262.1.9

package/fesm2022/colijnit-configurator.mjs

@@ -5,6 +5,7 @@ import { CommonModule, AsyncPipe } from '@angular/common';
 import { BehaviorSubject, Subject, combineLatest, debounceTime } from 'rxjs';
 import * as THREE from 'three';
 import { Color, WebGLRenderer, Box3, Vector3, Scene, PerspectiveCamera, MathUtils, AmbientLight, DirectionalLight, Group, Euler, Object3D, EventDispatcher, MeshBasicMaterial, Mesh, PlaneGeometry, DoubleSide, MeshStandardMaterial, CylinderGeometry, RingGeometry, Matrix4, Raycaster, BufferGeometry, Line, DataTexture, RGFormat, UnsignedByteType, LinearFilter, Shape, Vector2, SphereGeometry, SRGBColorSpace, PCFSoftShadowMap, ShadowMaterial, LightProbe, Texture as Texture$1, MeshPhongMaterial, NoToneMapping, TextureLoader, RGBAFormat, Quaternion, PointLight, BoxGeometry, BackSide, FrontSide, ShapeGeometry } from 'three';
+import { Options } from '@colijnit/ioneconnector/build/model/options';
 import { HdecoPlacement } from '@colijnit/configuratorapi/build/enum/hdeco-placement.enum';
 import * as i6 from '@colijnit/utilities';
 import { ObjectUtils, MaterialUtils, DeviceUtils as DeviceUtils$1, DeviceTier as DeviceTier$1, TranslationModule, UtilitiesPipesModule } from '@colijnit/utilities';
@@ -18,7 +19,6 @@ import { BusinessObjectFactory } from '@colijnit/ioneconnector/build/service/bus
 import { Configurator } from '@colijnit/configuratorapi';
 import { NodeType } from '@colijnit/configuratorapi/build/enum/node-type.enum';
 import { Articles } from '@colijnit/articleapi/build/articles';
-import { Options } from '@colijnit/ioneconnector/build/model/options';
 import { Article } from '@colijnit/configuratorapi/build/model/article';
 import { Selection } from '@colijnit/configuratorapi/build/model/selection';
 import { SelectorWithOptions } from '@colijnit/configuratorapi/build/model/selector-with-options';
@@ -159,20 +159,10 @@ class SceneSettings {
     scenes;
 }
 
-class ConfiguratorSettings {
-    url;
-    schema;
-    version;
-    branch;
+class ConfiguratorSettings extends Options {
     currency;
     currencySymbol = '€';
-    username;
-    password;
     session = undefined;
-    useGroups = true;
-    useRenders = false;
-    useLoginEncryption = true;
-    logoutWhenRefresh = true;
     useMatch = false;
     assetPath;
     threeDAssetPath;
@@ -181,10 +171,7 @@ class ConfiguratorSettings {
     additionalTranslationFile;
     apiUrl;
     client;
-    timeoutInMs;
-    languageCode;
     secondaryLogo;
-    jwtEnabled;
     gtm;
     dracoPath = 'https?://cdn1.colijn-it.nl/draco/';
     mainUrl;
@@ -262,6 +249,12 @@ class ConfiguratorSettingsService {
         const ownOptions = Object.assign({}, this.settings.options);
         const ownRenderParameters = Object.assign({}, this.settings.renderParameters);
         const blenderSceneSettings = Object.assign({}, this.settings.blenderSceneSettings);
+        if (this.settings.url !== obj.url) { // other backend, clear some stuff
+            this.settings.password = undefined;
+            this.settings.dataSessionId = undefined;
+            this.settings.sessionId = undefined;
+            this.settings.getAccessTokenFunction = undefined;
+        }
         this.settings = Object.assign({}, this.settings, obj);
         if (obj.renderParameters) {
             this.settings.renderParameters = Object.assign({}, ownRenderParameters, obj.renderParameters);
@@ -561,6 +554,19 @@ class RotationHelper {
     }
 }
 
+class ConfiguratorErrorMessage {
+    message;
+    safeMessage;
+    description;
+    safeDescription;
+    constructor(message, description) {
+        this.message = message;
+        if (description) {
+            this.description = description;
+        }
+    }
+}
+
 class ConfiguratorService {
     showLoader = new Subject();
     connectionReset = new Subject();
@@ -766,19 +772,6 @@ function notNill(questionPublicationCode) {
     throw new Error('Function not implemented.');
 }
 
-class ConfiguratorErrorMessage {
-    message;
-    safeMessage;
-    description;
-    safeDescription;
-    constructor(message, description) {
-        this.message = message;
-        if (description) {
-            this.description = description;
-        }
-    }
-}
-
 class ConfiguratorConnectorService {
     _appEventService;
     _settingsService;
@@ -1793,7 +1786,7 @@ class ThreedselectorService {
                             c.children = connectors.concat(meshes);
                         });
                         return resolve(object);
-                    });
+                    }).catch((e) => reject(e));
                 }
                 catch (e) {
                     reject(e);
@@ -1808,6 +1801,10 @@ class ThreedselectorService {
                 resolve(obj);
             }).catch(async (e) => {
                 DebugUtils.log('downloadAssetsAndReturn: ' + e);
+                // GLB failed, fall back to the legacy JSON model format. The XMLHttpRequest
+                // handlers above settle the promise: onloadend parses the response, onerror rejects.
+                oReq.open('GET', FileUtils.FixUrl(assetPath.replace('.glb.gz', '').replace('.glb', '')), true);
+                oReq.send(null);
             });
         });
     }
@@ -3288,7 +3285,7 @@ class LoadFurnitureBaseService {
                 return obj;
             }, err => {
                 DebugUtils.log('Error: ' + err);
-                return err;
+                return Promise.reject(new ConfiguratorErrorMessage('THREED_MODEL_NOT_FOUND', String(err)));
             });
             // }
         }
@@ -3329,7 +3326,7 @@ class LoadFurnitureBaseService {
                 return Promise.reject(configurationResultObject);
             }
         });
-        if (obj === null) {
+        if (!obj) { // no model url, or the download failed and onlyThreeD is off
             if (this.settingsService.settings.options.onlyThreeD && this.needs3DModel(configurationResultObject.placement)) {
                 configurationResultObject.resultType = ResultType.No3DModel;
                 return Promise.reject(configurationResultObject);