polfan-server-js-client 0.2.90 → 0.2.91

package/.idea/workspace.xml

@@ -5,9 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="831dae43-0da1-47fd-a5f7-33dd5eec2992" name="Changes" comment="Update Topic on redacted message">
-      <change beforePath="$PROJECT_DIR$/src/state-tracker/MessagesManager.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/state-tracker/MessagesManager.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/state-tracker/RoomMessagesHistory.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/state-tracker/RoomMessagesHistory.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/state-tracker/RoomsManager.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/state-tracker/RoomsManager.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/state-tracker/TopicHistoryWindow.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/state-tracker/TopicHistoryWindow.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -192,15 +190,7 @@
       <workItem from="1776327180094" duration="5055000" />
       <workItem from="1777136687009" duration="3369000" />
       <workItem from="1777301595900" duration="1696000" />
-      <workItem from="1778067371586" duration="4596000" />
-    </task>
-    <task id="LOCAL-00040" summary="Adapt FilesClient to new files API">
-      <option name="closed" value="true" />
-      <created>1752752404949</created>
-      <option name="number" value="00040" />
-      <option name="presentableId" value="LOCAL-00040" />
-      <option name="project" value="LOCAL" />
-      <updated>1752752404949</updated>
+      <workItem from="1778067371586" duration="10579000" />
     </task>
     <task id="LOCAL-00041" summary="Adapt FilesClient to new files API">
       <option name="closed" value="true" />
@@ -586,7 +576,15 @@
       <option name="project" value="LOCAL" />
       <updated>1778069870246</updated>
     </task>
-    <option name="localTasksCounter" value="89" />
+    <task id="LOCAL-00089" summary="Update Topic on redacted message">
+      <option name="closed" value="true" />
+      <created>1778076405751</created>
+      <option name="number" value="00089" />
+      <option name="presentableId" value="LOCAL-00089" />
+      <option name="project" value="LOCAL" />
+      <updated>1778076405751</updated>
+    </task>
+    <option name="localTasksCounter" value="90" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

package/build/index.cjs.js

@@ -767,7 +767,7 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
     key: "resetToLatest",
     value: function () {
       var _resetToLatest = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-        var result;
+        var result, originalState;
         return _regenerator().w(function (_context) {
           while (1) switch (_context.p = _context.n) {
             case 0:
@@ -777,6 +777,7 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
               }
               return _context.a(2);
             case 1:
+              originalState = this.state;
               this.internalState.ongoing = WindowState.LATEST;
               _context.p = 2;
               _context.n = 3;
@@ -792,6 +793,7 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
               this._items.deleteAll(); // Directly call deleteAll to prevent event emit.
               this.addItems(result, 'tail');
               this.internalState.current = WindowState.LATEST;
+              this.emitChangeWithDiff(true, originalState);
             case 6:
               return _context.a(2);
           }
@@ -806,7 +808,7 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
     key: "fetchPrevious",
     value: function () {
       var _fetchPrevious = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
-        var result, firstItem;
+        var result, originalState, firstItem;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.p = _context2.n) {
             case 0:
@@ -816,6 +818,7 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
               }
               return _context2.a(2);
             case 1:
+              originalState = this.state;
               this.internalState.ongoing = WindowState.PAST;
               _context2.p = 2;
               _context2.n = 3;
@@ -847,12 +850,15 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
               if (this.internalState.current === WindowState.PAST) {
                 this.internalState.current = WindowState.OLDEST;
               }
+              this.emitChangeWithDiff(false, originalState);
               return _context2.a(2);
             case 8:
               this.addItems(result, 'head');
               _context2.n = 9;
               return this.refreshFetchedState();
             case 9:
+              this.emitChangeWithDiff(true, originalState);
+            case 10:
               return _context2.a(2);
           }
         }, _callee2, this, [[2,, 4, 5]]);
@@ -866,7 +872,7 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
     key: "fetchNext",
     value: function () {
       var _fetchNext = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
-        var result;
+        var result, originalState;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.p = _context3.n) {
             case 0:
@@ -876,6 +882,7 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
               }
               return _context3.a(2);
             case 1:
+              originalState = this.state;
               this.internalState.ongoing = WindowState.PAST;
               _context3.p = 2;
               _context3.n = 3;
@@ -905,6 +912,7 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
               _context3.n = 8;
               return this.refreshFetchedState();
             case 8:
+              this.emitChangeWithDiff(true, originalState);
               return _context3.a(2);
             case 9:
               return _context3.a(2);
@@ -951,6 +959,8 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
   }, {
     key: "addItems",
     value: function addItems(newItems, to) {
+      var _this$_items,
+        _this2 = this;
       var result;
       if (to === 'head') {
         result = this.trimItemsArrayToLimit([].concat(TopicHistoryWindow_toConsumableArray(newItems), TopicHistoryWindow_toConsumableArray(this.items)), 'tail');
@@ -958,8 +968,21 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
       if (to === 'tail') {
         result = this.trimItemsArrayToLimit([].concat(TopicHistoryWindow_toConsumableArray(this.items), TopicHistoryWindow_toConsumableArray(newItems)), 'head');
       }
-      this._items.deleteAll(); // Directly call deleteAll to prevent event emit.
-      this.set.apply(this, TopicHistoryWindow_toConsumableArray(result));
+
+      // Directly calls to prevent event emit.
+      this._items.deleteAll();
+      (_this$_items = this._items).set.apply(_this$_items, TopicHistoryWindow_toConsumableArray(result.map(function (item) {
+        return [_this2.getId(item), item];
+      })));
+    }
+  }, {
+    key: "emitChangeWithDiff",
+    value: function emitChangeWithDiff(itemChanged, originalState) {
+      if (itemChanged || originalState !== this.state) {
+        this.eventTarget.emit('change', {
+          setItems: Array.from(this._items.items.keys())
+        });
+      }
     }
 
     /**
@@ -985,27 +1008,27 @@ var TraversableRemoteCollection = /*#__PURE__*/function (_ObservableIndexedObj)
 }(ObservableIndexedObjectCollection);
 var TopicHistoryWindow = /*#__PURE__*/function (_TraversableRemoteCol) {
   function TopicHistoryWindow(roomId, topicId, tracker) {
-    var _this2;
+    var _this3;
     var bindEvents = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
     TopicHistoryWindow_classCallCheck(this, TopicHistoryWindow);
-    _this2 = TopicHistoryWindow_callSuper(this, TopicHistoryWindow, ['id']);
+    _this3 = TopicHistoryWindow_callSuper(this, TopicHistoryWindow, ['id']);
     /**
      * Reexported available window modes enum.
      */
-    TopicHistoryWindow_defineProperty(_this2, "WindowState", WindowState);
-    _this2.roomId = roomId;
-    _this2.topicId = topicId;
-    _this2.tracker = tracker;
-    _this2.internalState.traverseLock = false;
+    TopicHistoryWindow_defineProperty(_this3, "WindowState", WindowState);
+    _this3.roomId = roomId;
+    _this3.topicId = topicId;
+    _this3.tracker = tracker;
+    _this3.internalState.traverseLock = false;
     if (bindEvents) {
-      _this2.tracker.client.on('NewMessage', function (ev) {
-        return _this2.handleNewMessage(ev);
+      _this3.tracker.client.on('NewMessage', function (ev) {
+        return _this3.handleNewMessage(ev);
       });
-      _this2.tracker.client.on('MessagesRedacted', function (ev) {
-        return _this2.handleMessagesRedacted(ev);
+      _this3.tracker.client.on('MessagesRedacted', function (ev) {
+        return _this3.handleMessagesRedacted(ev);
       });
     }
-    return _this2;
+    return _this3;
   }
   TopicHistoryWindow_inherits(TopicHistoryWindow, _TraversableRemoteCol);
   return TopicHistoryWindow_createClass(TopicHistoryWindow, [{
@@ -1127,83 +1150,23 @@ var TopicHistoryWindow = /*#__PURE__*/function (_TraversableRemoteCol) {
         }));
       }
     }
-  }, {
-    key: "handleNewMessage",
-    value: function () {
-      var _handleNewMessage = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(ev) {
-        return _regenerator().w(function (_context9) {
-          while (1) switch (_context9.n) {
-            case 0:
-              if ([WindowState.LATEST, WindowState.LIVE].includes(this.state) && ev.message.location.roomId === this.roomId && ev.message.location.topicId === this.topicId) {
-                this.addItems([ev.message], 'tail');
-              }
-            case 1:
-              return _context9.a(2);
-          }
-        }, _callee9, this);
-      }));
-      function handleNewMessage(_x2) {
-        return _handleNewMessage.apply(this, arguments);
-      }
-      return handleNewMessage;
-    }()
-  }, {
-    key: "handleMessagesRedacted",
-    value: function () {
-      var _handleMessagesRedacted = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(ev) {
-        var refTopicIds;
-        return _regenerator().w(function (_context0) {
-          while (1) switch (_context0.n) {
-            case 0:
-              if (!(ev.location.topicId !== this.topicId || ev.location.roomId !== this.roomId)) {
-                _context0.n = 1;
-                break;
-              }
-              return _context0.a(2);
-            case 1:
-              refTopicIds = this.items.filter(function (msg) {
-                return msg.topicRef && ev.ids.includes(msg.id);
-              }).map(function (msg) {
-                return msg.topicRef;
-              });
-              this["delete"].apply(this, TopicHistoryWindow_toConsumableArray(ev.ids));
-              if (!(this.length === 0)) {
-                _context0.n = 2;
-                break;
-              }
-              _context0.n = 2;
-              return this.resetToLatest();
-            case 2:
-              if (refTopicIds.length > 0) {
-                this.eventTarget.emit('reftopicsdeleted', refTopicIds);
-              }
-            case 3:
-              return _context0.a(2);
-          }
-        }, _callee0, this);
-      }));
-      function handleMessagesRedacted(_x3) {
-        return _handleMessagesRedacted.apply(this, arguments);
-      }
-      return handleMessagesRedacted;
-    }()
   }, {
     key: "fetchItemsAfter",
     value: function () {
-      var _fetchItemsAfter = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
+      var _fetchItemsAfter = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9() {
         var _this$getAt;
         var afterId, result;
-        return _regenerator().w(function (_context1) {
-          while (1) switch (_context1.n) {
+        return _regenerator().w(function (_context9) {
+          while (1) switch (_context9.n) {
             case 0:
               afterId = (_this$getAt = this.getAt(this.length - 1)) === null || _this$getAt === void 0 ? void 0 : _this$getAt.id;
               if (afterId) {
-                _context1.n = 1;
+                _context9.n = 1;
                 break;
               }
-              return _context1.a(2, null);
+              return _context9.a(2, null);
             case 1:
-              _context1.n = 2;
+              _context9.n = 2;
               return this.tracker.client.send('GetMessages', {
                 location: {
                   roomId: this.roomId,
@@ -1213,16 +1176,16 @@ var TopicHistoryWindow = /*#__PURE__*/function (_TraversableRemoteCol) {
                 limit: this.internalState.fetchLimit
               });
             case 2:
-              result = _context1.v;
+              result = _context9.v;
               if (!result.error) {
-                _context1.n = 3;
+                _context9.n = 3;
                 break;
               }
               throw new Error("Cannot fetch messages: ".concat(result.error.message));
             case 3:
-              return _context1.a(2, result.data.messages);
+              return _context9.a(2, result.data.messages);
           }
-        }, _callee1, this);
+        }, _callee9, this);
       }));
       function fetchItemsAfter() {
         return _fetchItemsAfter.apply(this, arguments);
@@ -1232,20 +1195,20 @@ var TopicHistoryWindow = /*#__PURE__*/function (_TraversableRemoteCol) {
   }, {
     key: "fetchItemsBefore",
     value: function () {
-      var _fetchItemsBefore = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10() {
+      var _fetchItemsBefore = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0() {
         var _this$getAt2;
         var beforeId, result;
-        return _regenerator().w(function (_context10) {
-          while (1) switch (_context10.n) {
+        return _regenerator().w(function (_context0) {
+          while (1) switch (_context0.n) {
             case 0:
               beforeId = (_this$getAt2 = this.getAt(0)) === null || _this$getAt2 === void 0 ? void 0 : _this$getAt2.id;
               if (beforeId) {
-                _context10.n = 1;
+                _context0.n = 1;
                 break;
               }
-              return _context10.a(2, null);
+              return _context0.a(2, null);
             case 1:
-              _context10.n = 2;
+              _context0.n = 2;
               return this.tracker.client.send('GetMessages', {
                 location: {
                   roomId: this.roomId,
@@ -1255,16 +1218,16 @@ var TopicHistoryWindow = /*#__PURE__*/function (_TraversableRemoteCol) {
                 limit: this.internalState.fetchLimit
               });
             case 2:
-              result = _context10.v;
+              result = _context0.v;
               if (!result.error) {
-                _context10.n = 3;
+                _context0.n = 3;
                 break;
               }
               throw new Error("Cannot fetch messages: ".concat(result.error.message));
             case 3:
-              return _context10.a(2, result.data.messages);
+              return _context0.a(2, result.data.messages);
           }
-        }, _callee10, this);
+        }, _callee0, this);
       }));
       function fetchItemsBefore() {
         return _fetchItemsBefore.apply(this, arguments);
@@ -1274,12 +1237,12 @@ var TopicHistoryWindow = /*#__PURE__*/function (_TraversableRemoteCol) {
   }, {
     key: "fetchLatestItems",
     value: function () {
-      var _fetchLatestItems = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11() {
+      var _fetchLatestItems = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
         var result;
-        return _regenerator().w(function (_context11) {
-          while (1) switch (_context11.n) {
+        return _regenerator().w(function (_context1) {
+          while (1) switch (_context1.n) {
             case 0:
-              _context11.n = 1;
+              _context1.n = 1;
               return this.tracker.client.send('GetMessages', {
                 location: {
                   roomId: this.roomId,
@@ -1288,16 +1251,16 @@ var TopicHistoryWindow = /*#__PURE__*/function (_TraversableRemoteCol) {
                 limit: this.internalState.fetchLimit
               });
             case 1:
-              result = _context11.v;
+              result = _context1.v;
               if (!result.error) {
-                _context11.n = 2;
+                _context1.n = 2;
                 break;
               }
               throw new Error("Cannot fetch messages: ".concat(result.error.message));
             case 2:
-              return _context11.a(2, result.data.messages);
+              return _context1.a(2, result.data.messages);
           }
-        }, _callee11, this);
+        }, _callee1, this);
       }));
       function fetchLatestItems() {
         return _fetchLatestItems.apply(this, arguments);
@@ -1307,16 +1270,16 @@ var TopicHistoryWindow = /*#__PURE__*/function (_TraversableRemoteCol) {
   }, {
     key: "getTopic",
     value: function () {
-      var _getTopic = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12() {
-        return _regenerator().w(function (_context12) {
-          while (1) switch (_context12.n) {
+      var _getTopic = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10() {
+        return _regenerator().w(function (_context10) {
+          while (1) switch (_context10.n) {
             case 0:
-              _context12.n = 1;
+              _context10.n = 1;
               return this.tracker.rooms.getTopics(this.roomId, [this.topicId]);
             case 1:
-              return _context12.a(2, _context12.v.get(this.topicId));
+              return _context10.a(2, _context10.v.get(this.topicId));
           }
-        }, _callee12, this);
+        }, _callee10, this);
       }));
       function getTopic() {
         return _getTopic.apply(this, arguments);
@@ -1326,43 +1289,43 @@ var TopicHistoryWindow = /*#__PURE__*/function (_TraversableRemoteCol) {
   }, {
     key: "getLatestMessageId",
     value: function () {
-      var _getLatestMessageId = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13() {
+      var _getLatestMessageId = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11() {
         var _yield$this$getTopic;
         var _t2, _t3, _t4, _t5;
-        return _regenerator().w(function (_context13) {
-          while (1) switch (_context13.n) {
+        return _regenerator().w(function (_context11) {
+          while (1) switch (_context11.n) {
             case 0:
-              _context13.n = 1;
+              _context11.n = 1;
               return this.getTopic();
             case 1:
-              _t4 = _yield$this$getTopic = _context13.v;
+              _t4 = _yield$this$getTopic = _context11.v;
               _t3 = _t4 === null;
               if (_t3) {
-                _context13.n = 2;
+                _context11.n = 2;
                 break;
               }
               _t3 = _yield$this$getTopic === void 0;
             case 2:
               _t2 = _t3;
               if (_t2) {
-                _context13.n = 3;
+                _context11.n = 3;
                 break;
               }
               _t2 = (_yield$this$getTopic = _yield$this$getTopic.lastMessage) === null || _yield$this$getTopic === void 0;
             case 3:
               if (!_t2) {
-                _context13.n = 4;
+                _context11.n = 4;
                 break;
               }
               _t5 = void 0;
-              _context13.n = 5;
+              _context11.n = 5;
               break;
             case 4:
               _t5 = _yield$this$getTopic.id;
             case 5:
-              return _context13.a(2, _t5);
+              return _context11.a(2, _t5);
           }
-        }, _callee13, this);
+        }, _callee11, this);
       }));
       function getLatestMessageId() {
         return _getLatestMessageId.apply(this, arguments);
@@ -1372,24 +1335,87 @@ var TopicHistoryWindow = /*#__PURE__*/function (_TraversableRemoteCol) {
   }, {
     key: "isLatestItemLoaded",
     value: function () {
-      var _isLatestItemLoaded = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14() {
+      var _isLatestItemLoaded = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12() {
         var lastMessageId;
-        return _regenerator().w(function (_context14) {
-          while (1) switch (_context14.n) {
+        return _regenerator().w(function (_context12) {
+          while (1) switch (_context12.n) {
             case 0:
-              _context14.n = 1;
+              _context12.n = 1;
               return this.getLatestMessageId();
             case 1:
-              lastMessageId = _context14.v;
-              return _context14.a(2, lastMessageId ? this.has(lastMessageId) : true);
+              lastMessageId = _context12.v;
+              return _context12.a(2, lastMessageId ? this.has(lastMessageId) : true);
           }
-        }, _callee14, this);
+        }, _callee12, this);
       }));
       function isLatestItemLoaded() {
         return _isLatestItemLoaded.apply(this, arguments);
       }
       return isLatestItemLoaded;
     }()
+  }, {
+    key: "handleNewMessage",
+    value: function () {
+      var _handleNewMessage = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13(ev) {
+        var originalState;
+        return _regenerator().w(function (_context13) {
+          while (1) switch (_context13.n) {
+            case 0:
+              if ([WindowState.LATEST, WindowState.LIVE].includes(this.state) && ev.message.location.roomId === this.roomId && ev.message.location.topicId === this.topicId) {
+                originalState = this.state;
+                this.addItems([ev.message], 'tail');
+                this.emitChangeWithDiff(true, originalState);
+              }
+            case 1:
+              return _context13.a(2);
+          }
+        }, _callee13, this);
+      }));
+      function handleNewMessage(_x2) {
+        return _handleNewMessage.apply(this, arguments);
+      }
+      return handleNewMessage;
+    }()
+  }, {
+    key: "handleMessagesRedacted",
+    value: function () {
+      var _handleMessagesRedacted = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee14(ev) {
+        var refTopicIds;
+        return _regenerator().w(function (_context14) {
+          while (1) switch (_context14.n) {
+            case 0:
+              if (!(ev.location.topicId !== this.topicId || ev.location.roomId !== this.roomId)) {
+                _context14.n = 1;
+                break;
+              }
+              return _context14.a(2);
+            case 1:
+              refTopicIds = this.items.filter(function (msg) {
+                return msg.topicRef && ev.ids.includes(msg.id);
+              }).map(function (msg) {
+                return msg.topicRef;
+              });
+              this["delete"].apply(this, TopicHistoryWindow_toConsumableArray(ev.ids));
+              if (!(this.length === 0)) {
+                _context14.n = 2;
+                break;
+              }
+              _context14.n = 2;
+              return this.resetToLatest();
+            case 2:
+              if (refTopicIds.length > 0) {
+                this.eventTarget.emit('reftopicsdeleted', refTopicIds);
+              }
+            case 3:
+              return _context14.a(2);
+          }
+        }, _callee14, this);
+      }));
+      function handleMessagesRedacted(_x3) {
+        return _handleMessagesRedacted.apply(this, arguments);
+      }
+      return handleMessagesRedacted;
+    }()
   }]);
 }(TraversableRemoteCollection);
 ;// ./src/state-tracker/RoomMessagesHistory.ts