polfan-server-js-client 0.2.57 → 0.2.58

package/.idea/workspace.xml

@@ -5,12 +5,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="831dae43-0da1-47fd-a5f7-33dd5eec2992" name="Changes" comment="Collection integration with React JS rework">
+      <change beforePath="$PROJECT_DIR$/babel.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/babel.config.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/build/index.cjs.js" beforeDir="false" afterPath="$PROJECT_DIR$/build/index.cjs.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/build/index.cjs.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/build/index.cjs.js.map" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/build/index.umd.js" beforeDir="false" afterPath="$PROJECT_DIR$/build/index.umd.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/build/index.umd.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/build/index.umd.js.map" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/build/types/state-tracker/TopicHistoryWindow.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/build/types/state-tracker/TopicHistoryWindow.d.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/IndexedObjectCollection.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/IndexedObjectCollection.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/state-tracker/TopicHistoryWindow.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/state-tracker/TopicHistoryWindow.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/tests/history-window.test.ts" beforeDir="false" afterPath="$PROJECT_DIR$/tests/history-window.test.ts" afterDir="false" />
     </list>
@@ -152,6 +155,7 @@
       <workItem from="1762800459831" duration="10000" />
       <workItem from="1763319451927" duration="2136000" />
       <workItem from="1763410036992" duration="181000" />
+      <workItem from="1763457144937" duration="7689000" />
     </task>
     <task id="LOCAL-00013" summary="Permission related changes in protocol types">
       <option name="closed" value="true" />

package/babel.config.js

@@ -1,7 +1,7 @@
 module.exports = {
   presets: [["@babel/env"]],
   plugins: [
+    ["@babel/plugin-transform-typescript" , { allowDeclareFields: true }],
     ["@babel/plugin-proposal-class-properties"],
-    ["@babel/plugin-transform-typescript"],
   ],
 };

package/build/index.cjs.js

@@ -195,7 +195,7 @@ class IndexedCollection {
     }
     return result;
   }
-  shallowCopy() {
+  createMirror() {
     const copy = new IndexedCollection();
     copy._items = this._items;
     return copy;
@@ -203,8 +203,8 @@ class IndexedCollection {
 }
 class IndexedObjectCollection {
   constructor(id, items = []) {
-    this.id = id;
     IndexedObjectCollection_defineProperty(this, "_items", void 0);
+    this.id = id;
     this._items = new IndexedCollection();
     this.set(...items);
   }
@@ -244,7 +244,7 @@ class IndexedObjectCollection {
     }
     return result;
   }
-  shallowCopy() {
+  createMirror() {
     const copy = new IndexedObjectCollection(this.id);
     copy._items = this._items;
     return copy;
@@ -285,7 +285,7 @@ class ObservableIndexedCollection extends IndexedCollection {
       });
     }
   }
-  shallowCopy() {
+  createMirror() {
     const copy = new ObservableIndexedCollection();
     copy.eventTarget = this.eventTarget;
     copy._items = this._items;
@@ -307,8 +307,8 @@ class ObservableIndexedCollection extends IndexedCollection {
 class ObservableIndexedObjectCollection extends IndexedObjectCollection {
   constructor(id, items = []) {
     super(id);
-    this.id = id;
     IndexedObjectCollection_defineProperty(this, "eventTarget", void 0);
+    this.id = id;
     this.eventTarget = new EventTarget();
     this.set(...items);
   }
@@ -337,7 +337,7 @@ class ObservableIndexedObjectCollection extends IndexedObjectCollection {
       });
     }
   }
-  shallowCopy() {
+  createMirror() {
     const copy = new ObservableIndexedObjectCollection(this.id);
     copy.eventTarget = this.eventTarget;
     copy._items = this._items;
@@ -423,64 +423,77 @@ let WindowState = /*#__PURE__*/function (WindowState) {
 class TraversableRemoteCollection extends ObservableIndexedObjectCollection {
   constructor(...args) {
     super(...args);
-    /**
-     * Maximum numer of items stored in window.
-     * Null for unlimited.
-     */
-    TopicHistoryWindow_defineProperty(this, "limit", 50);
-    TopicHistoryWindow_defineProperty(this, "oldestId", null);
-    TopicHistoryWindow_defineProperty(this, "currentState", WindowState.LIVE);
-    TopicHistoryWindow_defineProperty(this, "fetchingState", undefined);
+    TopicHistoryWindow_defineProperty(this, "internalState", {
+      current: WindowState.LIVE,
+      ongoing: undefined,
+      limit: 50,
+      oldestId: null
+    });
   }
   /**
    * Current mode od collection window. To change mode, call one of available fetch methods.
    */
   get state() {
-    return this.currentState;
+    return this.internalState.current;
+  }
+  /**
+   * Maximum numer of items stored in window.
+   * Null for unlimited.
+   */
+  get limit() {
+    return this.internalState.limit;
+  }
+
+  /**
+   * Maximum numer of items stored in window.
+   * Null for unlimited.
+   */
+  set limit(value) {
+    this.internalState.limit = value;
   }
   get hasLatest() {
     return [WindowState.LATEST, WindowState.LIVE].includes(this.state);
   }
   get hasOldest() {
-    return this.state === WindowState.OLDEST || this.oldestId !== null && this.has(this.oldestId);
+    return this.state === WindowState.OLDEST || this.internalState.oldestId !== null && this.has(this.internalState.oldestId);
   }
   async resetToLatest() {
-    if (this.fetchingState || this.currentState === WindowState.LATEST) {
+    if (this.internalState.ongoing || this.internalState.current === WindowState.LATEST) {
       return;
     }
-    this.fetchingState = WindowState.LATEST;
+    this.internalState.ongoing = WindowState.LATEST;
     let result;
     try {
       result = await this.fetchLatestItems();
     } finally {
-      this.fetchingState = undefined;
+      this.internalState.ongoing = undefined;
     }
     this.deleteAll();
     this.addItems(result, 'tail');
-    this.currentState = WindowState.LATEST;
+    this.internalState.current = WindowState.LATEST;
   }
   async fetchPrevious() {
-    if (this.fetchingState || this.hasOldest) {
+    if (this.internalState.ongoing || this.hasOldest) {
       return;
     }
-    this.fetchingState = WindowState.PAST;
+    this.internalState.ongoing = WindowState.PAST;
     let result;
     try {
       result = await this.fetchItemsBefore();
     } finally {
-      this.fetchingState = undefined;
+      this.internalState.ongoing = undefined;
     }
     if (!result) {
       return this.resetToLatest();
     }
     if (!result.length) {
       const firstItem = this.getAt(0);
-      this.oldestId = firstItem ? this.getId(firstItem) : null;
+      this.internalState.oldestId = firstItem ? this.getId(firstItem) : null;
       await this.refreshFetchedState();
 
       // LATEST state has priority over OLDEST
-      if (this.currentState === WindowState.PAST) {
-        this.currentState = WindowState.OLDEST;
+      if (this.internalState.current === WindowState.PAST) {
+        this.internalState.current = WindowState.OLDEST;
       }
       return;
     }
@@ -488,15 +501,15 @@ class TraversableRemoteCollection extends ObservableIndexedObjectCollection {
     await this.refreshFetchedState();
   }
   async fetchNext() {
-    if (this.fetchingState || this.hasLatest) {
+    if (this.internalState.ongoing || this.hasLatest) {
       return;
     }
-    this.fetchingState = WindowState.PAST;
+    this.internalState.ongoing = WindowState.PAST;
     let result;
     try {
       result = await this.fetchItemsAfter();
     } finally {
-      this.fetchingState = undefined;
+      this.internalState.ongoing = undefined;
     }
     if (!result) {
       await this.resetToLatest();
@@ -509,7 +522,7 @@ class TraversableRemoteCollection extends ObservableIndexedObjectCollection {
     }
   }
   async refreshFetchedState() {
-    this.currentState = (await this.isLatestItemLoaded()) ? WindowState.LATEST : WindowState.PAST;
+    this.internalState.current = (await this.isLatestItemLoaded()) ? WindowState.LATEST : WindowState.PAST;
   }
   addItems(newItems, to) {
     let result;
@@ -539,53 +552,51 @@ class TraversableRemoteCollection extends ObservableIndexedObjectCollection {
   }
 }
 class TopicHistoryWindow extends TraversableRemoteCollection {
-  constructor(roomId, topicId, tracker) {
+  constructor(roomId, topicId, tracker, bindEvents = true) {
     super('id');
-    this.roomId = roomId;
-    this.topicId = topicId;
-    this.tracker = tracker;
     /**
      * Reexported available window modes enum.
      */
     TopicHistoryWindow_defineProperty(this, "WindowState", WindowState);
-    TopicHistoryWindow_defineProperty(this, "traverseLock", false);
-    this.tracker.client.on('Session', ev => this.handleSession(ev));
-    this.tracker.client.on('NewMessage', ev => this.handleNewMessage(ev));
+    this.roomId = roomId;
+    this.topicId = topicId;
+    this.tracker = tracker;
+    this.internalState.traverseLock = false;
+    if (bindEvents) {
+      this.tracker.client.on('Session', ev => this.handleSession(ev));
+      this.tracker.client.on('NewMessage', ev => this.handleNewMessage(ev));
+    }
   }
-  shallowCopy() {
-    const copy = new TopicHistoryWindow(this.roomId, this.topicId, this.tracker);
+  createMirror() {
+    const copy = new TopicHistoryWindow(this.roomId, this.topicId, this.tracker, false);
     copy.eventTarget = this.eventTarget;
     copy._items = this._items;
-    copy.limit = this.limit;
-    copy.currentState = this.currentState;
-    copy.fetchingState = this.fetchingState;
-    copy.oldestId = this.oldestId;
-    copy.traverseLock = this.traverseLock;
+    copy.internalState = this.internalState;
     return copy;
   }
   get isTraverseLocked() {
-    return this.traverseLock;
+    return this.internalState.traverseLock;
   }
   async setTraverseLock(lock) {
-    this.traverseLock = lock;
+    this.internalState.traverseLock = lock;
     if (lock && this.state !== WindowState.LIVE && this.state !== WindowState.LATEST) {
       await super.resetToLatest();
     }
   }
   async resetToLatest() {
-    if (this.traverseLock) {
+    if (this.internalState.traverseLock) {
       return;
     }
     return super.resetToLatest();
   }
   async fetchNext() {
-    if (this.traverseLock) {
+    if (this.internalState.traverseLock) {
       return;
     }
     return super.fetchNext();
   }
   async fetchPrevious() {
-    if (this.traverseLock) {
+    if (this.internalState.traverseLock) {
       return;
     }
     return super.fetchPrevious();
@@ -613,7 +624,7 @@ class TopicHistoryWindow extends TraversableRemoteCollection {
   handleSession(ev) {
     const rooms = ev.state.rooms;
     if (rooms.find(room => room.id === this.roomId)) {
-      this.resetToLatest();
+      void this.resetToLatest();
     } else {
       this.deleteAll();
     }
@@ -685,10 +696,10 @@ function RoomMessagesHistory_toPrimitive(input, hint) { if (typeof input !== "ob
 
 class RoomMessagesHistory {
   constructor(room, tracker) {
-    this.room = room;
-    this.tracker = tracker;
     RoomMessagesHistory_defineProperty(this, "historyWindows", new IndexedCollection());
     RoomMessagesHistory_defineProperty(this, "traverseLock", false);
+    this.room = room;
+    this.tracker = tracker;
     this.tracker.client.on('RoomUpdated', ev => this.handleRoomUpdated(ev));
     this.tracker.client.on('NewTopic', ev => this.handleNewTopic(ev));
     this.tracker.client.on('TopicDeleted', ev => this.handleTopicDeleted(ev));
@@ -760,11 +771,11 @@ function MessagesManager_toPrimitive(input, hint) { if (typeof input !== "object
 
 class MessagesManager {
   constructor(tracker) {
-    this.tracker = tracker;
     MessagesManager_defineProperty(this, "roomHistories", new IndexedCollection());
     MessagesManager_defineProperty(this, "followedTopics", new IndexedCollection());
     MessagesManager_defineProperty(this, "followedTopicsPromises", new PromiseRegistry());
     MessagesManager_defineProperty(this, "deferredSession", new DeferredTask());
+    this.tracker = tracker;
     this.tracker.client.on('Session', ev => this.handleSession(ev));
     this.tracker.client.on('RoomJoined', ev => this.handleRoomJoin(ev));
     this.tracker.client.on('NewTopic', ev => this.handleNewTopic(ev));
@@ -985,7 +996,6 @@ function RoomsManager_toPrimitive(input, hint) { if (typeof input !== "object" |
 
 class RoomsManager {
   constructor(tracker) {
-    this.tracker = tracker;
     RoomsManager_defineProperty(this, "messages", void 0);
     RoomsManager_defineProperty(this, "list", new ObservableIndexedObjectCollection('id'));
     RoomsManager_defineProperty(this, "topics", new IndexedCollection());
@@ -993,6 +1003,7 @@ class RoomsManager {
     RoomsManager_defineProperty(this, "deferredSession", new DeferredTask());
     RoomsManager_defineProperty(this, "membersPromises", new PromiseRegistry());
     RoomsManager_defineProperty(this, "topicsPromises", new PromiseRegistry());
+    this.tracker = tracker;
     this.messages = new MessagesManager(tracker);
     this.tracker.client.on('NewMessage', ev => this.handleNewMessage(ev));
     this.tracker.client.on('NewTopic', ev => this.handleNewTopic(ev));
@@ -1311,7 +1322,6 @@ function SpacesManager_toPrimitive(input, hint) { if (typeof input !== "object"
 
 class SpacesManager {
   constructor(tracker) {
-    this.tracker = tracker;
     SpacesManager_defineProperty(this, "list", new ObservableIndexedObjectCollection('id'));
     SpacesManager_defineProperty(this, "roles", new IndexedCollection());
     SpacesManager_defineProperty(this, "rooms", new IndexedCollection());
@@ -1320,6 +1330,7 @@ class SpacesManager {
     SpacesManager_defineProperty(this, "deferredSession", new DeferredTask());
     SpacesManager_defineProperty(this, "roomsPromises", new PromiseRegistry());
     SpacesManager_defineProperty(this, "membersPromises", new PromiseRegistry());
+    this.tracker = tracker;
     this.tracker.client.on('NewRoom', ev => this.handleNewRoom(ev));
     this.tracker.client.on('RoomDeleted', ev => this.handleRoomDeleted(ev));
     this.tracker.client.on('RoomUpdated', ev => this.handleRoomUpdated(ev));
@@ -1680,9 +1691,9 @@ const getOvIdByObject = overwrites => getOvId(overwrites.location, overwrites.ta
 class PermissionsManager extends EventTarget {
   constructor(tracker) {
     super();
-    this.tracker = tracker;
     PermissionsManager_defineProperty(this, "overwrites", new IndexedCollection());
     PermissionsManager_defineProperty(this, "overwritesPromises", new PromiseRegistry());
+    this.tracker = tracker;
     this.tracker.client.on('PermissionOverwrites', ev => this.handlePermissionOverwrites(ev));
     this.tracker.client.on('PermissionOverwritesUpdated', ev => this.handlePermissionOverwrites(ev));
     this.tracker.client.on('SpaceDeleted', ev => this.handleSpaceDeleted(ev));
@@ -1920,9 +1931,9 @@ function EmoticonsManager_toPrimitive(input, hint) { if (typeof input !== "objec
 const GLOBAL_KEY = 'global';
 class EmoticonsManager {
   constructor(tracker) {
-    this.tracker = tracker;
     EmoticonsManager_defineProperty(this, "list", new IndexedCollection());
     EmoticonsManager_defineProperty(this, "emoticonsPromises", new PromiseRegistry());
+    this.tracker = tracker;
     this.tracker.client.on('Emoticons', ev => this.handleEmoticons(ev));
     this.tracker.client.on('NewEmoticon', ev => this.handleNewEmoticon(ev));
     this.tracker.client.on('EmoticonDeleted', ev => this.handleEmoticonDeleted(ev));
@@ -1978,9 +1989,9 @@ function UsersManager_toPrimitive(input, hint) { if (typeof input !== "object" |
 
 class UsersManager {
   constructor(tracker) {
-    this.tracker = tracker;
     UsersManager_defineProperty(this, "onlineStatus", new EventTarget());
     UsersManager_defineProperty(this, "users", new ObservableIndexedObjectCollection('id'));
+    this.tracker = tracker;
     // RoomMemberUpdated & SpaceMemberUpdated events are not contains user object
     tracker.client.on('UserUpdated', event => this.handleUsers([event.user]));
     tracker.client.on('RoomMemberJoined', event => this.handleMembers([event.member]));
@@ -2025,9 +2036,9 @@ const getId = (refUserId, type) => `${refUserId}-${type}`;
 const getIdFromRelationship = relationship => getId(relationship.refUser.id, relationship.type);
 class RelationshipsManager {
   constructor(tracker) {
-    this.tracker = tracker;
     RelationshipsManager_defineProperty(this, "relationships", new ObservableIndexedObjectCollection(getIdFromRelationship));
     RelationshipsManager_defineProperty(this, "promises", new PromiseRegistry());
+    this.tracker = tracker;
     this.tracker.client.on('Relationships', ev => this.handleRelationships(ev));
     this.tracker.client.on('NewRelationship', ev => this.handleNewRelationship(ev));
     this.tracker.client.on('RelationshipDeleted', ev => this.handleRelationshipDeleted(ev));
@@ -2083,7 +2094,6 @@ function ChatStateTracker_toPrimitive(input, hint) { if (typeof input !== "objec
 
 class ChatStateTracker {
   constructor(client) {
-    this.client = client;
     /**
      * State of your permissions.
      */
@@ -2110,6 +2120,7 @@ class ChatStateTracker {
     ChatStateTracker_defineProperty(this, "relationships", new RelationshipsManager(this));
     ChatStateTracker_defineProperty(this, "_me", null);
     ChatStateTracker_defineProperty(this, "deferredSession", new DeferredTask());
+    this.client = client;
     this.client.on('Session', ev => this.handleSession(ev));
   }
   get me() {
@@ -2140,7 +2151,6 @@ var WebSocketChatClientEvent = /*#__PURE__*/function (WebSocketChatClientEvent)
 class WebSocketChatClient extends AbstractChatClient {
   constructor(options) {
     super();
-    this.options = options;
     WebSocketChatClient_defineProperty(this, "Event", WebSocketChatClientEvent);
     WebSocketChatClient_defineProperty(this, "state", void 0);
     WebSocketChatClient_defineProperty(this, "ws", null);
@@ -2148,6 +2158,7 @@ class WebSocketChatClient extends AbstractChatClient {
     WebSocketChatClient_defineProperty(this, "connectingTimeoutId", void 0);
     WebSocketChatClient_defineProperty(this, "authenticated", void 0);
     WebSocketChatClient_defineProperty(this, "authenticatedResolvers", void 0);
+    this.options = options;
     if (this.options.stateTracking ?? true) {
       this.state = new ChatStateTracker(this);
     }
@@ -2247,9 +2258,9 @@ var WebApiChatClientEvent = /*#__PURE__*/function (WebApiChatClientEvent) {
 class WebApiChatClient extends AbstractChatClient {
   constructor(options) {
     super();
-    this.options = options;
     WebApiChatClient_defineProperty(this, "Event", WebApiChatClientEvent);
     WebApiChatClient_defineProperty(this, "sendStack", void 0);
+    this.options = options;
   }
   async send(commandType, commandData) {
     const envelope = this.createEnvelope(commandType, commandData);
@@ -2305,13 +2316,9 @@ class WebApiChatClient extends AbstractChatClient {
   }
 }
 ;// CONCATENATED MODULE: ./src/AbstractRestClient.ts
-function AbstractRestClient_defineProperty(obj, key, value) { key = AbstractRestClient_toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function AbstractRestClient_toPropertyKey(arg) { var key = AbstractRestClient_toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function AbstractRestClient_toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 class AbstractRestClient {
   constructor(options) {
     this.options = options;
-    AbstractRestClient_defineProperty(this, "defaultUrl", void 0);
   }
   async send(method, uri, data = undefined) {
     let url = this.getUrl(uri);