polfan-server-js-client 0.1.92 → 0.1.94

package/build/types/AbstractChatClient.d.ts

@@ -1,11 +1,5 @@
-import { Bye, GetSession, JoinSpace, Session, SpaceJoined, Error as ErrorType, SpaceLeft, SpaceMemberJoined, SpaceMemberLeft, SpaceMemberUpdated, SpaceDeleted, SpaceMembers, SpaceRooms, NewRole, RoomDeleted, RoomJoined, RoomLeft, RoomMemberLeft, RoomMemberJoined, RoomMembers, NewRoom, NewTopic, TopicDeleted, NewMessage, GetPermissionOverwrites, GetComputedPermissions, LeaveSpace, CreateSpace, DeleteSpace, GetSpaceMembers, GetSpaceRooms, CreateRole, DeleteRole, AssignRole, DeassignRole, SetPermissionOverwrites, JoinRoom, LeaveRoom, CreateRoom, DeleteRoom, GetRoomMembers, CreateTopic, DeleteTopic, CreateMessage, Envelope, PermissionOverwrites, PermissionOverwritesUpdated, RoomMemberUpdated, UpdateRole, RoleUpdated, Ack, UserUpdated, UpdateRoom, RoomUpdated, UpdateSpace, SpaceUpdated, PermissionOverwriteTargets, GetPermissionOverwriteTargets, Owners, Ok, GetOwners, CreateOwner, RoleDeleted } from "./types/src/index";
+import { Bye, GetSession, JoinSpace, Session, SpaceJoined, Error as ErrorType, SpaceLeft, SpaceMemberJoined, SpaceMemberLeft, SpaceMemberUpdated, SpaceDeleted, SpaceMembers, SpaceRooms, NewRole, RoomDeleted, RoomJoined, RoomLeft, RoomMemberLeft, RoomMemberJoined, RoomMembers, NewRoom, NewTopic, TopicDeleted, NewMessage, GetPermissionOverwrites, GetComputedPermissions, LeaveSpace, CreateSpace, DeleteSpace, GetSpaceMembers, GetSpaceRooms, CreateRole, DeleteRole, AssignRole, DeassignRole, SetPermissionOverwrites, JoinRoom, LeaveRoom, CreateRoom, DeleteRoom, GetRoomMembers, CreateTopic, DeleteTopic, CreateMessage, Envelope, PermissionOverwrites, PermissionOverwritesUpdated, RoomMemberUpdated, UpdateRole, RoleUpdated, Ack, UserUpdated, UpdateRoom, RoomUpdated, UpdateSpace, SpaceUpdated, PermissionOverwriteTargets, GetPermissionOverwriteTargets, Owners, Ok, GetOwners, CreateOwner, RoleDeleted, FollowedTopicUpdated, TopicFollowed, TopicUnfollowed, FollowedTopics, FollowTopic, UnfollowTopic, GetFollowedTopics } from "./types/src/index";
 import { EventTarget } from "./EventTarget";
-import { TopicFollowed } from "./types/src/schemes/events/TopicFollowed";
-import { TopicUnfollowed } from "./types/src/schemes/events/TopicUnfollowed";
-import { FollowedTopics } from "./types/src/schemes/events/FollowedTopics";
-import { FollowTopic } from "./types/src/schemes/commands/FollowTopic";
-import { UnfollowTopic } from "./types/src/schemes/commands/UnfollowTopic";
-import { GetFollowedTopics } from "./types/src/schemes/commands/GetFollowedTopics";
 type ArrayOfPromiseResolvers = [(value: any) => void, (reason?: any) => void];
 export declare abstract class AbstractChatClient extends EventTarget {
     protected awaitingResponse: Map<string, ArrayOfPromiseResolvers>;
@@ -63,6 +57,7 @@ export type EventsMap = {
     TopicFollowed: TopicFollowed;
     TopicUnfollowed: TopicUnfollowed;
     FollowedTopics: FollowedTopics;
+    FollowedTopicUpdated: FollowedTopicUpdated;
 };
 /**
  * Map of commands and their corresponding events.
@@ -97,7 +92,7 @@ export type CommandsMap = {
     CreateTopic: [CreateTopic, EventsMap['NewTopic']];
     DeleteTopic: [DeleteTopic, EventsMap['TopicDeleted']];
     CreateMessage: [CreateMessage, EventsMap['NewMessage']];
-    Ack: [Ack, EventsMap['FollowedTopics'] | EventsMap['Ok']];
+    Ack: [Ack, EventsMap['FollowedTopicUpdated'] | EventsMap['Ok']];
     FollowTopic: [FollowTopic, EventsMap['TopicFollowed']];
     UnfollowTopic: [UnfollowTopic, EventsMap['TopicUnfollowed']];
     GetFollowedTopics: [GetFollowedTopics, EventsMap['FollowedTopics']];

package/build/types/state-tracker/MessagesManager.d.ts

@@ -1,5 +1,5 @@
 import { ChatStateTracker } from "./ChatStateTracker";
-import { ChatLocation, Message, Topic, FollowedTopic } from "../types/src";
+import { ChatLocation, Message, FollowedTopic } from "../types/src";
 import { ObservableIndexedObjectCollection } from "../IndexedObjectCollection";
 export declare const getCombinedId: (location: ChatLocation) => string;
 export declare class MessagesManager {
@@ -27,19 +27,17 @@ export declare class MessagesManager {
      * @internal
      */
     _deleteByTopicIds(roomId: string, ...topicIds: string[]): void;
-    /**
-     * For internal use. If you want to add new topic, execute a proper command on client object.
-     * @internal
-     */
-    _handleNewTopics(roomId: string, ...newTopics: Topic[]): void;
+    private handleNewTopics;
     private handleNewMessage;
-    private handleFollowedTopics;
-    private createFollowedStructuresForNewTopics;
-    private updateLocallyFollowedTopicOnNewMessage;
+    private handleFollowedTopicUpdated;
     private handleTopicFollowed;
     private handleTopicUnfollowed;
     private handleRoomDeleted;
+    private handleRoomJoin;
     private handleRoomLeft;
+    private handleNewTopic;
     private handleTopicDeleted;
+    private handleSession;
+    private updateLocallyFollowedTopicOnNewMessage;
     private setFollowedTopicsArray;
 }

package/build/types/types/dist/schemes/events/FollowedTopicUpdated.d.ts

@@ -0,0 +1 @@
+export const __esModule: boolean;

package/build/types/types/src/index.d.ts

@@ -84,4 +84,5 @@ import { UnfollowTopic } from "./schemes/commands/UnfollowTopic";
 import { TopicUnfollowed } from "./schemes/events/TopicUnfollowed";
 import { TopicFollowed } from "./schemes/events/TopicFollowed";
 import { GetFollowedTopics } from "./schemes/commands/GetFollowedTopics";
-export { Envelope, Message, Role, Room, RoomType, RoomMember, RoomSummary, Space, SpaceMember, Topic, FollowedTopic, User, UserState, PermissionOverwritesValue, ChatLocation, MessageReference, Bye, Error, NewMessage, NewRole, NewRoom, NewTopic, TopicFollowed, TopicUnfollowed, FollowedTopics, ComputedPermissions, PermissionOverwrites, PermissionOverwritesUpdated, RoleDeleted, RoleUpdated, RoomDeleted, RoomUpdated, RoomJoined, RoomLeft, RoomMemberJoined, RoomMemberLeft, RoomMembers, RoomMemberUpdated, UserUpdated, Session, SpaceDeleted, SpaceUpdated, SpaceJoined, SpaceLeft, SpaceMemberJoined, SpaceMemberLeft, SpaceMembers, SpaceMemberUpdated, SpaceRooms, TopicDeleted, PermissionOverwriteTargets, Owners, Ok, AssignRole, CreateMessage, Ack, CreateRole, CreateRoom, CreateSpace, CreateTopic, FollowTopic, UnfollowTopic, GetFollowedTopics, DeassignRole, DeleteRole, DeleteRoom, DeleteSpace, DeleteTopic, SetPermissionOverwrites, GetPermissionOverwrites, GetComputedPermissions, GetRoomMembers, GetSession, GetSpaceMembers, GetSpaceRooms, JoinRoom, JoinSpace, LeaveRoom, LeaveSpace, UpdateRole, UpdateSpace, UpdateRoom, GetPermissionOverwriteTargets, CreateOwner, DeleteOwner, GetOwners, };
+import { FollowedTopicUpdated } from "./schemes/events/FollowedTopicUpdated";
+export { Envelope, Message, Role, Room, RoomType, RoomMember, RoomSummary, Space, SpaceMember, Topic, FollowedTopic, User, UserState, PermissionOverwritesValue, ChatLocation, MessageReference, Bye, Error, NewMessage, NewRole, NewRoom, NewTopic, TopicFollowed, TopicUnfollowed, FollowedTopics, FollowedTopicUpdated, ComputedPermissions, PermissionOverwrites, PermissionOverwritesUpdated, RoleDeleted, RoleUpdated, RoomDeleted, RoomUpdated, RoomJoined, RoomLeft, RoomMemberJoined, RoomMemberLeft, RoomMembers, RoomMemberUpdated, UserUpdated, Session, SpaceDeleted, SpaceUpdated, SpaceJoined, SpaceLeft, SpaceMemberJoined, SpaceMemberLeft, SpaceMembers, SpaceMemberUpdated, SpaceRooms, TopicDeleted, PermissionOverwriteTargets, Owners, Ok, AssignRole, CreateMessage, Ack, CreateRole, CreateRoom, CreateSpace, CreateTopic, FollowTopic, UnfollowTopic, GetFollowedTopics, DeassignRole, DeleteRole, DeleteRoom, DeleteSpace, DeleteTopic, SetPermissionOverwrites, GetPermissionOverwrites, GetComputedPermissions, GetRoomMembers, GetSession, GetSpaceMembers, GetSpaceRooms, JoinRoom, JoinSpace, LeaveRoom, LeaveSpace, UpdateRole, UpdateSpace, UpdateRoom, GetPermissionOverwriteTargets, CreateOwner, DeleteOwner, GetOwners, };

package/build/types/types/src/schemes/events/FollowedTopicUpdated.d.ts

@@ -0,0 +1,4 @@
+import { FollowedTopic } from "../FollowedTopic";
+export interface FollowedTopicUpdated {
+    followedTopic: FollowedTopic;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polfan-server-js-client",
-  "version": "0.1.92",
+  "version": "0.1.94",
   "description": "JavaScript client library for handling communication with Polfan chat server.",
   "author": "Jarosław Żak",
   "license": "MIT",

package/src/AbstractChatClient.ts

@@ -60,15 +60,17 @@ import {
     Owners,
     Ok,
     GetOwners,
-    CreateOwner, RoleDeleted,
+    CreateOwner,
+    RoleDeleted,
+    FollowedTopicUpdated,
+    TopicFollowed,
+    TopicUnfollowed,
+    FollowedTopics,
+    FollowTopic,
+    UnfollowTopic,
+    GetFollowedTopics,
 } from "./types/src/index";
 import {EventTarget} from "./EventTarget";
-import {TopicFollowed} from "./types/src/schemes/events/TopicFollowed";
-import {TopicUnfollowed} from "./types/src/schemes/events/TopicUnfollowed";
-import {FollowedTopics} from "./types/src/schemes/events/FollowedTopics";
-import {FollowTopic} from "./types/src/schemes/commands/FollowTopic";
-import {UnfollowTopic} from "./types/src/schemes/commands/UnfollowTopic";
-import {GetFollowedTopics} from "./types/src/schemes/commands/GetFollowedTopics";
 
 type ArrayOfPromiseResolvers = [(value: any) => void, (reason?: any) => void];
 
@@ -170,6 +172,7 @@ export type EventsMap = {
     TopicFollowed: TopicFollowed,
     TopicUnfollowed: TopicUnfollowed,
     FollowedTopics: FollowedTopics,
+    FollowedTopicUpdated: FollowedTopicUpdated,
 };
 
 /**
@@ -209,7 +212,7 @@ export type CommandsMap = {
     CreateTopic: [CreateTopic, EventsMap['NewTopic']],
     DeleteTopic: [DeleteTopic, EventsMap['TopicDeleted']],
     CreateMessage: [CreateMessage, EventsMap['NewMessage']],
-    Ack: [Ack, EventsMap['FollowedTopics'] | EventsMap['Ok']],
+    Ack: [Ack, EventsMap['FollowedTopicUpdated'] | EventsMap['Ok']],
     FollowTopic: [FollowTopic, EventsMap['TopicFollowed']],
     UnfollowTopic: [UnfollowTopic, EventsMap['TopicUnfollowed']],
     GetFollowedTopics: [GetFollowedTopics, EventsMap['FollowedTopics']],

package/src/state-tracker/MessagesManager.ts

@@ -5,12 +5,12 @@ import {
     NewMessage,
     Topic,
     FollowedTopic,
-    FollowedTopics,
     TopicFollowed,
     TopicUnfollowed,
     RoomDeleted,
     RoomLeft,
-    TopicDeleted
+    TopicDeleted,
+    FollowedTopicUpdated, RoomJoined, NewTopic, Session,
 } from "../types/src";
 import {
     IndexedCollection,
@@ -26,12 +26,15 @@ export class MessagesManager {
 
     public constructor(private tracker: ChatStateTracker) {
         this.tracker.client.on('NewMessage', ev => this.handleNewMessage(ev));
-        this.tracker.client.on('FollowedTopics', ev => this.handleFollowedTopics(ev));
+        this.tracker.client.on('FollowedTopicUpdated', ev => this.handleFollowedTopicUpdated(ev));
         this.tracker.client.on('TopicFollowed', ev => this.handleTopicFollowed(ev));
         this.tracker.client.on('TopicUnfollowed', ev => this.handleTopicUnfollowed(ev));
         this.tracker.client.on('RoomDeleted', ev => this.handleRoomDeleted(ev));
+        this.tracker.client.on('RoomJoined', ev => this.handleRoomJoin(ev));
         this.tracker.client.on('RoomLeft', ev => this.handleRoomLeft(ev));
+        this.tracker.client.on('NewTopic', ev => this.handleNewTopic(ev));
         this.tracker.client.on('TopicDeleted', ev => this.handleTopicDeleted(ev));
+        this.tracker.client.on('Session', ev => this.handleSession(ev));
     }
 
     /**
@@ -92,11 +95,7 @@ export class MessagesManager {
         this.followedTopics.get(roomId)?.delete(...topicIds);
     }
 
-    /**
-     * For internal use. If you want to add new topic, execute a proper command on client object.
-     * @internal
-     */
-    public _handleNewTopics(roomId: string, ...newTopics: Topic[]):void {
+    private handleNewTopics(roomId: string, ...newTopics: Topic[]):void {
         for (const newTopic of newTopics) {
             const newTopicCombinedId = getCombinedId({roomId, topicId: newTopic.id});
 
@@ -114,32 +113,53 @@ export class MessagesManager {
                 }
             }
         }
-
-        this.createFollowedStructuresForNewTopics(roomId, newTopics);
     }
 
     private handleNewMessage(ev: NewMessage): void {
-        this.list.get(getCombinedId(ev.location)).set(ev.message);
+        this.list.get(getCombinedId(ev.location))?.set(ev.message);
         this.updateLocallyFollowedTopicOnNewMessage(ev);
     }
 
-    private handleFollowedTopics(ev: FollowedTopics): void {
-        this.setFollowedTopicsArray(ev.followedTopics);
+    private handleFollowedTopicUpdated(ev: FollowedTopicUpdated): void {
+        this.followedTopics.get(ev.followedTopic.location.roomId)?.set(ev.followedTopic);
     }
 
-    private createFollowedStructuresForNewTopics(roomId: string, topics: Topic[]): void {
-        const followedTopic = this.followedTopics.get(roomId);
+    private handleTopicFollowed(ev: TopicFollowed): void {
+        this.setFollowedTopicsArray([ev.followedTopic]);
+    }
 
-        if (! followedTopic) {
-            // If we don't follow ack reports for this room, skip
-            return;
+    private handleTopicUnfollowed(ev: TopicUnfollowed): void {
+        this.followedTopics.get(ev.location.roomId)?.delete(ev.location.topicId);
+    }
+
+    private handleRoomDeleted(ev: RoomDeleted): void {
+        this.followedTopics.delete(ev.id);
+    }
+
+    private handleRoomJoin(ev: RoomJoined): void {
+        if (ev.room.defaultTopic) {
+            this.handleNewTopics(ev.room.id, ev.room.defaultTopic)
         }
+    }
+
+    private handleRoomLeft(ev: RoomLeft): void {
+        this.followedTopics.delete(ev.id);
+    }
+
+    private handleNewTopic(ev: NewTopic): void {
+        this.handleNewTopics(ev.roomId, ev.topic);
+    }
 
-        const followedTopics: FollowedTopic[] = topics.map(topic => ({
-            location: {roomId, topicId: topic.id}, lastAckMessageId: null, missed: 0, missedMoreThan: null
-        }));
+    private handleTopicDeleted(ev: TopicDeleted): void {
+        this.followedTopics.get(ev.location.roomId)?.delete(ev.location.topicId);
+    }
 
-        followedTopic.set(...followedTopics);
+    private handleSession(ev: Session): void {
+        ev.state.rooms.forEach(room => {
+            if (room.defaultTopic) {
+                this.handleNewTopics(room.id, room.defaultTopic);
+            }
+        });
     }
 
     private updateLocallyFollowedTopicOnNewMessage(ev: NewMessage): void {
@@ -168,26 +188,6 @@ export class MessagesManager {
         followedTopic.set({...currentFollowedTopic, ...update});
     }
 
-    private handleTopicFollowed(ev: TopicFollowed): void {
-        this.setFollowedTopicsArray([ev.followedTopic]);
-    }
-
-    private handleTopicUnfollowed(ev: TopicUnfollowed): void {
-        this.followedTopics.get(ev.location.roomId)?.delete(ev.location.topicId);
-    }
-
-    private handleRoomDeleted(ev: RoomDeleted): void {
-        this.followedTopics.delete(ev.id);
-    }
-
-    private handleRoomLeft(ev: RoomLeft): void {
-        this.followedTopics.delete(ev.id);
-    }
-
-    private handleTopicDeleted(ev: TopicDeleted): void {
-        this.followedTopics.get(ev.location.roomId)?.delete(ev.location.topicId);
-    }
-
     private setFollowedTopicsArray(followedTopics: FollowedTopic[]): void {
         const roomToTopics: {[roomId: string]: FollowedTopic[]} = {};
 

package/src/state-tracker/RoomsManager.ts

@@ -184,8 +184,6 @@ export class RoomsManager {
         } else {
             this.topics.set([roomId, new ObservableIndexedObjectCollection<Topic>('id', topics)]);
         }
-
-        this.messages._handleNewTopics(roomId, ...topics);
     }
 
     private handleRoomJoined(ev: RoomJoined): void {

package/src/types/dist/index.d.ts

@@ -84,4 +84,5 @@ import { UnfollowTopic } from "./schemes/commands/UnfollowTopic";
 import { TopicUnfollowed } from "./schemes/events/TopicUnfollowed";
 import { TopicFollowed } from "./schemes/events/TopicFollowed";
 import { GetFollowedTopics } from "./schemes/commands/GetFollowedTopics";
-export { Envelope, Message, Role, Room, RoomType, RoomMember, RoomSummary, Space, SpaceMember, Topic, FollowedTopic, User, UserState, PermissionOverwritesValue, ChatLocation, MessageReference, Bye, Error, NewMessage, NewRole, NewRoom, NewTopic, TopicFollowed, TopicUnfollowed, FollowedTopics, ComputedPermissions, PermissionOverwrites, PermissionOverwritesUpdated, RoleDeleted, RoleUpdated, RoomDeleted, RoomUpdated, RoomJoined, RoomLeft, RoomMemberJoined, RoomMemberLeft, RoomMembers, RoomMemberUpdated, UserUpdated, Session, SpaceDeleted, SpaceUpdated, SpaceJoined, SpaceLeft, SpaceMemberJoined, SpaceMemberLeft, SpaceMembers, SpaceMemberUpdated, SpaceRooms, TopicDeleted, PermissionOverwriteTargets, Owners, Ok, AssignRole, CreateMessage, Ack, CreateRole, CreateRoom, CreateSpace, CreateTopic, FollowTopic, UnfollowTopic, GetFollowedTopics, DeassignRole, DeleteRole, DeleteRoom, DeleteSpace, DeleteTopic, SetPermissionOverwrites, GetPermissionOverwrites, GetComputedPermissions, GetRoomMembers, GetSession, GetSpaceMembers, GetSpaceRooms, JoinRoom, JoinSpace, LeaveRoom, LeaveSpace, UpdateRole, UpdateSpace, UpdateRoom, GetPermissionOverwriteTargets, CreateOwner, DeleteOwner, GetOwners, };
+import { FollowedTopicUpdated } from "./schemes/events/FollowedTopicUpdated";
+export { Envelope, Message, Role, Room, RoomType, RoomMember, RoomSummary, Space, SpaceMember, Topic, FollowedTopic, User, UserState, PermissionOverwritesValue, ChatLocation, MessageReference, Bye, Error, NewMessage, NewRole, NewRoom, NewTopic, TopicFollowed, TopicUnfollowed, FollowedTopics, FollowedTopicUpdated, ComputedPermissions, PermissionOverwrites, PermissionOverwritesUpdated, RoleDeleted, RoleUpdated, RoomDeleted, RoomUpdated, RoomJoined, RoomLeft, RoomMemberJoined, RoomMemberLeft, RoomMembers, RoomMemberUpdated, UserUpdated, Session, SpaceDeleted, SpaceUpdated, SpaceJoined, SpaceLeft, SpaceMemberJoined, SpaceMemberLeft, SpaceMembers, SpaceMemberUpdated, SpaceRooms, TopicDeleted, PermissionOverwriteTargets, Owners, Ok, AssignRole, CreateMessage, Ack, CreateRole, CreateRoom, CreateSpace, CreateTopic, FollowTopic, UnfollowTopic, GetFollowedTopics, DeassignRole, DeleteRole, DeleteRoom, DeleteSpace, DeleteTopic, SetPermissionOverwrites, GetPermissionOverwrites, GetComputedPermissions, GetRoomMembers, GetSession, GetSpaceMembers, GetSpaceRooms, JoinRoom, JoinSpace, LeaveRoom, LeaveSpace, UpdateRole, UpdateSpace, UpdateRoom, GetPermissionOverwriteTargets, CreateOwner, DeleteOwner, GetOwners, };

package/src/types/dist/schemes/events/FollowedTopicUpdated.d.ts

@@ -0,0 +1,4 @@
+import { FollowedTopic } from "../FollowedTopic";
+export interface FollowedTopicUpdated {
+    followedTopic: FollowedTopic;
+}

package/src/types/dist/schemes/events/FollowedTopicUpdated.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/types/src/index.ts

@@ -84,6 +84,7 @@ import {UnfollowTopic} from "./schemes/commands/UnfollowTopic";
 import {TopicUnfollowed} from "./schemes/events/TopicUnfollowed";
 import {TopicFollowed} from "./schemes/events/TopicFollowed";
 import {GetFollowedTopics} from "./schemes/commands/GetFollowedTopics";
+import {FollowedTopicUpdated} from "./schemes/events/FollowedTopicUpdated";
 
 export {
     // objects
@@ -113,6 +114,7 @@ export {
     TopicFollowed,
     TopicUnfollowed,
     FollowedTopics,
+    FollowedTopicUpdated,
     ComputedPermissions,
     PermissionOverwrites,
     PermissionOverwritesUpdated,

package/src/types/src/schemes/events/FollowedTopicUpdated.ts

@@ -0,0 +1,5 @@
+import {FollowedTopic} from "../FollowedTopic";
+
+export interface FollowedTopicUpdated {
+    followedTopic: FollowedTopic;
+}