@colijnit/configurator 261.20.11 → 261.20.12

package/fesm2022/colijnit-configurator.mjs

@@ -561,6 +561,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 +779,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;
@@ -1783,7 +1783,7 @@ class ThreedselectorService {
                             c.children = connectors.concat(meshes);
                         });
                         return resolve(object);
-                    });
+                    }).catch((e) => reject(e));
                 }
                 catch (e) {
                     reject(e);
@@ -1798,6 +1798,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);
             });
         });
     }
@@ -3278,7 +3282,7 @@ class LoadFurnitureBaseService {
                 return obj;
             }, err => {
                 DebugUtils.log('Error: ' + err);
-                return err;
+                return Promise.reject(new ConfiguratorErrorMessage('THREED_MODEL_NOT_FOUND', String(err)));
             });
             // }
         }
@@ -3319,7 +3323,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);