@crystaldesign/web-planner-logic 26.13.0-beta.1 → 26.13.0-beta.10

package/build/cjs/{DivaBoxPlanner-5e930cef.js → DivaBoxPlanner-76112465.js}

@@ -5,16 +5,16 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-70f9ba19.js');
+var index = require('./index-0fefa866.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
-var PlannerHandler2D = require('./PlannerHandler2D-97dff60d.js');
+var PlannerHandler2D = require('./PlannerHandler2D-2772a96b.js');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('axios');
+require('@babel/runtime/helpers/typeof');
 require('@crystaldesign/planner-2d-core');
 require('@crystaldesign/basket-model');
-require('@babel/runtime/helpers/typeof');
 require('fast-xml-parser');
 require('@babel/runtime/helpers/possibleConstructorReturn');
 require('@babel/runtime/helpers/getPrototypeOf');

package/build/cjs/{DivaStandardPlanner-9b10f74c.js → DivaStandardPlanner-2ec3cf66.js}

@@ -6,15 +6,15 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-70f9ba19.js');
+var index = require('./index-0fefa866.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var planner2dCore = require('@crystaldesign/planner-2d-core');
-var PlannerHandler2D = require('./PlannerHandler2D-97dff60d.js');
+var PlannerHandler2D = require('./PlannerHandler2D-2772a96b.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('axios');
-require('@crystaldesign/basket-model');
 require('@babel/runtime/helpers/typeof');
+require('@crystaldesign/basket-model');
 require('fast-xml-parser');
 require('@babel/runtime/helpers/possibleConstructorReturn');
 require('@babel/runtime/helpers/getPrototypeOf');

package/build/cjs/{DoorPlanner-3c74f8e1.js → DoorPlanner-903b1704.js}

@@ -3,7 +3,7 @@
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-require('./index-70f9ba19.js');
+require('./index-0fefa866.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
@@ -11,9 +11,9 @@ require('@babel/runtime/regenerator');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');
 require('axios');
+require('@babel/runtime/helpers/typeof');
 require('@crystaldesign/planner-2d-core');
 require('@crystaldesign/basket-model');
-require('@babel/runtime/helpers/typeof');
 require('fast-xml-parser');
 require('@babel/runtime/helpers/possibleConstructorReturn');
 require('@babel/runtime/helpers/getPrototypeOf');

package/build/cjs/{Host3DSignalR-2ba0c49a.js → Host3DSignalR-18443430.js}

@@ -5,7 +5,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-70f9ba19.js');
+var index = require('./index-0fefa866.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var signalr = require('@microsoft/signalr');
 var io = require('socket.io-client');
@@ -14,9 +14,9 @@ require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');
 require('axios');
+require('@babel/runtime/helpers/typeof');
 require('@crystaldesign/planner-2d-core');
 require('@crystaldesign/basket-model');
-require('@babel/runtime/helpers/typeof');
 require('fast-xml-parser');
 require('@babel/runtime/helpers/possibleConstructorReturn');
 require('@babel/runtime/helpers/getPrototypeOf');
@@ -47,6 +47,8 @@ var Host3DSignalR = /*#__PURE__*/function () {
     _defineProperty__default["default"](this, "connectionErrorCount", void 0);
     _defineProperty__default["default"](this, "doIgnoreOnClosed", void 0);
     //This boolean allows to ignore the onClose connection event of the signalR connection.
+    _defineProperty__default["default"](this, "isClosed", false);
+    //Set by closeConnection(): a closed instance must never connect again.
     _defineProperty__default["default"](this, "sessionID", void 0);
     //DivaMediaService
     _defineProperty__default["default"](this, "divaMediaServiceSocketIO", undefined);
@@ -160,7 +162,7 @@ var Host3DSignalR = /*#__PURE__*/function () {
     value: (function () {
       var _initializeConnection = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2(divaNr) {
         var _this2 = this;
-        var that;
+        var that, connection;
         return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -179,11 +181,22 @@ var Host3DSignalR = /*#__PURE__*/function () {
               _context2.next = 5;
               return this.delay(100);
             case 5:
+              if (!this.isClosed) {
+                _context2.next = 7;
+                break;
+              }
+              return _context2.abrupt("return");
+            case 7:
               LOG.debug('Create SignalR connection with host: ' + this.renderSettings.Diva3DServerURL + '; RenderGroup: ' + this.renderSettings.RenderGroup);
               that = this;
               if (this.signalRConnection) {
                 this.doIgnoreOnClosed = true;
-                this.signalRConnection._completeClose();
+                // The replaced connection's close event is ignored below, so reset its state here.
+                this.connectionStarted = false;
+                this.successfullyLoggedIn = false;
+                this.successfullyJoinedDivaNr = false;
+                // stop() also closes the transport and cancels pending invocations, unlike the private _completeClose().
+                this.signalRConnection.stop()["catch"](function () {});
                 this.signalRConnection = null;
               }
               if ((typeof window === 'undefined' || window).DIVA_LOGGER == 0) {
@@ -191,11 +204,14 @@ var Host3DSignalR = /*#__PURE__*/function () {
               } else {
                 this.signalRConnection = new signalr.HubConnectionBuilder().withUrl(this.renderSettings.Diva3DServerURL).withHubProtocol(new signalrProtocolMsgpack.MessagePackHubProtocol()).configureLogging(signalr.LogLevel.None).build();
               }
+              // Callbacks of a connection that was replaced meanwhile must not change the state of the current one.
+              connection = this.signalRConnection;
               this.signalRConnection.on('UnvalidSessionID', this.unvalidSessionID);
               this.signalRConnection.on('noRenderClientFound', this.noRenderClientFound);
               this.signalRConnection.on('newRendering', this.newRendering);
               this.signalRConnection.on('newHQRenderScript', this.newHQRenderScript);
               this.signalRConnection.start().then(function () {
+                if (connection !== that.signalRConnection) return;
                 DivaUtils__default["default"].endSpanOfApm('PlannerHandler3D initSignalRConnection');
                 index.bootMark('signalr: connected');
                 that.connectionStarted = true;
@@ -208,6 +224,7 @@ var Host3DSignalR = /*#__PURE__*/function () {
                 that.reconnectingErrorCount = 0;
                 that.login(); //After connecting to signalR, the login should be performed
               })["catch"](function (err) {
+                if (connection !== that.signalRConnection) return;
                 DivaUtils__default["default"].endSpanOfApm('PlannerHandler3D initSignalRConnection');
                 LOG.error(new DivaUtils.DivaError('Connection error. Message: ' + err.toString(), {
                   code: 'WC_0014'
@@ -222,26 +239,32 @@ var Host3DSignalR = /*#__PURE__*/function () {
                 return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
+                      if (!(connection !== _this2.signalRConnection)) {
+                        _context.next = 2;
+                        break;
+                      }
+                      return _context.abrupt("return");
+                    case 2:
                       DivaUtils__default["default"].endSpanOfApm('PlannerHandler3D initSignalRConnection');
                       LOG.warn('Connection with 3D Host gets lost. Try to reconnect.', 'WC_0014');
                       that.connectionStarted = false;
                       _this2.successfullyLoggedIn = false;
                       _this2.successfullyJoinedDivaNr = false;
                       if (!_this2.doIgnoreOnClosed) {
-                        _context.next = 7;
+                        _context.next = 9;
                         break;
                       }
                       return _context.abrupt("return");
-                    case 7:
+                    case 9:
                       _this2.reconnectAfterError = true;
                       that.initializeConnection();
-                    case 9:
+                    case 11:
                     case "end":
                       return _context.stop();
                   }
                 }, _callee);
               })));
-            case 15:
+            case 18:
             case "end":
               return _context2.stop();
           }
@@ -442,11 +465,15 @@ var Host3DSignalR = /*#__PURE__*/function () {
   }, {
     key: "closeConnection",
     value: function closeConnection() {
+      this.isClosed = true;
       if (this.signalRConnection) {
         this.doIgnoreOnClosed = true;
         this.signalRConnection.invoke('LeaveWebClient')["catch"](function () {});
         LOG.debug('SignalRConnection: Close Connection and say byby to Diva3DHost.');
         this.signalRConnection.stop()["catch"](function () {});
+        // Drops the closed connection's callbacks: stopping it while it still starts rejects start(), which would
+        // otherwise reconnect and log in for a planner that is gone.
+        this.signalRConnection = null;
       }
 
       // Also close the socket connection to DivaMediaService
@@ -465,7 +492,7 @@ var Host3DSignalR = /*#__PURE__*/function () {
     key: "login",
     value: (function () {
       var _login = _asyncToGenerator__default["default"](/*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee6() {
-        var sessionId, that;
+        var connection, sessionId, that;
         return _regeneratorRuntime__default["default"].wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -473,11 +500,21 @@ var Host3DSignalR = /*#__PURE__*/function () {
               //_this.ServerLog("Login","send Login - userID:" + _userID + ", deviceID:" + _deviceID + ", divaSessionID:" SaveProjectWi+ _divaSessionID + ", info:" + _Application);
               DivaUtils__default["default"].startSpanOfApm('PlannerHandler3D login');
               index.bootMark('signalr: LoginWebPlanner sent');
-              _context6.prev = 3;
-              _context6.next = 6;
-              return this.signalRConnection.invoke('LoginWebPlanner', this.renderSettings.UserID, this.renderSettings.DeviceID, this.renderSettings.DivaSessionID, this.renderSettings.ApplicationName);
-            case 6:
+
+              // A login answered after its connection was replaced belongs to the old connection: reporting it would mark the
+              // client as logged in while the new connection is not started yet.
+              connection = this.signalRConnection;
+              _context6.prev = 4;
+              _context6.next = 7;
+              return connection.invoke('LoginWebPlanner', this.renderSettings.UserID, this.renderSettings.DeviceID, this.renderSettings.DivaSessionID, this.renderSettings.ApplicationName);
+            case 7:
               sessionId = _context6.sent;
+              if (!(connection !== this.signalRConnection)) {
+                _context6.next = 10;
+                break;
+              }
+              return _context6.abrupt("return");
+            case 10:
               index.bootMark('signalr: LoginWebPlanner acked', {
                 ok: sessionId != '' ? 1 : 0
               });
@@ -494,21 +531,27 @@ var Host3DSignalR = /*#__PURE__*/function () {
                   status: 'ERROR'
                 });
               }
-              _context6.next = 17;
+              _context6.next = 22;
               break;
-            case 12:
-              _context6.prev = 12;
-              _context6.t0 = _context6["catch"](3);
+            case 15:
+              _context6.prev = 15;
+              _context6.t0 = _context6["catch"](4);
+              if (!(connection !== this.signalRConnection)) {
+                _context6.next = 19;
+                break;
+              }
+              return _context6.abrupt("return");
+            case 19:
               DivaUtils__default["default"].endSpanOfApm('PlannerHandler3D login');
               that = this;
               this.handleConnectionError(_context6.t0, function () {
                 that.login();
               });
-            case 17:
+            case 22:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[3, 12]]);
+        }, _callee6, this, [[4, 15]]);
       }));
       function login() {
         return _login.apply(this, arguments);

package/build/cjs/{LiviqueWWSHandler-a4230440.js → LiviqueWWSHandler-f8f80ead.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-70f9ba19.js');
+require('./index-0fefa866.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');
@@ -11,9 +11,9 @@ require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');
 require('axios');
 require('@crystaldesign/diva-utils');
+require('@babel/runtime/helpers/typeof');
 require('@crystaldesign/planner-2d-core');
 require('@crystaldesign/basket-model');
-require('@babel/runtime/helpers/typeof');
 require('fast-xml-parser');
 require('@babel/runtime/helpers/possibleConstructorReturn');
 require('@babel/runtime/helpers/getPrototypeOf');

package/build/cjs/{PfisterWWSHandler-2d41405a.js → PfisterWWSHandler-1e2fa7cc.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-var index = require('./index-70f9ba19.js');
+var index = require('./index-0fefa866.js');
 var basketModel = require('@crystaldesign/basket-model');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
@@ -12,8 +12,8 @@ require('@babel/runtime/regenerator');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');
 require('axios');
-require('@crystaldesign/planner-2d-core');
 require('@babel/runtime/helpers/typeof');
+require('@crystaldesign/planner-2d-core');
 require('fast-xml-parser');
 require('@babel/runtime/helpers/possibleConstructorReturn');
 require('@babel/runtime/helpers/getPrototypeOf');

package/build/cjs/{PlannerHandler2D-97dff60d.js → PlannerHandler2D-2772a96b.js}

@@ -5,7 +5,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-70f9ba19.js');
+var index = require('./index-0fefa866.js');
 var _possibleConstructorReturn = require('@babel/runtime/helpers/possibleConstructorReturn');
 var _getPrototypeOf = require('@babel/runtime/helpers/getPrototypeOf');
 var _get = require('@babel/runtime/helpers/get');

package/build/cjs/{SeriousBasketHandler-a5c22844.js → SeriousBasketHandler-db8488d2.js}

@@ -3,7 +3,7 @@
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var index = require('./index-70f9ba19.js');
+var index = require('./index-0fefa866.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
@@ -11,9 +11,9 @@ require('@babel/runtime/regenerator');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');
 require('axios');
+require('@babel/runtime/helpers/typeof');
 require('@crystaldesign/planner-2d-core');
 require('@crystaldesign/basket-model');
-require('@babel/runtime/helpers/typeof');
 require('fast-xml-parser');
 require('@babel/runtime/helpers/possibleConstructorReturn');
 require('@babel/runtime/helpers/getPrototypeOf');

package/build/cjs/{ShelfPlanner-b30f8c39.js → ShelfPlanner-87cecae1.js}

@@ -6,14 +6,14 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-70f9ba19.js');
+var index = require('./index-0fefa866.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('axios');
+require('@babel/runtime/helpers/typeof');
 require('@crystaldesign/planner-2d-core');
 require('@crystaldesign/basket-model');
-require('@babel/runtime/helpers/typeof');
 require('fast-xml-parser');
 require('@babel/runtime/helpers/possibleConstructorReturn');
 require('@babel/runtime/helpers/getPrototypeOf');

package/build/cjs/{StandardWWSHandler-40c2a2e8.js → StandardWWSHandler-537180c7.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-70f9ba19.js');
+require('./index-0fefa866.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');
@@ -11,9 +11,9 @@ require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');
 require('axios');
 require('@crystaldesign/diva-utils');
+require('@babel/runtime/helpers/typeof');
 require('@crystaldesign/planner-2d-core');
 require('@crystaldesign/basket-model');
-require('@babel/runtime/helpers/typeof');
 require('fast-xml-parser');
 require('@babel/runtime/helpers/possibleConstructorReturn');
 require('@babel/runtime/helpers/getPrototypeOf');