kitchen-simulator 3.1.0-alpha.14 → 3.1.0-alpha.15

package/es/LiteKitchenConfigurator.js

@@ -331,38 +331,22 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _this3 = this;
       var ev = this.props.externalEvent;
-
-      // nothing new
       if (!ev || ev === prevProps.externalEvent) return;
-
-      // must have id to ack
       var eventId = ev.__eventId;
       if (eventId == null) return;
-
-      // exactly-once guard
       if (this.lastProcessedExternalEventId === eventId) return;
       this.lastProcessedExternalEventId = eventId;
+      console.log('[Tool] got external', eventId, ev.type, !!this.props.onExternalEventProcessed);
       try {
-        var result = handleExternalEvent(this.props);
-
-        // if it returns a promise, ack after it resolves/rejects
-        if (result && typeof result.then === 'function') {
-          result["finally"](function () {
-            var _this3$props$onExtern, _this3$props;
-            (_this3$props$onExtern = (_this3$props = _this3.props).onExternalEventProcessed) === null || _this3$props$onExtern === void 0 || _this3$props$onExtern.call(_this3$props, eventId);
-          });
-        } else {
-          var _this$props$onExterna, _this$props2;
-          // sync case
-          (_this$props$onExterna = (_this$props2 = this.props).onExternalEventProcessed) === null || _this$props$onExterna === void 0 || _this$props$onExterna.call(_this$props2, eventId);
-        }
+        handleExternalEvent(this.props);
       } catch (e) {
-        var _this$props$onExterna2, _this$props3;
-        // never deadlock the host queue
-        (_this$props$onExterna2 = (_this$props3 = this.props).onExternalEventProcessed) === null || _this$props$onExterna2 === void 0 || _this$props$onExterna2.call(_this$props3, eventId);
+        console.error('[Tool] handleExternalEvent crashed', e);
         throw e;
+      } finally {
+        var _this$props$onExterna, _this$props2;
+        (_this$props$onExterna = (_this$props2 = this.props).onExternalEventProcessed) === null || _this$props$onExterna === void 0 || _this$props$onExterna.call(_this$props2, eventId);
+        console.log('[Tool] ack external', eventId);
       }
     }
   }, {
@@ -376,13 +360,13 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props4 = this.props,
-        width = _this$props4.width,
-        height = _this$props4.height,
-        state = _this$props4.state,
-        stateExtractor = _this$props4.stateExtractor,
-        measurementUnit = _this$props4.measurementUnit,
-        props = _objectWithoutProperties(_this$props4, _excluded);
+      var _this$props3 = this.props,
+        width = _this$props3.width,
+        height = _this$props3.height,
+        state = _this$props3.state,
+        stateExtractor = _this$props3.stateExtractor,
+        measurementUnit = _this$props3.measurementUnit,
+        props = _objectWithoutProperties(_this$props3, _excluded);
       var _this$state = this.state,
         savePopupVisible = _this$state.savePopupVisible,
         quotePopupVisible = _this$state.quotePopupVisible,

package/es/index.js

@@ -62,14 +62,9 @@ export function renderKitchenSimulator(container) {
         var promise = new Promise(function (res) {
           return _resolve = res;
         });
-
-        // failsafe: resolve after X ms no matter what (avoid host deadlock)
         var timeoutMs = (_ev$waitForAckMs = ev === null || ev === void 0 ? void 0 : ev.waitForAckMs) !== null && _ev$waitForAckMs !== void 0 ? _ev$waitForAckMs : 15000;
         var t = setTimeout(function () {
-          if (_this3._currentId === id) {
-            console.warn('External event ack timeout', id, ev);
-            _this3.onExternalEventProcessed(id); // force-drain
-          }
+          _this3.forceComplete(id, 'ack-timeout');
         }, timeoutMs);
         this.queue.push({
           id: id,
@@ -109,6 +104,22 @@ export function renderKitchenSimulator(container) {
           });
         });
       }
+    }, {
+      key: "forceComplete",
+      value: function forceComplete(id, reason) {
+        // only force-complete if this is still the in-flight event
+        if (this._currentId !== id) return;
+        console.warn('[Tool] force complete external event', id, reason);
+        try {
+          var _this$_currentResolve2;
+          (_this$_currentResolve2 = this._currentResolve) === null || _this$_currentResolve2 === void 0 || _this$_currentResolve2.call(this);
+        } finally {
+          this._currentResolve = null;
+          this._currentId = null;
+          this.processing = false;
+          this.processNext();
+        }
+      }
     }, {
       key: "render",
       value: function render() {

package/lib/LiteKitchenConfigurator.js

@@ -340,38 +340,22 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      var _this3 = this;
       var ev = this.props.externalEvent;
-
-      // nothing new
       if (!ev || ev === prevProps.externalEvent) return;
-
-      // must have id to ack
       var eventId = ev.__eventId;
       if (eventId == null) return;
-
-      // exactly-once guard
       if (this.lastProcessedExternalEventId === eventId) return;
       this.lastProcessedExternalEventId = eventId;
+      console.log('[Tool] got external', eventId, ev.type, !!this.props.onExternalEventProcessed);
       try {
-        var result = (0, _isolateEventHandler.handleExternalEvent)(this.props);
-
-        // if it returns a promise, ack after it resolves/rejects
-        if (result && typeof result.then === 'function') {
-          result["finally"](function () {
-            var _this3$props$onExtern, _this3$props;
-            (_this3$props$onExtern = (_this3$props = _this3.props).onExternalEventProcessed) === null || _this3$props$onExtern === void 0 || _this3$props$onExtern.call(_this3$props, eventId);
-          });
-        } else {
-          var _this$props$onExterna, _this$props2;
-          // sync case
-          (_this$props$onExterna = (_this$props2 = this.props).onExternalEventProcessed) === null || _this$props$onExterna === void 0 || _this$props$onExterna.call(_this$props2, eventId);
-        }
+        (0, _isolateEventHandler.handleExternalEvent)(this.props);
       } catch (e) {
-        var _this$props$onExterna2, _this$props3;
-        // never deadlock the host queue
-        (_this$props$onExterna2 = (_this$props3 = this.props).onExternalEventProcessed) === null || _this$props$onExterna2 === void 0 || _this$props$onExterna2.call(_this$props3, eventId);
+        console.error('[Tool] handleExternalEvent crashed', e);
         throw e;
+      } finally {
+        var _this$props$onExterna, _this$props2;
+        (_this$props$onExterna = (_this$props2 = this.props).onExternalEventProcessed) === null || _this$props$onExterna === void 0 || _this$props$onExterna.call(_this$props2, eventId);
+        console.log('[Tool] ack external', eventId);
       }
     }
   }, {
@@ -385,13 +369,13 @@ var LiteKitchenConfigurator = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props4 = this.props,
-        width = _this$props4.width,
-        height = _this$props4.height,
-        state = _this$props4.state,
-        stateExtractor = _this$props4.stateExtractor,
-        measurementUnit = _this$props4.measurementUnit,
-        props = (0, _objectWithoutProperties2["default"])(_this$props4, _excluded);
+      var _this$props3 = this.props,
+        width = _this$props3.width,
+        height = _this$props3.height,
+        state = _this$props3.state,
+        stateExtractor = _this$props3.stateExtractor,
+        measurementUnit = _this$props3.measurementUnit,
+        props = (0, _objectWithoutProperties2["default"])(_this$props3, _excluded);
       var _this$state = this.state,
         savePopupVisible = _this$state.savePopupVisible,
         quotePopupVisible = _this$state.quotePopupVisible,

package/lib/index.js

@@ -70,14 +70,9 @@ function renderKitchenSimulator(container) {
         var promise = new Promise(function (res) {
           return _resolve = res;
         });
-
-        // failsafe: resolve after X ms no matter what (avoid host deadlock)
         var timeoutMs = (_ev$waitForAckMs = ev === null || ev === void 0 ? void 0 : ev.waitForAckMs) !== null && _ev$waitForAckMs !== void 0 ? _ev$waitForAckMs : 15000;
         var t = setTimeout(function () {
-          if (_this3._currentId === id) {
-            console.warn('External event ack timeout', id, ev);
-            _this3.onExternalEventProcessed(id); // force-drain
-          }
+          _this3.forceComplete(id, 'ack-timeout');
         }, timeoutMs);
         this.queue.push({
           id: id,
@@ -117,6 +112,22 @@ function renderKitchenSimulator(container) {
           });
         });
       }
+    }, {
+      key: "forceComplete",
+      value: function forceComplete(id, reason) {
+        // only force-complete if this is still the in-flight event
+        if (this._currentId !== id) return;
+        console.warn('[Tool] force complete external event', id, reason);
+        try {
+          var _this$_currentResolve2;
+          (_this$_currentResolve2 = this._currentResolve) === null || _this$_currentResolve2 === void 0 || _this$_currentResolve2.call(this);
+        } finally {
+          this._currentResolve = null;
+          this._currentId = null;
+          this.processing = false;
+          this.processNext();
+        }
+      }
     }, {
       key: "render",
       value: function render() {

package/package.json

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