kitchen-simulator 3.16.5 → 3.16.7

package/es/index.js

@@ -23,11 +23,14 @@ function nextFrame() {
 }
 
 /**
- * Track GLTF/GLB network activity via XHR + fetch.
+ * Track 3D asset network activity (gltf/glb/bin/textures/hdr/etc)
  * Ref-counted global install so multiple instances don't clobber each other.
  */
 function installGltfTracker() {
   if (typeof window === 'undefined') {
+    var _subscribe = function _subscribe() {
+      return function () {};
+    };
     return {
       getInFlight: function getInFlight() {
         return 0;
@@ -49,7 +52,8 @@ function installGltfTracker() {
         }
         return waitForIdle;
       }(),
-      uninstall: function uninstall() {}
+      uninstall: function uninstall() {},
+      subscribe: _subscribe
     };
   }
   var GLOBAL_KEY = '__kitchenSimulatorGltfTracker__';
@@ -65,12 +69,12 @@ function installGltfTracker() {
     };
   }
   var g = window[GLOBAL_KEY];
-  var isGltfUrl = function isGltfUrl(url) {
+  var is3dAssetUrl = function is3dAssetUrl(url) {
     try {
       var _url$toString, _url$toString2;
       var s = typeof url === 'string' ? url : (_url$toString = url === null || url === void 0 || (_url$toString2 = url.toString) === null || _url$toString2 === void 0 ? void 0 : _url$toString2.call(url)) !== null && _url$toString !== void 0 ? _url$toString : '';
-      var u = s.toLowerCase();
-      return u.includes('.gltf') || u.includes('.glb');
+      var u = s.toLowerCase().split('?')[0]; // ignore cache params
+      return u.endsWith('.gltf') || u.endsWith('.glb') || u.endsWith('.bin') || u.endsWith('.ktx2') || u.endsWith('.hdr') || u.endsWith('.exr') || u.endsWith('.png') || u.endsWith('.jpg') || u.endsWith('.jpeg') || u.endsWith('.webp');
     } catch (_unused) {
       return false;
     }
@@ -91,7 +95,7 @@ function installGltfTracker() {
   };
   var subscribe = function subscribe(fn) {
     g.listeners.add(fn);
-    fn(g.inFlight); // sync emit
+    fn(g.inFlight); // sync emit on subscribe
     return function () {
       return g.listeners["delete"](fn);
     };
@@ -107,7 +111,7 @@ function installGltfTracker() {
       g.originalSend = XHR.prototype.send;
       XHR.prototype.open = function (method, url) {
         var _g$originalOpen;
-        this.__isGltfRequest = isGltfUrl(url);
+        this.__is3dAssetRequest = is3dAssetUrl(url);
         for (var _len = arguments.length, rest = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
           rest[_key - 2] = arguments[_key];
         }
@@ -115,7 +119,7 @@ function installGltfTracker() {
       };
       XHR.prototype.send = function () {
         var _this = this;
-        if (this.__isGltfRequest) {
+        if (this.__is3dAssetRequest) {
           g.inFlight += 1;
           notify();
           var _done = function done() {
@@ -150,7 +154,7 @@ function installGltfTracker() {
                 args[_key3] = _args2[_key3];
               }
               url = args === null || args === void 0 ? void 0 : args[0];
-              track = isGltfUrl(url);
+              track = is3dAssetUrl(url);
               if (track) {
                 _context2.next = 1;
                 break;
@@ -180,7 +184,7 @@ function installGltfTracker() {
     g.installed = true;
   };
 
-  // ✅ “No grace” but safe: require idle to remain idle across 2 RAF frames.
+  // “No grace” but stable: idle must remain idle for 2 RAF frames
   function waitStableIdle2Frames() {
     return _waitStableIdle2Frames.apply(this, arguments);
   }
@@ -221,7 +225,7 @@ function installGltfTracker() {
         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(); // fast-ish path: already stable idle
+            start = Date.now();
             _context4.next = 1;
             return waitStableIdle2Frames();
           case 1:
@@ -245,7 +249,7 @@ function installGltfTracker() {
                         }
                         if (Date.now() - start > timeoutMs) {
                           if (unsub) unsub();
-                          reject(new Error('GLTF did not become idle within timeout'));
+                          reject(new Error('3D assets did not become idle within timeout'));
                         }
                         return _context3.abrupt("return");
                       case 1:
@@ -263,7 +267,7 @@ function installGltfTracker() {
                       case 3:
                         if (Date.now() - start > timeoutMs) {
                           if (unsub) unsub();
-                          reject(new Error('GLTF did not become idle within timeout'));
+                          reject(new Error('3D assets did not become idle within timeout'));
                         }
                       case 4:
                       case "end":
@@ -309,11 +313,12 @@ function installGltfTracker() {
       return g.inFlight;
     },
     waitForIdle: waitForIdle,
-    uninstall: uninstall
+    uninstall: uninstall,
+    subscribe: subscribe // ✅ IMPORTANT: return subscribe (this fixes your error)
   };
 }
 export function renderKitchenSimulator(container) {
-  var _props$framesPerEvent, _props$waitForGltfIdl, _props$gltfTimeoutMs, _props$syncExtraFrame;
+  var _props$framesPerEvent, _props$waitForGltfIdl, _props$gltfTimeoutMs;
   var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (!container) throw new Error('renderKitchenSimulator: container is required');
 
@@ -337,11 +342,13 @@ export function renderKitchenSimulator(container) {
   var MARKER = Symbol('marker');
   var gltfTracker = installGltfTracker();
 
-  // ---- FAST defaults (still safe) ----
-  var defaultFramesPerEvent = (_props$framesPerEvent = props.framesPerEvent) !== null && _props$framesPerEvent !== void 0 ? _props$framesPerEvent : 1; // was 2
-  var waitForGltf = (_props$waitForGltfIdl = props.waitForGltfIdleAfterEachEvent) !== null && _props$waitForGltfIdl !== void 0 ? _props$waitForGltfIdl : true;
+  // FAST defaults (safe)
+  var defaultFramesPerEvent = (_props$framesPerEvent = props.framesPerEvent) !== null && _props$framesPerEvent !== void 0 ? _props$framesPerEvent : 1;
+  var waitForAssets = (_props$waitForGltfIdl = props.waitForGltfIdleAfterEachEvent) !== null && _props$waitForGltfIdl !== void 0 ? _props$waitForGltfIdl : true;
   var defaultTimeout = (_props$gltfTimeoutMs = props.gltfTimeoutMs) !== null && _props$gltfTimeoutMs !== void 0 ? _props$gltfTimeoutMs : 30000;
-  var syncExtraFrames = (_props$syncExtraFrame = props.syncExtraFrames) !== null && _props$syncExtraFrame !== void 0 ? _props$syncExtraFrame : 1; // was 2
+
+  // If you want ultra-fast UI responsiveness, you can disable waiting per-event
+  // and only wait on “important” events, see comment in settle() below.
 
   var draining = false;
   function isSyncScene(ev) {
@@ -353,12 +360,12 @@ export function renderKitchenSimulator(container) {
   }
   function _settle() {
     _settle = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee7(ev) {
-      var _ev$framesPerEvent, _ev$gltfTimeoutMs;
-      var frames, i, timeoutMs, _i;
+      var _ev$framesPerEvent, _ev$waitForGltfIdleAf;
+      var frames, i, shouldWait, _ev$gltfTimeoutMs, timeoutMs;
       return _regeneratorRuntime.wrap(function (_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            frames = (_ev$framesPerEvent = ev === null || ev === void 0 ? void 0 : ev.framesPerEvent) !== null && _ev$framesPerEvent !== void 0 ? _ev$framesPerEvent : defaultFramesPerEvent; // 1) allow reducers/react to run
+            frames = (_ev$framesPerEvent = ev === null || ev === void 0 ? void 0 : ev.framesPerEvent) !== null && _ev$framesPerEvent !== void 0 ? _ev$framesPerEvent : defaultFramesPerEvent; // (1) allow react/reducers to run (fixes “must zoom to see updates”)
             i = 0;
           case 1:
             if (!(i < frames)) {
@@ -372,39 +379,30 @@ export function renderKitchenSimulator(container) {
             _context7.next = 1;
             break;
           case 3:
-            if (waitForGltf) {
+            // (2) optionally wait for assets
+            // fastest safe approach: keep ON for events that add/replace/load models
+            // You can override per-event via ev.waitForGltfIdleAfterEachEvent = false
+            shouldWait = (_ev$waitForGltfIdleAf = ev === null || ev === void 0 ? void 0 : ev.waitForGltfIdleAfterEachEvent) !== null && _ev$waitForGltfIdleAf !== void 0 ? _ev$waitForGltfIdleAf : waitForAssets;
+            if (!shouldWait) {
               _context7.next = 4;
               break;
             }
-            return _context7.abrupt("return");
-          case 4:
-            // 2) wait for gltf idle (stable-idle 2 frames, no time grace)
             timeoutMs = (_ev$gltfTimeoutMs = ev === null || ev === void 0 ? void 0 : ev.gltfTimeoutMs) !== null && _ev$gltfTimeoutMs !== void 0 ? _ev$gltfTimeoutMs : defaultTimeout;
-            _context7.next = 5;
+            _context7.next = 4;
             return gltfTracker.waitForIdle({
               timeoutMs: timeoutMs
             });
-          case 5:
-            _context7.next = 6;
+          case 4:
+            _context7.next = 5;
             return nextFrame();
-          case 6:
+          case 5:
             if (!isSyncScene(ev)) {
-              _context7.next = 9;
-              break;
-            }
-            _i = 0;
-          case 7:
-            if (!(_i < syncExtraFrames)) {
-              _context7.next = 9;
+              _context7.next = 6;
               break;
             }
-            _context7.next = 8;
+            _context7.next = 6;
             return nextFrame();
-          case 8:
-            _i += 1;
-            _context7.next = 7;
-            break;
-          case 9:
+          case 6:
           case "end":
             return _context7.stop();
         }
@@ -441,10 +439,6 @@ export function renderKitchenSimulator(container) {
             _context8.next = 4;
             return nextFrame();
           case 4:
-            if (setExternalEventFn) {
-              _context8.next = 5;
-              break;
-            }
             return _context8.abrupt("continue", 3);
           case 5:
             item = queue.shift();
@@ -516,11 +510,13 @@ export function renderKitchenSimulator(container) {
     __render: function __render(nextProps) {
       root.render(/*#__PURE__*/React.createElement(Wrapper, nextProps));
     },
-    /** Number of tracked .gltf/.glb requests currently in flight */getGltfInFlight: function getGltfInFlight() {
+    // ✅ host can query current inFlight
+    getGltfInFlight: function getGltfInFlight() {
       return gltfTracker.getInFlight();
     },
-    /** Resolves when GLTF becomes idle (stable idle) */waitForGltfIdle: function waitForGltfIdle(opts) {
-      return gltfTracker.waitForIdle(opts);
+    // ✅ host can subscribe to inFlight changes (loader)
+    subscribeGltfInFlight: function subscribeGltfInFlight(cb) {
+      return gltfTracker.subscribe(cb);
     },
     sendExternalEvents: function sendExternalEvents(eventOrEvents) {
       var events = Array.isArray(eventOrEvents) ? eventOrEvents : [eventOrEvents];
@@ -544,7 +540,7 @@ export function renderKitchenSimulator(container) {
       });
       drain();
 
-      // keep same semantics (resolve when marker cleared)
+      // resolve when marker cleared
       return new Promise(function (resolve) {
         var check = /*#__PURE__*/function () {
           var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {

package/lib/index.js

@@ -31,11 +31,14 @@ function nextFrame() {
 }
 
 /**
- * Track GLTF/GLB network activity via XHR + fetch.
+ * Track 3D asset network activity (gltf/glb/bin/textures/hdr/etc)
  * Ref-counted global install so multiple instances don't clobber each other.
  */
 function installGltfTracker() {
   if (typeof window === 'undefined') {
+    var _subscribe = function _subscribe() {
+      return function () {};
+    };
     return {
       getInFlight: function getInFlight() {
         return 0;
@@ -57,7 +60,8 @@ function installGltfTracker() {
         }
         return waitForIdle;
       }(),
-      uninstall: function uninstall() {}
+      uninstall: function uninstall() {},
+      subscribe: _subscribe
     };
   }
   var GLOBAL_KEY = '__kitchenSimulatorGltfTracker__';
@@ -73,12 +77,12 @@ function installGltfTracker() {
     };
   }
   var g = window[GLOBAL_KEY];
-  var isGltfUrl = function isGltfUrl(url) {
+  var is3dAssetUrl = function is3dAssetUrl(url) {
     try {
       var _url$toString, _url$toString2;
       var s = typeof url === 'string' ? url : (_url$toString = url === null || url === void 0 || (_url$toString2 = url.toString) === null || _url$toString2 === void 0 ? void 0 : _url$toString2.call(url)) !== null && _url$toString !== void 0 ? _url$toString : '';
-      var u = s.toLowerCase();
-      return u.includes('.gltf') || u.includes('.glb');
+      var u = s.toLowerCase().split('?')[0]; // ignore cache params
+      return u.endsWith('.gltf') || u.endsWith('.glb') || u.endsWith('.bin') || u.endsWith('.ktx2') || u.endsWith('.hdr') || u.endsWith('.exr') || u.endsWith('.png') || u.endsWith('.jpg') || u.endsWith('.jpeg') || u.endsWith('.webp');
     } catch (_unused) {
       return false;
     }
@@ -99,7 +103,7 @@ function installGltfTracker() {
   };
   var subscribe = function subscribe(fn) {
     g.listeners.add(fn);
-    fn(g.inFlight); // sync emit
+    fn(g.inFlight); // sync emit on subscribe
     return function () {
       return g.listeners["delete"](fn);
     };
@@ -115,7 +119,7 @@ function installGltfTracker() {
       g.originalSend = XHR.prototype.send;
       XHR.prototype.open = function (method, url) {
         var _g$originalOpen;
-        this.__isGltfRequest = isGltfUrl(url);
+        this.__is3dAssetRequest = is3dAssetUrl(url);
         for (var _len = arguments.length, rest = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
           rest[_key - 2] = arguments[_key];
         }
@@ -123,7 +127,7 @@ function installGltfTracker() {
       };
       XHR.prototype.send = function () {
         var _this = this;
-        if (this.__isGltfRequest) {
+        if (this.__is3dAssetRequest) {
           g.inFlight += 1;
           notify();
           var _done = function done() {
@@ -158,7 +162,7 @@ function installGltfTracker() {
                 args[_key3] = _args2[_key3];
               }
               url = args === null || args === void 0 ? void 0 : args[0];
-              track = isGltfUrl(url);
+              track = is3dAssetUrl(url);
               if (track) {
                 _context2.next = 1;
                 break;
@@ -188,7 +192,7 @@ function installGltfTracker() {
     g.installed = true;
   };
 
-  // ✅ “No grace” but safe: require idle to remain idle across 2 RAF frames.
+  // “No grace” but stable: idle must remain idle for 2 RAF frames
   function waitStableIdle2Frames() {
     return _waitStableIdle2Frames.apply(this, arguments);
   }
@@ -229,7 +233,7 @@ function installGltfTracker() {
         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(); // fast-ish path: already stable idle
+            start = Date.now();
             _context4.next = 1;
             return waitStableIdle2Frames();
           case 1:
@@ -253,7 +257,7 @@ function installGltfTracker() {
                         }
                         if (Date.now() - start > timeoutMs) {
                           if (unsub) unsub();
-                          reject(new Error('GLTF did not become idle within timeout'));
+                          reject(new Error('3D assets did not become idle within timeout'));
                         }
                         return _context3.abrupt("return");
                       case 1:
@@ -271,7 +275,7 @@ function installGltfTracker() {
                       case 3:
                         if (Date.now() - start > timeoutMs) {
                           if (unsub) unsub();
-                          reject(new Error('GLTF did not become idle within timeout'));
+                          reject(new Error('3D assets did not become idle within timeout'));
                         }
                       case 4:
                       case "end":
@@ -317,11 +321,12 @@ function installGltfTracker() {
       return g.inFlight;
     },
     waitForIdle: waitForIdle,
-    uninstall: uninstall
+    uninstall: uninstall,
+    subscribe: subscribe // ✅ IMPORTANT: return subscribe (this fixes your error)
   };
 }
 function renderKitchenSimulator(container) {
-  var _props$framesPerEvent, _props$waitForGltfIdl, _props$gltfTimeoutMs, _props$syncExtraFrame;
+  var _props$framesPerEvent, _props$waitForGltfIdl, _props$gltfTimeoutMs;
   var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (!container) throw new Error('renderKitchenSimulator: container is required');
 
@@ -345,11 +350,13 @@ function renderKitchenSimulator(container) {
   var MARKER = Symbol('marker');
   var gltfTracker = installGltfTracker();
 
-  // ---- FAST defaults (still safe) ----
-  var defaultFramesPerEvent = (_props$framesPerEvent = props.framesPerEvent) !== null && _props$framesPerEvent !== void 0 ? _props$framesPerEvent : 1; // was 2
-  var waitForGltf = (_props$waitForGltfIdl = props.waitForGltfIdleAfterEachEvent) !== null && _props$waitForGltfIdl !== void 0 ? _props$waitForGltfIdl : true;
+  // FAST defaults (safe)
+  var defaultFramesPerEvent = (_props$framesPerEvent = props.framesPerEvent) !== null && _props$framesPerEvent !== void 0 ? _props$framesPerEvent : 1;
+  var waitForAssets = (_props$waitForGltfIdl = props.waitForGltfIdleAfterEachEvent) !== null && _props$waitForGltfIdl !== void 0 ? _props$waitForGltfIdl : true;
   var defaultTimeout = (_props$gltfTimeoutMs = props.gltfTimeoutMs) !== null && _props$gltfTimeoutMs !== void 0 ? _props$gltfTimeoutMs : 30000;
-  var syncExtraFrames = (_props$syncExtraFrame = props.syncExtraFrames) !== null && _props$syncExtraFrame !== void 0 ? _props$syncExtraFrame : 1; // was 2
+
+  // If you want ultra-fast UI responsiveness, you can disable waiting per-event
+  // and only wait on “important” events, see comment in settle() below.
 
   var draining = false;
   function isSyncScene(ev) {
@@ -361,12 +368,12 @@ function renderKitchenSimulator(container) {
   }
   function _settle() {
     _settle = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(ev) {
-      var _ev$framesPerEvent, _ev$gltfTimeoutMs;
-      var frames, i, timeoutMs, _i;
+      var _ev$framesPerEvent, _ev$waitForGltfIdleAf;
+      var frames, i, shouldWait, _ev$gltfTimeoutMs, timeoutMs;
       return _regenerator["default"].wrap(function (_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            frames = (_ev$framesPerEvent = ev === null || ev === void 0 ? void 0 : ev.framesPerEvent) !== null && _ev$framesPerEvent !== void 0 ? _ev$framesPerEvent : defaultFramesPerEvent; // 1) allow reducers/react to run
+            frames = (_ev$framesPerEvent = ev === null || ev === void 0 ? void 0 : ev.framesPerEvent) !== null && _ev$framesPerEvent !== void 0 ? _ev$framesPerEvent : defaultFramesPerEvent; // (1) allow react/reducers to run (fixes “must zoom to see updates”)
             i = 0;
           case 1:
             if (!(i < frames)) {
@@ -380,39 +387,30 @@ function renderKitchenSimulator(container) {
             _context7.next = 1;
             break;
           case 3:
-            if (waitForGltf) {
+            // (2) optionally wait for assets
+            // fastest safe approach: keep ON for events that add/replace/load models
+            // You can override per-event via ev.waitForGltfIdleAfterEachEvent = false
+            shouldWait = (_ev$waitForGltfIdleAf = ev === null || ev === void 0 ? void 0 : ev.waitForGltfIdleAfterEachEvent) !== null && _ev$waitForGltfIdleAf !== void 0 ? _ev$waitForGltfIdleAf : waitForAssets;
+            if (!shouldWait) {
               _context7.next = 4;
               break;
             }
-            return _context7.abrupt("return");
-          case 4:
-            // 2) wait for gltf idle (stable-idle 2 frames, no time grace)
             timeoutMs = (_ev$gltfTimeoutMs = ev === null || ev === void 0 ? void 0 : ev.gltfTimeoutMs) !== null && _ev$gltfTimeoutMs !== void 0 ? _ev$gltfTimeoutMs : defaultTimeout;
-            _context7.next = 5;
+            _context7.next = 4;
             return gltfTracker.waitForIdle({
               timeoutMs: timeoutMs
             });
-          case 5:
-            _context7.next = 6;
+          case 4:
+            _context7.next = 5;
             return nextFrame();
-          case 6:
+          case 5:
             if (!isSyncScene(ev)) {
-              _context7.next = 9;
-              break;
-            }
-            _i = 0;
-          case 7:
-            if (!(_i < syncExtraFrames)) {
-              _context7.next = 9;
+              _context7.next = 6;
               break;
             }
-            _context7.next = 8;
+            _context7.next = 6;
             return nextFrame();
-          case 8:
-            _i += 1;
-            _context7.next = 7;
-            break;
-          case 9:
+          case 6:
           case "end":
             return _context7.stop();
         }
@@ -449,10 +447,6 @@ function renderKitchenSimulator(container) {
             _context8.next = 4;
             return nextFrame();
           case 4:
-            if (setExternalEventFn) {
-              _context8.next = 5;
-              break;
-            }
             return _context8.abrupt("continue", 3);
           case 5:
             item = queue.shift();
@@ -524,11 +518,13 @@ function renderKitchenSimulator(container) {
     __render: function __render(nextProps) {
       root.render(/*#__PURE__*/_react["default"].createElement(Wrapper, nextProps));
     },
-    /** Number of tracked .gltf/.glb requests currently in flight */getGltfInFlight: function getGltfInFlight() {
+    // ✅ host can query current inFlight
+    getGltfInFlight: function getGltfInFlight() {
       return gltfTracker.getInFlight();
     },
-    /** Resolves when GLTF becomes idle (stable idle) */waitForGltfIdle: function waitForGltfIdle(opts) {
-      return gltfTracker.waitForIdle(opts);
+    // ✅ host can subscribe to inFlight changes (loader)
+    subscribeGltfInFlight: function subscribeGltfInFlight(cb) {
+      return gltfTracker.subscribe(cb);
     },
     sendExternalEvents: function sendExternalEvents(eventOrEvents) {
       var events = Array.isArray(eventOrEvents) ? eventOrEvents : [eventOrEvents];
@@ -552,7 +548,7 @@ function renderKitchenSimulator(container) {
       });
       drain();
 
-      // keep same semantics (resolve when marker cleared)
+      // resolve when marker cleared
       return new Promise(function (resolve) {
         var check = /*#__PURE__*/function () {
           var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "3.16.5",
+  "version": "3.16.7",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "main": "lib/index.js",