matrix-js-sdk 41.5.0 → 41.6.0

package/lib/sync.js

@@ -1,3 +1,4 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -111,6 +112,8 @@ export function defaultSyncApiOpts(syncOpts) {
   }, syncOpts);
 }
 export class SyncApi {
+  // flag set if the store needs to be cleared before we can start
+
   /**
    * Construct an entity which is able to sync with a homeserver.
    * @param client - The matrix client instance to use.
@@ -120,26 +123,16 @@ export class SyncApi {
    */
   constructor(client, opts, syncOpts) {
     var _this = this;
-    this.client = client;
-    _defineProperty(this, "opts", void 0);
-    _defineProperty(this, "syncOpts", void 0);
     _defineProperty(this, "_peekRoom", null);
-    _defineProperty(this, "currentSyncRequest", void 0);
-    _defineProperty(this, "abortController", void 0);
     _defineProperty(this, "syncState", null);
-    _defineProperty(this, "syncStateData", void 0);
     // additional data (eg. error object for failed sync)
     _defineProperty(this, "catchingUp", false);
     _defineProperty(this, "running", false);
-    _defineProperty(this, "keepAliveTimer", void 0);
-    _defineProperty(this, "connectionReturnedResolvers", void 0);
     _defineProperty(this, "notifEvents", []);
     // accumulator of sync events in the current sync response
     _defineProperty(this, "failedSyncCount", 0);
     // Number of consecutive failed /sync requests
     _defineProperty(this, "storeIsInvalid", false);
-    // flag set if the store needs to be cleared before we can start
-    _defineProperty(this, "presence", void 0);
     _defineProperty(this, "getPushRules", /*#__PURE__*/_asyncToGenerator(function* () {
       try {
         _this.syncOpts.logger.debug("Getting push rules...");
@@ -228,7 +221,6 @@ export class SyncApi {
         filterId
       };
     }));
-    _defineProperty(this, "savedSyncPromise", void 0);
     /**
      * Event handler for the 'online' event
      * This event is generally unreliable and precise behaviour
@@ -239,6 +231,7 @@ export class SyncApi {
       this.syncOpts.logger.debug("Browser thinks we are back online");
       this.startKeepAlives(0);
     });
+    this.client = client;
     this.opts = defaultClientOpts(opts);
     this.syncOpts = defaultSyncApiOpts(syncOpts);
     if (client.getNotifTimelineSet()) {
@@ -263,9 +256,8 @@ export class SyncApi {
    * as `true`, the given marker event will be ignored
    */
   onMarkerStateEvent(room, markerEvent) {
-    var {
-      timelineWasEmpty
-    } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    var _ref5 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+      timelineWasEmpty = _ref5.timelineWasEmpty;
     // We don't need to refresh the timeline if it was empty before the
     // marker arrived. This could be happen in a variety of cases:
     //  1. From the initial sync
@@ -338,7 +330,7 @@ export class SyncApi {
         leaveRooms = _this2.mapSyncResponseToRoomArray(data.rooms.leave);
       }
       var rooms = yield Promise.all(leaveRooms.map(/*#__PURE__*/function () {
-        var _ref5 = _asyncToGenerator(function* (leaveObj) {
+        var _ref6 = _asyncToGenerator(function* (leaveObj) {
           var room = leaveObj.room;
           if (!leaveObj.isBrandNewRoom) {
             // the intention behind syncLeftRooms is to add in rooms which were
@@ -359,9 +351,8 @@ export class SyncApi {
           // set the back-pagination token. Do this *before* adding any
           // events so that clients can start back-paginating.
           room.getLiveTimeline().setPaginationToken(leaveObj.timeline.prev_batch, EventTimeline.BACKWARDS);
-          var {
-            timelineEvents
-          } = yield _this2.mapAndInjectRoomEvents(leaveObj);
+          var _yield$_this2$mapAndI = yield _this2.mapAndInjectRoomEvents(leaveObj),
+            timelineEvents = _yield$_this2$mapAndI.timelineEvents;
           room.recalculate();
           client.store.storeRoom(room);
           client.emit(ClientEvent.Room, room);
@@ -369,7 +360,7 @@ export class SyncApi {
           return room;
         });
         return function (_x) {
-          return _ref5.apply(this, arguments);
+          return _ref6.apply(this, arguments);
         };
       }()));
       return rooms.filter(Boolean);
@@ -480,7 +471,7 @@ export class SyncApi {
       localTimeoutMs: 50 * 1000,
       abortSignal: (_this$abortController = this.abortController) === null || _this$abortController === void 0 ? void 0 : _this$abortController.signal
     }).then(/*#__PURE__*/function () {
-      var _ref6 = _asyncToGenerator(function* (res) {
+      var _ref7 = _asyncToGenerator(function* (res) {
         if (_this3._peekRoom !== peekRoom) {
           _this3.syncOpts.logger.debug("Stopped peeking in room %s", peekRoom.roomId);
           return;
@@ -520,7 +511,7 @@ export class SyncApi {
         _this3.peekPoll(peekRoom, res.end);
       });
       return function (_x2) {
-        return _ref6.apply(this, arguments);
+        return _ref7.apply(this, arguments);
       };
     }(), err => {
       this.syncOpts.logger.error("[%s] Peek poll failed: %s", peekRoom.roomId, err);
@@ -623,10 +614,9 @@ export class SyncApi {
       _this5.prepareSyncFilterLazyLoading();
       yield _this5.prepareSyncFilterUserProfiles();
       yield _this5.storeClientOptions();
-      var {
-        filterId,
-        filter
-      } = yield _this5.getFilter();
+      var _yield$_this5$getFilt = yield _this5.getFilter(),
+        filterId = _yield$_this5$getFilt.filterId,
+        filter = _yield$_this5$getFilt.filter;
       if (!filter) return; // bail, getFilter failed
 
       // reset the notifications timeline to prepare it to paginate from
@@ -1033,7 +1023,10 @@ export class SyncApi {
       if (typeof userUpdate === "object" && userUpdate !== null) {
         var usersToRemove = [];
         var profilesToAmend = new Map();
-        for (var [userId, userData] of Object.entries(userUpdate)) {
+        for (var _ref0 of Object.entries(userUpdate)) {
+          var _ref9 = _slicedToArray(_ref0, 2);
+          var userId = _ref9[0];
+          var userData = _ref9[1];
           logger.info("Storing user profile ".concat(userId), userData);
           if (userData.profile_updates) {
             client.emit(ClientEvent.UserProfileUpdate, userId, userData.profile_updates);
@@ -1096,7 +1089,7 @@ export class SyncApi {
 
       // Handle invites
       yield Promise.all(inviteRooms.map(/*#__PURE__*/function () {
-        var _ref7 = _asyncToGenerator(function* (inviteObj) {
+        var _ref1 = _asyncToGenerator(function* (inviteObj) {
           var room = inviteObj.room;
           var stateEvents = _this9.mapSyncEventsFormat(inviteObj.invite_state, room);
           yield _this9.injectRoomEvents(room, stateEvents, undefined);
@@ -1113,13 +1106,13 @@ export class SyncApi {
           });
         });
         return function (_x3) {
-          return _ref7.apply(this, arguments);
+          return _ref1.apply(this, arguments);
         };
       }()));
 
       // Handle joins
       yield Promise.all(joinRooms.map(/*#__PURE__*/function () {
-        var _ref8 = _asyncToGenerator(function* (joinObj) {
+        var _ref10 = _asyncToGenerator(function* (joinObj) {
           var _joinObj$UNREAD_THREA;
           var room = joinObj.room;
           var stateEvents = _this9.mapSyncEventsFormat(joinObj.state, room);
@@ -1173,7 +1166,10 @@ export class SyncApi {
             // object implicitly have zero notifications, so start by clearing the total counts
             // for all such threads.
             room.resetThreadUnreadNotificationCountFromSync(Object.keys(unreadThreadNotifications));
-            for (var [threadId, unreadNotification] of Object.entries(unreadThreadNotifications)) {
+            for (var _ref13 of Object.entries(unreadThreadNotifications)) {
+              var _ref12 = _slicedToArray(_ref13, 2);
+              var threadId = _ref12[0];
+              var unreadNotification = _ref12[1];
               if (!encrypted || unreadNotification.notification_count === 0) {
                 var _unreadNotification$n;
                 room.setThreadUnreadNotificationCount(threadId, NotificationCountType.Total, (_unreadNotification$n = unreadNotification.notification_count) !== null && _unreadNotification$n !== void 0 ? _unreadNotification$n : 0);
@@ -1316,19 +1312,18 @@ export class SyncApi {
           room.decryptCriticalEvents();
         });
         return function (_x4) {
-          return _ref8.apply(this, arguments);
+          return _ref10.apply(this, arguments);
         };
       }()));
 
       // Handle leaves (e.g. kicked rooms)
       yield Promise.all(leaveRooms.map(/*#__PURE__*/function () {
-        var _ref9 = _asyncToGenerator(function* (leaveObj) {
+        var _ref14 = _asyncToGenerator(function* (leaveObj) {
           var room = leaveObj.room;
-          var {
-            timelineEvents,
-            stateEvents,
-            stateAfterEvents
-          } = yield _this9.mapAndInjectRoomEvents(leaveObj);
+          var _yield$_this9$mapAndI = yield _this9.mapAndInjectRoomEvents(leaveObj),
+            timelineEvents = _yield$_this9$mapAndI.timelineEvents,
+            stateEvents = _yield$_this9$mapAndI.stateEvents,
+            stateAfterEvents = _yield$_this9$mapAndI.stateAfterEvents;
           var accountDataEvents = _this9.mapSyncEventsFormat(leaveObj.account_data);
           room.addAccountData(accountDataEvents);
           room.recalculate();
@@ -1351,13 +1346,13 @@ export class SyncApi {
           });
         });
         return function (_x5) {
-          return _ref9.apply(this, arguments);
+          return _ref14.apply(this, arguments);
         };
       }()));
 
       // Handle knocks
       yield Promise.all(knockRooms.map(/*#__PURE__*/function () {
-        var _ref0 = _asyncToGenerator(function* (knockObj) {
+        var _ref15 = _asyncToGenerator(function* (knockObj) {
           var room = knockObj.room;
           var stateEvents = _this9.mapSyncEventsFormat(knockObj.knock_state, room);
           yield _this9.injectRoomEvents(room, stateEvents, undefined);
@@ -1374,7 +1369,7 @@ export class SyncApi {
           });
         });
         return function (_x6) {
-          return _ref0.apply(this, arguments);
+          return _ref15.apply(this, arguments);
         };
       }()));
 
@@ -1731,9 +1726,7 @@ export class SyncApi {
 // /!\ This function is not intended for public use! It's only exported from
 // here in order to share some common logic with sliding-sync-sdk.ts.
 export function _createAndReEmitRoom(client, roomId, opts) {
-  var {
-    timelineSupport
-  } = client;
+  var timelineSupport = client.timelineSupport;
   var room = new Room(roomId, client, client.getUserId(), {
     lazyLoadMembers: opts.lazyLoadMembers,
     pendingEventOrdering: opts.pendingEventOrdering,