kitchen-simulator 5.10.5-react.18 → 5.10.6-react.18

package/es/index.js

@@ -140,8 +140,14 @@ function installGltfTracker() {
             if (g.inFlight < 0) g.inFlight = 0;
             notify();
             _this.removeEventListener('loadend', _done);
+            _this.removeEventListener('error', _done);
+            _this.removeEventListener('abort', _done);
+            _this.removeEventListener('timeout', _done);
           };
           this.addEventListener('loadend', _done);
+          this.addEventListener('error', _done);
+          this.addEventListener('abort', _done);
+          this.addEventListener('timeout', _done);
         }
         for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
           args[_key2] = arguments[_key2];
@@ -240,13 +246,11 @@ function installGltfTracker() {
       var _ref3,
         _ref3$timeoutMs,
         timeoutMs,
-        start,
         _args4 = arguments;
       return _regeneratorRuntime.wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             _ref3 = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {}, _ref3$timeoutMs = _ref3.timeoutMs, timeoutMs = _ref3$timeoutMs === void 0 ? 30000 : _ref3$timeoutMs;
-            start = Date.now();
             _context4.next = 1;
             return waitStableIdle2Frames();
           case 1:
@@ -258,38 +262,50 @@ function installGltfTracker() {
           case 2:
             return _context4.abrupt("return", new Promise(function (resolve, reject) {
               var unsub = null;
+              var finished = false;
+              var finishOk = function finishOk() {
+                if (finished) return;
+                finished = true;
+                if (unsub) unsub();
+                clearTimeout(timer);
+                resolve(true);
+              };
+              var finishErr = function finishErr(err) {
+                if (finished) return;
+                finished = true;
+                if (unsub) unsub();
+                clearTimeout(timer);
+                reject(err);
+              };
+
+              // ✅ Real timeout no matter what happens with inFlight changes
+              var timer = setTimeout(function () {
+                finishErr(new Error('3D assets did not become idle within timeout'));
+              }, timeoutMs);
               var onChange = /*#__PURE__*/function () {
                 var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(count) {
                   var stable;
                   return _regeneratorRuntime.wrap(function (_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
                       case 0:
-                        if (!(count !== 0)) {
+                        if (!finished) {
                           _context3.next = 1;
                           break;
                         }
-                        if (Date.now() - start > timeoutMs) {
-                          if (unsub) unsub();
-                          reject(new Error('3D assets did not become idle within timeout'));
-                        }
                         return _context3.abrupt("return");
                       case 1:
-                        _context3.next = 2;
-                        return waitStableIdle2Frames();
-                      case 2:
-                        stable = _context3.sent;
-                        if (!stable) {
-                          _context3.next = 3;
+                        if (!(count !== 0)) {
+                          _context3.next = 2;
                           break;
                         }
-                        if (unsub) unsub();
-                        resolve(true);
                         return _context3.abrupt("return");
+                      case 2:
+                        _context3.next = 3;
+                        return waitStableIdle2Frames();
                       case 3:
-                        if (Date.now() - start > timeoutMs) {
-                          if (unsub) unsub();
-                          reject(new Error('3D assets did not become idle within timeout'));
-                        }
+                        stable = _context3.sent;
+                        if (stable) finishOk();
+                        // else keep waiting
                       case 4:
                       case "end":
                         return _context3.stop();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "5.10.5-react.18",
+  "version": "5.10.6-react.18",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "module": "es/index.js",