@webex/plugin-meetings 3.12.0-next.23 → 3.12.0-next.25

package/dist/hashTree/hashTreeParser.js

@@ -1282,7 +1282,7 @@ var HashTreeParser = /*#__PURE__*/function () {
     key: "performSync",
     value: (function () {
       var _performSync = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee6(dataSet, reason, isInitialization) {
-        var hashTree, rootHash, leavesData, i, receivedHashes, hashesResult, mismatchedLeaveIndexes, syncResponse, _t3, _t4;
+        var hashTree, rootHash, leavesData, receivedHashes, hashesResult, mismatchedLeaveIndexes, syncResponse, _t3, _t4;
         return _regenerator.default.wrap(function (_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -1296,81 +1296,90 @@ var HashTreeParser = /*#__PURE__*/function () {
               rootHash = hashTree.getRootHash();
               _context7.prev = 2;
               _loggerProxy.default.logger.info("HashTreeParser#performSync --> ".concat(this.debugId, " ").concat(reason, ", syncing data set \"").concat(dataSet.name, "\""));
-              if (!isInitialization) {
-                _context7.next = 3;
-                break;
-              }
-              // initialization sync: send all leaves as empty to get all data from Locus
               leavesData = {};
-              for (i = 0; i < dataSet.leafCount; i += 1) {
-                leavesData[i] = [];
+              if (isInitialization) {
+                _context7.next = 10;
+                break;
               }
-              _context7.next = 11;
-              break;
-            case 3:
               if (!(dataSet.leafCount !== 1)) {
-                _context7.next = 10;
+                _context7.next = 9;
                 break;
               }
-              leavesData = {};
-              _context7.prev = 4;
-              _context7.next = 5;
+              _context7.prev = 3;
+              _context7.next = 4;
               return this.getHashesFromLocus(dataSet.name, rootHash);
-            case 5:
+            case 4:
               hashesResult = _context7.sent;
               if (hashesResult) {
-                _context7.next = 6;
+                _context7.next = 5;
                 break;
               }
               return _context7.abrupt("return");
-            case 6:
+            case 5:
               receivedHashes = hashesResult.hashes;
               hashTree.resize(hashesResult.dataSet.leafCount);
-              _context7.next = 9;
+              _context7.next = 8;
               break;
-            case 7:
-              _context7.prev = 7;
-              _t3 = _context7["catch"](4);
+            case 6:
+              _context7.prev = 6;
+              _t3 = _context7["catch"](3);
               if (!((_t3 === null || _t3 === void 0 ? void 0 : _t3.statusCode) === 409)) {
-                _context7.next = 8;
+                _context7.next = 7;
                 break;
               }
               // this is a leaf count mismatch, we should do nothing, just wait for another heartbeat message from Locus
               _loggerProxy.default.logger.info("HashTreeParser#getHashesFromLocus --> ".concat(this.debugId, " Got 409 when fetching hashes for data set \"").concat(dataSet.name, "\": ").concat(_t3.message));
               return _context7.abrupt("return");
-            case 8:
+            case 7:
               throw _t3;
-            case 9:
+            case 8:
               // identify mismatched leaves
               mismatchedLeaveIndexes = hashTree.diffHashes(receivedHashes);
               mismatchedLeaveIndexes.forEach(function (index) {
                 leavesData[index] = hashTree.getLeafData(index);
               });
-              _context7.next = 11;
+              _context7.next = 10;
               break;
-            case 10:
+            case 9:
               leavesData = {
                 0: hashTree.getLeafData(0)
               };
+            case 10:
+              // request sync for mismatched leaves
+              syncResponse = null;
+              if (!isInitialization) {
+                _context7.next = 12;
+                break;
+              }
+              _context7.next = 11;
+              return this.sendSyncRequestToLocus(dataSet, {
+                isInitialization: true
+              });
             case 11:
+              syncResponse = _context7.sent;
+              _context7.next = 14;
+              break;
+            case 12:
               if (!((0, _keys.default)(leavesData).length > 0)) {
-                _context7.next = 13;
+                _context7.next = 14;
                 break;
               }
-              _context7.next = 12;
-              return this.sendSyncRequestToLocus(dataSet, leavesData);
-            case 12:
+              _context7.next = 13;
+              return this.sendSyncRequestToLocus(dataSet, {
+                mismatchedLeavesData: leavesData
+              });
+            case 13:
               syncResponse = _context7.sent;
+            case 14:
               // sync API may return nothing (in that case data will arrive via messages)
               // or it may return a response in the same format as messages
               if (syncResponse) {
                 this.handleMessage(syncResponse, 'via sync API');
               }
-            case 13:
-              _context7.next = 15;
+              _context7.next = 16;
               break;
-            case 14:
-              _context7.prev = 14;
+            case 15:
+              _context7.prev = 15;
               _t4 = _context7["catch"](2);
               if (_t4 instanceof MeetingEndedError) {
                 this.callLocusInfoUpdateCallback({
@@ -1379,11 +1388,11 @@ var HashTreeParser = /*#__PURE__*/function () {
               } else {
                 _loggerProxy.default.logger.warn("HashTreeParser#performSync --> ".concat(this.debugId, " error during sync for data set \"").concat(dataSet.name, "\":"), _t4);
               }
-            case 15:
+            case 16:
             case "end":
               return _context7.stop();
           }
-        }, _callee6, this, [[2, 14], [4, 7]]);
+        }, _callee6, this, [[2, 15], [3, 6]]);
       }));
       function performSync(_x8, _x9, _x0) {
         return _performSync.apply(this, arguments);
@@ -1828,26 +1837,36 @@ var HashTreeParser = /*#__PURE__*/function () {
      * Sends a sync request to Locus for the specified data set.
      *
      * @param {InternalDataSet} dataSet The data set to sync.
-     * @param {Record<number, LeafDataItem[]>} mismatchedLeavesData The mismatched leaves data to include in the sync request.
+     * @param {Object} options Either `{ isInitialization: true }` for init syncs (uses leafCount=1 with empty leaf data) or `{ mismatchedLeavesData }` for normal syncs.
      * @returns {Promise<HashTreeMessage|null>}
      */
   }, {
     key: "sendSyncRequestToLocus",
-    value: function sendSyncRequestToLocus(dataSet, mismatchedLeavesData) {
+    value: function sendSyncRequestToLocus(dataSet, options) {
       var _this13 = this;
       _loggerProxy.default.logger.info("HashTreeParser#sendSyncRequestToLocus --> ".concat(this.debugId, " Sending sync request for data set \"").concat(dataSet.name, "\""));
+      var isInitialization = 'isInitialization' in options;
       var url = "".concat(dataSet.url, "/sync");
       var body = {
-        leafCount: dataSet.leafCount,
+        leafCount: isInitialization ? 1 : dataSet.leafCount,
         leafDataEntries: []
       };
-      (0, _keys.default)(mismatchedLeavesData).forEach(function (index) {
-        var leafIndex = (0, _parseInt2.default)(index, 10);
+      if (isInitialization) {
+        // initialization sync: Locus requires leafCount=1 with a single empty leaf
         body.leafDataEntries.push({
-          leafIndex: leafIndex,
-          elementIds: mismatchedLeavesData[leafIndex]
+          leafIndex: 0,
+          elementIds: []
         });
-      });
+      } else {
+        var mismatchedLeavesData = options.mismatchedLeavesData;
+        (0, _keys.default)(mismatchedLeavesData).forEach(function (index) {
+          var leafIndex = (0, _parseInt2.default)(index, 10);
+          body.leafDataEntries.push({
+            leafIndex: leafIndex,
+            elementIds: mismatchedLeavesData[leafIndex]
+          });
+        });
+      }
       var ourCurrentRootHash = dataSet.hashTree ? dataSet.hashTree.getRootHash() : _constants2.EMPTY_HASH;
       return this.webexRequest({
         method: _constants.HTTP_VERBS.POST,