polfan-server-js-client 0.1.39 → 0.1.41

package/build/types/AbstractChatClient.d.ts

@@ -1,4 +1,4 @@
-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, PermissionOverwritesChanged, RoomMemberUpdated, UpdateRole, RoleUpdated, AckReports, Ack, GetAckReports, UserChanged } from "pserv-ts-types";
+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, AckReports, Ack, GetAckReports, UserUpdated, UpdateRoom, RoomUpdated, UpdateSpace, SpaceUpdated } from "pserv-ts-types";
 import { EventTarget } from "./EventTarget";
 type ArrayOfPromiseResolvers = [(value: any) => void, (reason?: any) => void];
 export declare abstract class AbstractChatClient extends EventTarget {
@@ -25,12 +25,13 @@ export type EventsMap = {
     Session: Session;
     Permissions: Permissions;
     PermissionOverwrites: PermissionOverwrites;
-    PermissionOverwritesChanged: PermissionOverwritesChanged;
+    PermissionOverwritesUpdated: PermissionOverwritesUpdated;
     SpaceJoined: SpaceJoined;
     SpaceLeft: SpaceLeft;
     SpaceMemberJoined: SpaceMemberJoined;
     SpaceMemberLeft: SpaceMemberLeft;
     SpaceMemberUpdated: SpaceMemberUpdated;
+    SpaceUpdated: SpaceUpdated;
     SpaceDeleted: SpaceDeleted;
     SpaceMembers: SpaceMembers;
     SpaceRooms: SpaceRooms;
@@ -45,23 +46,25 @@ export type EventsMap = {
     RoomMembers: RoomMembers;
     NewRoom: NewRoom;
     RoomDeleted: RoomDeleted;
+    RoomUpdated: RoomUpdated;
     NewTopic: NewTopic;
     TopicDeleted: TopicDeleted;
     NewMessage: NewMessage;
     AckReports: AckReports;
-    UserChanged: UserChanged;
+    UserUpdated: UserUpdated;
 };
 /**
  * Map of commands and their corresponding events.
  */
 export type CommandsMap = {
     GetSession: [GetSession, EventsMap['Session']];
-    SetPermissionOverwrites: [SetPermissionOverwrites, EventsMap['PermissionOverwritesChanged']];
+    SetPermissionOverwrites: [SetPermissionOverwrites, EventsMap['PermissionOverwritesUpdated']];
     GetPermissionOverwrites: [GetPermissionOverwrites, EventsMap['PermissionOverwrites']];
     GetComputedPermissions: [GetComputedPermissions, EventsMap['Permissions']];
     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']];
@@ -74,6 +77,7 @@ export type CommandsMap = {
     LeaveRoom: [LeaveRoom, EventsMap['RoomLeft']];
     CreateRoom: [CreateRoom, EventsMap['NewRoom']];
     DeleteRoom: [DeleteRoom, EventsMap['RoomDeleted']];
+    UpdateRoom: [UpdateRoom, EventsMap['RoomUpdated']];
     GetRoomMembers: [GetRoomMembers, EventsMap['RoomMembers']];
     CreateTopic: [CreateTopic, EventsMap['NewTopic']];
     DeleteTopic: [DeleteTopic, EventsMap['TopicDeleted']];

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

@@ -37,6 +37,7 @@ export declare class RoomsManager {
     private handleNewTopic;
     private addJoinedRoomTopics;
     private handleRoomJoined;
+    private handleRoomUpdated;
     private handleRoomDeleted;
     private addJoinedRooms;
     private handleRoomLeft;
@@ -44,5 +45,5 @@ export declare class RoomsManager {
     private handleRoomMemberLeft;
     private handleRoomMembers;
     private handleSession;
-    private handleUserChanged;
+    private handleUserUpdated;
 }

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

@@ -33,8 +33,10 @@ export declare class SpacesManager {
     getMe(spaceId: string): Promise<SpaceMember | undefined>;
     private handleNewRole;
     private handleNewRoom;
+    private handleRoomUpdated;
     private handleRoomDeleted;
     private handleRoleDeleted;
+    private handleSpaceUpdated;
     private handleSpaceDeleted;
     private handleSpaceJoined;
     private addJoinedSpaces;
@@ -45,5 +47,5 @@ export declare class SpacesManager {
     private handleSpaceMemberUpdated;
     private handleRoleUpdated;
     private handleSession;
-    private handleUserChanged;
+    private handleUserUpdated;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polfan-server-js-client",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "description": "JavaScript client library for handling communication with Polfan chat server.",
   "author": "Jarosław Żak",
   "license": "MIT",
@@ -35,7 +35,7 @@
     "html-webpack-plugin": "^5.5.0",
     "jest": "^29.3.1",
     "mini-css-extract-plugin": "^2.7.2",
-    "pserv-ts-types": "^0.0.25",
+    "pserv-ts-types": "^0.0.26",
     "style-loader": "^3.3.1",
     "terser-webpack-plugin": "^5.3.5",
     "typescript": "^4.9.4",

package/src/AbstractChatClient.ts

@@ -45,14 +45,14 @@ import {
     CreateMessage,
     Envelope,
     PermissionOverwrites,
-    PermissionOverwritesChanged,
+    PermissionOverwritesUpdated,
     RoomMemberUpdated,
     UpdateRole,
     RoleUpdated,
     AckReports,
     Ack,
     GetAckReports,
-    UserChanged,
+    UserUpdated, UpdateRoom, RoomUpdated, UpdateSpace, SpaceUpdated,
 } from "pserv-ts-types";
 import {EventTarget} from "./EventTarget";
 
@@ -121,13 +121,14 @@ export type EventsMap = {
     Session: Session,
     Permissions: Permissions,
     PermissionOverwrites: PermissionOverwrites,
-    PermissionOverwritesChanged: PermissionOverwritesChanged,
+    PermissionOverwritesUpdated: PermissionOverwritesUpdated,
     // Space events
     SpaceJoined: SpaceJoined,
     SpaceLeft: SpaceLeft,
     SpaceMemberJoined: SpaceMemberJoined,
     SpaceMemberLeft: SpaceMemberLeft,
     SpaceMemberUpdated: SpaceMemberUpdated,
+    SpaceUpdated: SpaceUpdated,
     SpaceDeleted: SpaceDeleted,
     SpaceMembers: SpaceMembers,
     SpaceRooms: SpaceRooms,
@@ -143,12 +144,13 @@ export type EventsMap = {
     RoomMembers: RoomMembers,
     NewRoom: NewRoom,
     RoomDeleted: RoomDeleted,
+    RoomUpdated: RoomUpdated,
     // Topic events
     NewTopic: NewTopic,
     TopicDeleted: TopicDeleted,
     NewMessage: NewMessage,
     AckReports: AckReports,
-    UserChanged: UserChanged,
+    UserUpdated: UserUpdated,
 };
 
 /**
@@ -157,13 +159,14 @@ export type EventsMap = {
 export type CommandsMap = {
     // General commands
     GetSession: [GetSession, EventsMap['Session']],
-    SetPermissionOverwrites: [SetPermissionOverwrites, EventsMap['PermissionOverwritesChanged']],
+    SetPermissionOverwrites: [SetPermissionOverwrites, EventsMap['PermissionOverwritesUpdated']],
     GetPermissionOverwrites: [GetPermissionOverwrites, EventsMap['PermissionOverwrites']],
     GetComputedPermissions: [GetComputedPermissions, EventsMap['Permissions']],
     // 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']],
@@ -177,6 +180,7 @@ export type CommandsMap = {
     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']],

package/src/state-tracker/PermissionsManager.ts

@@ -1,7 +1,7 @@
 import {ChatStateTracker} from "./ChatStateTracker";
 import {
     PermissionOverwrites,
-    PermissionOverwritesChanged,
+    PermissionOverwritesUpdated,
     PermissionOverwritesValue, RoleDeleted, RoomDeleted, RoomLeft, SpaceDeleted, SpaceLeft, TopicDeleted,
 } from "pserv-ts-types";
 import {EventHandler, EventTarget} from "../EventTarget";
@@ -16,7 +16,7 @@ const getOvId = (
     targetId?: PermissionOverwrites['targetId'],
 ) => layer + (layerId ?? '') + (target ?? '') + (targetId ?? '');
 
-const getOvIdByObject = (overwrites: PermissionOverwrites | PermissionOverwritesChanged): string => getOvId(
+const getOvIdByObject = (overwrites: PermissionOverwrites | PermissionOverwritesUpdated): string => getOvId(
     overwrites.layer, overwrites.layerId, overwrites.target, overwrites.targetId
 );
 
@@ -27,7 +27,7 @@ export class PermissionsManager extends EventTarget {
     public constructor(private tracker: ChatStateTracker) {
         super();
         this.tracker.client.on('PermissionOverwrites', ev => this.handlePermissionOverwrites(ev));
-        this.tracker.client.on('PermissionOverwritesChanged', ev => this.handlePermissionOverwrites(ev));
+        this.tracker.client.on('PermissionOverwritesUpdated', ev => this.handlePermissionOverwrites(ev));
         this.tracker.client.on('SpaceDeleted', ev => this.handleSpaceDeleted(ev));
         this.tracker.client.on('SpaceLeft', ev => this.handleSpaceDeleted(ev));
         this.tracker.client.on('RoomDeleted', ev => this.handleRoomDeleted(ev));
@@ -89,21 +89,25 @@ export class PermissionsManager extends EventTarget {
         }
 
         const userId = (await this.tracker.getMe()).id;
-
         const userRoles: string[] = [];
+        const [spaces, rooms, topics] = await Promise.all([
+            this.tracker.spaces.get(),
+            this.tracker.rooms.get(),
+            roomId ? this.tracker.rooms.getTopics(roomId) : null,
+        ]);
 
         const promises: Promise<PermissionOverwritesValue>[] = [
             // Global user overwrites
             this.getOverwrites('Global', null, 'User', userId).then(v => v.overwrites),
         ];
 
-        if (spaceId) {
+        if (spaceId && spaces.has(spaceId)) {
             userRoles.push(...(await this.tracker.spaces.getMe(spaceId)).roles);
             promises.push(this.collectRoleOverwrites(spaceId, 'Space', spaceId, userRoles));
             promises.push(this.getOverwrites('Space', spaceId, 'User', userId).then(v => v.overwrites));
         }
 
-        if (roomId) {
+        if (roomId && rooms.has(roomId)) {
             const roomMember = await this.tracker.rooms.getMe(roomId);
 
             if (roomMember.roles !== null) { // Room overwrites from roles (only for space rooms)
@@ -114,7 +118,7 @@ export class PermissionsManager extends EventTarget {
             promises.push(this.getOverwrites('Room', roomId, 'User', userId).then(v => v.overwrites));
         }
 
-        if (topicId) {
+        if (topicId && topics && topics.has(topicId)) {
             if (userRoles.length) {
                 promises.push(this.collectRoleOverwrites(spaceId, 'Topic', topicId, userRoles));
             }
@@ -125,7 +129,7 @@ export class PermissionsManager extends EventTarget {
         return this.resolveOverwritesHierarchy(await Promise.all(promises));
     }
 
-    private handlePermissionOverwrites(ev: PermissionOverwritesChanged | PermissionOverwrites): void {
+    private handlePermissionOverwrites(ev: PermissionOverwritesUpdated | PermissionOverwrites): void {
         this.overwrites.set([getOvIdByObject(ev), ev]);
         this.emit('change');
     }

package/src/state-tracker/RoomsManager.ts

@@ -4,11 +4,11 @@ import {
     Room, RoomDeleted,
     RoomJoined, RoomLeft,
     RoomMember, RoomMemberJoined, RoomMemberLeft, RoomMembers,
-    RoomMemberUpdated, Session, SpaceDeleted, SpaceLeft, SpaceMemberLeft,
+    RoomMemberUpdated, RoomUpdated, Session, SpaceDeleted, SpaceLeft, SpaceMemberLeft,
     SpaceMemberUpdated,
     Topic,
     TopicDeleted,
-    UserChanged,
+    UserUpdated,
 } from "pserv-ts-types";
 import {ChatStateTracker} from "./ChatStateTracker";
 import {DeferredTask, PromiseRegistry} from "./AsyncUtils";
@@ -30,6 +30,7 @@ export class RoomsManager {
         this.tracker.client.on('TopicDeleted', ev => this.handleTopicDeleted(ev));
         this.tracker.client.on('RoomJoined', ev => this.handleRoomJoined(ev));
         this.tracker.client.on('RoomLeft', ev => this.handleRoomLeft(ev));
+        this.tracker.client.on('RoomUpdated', ev => this.handleRoomUpdated(ev));
         this.tracker.client.on('RoomDeleted', ev => this.handleRoomDeleted(ev));
         this.tracker.client.on('RoomMemberJoined', ev => this.handleRoomMemberJoined(ev));
         this.tracker.client.on('RoomMemberLeft', ev => this.handleRoomMemberLeft(ev));
@@ -39,7 +40,7 @@ export class RoomsManager {
         this.tracker.client.on('SpaceMemberUpdated', ev => this.handleSpaceMemberUpdated(ev));
         this.tracker.client.on('SpaceDeleted', ev => this.handleSpaceDeleted(ev));
         this.tracker.client.on('SpaceLeft', ev => this.handleSpaceDeleted(ev));
-        this.tracker.client.on('UserChanged', ev => this.handleUserChanged(ev));
+        this.tracker.client.on('UserUpdated', ev => this.handleUserUpdated(ev));
         this.tracker.client.on('Session', ev => this.handleSession(ev));
     }
 
@@ -66,13 +67,13 @@ export class RoomsManager {
      */
     public async getMe(roomId: string): Promise<RoomMember | undefined> {
         const userId = (await this.tracker.getMe()).id;
-        const members = await this.getMembers(roomId);
 
-        if (! members) {
+        if (! this.list.has(roomId)) {
             // User is not in passed room.
             return undefined;
         }
 
+        const members = await this.getMembers(roomId);
         return members.items.find(member => (member.user?.id ?? member.spaceMember.user.id) === userId);
     }
 
@@ -186,6 +187,14 @@ export class RoomsManager {
         this.addJoinedRooms(ev.room);
     }
 
+    private handleRoomUpdated(ev: RoomUpdated): void {
+        this.list.set({
+            ...this.list.get(ev.room.id),
+            name: ev.room.name,
+            description: ev.room.description,
+        } as Room);
+    }
+
     private handleRoomDeleted(ev: RoomDeleted): void {
         this.deleteRoom(ev.id);
     }
@@ -235,7 +244,7 @@ export class RoomsManager {
         this.deferredSession.resolve();
     }
 
-    private handleUserChanged(ev: UserChanged): void {
+    private handleUserUpdated(ev: UserUpdated): void {
         this.members.items.forEach((members) => {
             const member = members.get(ev.user.id);
 

package/src/state-tracker/SpacesManager.ts

@@ -4,11 +4,24 @@ import {
     NewRole,
     NewRoom,
     Role,
-    RoleDeleted, RoleUpdated, RoomDeleted,
-    RoomSummary, Session,
+    RoleDeleted,
+    RoleUpdated,
+    RoomDeleted,
+    RoomSummary,
+    RoomUpdated,
+    Session,
     Space,
-    SpaceDeleted, SpaceJoined, SpaceLeft,
-    SpaceMember, SpaceMemberJoined, SpaceMemberLeft, SpaceMembers, SpaceMemberUpdated, SpaceRooms, UserChanged
+    SpaceDeleted,
+    SpaceJoined,
+    SpaceLeft,
+    SpaceMember,
+    SpaceMemberJoined,
+    SpaceMemberLeft,
+    SpaceMembers,
+    SpaceMemberUpdated,
+    SpaceRooms,
+    SpaceUpdated,
+    UserUpdated
 } from "pserv-ts-types";
 import {DeferredTask, PromiseRegistry} from "./AsyncUtils";
 import {reorderRolesOnPriorityUpdate} from "./functions";
@@ -25,7 +38,9 @@ export class SpacesManager {
     public constructor(private tracker: ChatStateTracker) {
         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));
         this.tracker.client.on('SpaceDeleted', ev => this.handleSpaceDeleted(ev));
+        this.tracker.client.on('SpaceUpdated', ev => this.handleSpaceUpdated(ev));
         this.tracker.client.on('SpaceJoined', ev => this.handleSpaceJoined(ev));
         this.tracker.client.on('SpaceLeft', ev => this.handleSpaceDeleted(ev));
         this.tracker.client.on('SpaceMemberJoined', ev => this.handleSpaceMemberJoined(ev));
@@ -33,7 +48,7 @@ export class SpacesManager {
         this.tracker.client.on('SpaceMembers', ev => this.handleSpaceMembers(ev));
         this.tracker.client.on('SpaceRooms', ev => this.handleSpaceRooms(ev));
         this.tracker.client.on('SpaceMemberUpdated', ev => this.handleSpaceMemberUpdated(ev));
-        this.tracker.client.on('UserChanged', ev => this.handleUserChanged(ev));
+        this.tracker.client.on('UserUpdated', ev => this.handleUserUpdated(ev));
         this.tracker.client.on('NewRole', ev => this.handleNewRole(ev));
         this.tracker.client.on('RoleDeleted', ev => this.handleRoleDeleted(ev));
         this.tracker.client.on('RoleUpdated', ev => this.handleRoleUpdated(ev));
@@ -97,13 +112,13 @@ export class SpacesManager {
      */
     public async getMe(spaceId: string): Promise<SpaceMember | undefined> {
         const userId = (await this.tracker.getMe()).id;
-        const members = await this.getMembers(spaceId);
 
-        if (! members) {
+        if (! this.list.has(spaceId)) {
             // User is not in passed space.
             return undefined;
         }
 
+        const members = await this.getMembers(spaceId);
         return members.items.find(member => member.user.id === userId);
     }
 
@@ -117,8 +132,19 @@ export class SpacesManager {
         this.rooms.get(ev.spaceId)?.set(ev.summary);
     }
 
+    private handleRoomUpdated(ev: RoomUpdated): void {
+        if (ev.room.spaceId && this.rooms.has(ev.room.spaceId)) {
+            const rooms = this.rooms.get(ev.room.spaceId);
+            rooms.set({
+                ...rooms.get(ev.room.id),
+                name: ev.room.name,
+                description: ev.room.description,
+            } as RoomSummary);
+        }
+    }
+
     private handleRoomDeleted(ev: RoomDeleted): void {
-        if (ev.spaceId) {
+        if (ev.spaceId && this.rooms.has(ev.id)) {
             this.rooms.get(ev.spaceId).delete(ev.id);
         }
     }
@@ -129,6 +155,13 @@ export class SpacesManager {
         this.list.get(ev.spaceId).roles = collection.items;
     }
 
+    private handleSpaceUpdated(ev: SpaceUpdated): void {
+        this.list.set({
+            ...this.list.get(ev.space.id),
+            name: ev.space.name,
+        } as Space);
+    }
+
     private handleSpaceDeleted(ev: SpaceDeleted | SpaceLeft): void {
         this.roles.delete(ev.id);
         this.members.delete(ev.id);
@@ -211,7 +244,7 @@ export class SpacesManager {
         this.deferredSession.resolve();
     }
 
-    private handleUserChanged(ev: UserChanged): void {
+    private handleUserUpdated(ev: UserUpdated): void {
         this.members.items.forEach((members) => {
             const member = members.get(ev.user.id);