polfan-server-js-client 0.1.94 → 0.1.96

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

@@ -27,7 +27,7 @@ export declare class MessagesManager {
      * @internal
      */
     _deleteByTopicIds(roomId: string, ...topicIds: string[]): void;
-    private handleNewTopics;
+    private createHistoryForNewTopic;
     private handleNewMessage;
     private handleFollowedTopicUpdated;
     private handleTopicFollowed;

package/package.json

@@ -1,47 +1,47 @@
-{
-  "name": "polfan-server-js-client",
-  "version": "0.1.94",
-  "description": "JavaScript client library for handling communication with Polfan chat server.",
-  "author": "Jarosław Żak",
-  "license": "MIT",
-  "main": "build/index.js",
-  "types": "build/types/index.d.ts",
-  "scripts": {
-    "start": "webpack serve --config webpack.config.demo.js",
-    "build": "webpack && tsc",
-    "build:demo": "webpack --config webpack.config.demo.js",
-    "test": "jest",
-    "coverage": "npm run test -- --coverage",
-    "prepare": "npm run build",
-    "trypublish": "npm publish || true"
-  },
-  "devDependencies": {
-    "@babel/cli": "^7.20.7",
-    "@babel/core": "^7.20.12",
-    "@babel/plugin-proposal-class-properties": "^7.16.0",
-    "@babel/plugin-transform-typescript": "^7.20.2",
-    "@babel/polyfill": "^7.12.1",
-    "@babel/preset-env": "^7.20.2",
-    "@types/jest": "^29.2.5",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
-    "babel-eslint": "^10.1.0",
-    "babel-loader": "^9.1.2",
-    "babel-preset-minify": "^0.5.2",
-    "css-loader": "^6.7.3",
-    "css-minimizer-webpack-plugin": "^4.2.2",
-    "eslint": "^7.32.0",
-    "file-loader": "^6.2.0",
-    "html-webpack-plugin": "^5.5.0",
-    "jest": "^29.3.1",
-    "mini-css-extract-plugin": "^2.7.2",
-    "style-loader": "^3.3.1",
-    "terser-webpack-plugin": "^5.3.5",
-    "ts-node": "^10.9.2",
-    "typescript": "^4.9.4",
-    "url-loader": "^4.1.1",
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "4.11.1"
-  }
-}
+{
+  "name": "polfan-server-js-client",
+  "version": "0.1.96",
+  "description": "JavaScript client library for handling communication with Polfan chat server.",
+  "author": "Jarosław Żak",
+  "license": "MIT",
+  "main": "build/index.js",
+  "types": "build/types/index.d.ts",
+  "scripts": {
+    "start": "webpack serve --config webpack.config.demo.js",
+    "build": "webpack && tsc",
+    "build:demo": "webpack --config webpack.config.demo.js",
+    "test": "jest",
+    "coverage": "npm run test -- --coverage",
+    "prepare": "npm run build",
+    "trypublish": "npm publish || true"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.20.7",
+    "@babel/core": "^7.20.12",
+    "@babel/plugin-proposal-class-properties": "^7.16.0",
+    "@babel/plugin-transform-typescript": "^7.20.2",
+    "@babel/polyfill": "^7.12.1",
+    "@babel/preset-env": "^7.20.2",
+    "@types/jest": "^29.2.5",
+    "@typescript-eslint/eslint-plugin": "^4.33.0",
+    "@typescript-eslint/parser": "^4.33.0",
+    "babel-eslint": "^10.1.0",
+    "babel-loader": "^9.1.2",
+    "babel-preset-minify": "^0.5.2",
+    "css-loader": "^6.7.3",
+    "css-minimizer-webpack-plugin": "^4.2.2",
+    "eslint": "^7.32.0",
+    "file-loader": "^6.2.0",
+    "html-webpack-plugin": "^5.5.0",
+    "jest": "^29.3.1",
+    "mini-css-extract-plugin": "^2.7.2",
+    "style-loader": "^3.3.1",
+    "terser-webpack-plugin": "^5.3.5",
+    "ts-node": "^10.9.2",
+    "typescript": "^4.9.4",
+    "url-loader": "^4.1.1",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.0.1",
+    "webpack-dev-server": "4.11.1"
+  }
+}

package/src/AbstractChatClient.ts

@@ -1,219 +1,219 @@
-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";
-
-type ArrayOfPromiseResolvers = [(value: any) => void, (reason?: any) => void];
-
-export abstract class AbstractChatClient extends EventTarget {
-    protected awaitingResponse: Map<string, ArrayOfPromiseResolvers> = new Map<string, ArrayOfPromiseResolvers>();
-    protected sentCounter: number = 0;
-
-    public abstract send<CommandType extends keyof CommandsMap>
-        (commandType: CommandType, commandData: CommandsMap[CommandType][0]): Promise<CommandResult<CommandsMap[CommandType][1]>>;
-
-    public on<EventName extends keyof EventsMap>
-        (eventName: EventName | string, handler: (event: EventsMap[EventName]) => void): this {
-        return super.on(eventName, handler);
-    }
-
-    public once<EventName extends keyof EventsMap>
-        (eventName: EventName, handler: (event: EventsMap[EventName]) => void): this {
-        return super.once(eventName, handler);
-    }
-
-    protected createEnvelope<CommandT>(type: string, data: CommandT): Envelope<CommandT> {
-        return {
-            type, data, ref: (++this.sentCounter).toString()
-        };
-    }
-
-    protected createPromiseFromCommandEnvelope
-        <CommandT extends keyof CommandsMap>(envelope: Envelope<CommandsMap[CommandT][0]>):
-        Promise<CommandResult<CommandsMap[CommandT][1]>> {
-        return new Promise((...args) =>
-            this.awaitingResponse.set(envelope.ref as string, args));
-    }
-
-    protected handleIncomingEnvelope(envelope: Envelope): void {
-        if (!this.awaitingResponse.has(envelope.ref)) {
-            return;
-        }
-        const isError = envelope.type === 'Error';
-        this.awaitingResponse.get(envelope.ref)[0]({
-            data: isError ? null : envelope.data,
-            error: isError ? envelope.data : null,
-        } as CommandResult<any>);
-        this.awaitingResponse.delete(envelope.ref);
-    }
-
-    protected handleEnvelopeSendError(envelope: Envelope, error: any): void {
-        if (!this.awaitingResponse.has(envelope.ref)) {
-            return;
-        }
-        this.awaitingResponse.get(envelope.ref)[0](error);
-        this.awaitingResponse.delete(envelope.ref);
-    }
-}
-
-export type CommandResult<ResultT> = {data?: ResultT, error?: Error};
-
-/**
- * Map of incoming events.
- */
-export type EventsMap = {
-    // General Events
-    Bye: Bye,
-    Ok: Ok,
-    Error: ErrorType,
-    Session: Session,
-    Permissions: Permissions,
-    PermissionOverwrites: PermissionOverwrites,
-    PermissionOverwritesUpdated: PermissionOverwritesUpdated,
-    PermissionOverwriteTargets: PermissionOverwriteTargets,
-    Owners: Owners,
-    // Space events
-    SpaceJoined: SpaceJoined,
-    SpaceLeft: SpaceLeft,
-    SpaceMemberJoined: SpaceMemberJoined,
-    SpaceMemberLeft: SpaceMemberLeft,
-    SpaceMemberUpdated: SpaceMemberUpdated,
-    SpaceUpdated: SpaceUpdated,
-    SpaceDeleted: SpaceDeleted,
-    SpaceMembers: SpaceMembers,
-    SpaceRooms: SpaceRooms,
-    NewRole: NewRole,
-    RoleDeleted: RoleDeleted,
-    RoleUpdated: RoleUpdated,
-    // Room events
-    RoomJoined: RoomJoined,
-    RoomLeft: RoomLeft,
-    RoomMemberJoined: RoomMemberJoined,
-    RoomMemberLeft: RoomMemberLeft,
-    RoomMemberUpdated: RoomMemberUpdated,
-    RoomMembers: RoomMembers,
-    NewRoom: NewRoom,
-    RoomDeleted: RoomDeleted,
-    RoomUpdated: RoomUpdated,
-    // Topic events
-    NewTopic: NewTopic,
-    TopicDeleted: TopicDeleted,
-    NewMessage: NewMessage,
-    UserUpdated: UserUpdated,
-    TopicFollowed: TopicFollowed,
-    TopicUnfollowed: TopicUnfollowed,
-    FollowedTopics: FollowedTopics,
-    FollowedTopicUpdated: FollowedTopicUpdated,
-};
-
-/**
- * Map of commands and their corresponding events.
- */
-export type CommandsMap = {
-    // General commands
-    GetSession: [GetSession, EventsMap['Session']],
-    SetPermissionOverwrites: [SetPermissionOverwrites, EventsMap['PermissionOverwritesUpdated']],
-    GetPermissionOverwrites: [GetPermissionOverwrites, EventsMap['PermissionOverwrites']],
-    GetComputedPermissions: [GetComputedPermissions, EventsMap['Permissions']],
-    GetPermissionOverwriteTargets: [GetPermissionOverwriteTargets, EventsMap['PermissionOverwriteTargets']],
-    GetOwners: [GetOwners, EventsMap['Owners']],
-    CreateOwner: [CreateOwner, EventsMap['Owners']],
-    DeleteOwner: [CreateOwner, EventsMap['Owners']],
-    // Space commands
-    JoinSpace: [JoinSpace, EventsMap['SpaceJoined']],
-    LeaveSpace: [LeaveSpace, EventsMap['SpaceLeft']],
-    CreateSpace: [CreateSpace, EventsMap['SpaceJoined']],
-    UpdateSpace: [UpdateSpace, EventsMap['SpaceUpdated']],
-    DeleteSpace: [DeleteSpace, EventsMap['SpaceDeleted']],
-    GetSpaceMembers: [GetSpaceMembers, EventsMap['SpaceMembers']],
-    GetSpaceRooms: [GetSpaceRooms, EventsMap['SpaceRooms']],
-    CreateRole: [CreateRole, EventsMap['NewRole']],
-    DeleteRole: [DeleteRole, EventsMap['RoleDeleted']],
-    UpdateRole: [UpdateRole, EventsMap['RoleUpdated']],
-    AssignRole: [AssignRole, EventsMap['SpaceMemberUpdated'] | EventsMap['RoomMemberUpdated']],
-    DeassignRole: [DeassignRole, EventsMap['SpaceMemberUpdated'] | EventsMap['RoomMemberUpdated']],
-    // Room commands
-    JoinRoom: [JoinRoom, EventsMap['RoomJoined']],
-    LeaveRoom: [LeaveRoom, EventsMap['RoomLeft']],
-    CreateRoom: [CreateRoom, EventsMap['NewRoom']],
-    DeleteRoom: [DeleteRoom, EventsMap['RoomDeleted']],
-    UpdateRoom: [UpdateRoom, EventsMap['RoomUpdated']],
-    GetRoomMembers: [GetRoomMembers, EventsMap['RoomMembers']],
-    // Topic commands
-    CreateTopic: [CreateTopic, EventsMap['NewTopic']],
-    DeleteTopic: [DeleteTopic, EventsMap['TopicDeleted']],
-    CreateMessage: [CreateMessage, EventsMap['NewMessage']],
-    Ack: [Ack, EventsMap['FollowedTopicUpdated'] | EventsMap['Ok']],
-    FollowTopic: [FollowTopic, EventsMap['TopicFollowed']],
-    UnfollowTopic: [UnfollowTopic, EventsMap['TopicUnfollowed']],
-    GetFollowedTopics: [GetFollowedTopics, EventsMap['FollowedTopics']],
+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";
+
+type ArrayOfPromiseResolvers = [(value: any) => void, (reason?: any) => void];
+
+export abstract class AbstractChatClient extends EventTarget {
+    protected awaitingResponse: Map<string, ArrayOfPromiseResolvers> = new Map<string, ArrayOfPromiseResolvers>();
+    protected sentCounter: number = 0;
+
+    public abstract send<CommandType extends keyof CommandsMap>
+        (commandType: CommandType, commandData: CommandsMap[CommandType][0]): Promise<CommandResult<CommandsMap[CommandType][1]>>;
+
+    public on<EventName extends keyof EventsMap>
+        (eventName: EventName | string, handler: (event: EventsMap[EventName]) => void): this {
+        return super.on(eventName, handler);
+    }
+
+    public once<EventName extends keyof EventsMap>
+        (eventName: EventName, handler: (event: EventsMap[EventName]) => void): this {
+        return super.once(eventName, handler);
+    }
+
+    protected createEnvelope<CommandT>(type: string, data: CommandT): Envelope<CommandT> {
+        return {
+            type, data, ref: (++this.sentCounter).toString()
+        };
+    }
+
+    protected createPromiseFromCommandEnvelope
+        <CommandT extends keyof CommandsMap>(envelope: Envelope<CommandsMap[CommandT][0]>):
+        Promise<CommandResult<CommandsMap[CommandT][1]>> {
+        return new Promise((...args) =>
+            this.awaitingResponse.set(envelope.ref as string, args));
+    }
+
+    protected handleIncomingEnvelope(envelope: Envelope): void {
+        if (!this.awaitingResponse.has(envelope.ref)) {
+            return;
+        }
+        const isError = envelope.type === 'Error';
+        this.awaitingResponse.get(envelope.ref)[0]({
+            data: isError ? null : envelope.data,
+            error: isError ? envelope.data : null,
+        } as CommandResult<any>);
+        this.awaitingResponse.delete(envelope.ref);
+    }
+
+    protected handleEnvelopeSendError(envelope: Envelope, error: any): void {
+        if (!this.awaitingResponse.has(envelope.ref)) {
+            return;
+        }
+        this.awaitingResponse.get(envelope.ref)[0](error);
+        this.awaitingResponse.delete(envelope.ref);
+    }
+}
+
+export type CommandResult<ResultT> = {data?: ResultT, error?: Error};
+
+/**
+ * Map of incoming events.
+ */
+export type EventsMap = {
+    // General Events
+    Bye: Bye,
+    Ok: Ok,
+    Error: ErrorType,
+    Session: Session,
+    Permissions: Permissions,
+    PermissionOverwrites: PermissionOverwrites,
+    PermissionOverwritesUpdated: PermissionOverwritesUpdated,
+    PermissionOverwriteTargets: PermissionOverwriteTargets,
+    Owners: Owners,
+    // Space events
+    SpaceJoined: SpaceJoined,
+    SpaceLeft: SpaceLeft,
+    SpaceMemberJoined: SpaceMemberJoined,
+    SpaceMemberLeft: SpaceMemberLeft,
+    SpaceMemberUpdated: SpaceMemberUpdated,
+    SpaceUpdated: SpaceUpdated,
+    SpaceDeleted: SpaceDeleted,
+    SpaceMembers: SpaceMembers,
+    SpaceRooms: SpaceRooms,
+    NewRole: NewRole,
+    RoleDeleted: RoleDeleted,
+    RoleUpdated: RoleUpdated,
+    // Room events
+    RoomJoined: RoomJoined,
+    RoomLeft: RoomLeft,
+    RoomMemberJoined: RoomMemberJoined,
+    RoomMemberLeft: RoomMemberLeft,
+    RoomMemberUpdated: RoomMemberUpdated,
+    RoomMembers: RoomMembers,
+    NewRoom: NewRoom,
+    RoomDeleted: RoomDeleted,
+    RoomUpdated: RoomUpdated,
+    // Topic events
+    NewTopic: NewTopic,
+    TopicDeleted: TopicDeleted,
+    NewMessage: NewMessage,
+    UserUpdated: UserUpdated,
+    TopicFollowed: TopicFollowed,
+    TopicUnfollowed: TopicUnfollowed,
+    FollowedTopics: FollowedTopics,
+    FollowedTopicUpdated: FollowedTopicUpdated,
+};
+
+/**
+ * Map of commands and their corresponding events.
+ */
+export type CommandsMap = {
+    // General commands
+    GetSession: [GetSession, EventsMap['Session']],
+    SetPermissionOverwrites: [SetPermissionOverwrites, EventsMap['PermissionOverwritesUpdated']],
+    GetPermissionOverwrites: [GetPermissionOverwrites, EventsMap['PermissionOverwrites']],
+    GetComputedPermissions: [GetComputedPermissions, EventsMap['Permissions']],
+    GetPermissionOverwriteTargets: [GetPermissionOverwriteTargets, EventsMap['PermissionOverwriteTargets']],
+    GetOwners: [GetOwners, EventsMap['Owners']],
+    CreateOwner: [CreateOwner, EventsMap['Owners']],
+    DeleteOwner: [CreateOwner, EventsMap['Owners']],
+    // Space commands
+    JoinSpace: [JoinSpace, EventsMap['SpaceJoined']],
+    LeaveSpace: [LeaveSpace, EventsMap['SpaceLeft']],
+    CreateSpace: [CreateSpace, EventsMap['SpaceJoined']],
+    UpdateSpace: [UpdateSpace, EventsMap['SpaceUpdated']],
+    DeleteSpace: [DeleteSpace, EventsMap['SpaceDeleted']],
+    GetSpaceMembers: [GetSpaceMembers, EventsMap['SpaceMembers']],
+    GetSpaceRooms: [GetSpaceRooms, EventsMap['SpaceRooms']],
+    CreateRole: [CreateRole, EventsMap['NewRole']],
+    DeleteRole: [DeleteRole, EventsMap['RoleDeleted']],
+    UpdateRole: [UpdateRole, EventsMap['RoleUpdated']],
+    AssignRole: [AssignRole, EventsMap['SpaceMemberUpdated'] | EventsMap['RoomMemberUpdated']],
+    DeassignRole: [DeassignRole, EventsMap['SpaceMemberUpdated'] | EventsMap['RoomMemberUpdated']],
+    // Room commands
+    JoinRoom: [JoinRoom, EventsMap['RoomJoined']],
+    LeaveRoom: [LeaveRoom, EventsMap['RoomLeft']],
+    CreateRoom: [CreateRoom, EventsMap['NewRoom']],
+    DeleteRoom: [DeleteRoom, EventsMap['RoomDeleted']],
+    UpdateRoom: [UpdateRoom, EventsMap['RoomUpdated']],
+    GetRoomMembers: [GetRoomMembers, EventsMap['RoomMembers']],
+    // Topic commands
+    CreateTopic: [CreateTopic, EventsMap['NewTopic']],
+    DeleteTopic: [DeleteTopic, EventsMap['TopicDeleted']],
+    CreateMessage: [CreateMessage, EventsMap['NewMessage']],
+    Ack: [Ack, EventsMap['FollowedTopicUpdated'] | EventsMap['Ok']],
+    FollowTopic: [FollowTopic, EventsMap['TopicFollowed']],
+    UnfollowTopic: [UnfollowTopic, EventsMap['TopicUnfollowed']],
+    GetFollowedTopics: [GetFollowedTopics, EventsMap['FollowedTopics']],
 }

package/src/state-tracker/MessagesManager.ts

@@ -25,16 +25,16 @@ export class MessagesManager {
     private readonly followedTopics = new IndexedCollection<string, ObservableIndexedObjectCollection<FollowedTopic>>();
 
     public constructor(private tracker: ChatStateTracker) {
-        this.tracker.client.on('NewMessage', ev => this.handleNewMessage(ev));
+        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));
         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('NewMessage', ev => this.handleNewMessage(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));
     }
 
     /**
@@ -95,7 +95,7 @@ export class MessagesManager {
         this.followedTopics.get(roomId)?.delete(...topicIds);
     }
 
-    private handleNewTopics(roomId: string, ...newTopics: Topic[]):void {
+    private createHistoryForNewTopic(roomId: string, ...newTopics: Topic[]): void {
         for (const newTopic of newTopics) {
             const newTopicCombinedId = getCombinedId({roomId, topicId: newTopic.id});
 
@@ -138,7 +138,7 @@ export class MessagesManager {
 
     private handleRoomJoin(ev: RoomJoined): void {
         if (ev.room.defaultTopic) {
-            this.handleNewTopics(ev.room.id, ev.room.defaultTopic)
+            this.createHistoryForNewTopic(ev.room.id, ev.room.defaultTopic)
         }
     }
 
@@ -146,8 +146,21 @@ export class MessagesManager {
         this.followedTopics.delete(ev.id);
     }
 
-    private handleNewTopic(ev: NewTopic): void {
-        this.handleNewTopics(ev.roomId, ev.topic);
+    private async handleNewTopic(ev: NewTopic): Promise<void> {
+        this.createHistoryForNewTopic(ev.roomId, ev.topic);
+
+        if (this.followedTopics.has(ev.roomId)) {
+            // Check if the new topic is followed by user
+            // only if client asked for followed topics list before for this room
+            const result = await this.tracker.client.send(
+                'GetFollowedTopics',
+                {location: {roomId: ev.roomId, topicId: ev.topic.id}},
+            );
+            const followedTopic = result.data.followedTopics[0];
+            if (followedTopic) {
+                this.followedTopics.get(ev.roomId).set(followedTopic);
+            }
+        }
     }
 
     private handleTopicDeleted(ev: TopicDeleted): void {
@@ -157,21 +170,22 @@ export class MessagesManager {
     private handleSession(ev: Session): void {
         ev.state.rooms.forEach(room => {
             if (room.defaultTopic) {
-                this.handleNewTopics(room.id, room.defaultTopic);
+                this.createHistoryForNewTopic(room.id, room.defaultTopic);
             }
         });
     }
 
     private updateLocallyFollowedTopicOnNewMessage(ev: NewMessage): void {
-        const followedTopic = this.followedTopics.get(ev.location.roomId);
+        const roomFollowedTopics = this.followedTopics.get(ev.location.roomId);
+        const followedTopic = roomFollowedTopics.get(ev.location.topicId);
 
-        if (! followedTopic) {
-            // If we don't follow ack reports for this room, skip
+        if (! roomFollowedTopics || ! followedTopic) {
+            // Skip if we don't follow this room or targeted topic
             return;
         }
 
         const isMe = ev.message.author.id === this.tracker.me?.id;
-        const currentFollowedTopic = followedTopic.get(ev.location.topicId);
+
         let update: Partial<FollowedTopic>;
 
         if (isMe) {
@@ -180,12 +194,12 @@ export class MessagesManager {
         } else {
             // ...add 1 otherwise
             update = {
-                missed: currentFollowedTopic.missed === null ? null : currentFollowedTopic.missed + 1,
-                missedMoreThan: currentFollowedTopic.missedMoreThan === null ? null : currentFollowedTopic.missedMoreThan,
+                missed: followedTopic.missed === null ? null : followedTopic.missed + 1,
+                missedMoreThan: followedTopic.missedMoreThan === null ? null : followedTopic.missedMoreThan,
             };
         }
 
-        followedTopic.set({...currentFollowedTopic, ...update});
+        roomFollowedTopics.set({...followedTopic, ...update});
     }
 
     private setFollowedTopicsArray(followedTopics: FollowedTopic[]): void {

package/build/types/types/dist/schemes/AckReport.d.ts

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

package/build/types/types/dist/schemes/commands/GetAckReports.d.ts

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

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

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