polfan-server-js-client 0.1.993 → 0.1.995

package/build/index.js

@@ -650,9 +650,10 @@ function TopicHistoryWindow_toPrimitive(input, hint) { if (TopicHistoryWindow_ty
 
 var WindowState;
 (function (WindowState) {
-  WindowState[WindowState["UNINITIALIZED"] = 0] = "UNINITIALIZED";
-  WindowState[WindowState["LATEST"] = 1] = "LATEST";
-  WindowState[WindowState["PAST"] = 2] = "PAST";
+  WindowState[WindowState["EMPTY"] = 0] = "EMPTY";
+  WindowState[WindowState["LATEST_LIVE"] = 1] = "LATEST_LIVE";
+  WindowState[WindowState["LATEST_FETCHED"] = 2] = "LATEST_FETCHED";
+  WindowState[WindowState["PAST_FETCHED"] = 3] = "PAST_FETCHED";
 })(WindowState || (WindowState = {}));
 var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj) {
   TopicHistoryWindow_inherits(TraversableRemoteCollection, _ObservableIndexedObj);
@@ -665,7 +666,7 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
     }
     _this = _super.call.apply(_super, [this].concat(args));
     TopicHistoryWindow_defineProperty(TopicHistoryWindow_assertThisInitialized(_this), "limit", 50);
-    TopicHistoryWindow_defineProperty(TopicHistoryWindow_assertThisInitialized(_this), "currentState", WindowState.UNINITIALIZED);
+    TopicHistoryWindow_defineProperty(TopicHistoryWindow_assertThisInitialized(_this), "currentState", WindowState.EMPTY);
     TopicHistoryWindow_defineProperty(TopicHistoryWindow_assertThisInitialized(_this), "fetchingState", undefined);
     return _this;
   }
@@ -693,13 +694,13 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
             switch (_context.prev = _context.next) {
               case 0:
                 this.throwIfFetchingInProgress();
-                if (!(this.currentState === WindowState.LATEST)) {
+                if (!(this.currentState === WindowState.LATEST_FETCHED)) {
                   _context.next = 3;
                   break;
                 }
                 return _context.abrupt("return");
               case 3:
-                this.fetchingState = WindowState.LATEST;
+                this.fetchingState = WindowState.LATEST_FETCHED;
                 _context.prev = 4;
                 _context.next = 7;
                 return this.fetchLatestItems();
@@ -712,7 +713,7 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
               case 11:
                 this.deleteAll();
                 this.addItems(result, 'tail');
-                this.currentState = WindowState.LATEST;
+                this.currentState = WindowState.LATEST_FETCHED;
               case 14:
               case "end":
                 return _context.stop();
@@ -735,7 +736,7 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
             switch (_context2.prev = _context2.next) {
               case 0:
                 this.throwIfFetchingInProgress();
-                this.fetchingState = WindowState.PAST;
+                this.fetchingState = WindowState.PAST_FETCHED;
                 _context2.prev = 2;
                 _context2.next = 5;
                 return this.fetchItemsBefore();
@@ -753,25 +754,13 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
                 return _context2.abrupt("return", this.resetToLatest());
               case 11:
                 if (!result.length) {
-                  _context2.next = 21;
+                  _context2.next = 15;
                   break;
                 }
                 this.addItems(result, 'head');
                 _context2.next = 15;
-                return this.isLatestItemLoaded();
+                return this.refreshFetchedState();
               case 15:
-                if (!_context2.sent) {
-                  _context2.next = 19;
-                  break;
-                }
-                _context2.t0 = WindowState.LATEST;
-                _context2.next = 20;
-                break;
-              case 19:
-                _context2.t0 = WindowState.PAST;
-              case 20:
-                this.currentState = _context2.t0;
-              case 21:
               case "end":
                 return _context2.stop();
             }
@@ -818,7 +807,7 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
                 }
                 this.addItems(result, 'tail');
                 _context3.next = 16;
-                return this.refreshMode();
+                return this.refreshFetchedState();
               case 16:
               case "end":
                 return _context3.stop();
@@ -832,9 +821,9 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
       return fetchNext;
     }()
   }, {
-    key: "refreshMode",
+    key: "refreshFetchedState",
     value: function () {
-      var _refreshMode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _refreshFetchedState = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
@@ -846,11 +835,11 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
                   _context4.next = 6;
                   break;
                 }
-                _context4.t0 = WindowState.LATEST;
+                _context4.t0 = WindowState.LATEST_FETCHED;
                 _context4.next = 7;
                 break;
               case 6:
-                _context4.t0 = WindowState.PAST;
+                _context4.t0 = WindowState.PAST_FETCHED;
               case 7:
                 this.currentState = _context4.t0;
               case 8:
@@ -860,11 +849,18 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
           }
         }, _callee4, this);
       }));
-      function refreshMode() {
-        return _refreshMode.apply(this, arguments);
+      function refreshFetchedState() {
+        return _refreshFetchedState.apply(this, arguments);
       }
-      return refreshMode;
+      return refreshFetchedState;
     }()
+  }, {
+    key: "refreshLiveState",
+    value: function refreshLiveState() {
+      if (this.currentState === WindowState.EMPTY && this.length) {
+        this.currentState = WindowState.LATEST_LIVE;
+      }
+    }
   }, {
     key: "throwIfFetchingInProgress",
     value: function throwIfFetchingInProgress() {
@@ -952,18 +948,11 @@ var TopicHistoryWindow = /*#__PURE__*/function (_TraversableRemoteCol) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                if (!([WindowState.LATEST, WindowState.UNINITIALIZED].includes(this.state) && ev.location.roomId === this.roomId && ev.location.topicId === this.topicId)) {
-                  _context5.next = 5;
-                  break;
+                if ([WindowState.LATEST_FETCHED, WindowState.LATEST_LIVE, WindowState.EMPTY].includes(this.state) && ev.location.roomId === this.roomId && ev.location.topicId === this.topicId) {
+                  this.set(ev.message);
+                  this.refreshLiveState();
                 }
-                this.set(ev.message);
-                if (!(this.state === WindowState.UNINITIALIZED)) {
-                  _context5.next = 5;
-                  break;
-                }
-                _context5.next = 5;
-                return this.refreshMode();
-              case 5:
+              case 1:
               case "end":
                 return _context5.stop();
             }
@@ -1189,7 +1178,7 @@ var TopicHistoryWindow = /*#__PURE__*/function (_TraversableRemoteCol) {
                 return this.getLatestMessageId();
               case 2:
                 lastMessageId = _context11.sent;
-                return _context11.abrupt("return", lastMessageId ? this.has(lastMessageId) : false);
+                return _context11.abrupt("return", lastMessageId ? this.has(lastMessageId) : true);
               case 4:
               case "end":
                 return _context11.stop();
@@ -2046,7 +2035,7 @@ var RoomsManager = /*#__PURE__*/function () {
     value: function () {
       var _getTopics = RoomsManager_asyncToGenerator( /*#__PURE__*/RoomsManager_regeneratorRuntime().mark(function _callee5(roomId, tryToFetchTopicIds) {
         var _this3 = this;
-        var missingIds, promise, _iterator, _step, topicId;
+        var canFetch, idsToFetch, promise, _iterator, _step, topicId;
         return RoomsManager_regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
@@ -2055,57 +2044,60 @@ var RoomsManager = /*#__PURE__*/function () {
                 return this.deferredSession.promise;
               case 2:
                 if (!(tryToFetchTopicIds !== null && tryToFetchTopicIds !== void 0 && tryToFetchTopicIds.length)) {
-                  _context5.next = 22;
+                  _context5.next = 23;
                   break;
                 }
-                missingIds = tryToFetchTopicIds.filter(function (topicId) {
-                  return !_this3.topicsPromises.has(roomId + topicId);
-                });
-                if (missingIds.length) {
+                // Topic can be fetched if it isn't already cached and fetch is not already in progress
+                canFetch = function canFetch(topicId) {
+                  var _this3$topics$get;
+                  return !((_this3$topics$get = _this3.topics.get(roomId)) !== null && _this3$topics$get !== void 0 && _this3$topics$get.has(topicId)) && !_this3.topicsPromises.has(roomId + topicId);
+                };
+                idsToFetch = tryToFetchTopicIds.filter(canFetch);
+                if (idsToFetch.length) {
                   promise = this.tracker.client.send('GetTopics', {
                     roomId: roomId,
-                    ids: missingIds
+                    topicIds: idsToFetch
                   }).then(function (result) {
-                    var _this3$topics$get;
-                    return (_this3$topics$get = _this3.topics.get(result.data.location.roomId)) === null || _this3$topics$get === void 0 ? void 0 : _this3$topics$get.set.apply(_this3$topics$get, RoomsManager_toConsumableArray(result.data.topics));
+                    var _this3$topics$get2;
+                    return (_this3$topics$get2 = _this3.topics.get(result.data.location.roomId)) === null || _this3$topics$get2 === void 0 ? void 0 : _this3$topics$get2.set.apply(_this3$topics$get2, RoomsManager_toConsumableArray(result.data.topics));
                   });
-                  missingIds.forEach(function (topicId) {
+                  idsToFetch.forEach(function (topicId) {
                     return _this3.topicsPromises.register(promise, roomId + topicId);
                   });
                 }
                 _iterator = RoomsManager_createForOfIteratorHelper(tryToFetchTopicIds);
-                _context5.prev = 6;
+                _context5.prev = 7;
                 _iterator.s();
-              case 8:
+              case 9:
                 if ((_step = _iterator.n()).done) {
-                  _context5.next = 14;
+                  _context5.next = 15;
                   break;
                 }
                 topicId = _step.value;
-                _context5.next = 12;
+                _context5.next = 13;
                 return this.topicsPromises.get(roomId + topicId);
-              case 12:
-                _context5.next = 8;
+              case 13:
+                _context5.next = 9;
                 break;
-              case 14:
-                _context5.next = 19;
+              case 15:
+                _context5.next = 20;
                 break;
-              case 16:
-                _context5.prev = 16;
-                _context5.t0 = _context5["catch"](6);
+              case 17:
+                _context5.prev = 17;
+                _context5.t0 = _context5["catch"](7);
                 _iterator.e(_context5.t0);
-              case 19:
-                _context5.prev = 19;
+              case 20:
+                _context5.prev = 20;
                 _iterator.f();
-                return _context5.finish(19);
-              case 22:
-                return _context5.abrupt("return", this.topics.get(roomId));
+                return _context5.finish(20);
               case 23:
+                return _context5.abrupt("return", this.topics.get(roomId));
+              case 24:
               case "end":
                 return _context5.stop();
             }
           }
-        }, _callee5, this, [[6, 16, 19, 22]]);
+        }, _callee5, this, [[7, 17, 20, 23]]);
       }));
       function getTopics(_x3, _x4) {
         return _getTopics.apply(this, arguments);