polfan-server-js-client 0.1.58 → 0.1.91

package/.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/src/types" vcs="Git" />
   </component>
 </project>

package/build/index.js

@@ -642,9 +642,8 @@ function MessagesManager_toPropertyKey(arg) { var key = MessagesManager_toPrimit
 function MessagesManager_toPrimitive(input, hint) { if (MessagesManager_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (MessagesManager_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 
 var getCombinedId = function getCombinedId(location) {
-  return Object.values(location).filter(function (v) {
-    return v;
-  }).join('_');
+  var _location$roomId, _location$topicId;
+  return ((_location$roomId = location.roomId) !== null && _location$roomId !== void 0 ? _location$roomId : '') + ((_location$topicId = location.topicId) !== null && _location$topicId !== void 0 ? _location$topicId : '');
 };
 var MessagesManager = /*#__PURE__*/function () {
   // Temporary not lazy loaded; server must implement GetTopicMessages command.
@@ -709,7 +708,7 @@ var MessagesManager = /*#__PURE__*/function () {
                   _context2.next = 4;
                   break;
                 }
-                throw "You are not in space ".concat(spaceId);
+                throw new Error("You are not in space ".concat(spaceId));
               case 4:
                 _context2.next = 6;
                 return this.tracker.rooms.get();
@@ -839,17 +838,34 @@ var MessagesManager = /*#__PURE__*/function () {
   }, {
     key: "_handleNewTopics",
     value: function _handleNewTopics(roomId) {
-      var _this$list2;
-      for (var _len2 = arguments.length, topics = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-        topics[_key2 - 1] = arguments[_key2];
+      for (var _len2 = arguments.length, newTopics = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
+        newTopics[_key2 - 1] = arguments[_key2];
       }
-      (_this$list2 = this.list).set.apply(_this$list2, MessagesManager_toConsumableArray(topics.map(function (topic) {
-        return [getCombinedId({
+      for (var _i = 0, _newTopics = newTopics; _i < _newTopics.length; _i++) {
+        var newTopic = _newTopics[_i];
+        var newTopicCombinedId = getCombinedId({
           roomId: roomId,
-          topicId: topic.id
-        }), new ObservableIndexedObjectCollection('id')];
-      })));
-      this.createAckReportsForNewTopics(roomId, topics);
+          topicId: newTopic.id
+        });
+        this.list.set([newTopicCombinedId, new ObservableIndexedObjectCollection('id')]);
+
+        // If new topic refers to some message from this room, update other structures
+        if (newTopic.messageRef) {
+          var refTopicCombinedId = getCombinedId({
+            roomId: roomId,
+            topicId: newTopic.messageRef.topicId
+          });
+          var refTopicMessages = this.list.get(refTopicCombinedId);
+          var refMessage = refTopicMessages === null || refTopicMessages === void 0 ? void 0 : refTopicMessages.get(newTopic.messageRef.messageId);
+          if (refMessage) {
+            // Update referenced topic ID in message
+            refTopicMessages.set(_objectSpread(_objectSpread({}, refMessage), {}, {
+              topicRef: newTopic.id
+            }));
+          }
+        }
+      }
+      this.createAckReportsForNewTopics(roomId, newTopics);
     }
   }, {
     key: "handleNewMessage",
@@ -953,6 +969,9 @@ var RoomsManager = /*#__PURE__*/function () {
     RoomsManager_defineProperty(this, "deferredSession", new DeferredTask());
     RoomsManager_defineProperty(this, "membersPromises", new PromiseRegistry());
     this.messages = new MessagesManager(tracker);
+    this.tracker.client.on('NewMessage', function (ev) {
+      return _this.handleNewMessage(ev);
+    });
     this.tracker.client.on('NewTopic', function (ev) {
       return _this.handleNewTopic(ev);
     });
@@ -1367,6 +1386,18 @@ var RoomsManager = /*#__PURE__*/function () {
         members.set(newMember);
       });
     }
+  }, {
+    key: "handleNewMessage",
+    value: function handleNewMessage(ev) {
+      var topics = this.topics.get(ev.location.roomId);
+      var topic = topics.get(ev.location.topicId);
+      if (topic) {
+        topics.set(RoomsManager_objectSpread(RoomsManager_objectSpread({}, topic), {}, {
+          messageCount: topic.messageCount + 1,
+          lastMessage: ev.message
+        }));
+      }
+    }
   }]);
   return RoomsManager;
 }();
@@ -1932,32 +1963,36 @@ Permissions_defineProperty(Permissions, "list", {
     value: 1 << 4,
     maxLayer: Layer.Room
   },
-  ManageTopic: {
+  CreateTopics: {
     value: 1 << 5,
+    maxLayer: Layer.Room
+  },
+  ManageTopic: {
+    value: 1 << 6,
     maxLayer: Layer.Topic
   },
   ManageSpaceMembers: {
-    value: 1 << 6,
+    value: 1 << 7,
     maxLayer: Layer.Space
   },
   ManageRoomMembers: {
-    value: 1 << 7,
+    value: 1 << 8,
     maxLayer: Layer.Room
   },
   CreateMessages: {
-    value: 1 << 8,
+    value: 1 << 9,
     maxLayer: Layer.Topic
   },
   ManagePermissions: {
-    value: 1 << 9,
+    value: 1 << 10,
     maxLayer: Layer.Topic
   },
   CreateSpaceRooms: {
-    value: 1 << 10,
+    value: 1 << 11,
     maxLayer: Layer.Space
   },
   ManageSpaceRooms: {
-    value: 1 << 11,
+    value: 1 << 12,
     maxLayer: Layer.Space
   }
 });