kitchen-simulator 5.10.4-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();
@@ -436,7 +452,7 @@ export function renderKitchenSimulator(container) {
   }
   function _drain() {
     _drain = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
-      var item;
+      var item, _t;
       return _regeneratorRuntime.wrap(function (_context8) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
@@ -450,7 +466,7 @@ export function renderKitchenSimulator(container) {
             _context8.prev = 2;
           case 3:
             if (!(!destroyed && queue.length)) {
-              _context8.next = 8;
+              _context8.next = 10;
               break;
             }
             if (setExternalEventFn) {
@@ -470,21 +486,31 @@ export function renderKitchenSimulator(container) {
             pendingMarkers["delete"](item.token);
             return _context8.abrupt("continue", 3);
           case 6:
+            _context8.prev = 6;
             setExternalEventFn(item);
             _context8.next = 7;
             return settle(item);
           case 7:
-            _context8.next = 3;
+            _context8.next = 9;
             break;
           case 8:
             _context8.prev = 8;
-            draining = false;
-            return _context8.finish(8);
+            _t = _context8["catch"](6);
+            console.error('[kitchen-simulator] event failed:', item, _t);
+            // IMPORTANT: continue so we can eventually consume the marker
+            // Optionally you can decide to clear remaining queue here.
           case 9:
+            _context8.next = 3;
+            break;
+          case 10:
+            _context8.prev = 10;
+            draining = false;
+            return _context8.finish(10);
+          case 11:
           case "end":
             return _context8.stop();
         }
-      }, _callee8, null, [[2,, 8, 9]]);
+      }, _callee8, null, [[2,, 10, 11], [6, 8]]);
     }));
     return _drain.apply(this, arguments);
   }
@@ -540,6 +566,9 @@ export function renderKitchenSimulator(container) {
       return gltfTracker.subscribe(cb);
     },
     sendExternalEvents: function sendExternalEvents(eventOrEvents) {
+      var _ref5 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+        _ref5$timeoutMs = _ref5.timeoutMs,
+        timeoutMs = _ref5$timeoutMs === void 0 ? 60000 : _ref5$timeoutMs;
       var events = Array.isArray(eventOrEvents) ? eventOrEvents : [eventOrEvents];
       var _iterator2 = _createForOfIteratorHelper(events),
         _step2;
@@ -563,36 +592,47 @@ export function renderKitchenSimulator(container) {
 
       // resolve when marker cleared
       return new Promise(function (resolve) {
+        var start = Date.now();
         var check = /*#__PURE__*/function () {
-          var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+          var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
             return _regeneratorRuntime.wrap(function (_context6) {
               while (1) switch (_context6.prev = _context6.next) {
                 case 0:
                   if (destroyed) {
-                    _context6.next = 3;
+                    _context6.next = 4;
                     break;
                   }
-                  if (!pendingMarkers.has(token)) {
-                    _context6.next = 2;
+                  if (pendingMarkers.has(token)) {
+                    _context6.next = 1;
                     break;
                   }
-                  _context6.next = 1;
-                  return nextFrame();
-                case 1:
-                  return _context6.abrupt("continue", 0);
-                case 2:
                   resolve(true);
                   return _context6.abrupt("return");
-                case 3:
+                case 1:
+                  if (!(Date.now() - start > timeoutMs)) {
+                    _context6.next = 2;
+                    break;
+                  }
+                  console.error('[kitchen-simulator] sendExternalEvents timed out');
+                  pendingMarkers["delete"](token); // fail-open
                   resolve(false);
+                  return _context6.abrupt("return");
+                case 2:
+                  _context6.next = 3;
+                  return nextFrame();
+                case 3:
+                  _context6.next = 0;
+                  break;
                 case 4:
+                  resolve(false);
+                case 5:
                 case "end":
                   return _context6.stop();
               }
             }, _callee6);
           }));
           return function check() {
-            return _ref5.apply(this, arguments);
+            return _ref6.apply(this, arguments);
           };
         }();
         check();

package/package.json

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