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

package/build/cjs/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-70f9ba19.js');
+var index = require('./index-0fefa866.js');
 var planner2dCore = require('@crystaldesign/planner-2d-core');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
@@ -14,8 +14,8 @@ require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');
 require('axios');
 require('@crystaldesign/diva-utils');
-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/esm/{DivaBoxPlanner-87010599.js → DivaBoxPlanner-9145f178.js}

@@ -3,16 +3,16 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { c as Vector2, V as Vector3, P as PlannerElementData, B as BoundingBox } from './index-9eba9def.js';
+import { c as Vector2, V as Vector3, P as PlannerElementData, B as BoundingBox } from './index-44a2cb08.js';
 import DivaUtils, { DivaError, md5 } from '@crystaldesign/diva-utils';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
-import { d as dockingPointHandlerInst, h as handler2D } from './PlannerHandler2D-288e724b.js';
+import { d as dockingPointHandlerInst, h as handler2D } from './PlannerHandler2D-83b17b7f.js';
 import '@babel/runtime/helpers/objectWithoutProperties';
 import 'axios';
+import '@babel/runtime/helpers/typeof';
 import '@crystaldesign/planner-2d-core';
 import '@crystaldesign/basket-model';
-import '@babel/runtime/helpers/typeof';
 import 'fast-xml-parser';
 import '@babel/runtime/helpers/possibleConstructorReturn';
 import '@babel/runtime/helpers/getPrototypeOf';

package/build/esm/{DivaStandardPlanner-f5f47d3b.js → DivaStandardPlanner-7331d5ae.js}

@@ -4,15 +4,15 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { V as Vector3, P as PlannerElementData, B as BoundingBox } from './index-9eba9def.js';
+import { V as Vector3, P as PlannerElementData, B as BoundingBox } from './index-44a2cb08.js';
 import DivaUtils, { DivaError, md5 } from '@crystaldesign/diva-utils';
 import { computeDockedTransform } from '@crystaldesign/planner-2d-core';
-import { d as dockingPointHandlerInst, h as handler2D } from './PlannerHandler2D-288e724b.js';
+import { d as dockingPointHandlerInst, h as handler2D } from './PlannerHandler2D-83b17b7f.js';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/objectWithoutProperties';
 import 'axios';
-import '@crystaldesign/basket-model';
 import '@babel/runtime/helpers/typeof';
+import '@crystaldesign/basket-model';
 import 'fast-xml-parser';
 import '@babel/runtime/helpers/possibleConstructorReturn';
 import '@babel/runtime/helpers/getPrototypeOf';

package/build/esm/{DoorPlanner-fb5b9eb2.js → DoorPlanner-cc097ffd.js}

@@ -1,7 +1,7 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import './index-9eba9def.js';
+import './index-44a2cb08.js';
 import DivaUtils from '@crystaldesign/diva-utils';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/asyncToGenerator';
@@ -9,9 +9,9 @@ import '@babel/runtime/regenerator';
 import '@babel/runtime/helpers/objectWithoutProperties';
 import '@babel/runtime/helpers/toConsumableArray';
 import 'axios';
+import '@babel/runtime/helpers/typeof';
 import '@crystaldesign/planner-2d-core';
 import '@crystaldesign/basket-model';
-import '@babel/runtime/helpers/typeof';
 import 'fast-xml-parser';
 import '@babel/runtime/helpers/possibleConstructorReturn';
 import '@babel/runtime/helpers/getPrototypeOf';

package/build/esm/{Host3DSignalR-d316eb88.js → Host3DSignalR-72ecec93.js}

@@ -3,7 +3,7 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { d as bootMark, R as Rendering, H as HQRenderScript } from './index-9eba9def.js';
+import { d as bootMark, R as Rendering, H as HQRenderScript } from './index-44a2cb08.js';
 import DivaUtils, { DivaError } from '@crystaldesign/diva-utils';
 import { HubConnectionBuilder, LogLevel } from '@microsoft/signalr';
 import io from 'socket.io-client';
@@ -12,9 +12,9 @@ import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/objectWithoutProperties';
 import '@babel/runtime/helpers/toConsumableArray';
 import 'axios';
+import '@babel/runtime/helpers/typeof';
 import '@crystaldesign/planner-2d-core';
 import '@crystaldesign/basket-model';
-import '@babel/runtime/helpers/typeof';
 import 'fast-xml-parser';
 import '@babel/runtime/helpers/possibleConstructorReturn';
 import '@babel/runtime/helpers/getPrototypeOf';
@@ -35,6 +35,8 @@ var Host3DSignalR = /*#__PURE__*/function () {
     _defineProperty(this, "connectionErrorCount", void 0);
     _defineProperty(this, "doIgnoreOnClosed", void 0);
     //This boolean allows to ignore the onClose connection event of the signalR connection.
+    _defineProperty(this, "isClosed", false);
+    //Set by closeConnection(): a closed instance must never connect again.
     _defineProperty(this, "sessionID", void 0);
     //DivaMediaService
     _defineProperty(this, "divaMediaServiceSocketIO", undefined);
@@ -148,7 +150,7 @@ var Host3DSignalR = /*#__PURE__*/function () {
     value: (function () {
       var _initializeConnection = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(divaNr) {
         var _this2 = this;
-        var that;
+        var that, connection;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -167,11 +169,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) {
@@ -179,11 +192,14 @@ var Host3DSignalR = /*#__PURE__*/function () {
               } else {
                 this.signalRConnection = new HubConnectionBuilder().withUrl(this.renderSettings.Diva3DServerURL).withHubProtocol(new MessagePackHubProtocol()).configureLogging(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.endSpanOfApm('PlannerHandler3D initSignalRConnection');
                 bootMark('signalr: connected');
                 that.connectionStarted = true;
@@ -196,6 +212,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.endSpanOfApm('PlannerHandler3D initSignalRConnection');
                 LOG.error(new DivaError('Connection error. Message: ' + err.toString(), {
                   code: 'WC_0014'
@@ -210,26 +227,32 @@ var Host3DSignalR = /*#__PURE__*/function () {
                 return _regeneratorRuntime.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.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();
           }
@@ -430,11 +453,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
@@ -453,7 +480,7 @@ var Host3DSignalR = /*#__PURE__*/function () {
     key: "login",
     value: (function () {
       var _login = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
-        var sessionId, that;
+        var connection, sessionId, that;
         return _regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -461,11 +488,21 @@ var Host3DSignalR = /*#__PURE__*/function () {
               //_this.ServerLog("Login","send Login - userID:" + _userID + ", deviceID:" + _deviceID + ", divaSessionID:" SaveProjectWi+ _divaSessionID + ", info:" + _Application);
               DivaUtils.startSpanOfApm('PlannerHandler3D login');
               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:
               bootMark('signalr: LoginWebPlanner acked', {
                 ok: sessionId != '' ? 1 : 0
               });
@@ -482,21 +519,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.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/esm/{LiviqueWWSHandler-2a135ba1.js → LiviqueWWSHandler-4d18f0f8.js}

@@ -1,6 +1,6 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
-import './index-9eba9def.js';
+import './index-44a2cb08.js';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/asyncToGenerator';
 import '@babel/runtime/helpers/defineProperty';
@@ -9,9 +9,9 @@ import '@babel/runtime/helpers/objectWithoutProperties';
 import '@babel/runtime/helpers/toConsumableArray';
 import 'axios';
 import '@crystaldesign/diva-utils';
+import '@babel/runtime/helpers/typeof';
 import '@crystaldesign/planner-2d-core';
 import '@crystaldesign/basket-model';
-import '@babel/runtime/helpers/typeof';
 import 'fast-xml-parser';
 import '@babel/runtime/helpers/possibleConstructorReturn';
 import '@babel/runtime/helpers/getPrototypeOf';

package/build/esm/{PfisterWWSHandler-e7d55634.js → PfisterWWSHandler-156c7d93.js}

@@ -1,6 +1,6 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
-import { a as articleHandlerInstance } from './index-9eba9def.js';
+import { a as articleHandlerInstance } from './index-44a2cb08.js';
 import { SAPOrderLineData } from '@crystaldesign/basket-model';
 import DivaUtils, { DivaError } from '@crystaldesign/diva-utils';
 import '@babel/runtime/helpers/slicedToArray';
@@ -10,8 +10,8 @@ import '@babel/runtime/regenerator';
 import '@babel/runtime/helpers/objectWithoutProperties';
 import '@babel/runtime/helpers/toConsumableArray';
 import 'axios';
-import '@crystaldesign/planner-2d-core';
 import '@babel/runtime/helpers/typeof';
+import '@crystaldesign/planner-2d-core';
 import 'fast-xml-parser';
 import '@babel/runtime/helpers/possibleConstructorReturn';
 import '@babel/runtime/helpers/getPrototypeOf';

package/build/esm/{PlannerHandler2D-288e724b.js → PlannerHandler2D-83b17b7f.js}

@@ -3,7 +3,7 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { c as Vector2, S as SVGUtils } from './index-9eba9def.js';
+import { c as Vector2, S as SVGUtils } from './index-44a2cb08.js';
 import _possibleConstructorReturn from '@babel/runtime/helpers/possibleConstructorReturn';
 import _getPrototypeOf from '@babel/runtime/helpers/getPrototypeOf';
 import _get from '@babel/runtime/helpers/get';

package/build/esm/{SeriousBasketHandler-60cbf854.js → SeriousBasketHandler-1652bb9b.js}

@@ -1,7 +1,7 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { s as summaryHandlerInstance } from './index-9eba9def.js';
+import { s as summaryHandlerInstance } from './index-44a2cb08.js';
 import DivaUtils from '@crystaldesign/diva-utils';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/asyncToGenerator';
@@ -9,9 +9,9 @@ import '@babel/runtime/regenerator';
 import '@babel/runtime/helpers/objectWithoutProperties';
 import '@babel/runtime/helpers/toConsumableArray';
 import 'axios';
+import '@babel/runtime/helpers/typeof';
 import '@crystaldesign/planner-2d-core';
 import '@crystaldesign/basket-model';
-import '@babel/runtime/helpers/typeof';
 import 'fast-xml-parser';
 import '@babel/runtime/helpers/possibleConstructorReturn';
 import '@babel/runtime/helpers/getPrototypeOf';

package/build/esm/{ShelfPlanner-f3a02665.js → ShelfPlanner-9f76f2ea.js}

@@ -4,14 +4,14 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
-import { G as Grid, a as articleHandlerInstance, b as setHandlerInstance } from './index-9eba9def.js';
+import { G as Grid, a as articleHandlerInstance, b as setHandlerInstance } from './index-44a2cb08.js';
 import DivaUtils, { DivaError } from '@crystaldesign/diva-utils';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/objectWithoutProperties';
 import 'axios';
+import '@babel/runtime/helpers/typeof';
 import '@crystaldesign/planner-2d-core';
 import '@crystaldesign/basket-model';
-import '@babel/runtime/helpers/typeof';
 import 'fast-xml-parser';
 import '@babel/runtime/helpers/possibleConstructorReturn';
 import '@babel/runtime/helpers/getPrototypeOf';

package/build/esm/{StandardWWSHandler-eb1ba4cf.js → StandardWWSHandler-649e12c5.js}

@@ -1,6 +1,6 @@
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
-import './index-9eba9def.js';
+import './index-44a2cb08.js';
 import '@babel/runtime/helpers/slicedToArray';
 import '@babel/runtime/helpers/asyncToGenerator';
 import '@babel/runtime/helpers/defineProperty';
@@ -9,9 +9,9 @@ import '@babel/runtime/helpers/objectWithoutProperties';
 import '@babel/runtime/helpers/toConsumableArray';
 import 'axios';
 import '@crystaldesign/diva-utils';
+import '@babel/runtime/helpers/typeof';
 import '@crystaldesign/planner-2d-core';
 import '@crystaldesign/basket-model';
-import '@babel/runtime/helpers/typeof';
 import 'fast-xml-parser';
 import '@babel/runtime/helpers/possibleConstructorReturn';
 import '@babel/runtime/helpers/getPrototypeOf';