polfan-server-js-client 0.2.94 → 0.2.96

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, PermissionOverwritesUpdated, RoomMemberUpdated, UpdateRole, RoleUpdated, Ack, UserUpdated, UpdateRoom, RoomUpdated, UpdateSpace, SpaceUpdated, PermissionOverwriteTargets, GetPermissionOverwriteTargets, Owners, Ok, GetOwners, CreateOwner, RoleDeleted, FollowedTopicUpdated, TopicFollowed, FollowedTopics, FollowTopic, UpdateFollowedTopic, GetFollowedTopics, Messages, GetMessages, Topics, GetTopics, TopicUpdated, UpdateTopic, GetDiscoverableSpaces, DiscoverableSpaces, CreateEmoticon, DeleteEmoticon, GetEmoticons, Emoticons, EmoticonDeleted, NewEmoticon, Bans, GetBans, Ban, Unban, Kick, ClientData, GetClientData, SetClientData, GetRoomSummary, GetSpaceSummary, RoomSummaryEvent, SpaceSummaryEvent, UpdateSpaceMember, Relationships, RelationshipDeleted, NewRelationship, DeleteRelationship, CreateRelationship, RoomSummaryUpdated, Pong, Ping, RedactMessages, MessagesRedacted, ReportAbuse, UpdateRoomMember, GetRelationships, GetUserInfo, UserInfo } from "./types/src";
+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, FollowedTopics, FollowTopic, UpdateFollowedTopic, GetFollowedTopics, Messages, GetMessages, Topics, GetTopics, TopicUpdated, UpdateTopic, GetDiscoverableSpaces, DiscoverableSpaces, CreateEmoticon, DeleteEmoticon, GetEmoticons, Emoticons, EmoticonDeleted, NewEmoticon, Bans, GetBans, Ban, Unban, Kick, ClientData, GetClientData, SetClientData, GetRoomSummary, GetSpaceSummary, RoomSummaryEvent, SpaceSummaryEvent, UpdateSpaceMember, Relationships, RelationshipDeleted, NewRelationship, DeleteRelationship, CreateRelationship, RoomSummaryUpdated, Pong, Ping, RedactMessages, MessagesRedacted, ReportAbuse, UpdateRoomMember, GetRelationships, GetUserInfo, UserInfo, SetSessionData } from "./types/src";
 import { EventTarget } from "./EventTarget";
 type ArrayOfPromiseResolvers = [(value: any) => void, (reason?: any) => void];
 type ExtraEventMap = Record<string, any>;
@@ -108,6 +108,7 @@ export type CommandsMap = {
     Ping: CommandDefinition<Ping, EventsMap['Pong']>;
     ReportAbuse: CommandDefinition<ReportAbuse, EventsMap['Ok']>;
     GetUserInfo: CommandDefinition<GetUserInfo, EventsMap['UserInfo']>;
+    SetSessionData: CommandDefinition<SetSessionData, EventsMap['Ok']>;
     GetDiscoverableSpaces: CommandDefinition<GetDiscoverableSpaces, EventsMap['DiscoverableSpaces']>;
     JoinSpace: CommandDefinition<JoinSpace, EventsMap['SpaceJoined']>;
     LeaveSpace: CommandDefinition<LeaveSpace, EventsMap['SpaceLeft']>;

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

@@ -133,4 +133,5 @@ import { GetRelationships } from "./schemes/commands/GetRelationships";
 import { GetUserInfo } from "./schemes/commands/GetUserInfo";
 import { UserInfo } from "./schemes/events/UserInfo";
 import { UserInformation } from "./schemes/UserInformation";
-export { Envelope, Message, MessageType, MessageAuthor, Role, Room, RoomType, RoomStream, RoomStreamType, RoomHistory, RoomHistoryMode, RoomMember, RoomSummary, RoomSummaryExtras, Space, SpaceMember, Topic, FollowedTopic, NotificationLevel, User, UserState, PermissionOverwritesValue, ChatLocation, SpaceSummary, SpaceDiscoverable, Emoticon, PermissionOverwritesTarget, BanObject, LeaveReason, UserRelationship, UserRelationshipType, CreateTopicInitialMessage, UserInformation, Bye, Error, Messages, NewMessage, NewRole, NewRoom, NewTopic, TopicFollowed, 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, TopicUpdated, PermissionOverwriteTargets, Owners, Ok, DiscoverableSpaces, Emoticons, EmoticonDeleted, NewEmoticon, Bans, ClientData, SpaceSummaryEvent, RoomSummaryEvent, NewRelationship, RelationshipDeleted, Relationships, RoomSummaryUpdated, Pong, MessagesRedacted, UserInfo, AssignRole, GetMessages, CreateMessage, Ack, CreateRole, CreateRoom, CreateSpace, CreateTopic, FollowTopic, UpdateFollowedTopic, GetFollowedTopics, DeassignRole, DeleteRole, DeleteRoom, DeleteSpace, DeleteTopic, SetPermissionOverwrites, GetPermissionOverwrites, GetComputedPermissions, GetRoomMembers, GetSession, GetSpaceMembers, GetSpaceRooms, JoinRoom, JoinSpace, LeaveRoom, LeaveSpace, UpdateRole, UpdateSpace, UpdateRoom, UpdateTopic, GetPermissionOverwriteTargets, CreateOwner, DeleteOwner, GetOwners, Topics, GetTopics, GetDiscoverableSpaces, GetEmoticons, CreateEmoticon, DeleteEmoticon, Ban, Unban, GetBans, Kick, GetClientData, SetClientData, GetSpaceSummary, GetRoomSummary, UpdateSpaceMember, CreateRelationship, DeleteRelationship, GetRelationships, UpdateRoomMember, Ping, ReportAbuse, RedactMessages, GetUserInfo, };
+import { SetSessionData, SessionPush } from "./schemes/commands/SetSessionData";
+export { Envelope, Message, MessageType, MessageAuthor, Role, Room, RoomType, RoomStream, RoomStreamType, RoomHistory, RoomHistoryMode, RoomMember, RoomSummary, RoomSummaryExtras, Space, SpaceMember, Topic, FollowedTopic, NotificationLevel, User, UserState, PermissionOverwritesValue, ChatLocation, SpaceSummary, SpaceDiscoverable, Emoticon, PermissionOverwritesTarget, BanObject, LeaveReason, UserRelationship, UserRelationshipType, CreateTopicInitialMessage, UserInformation, SessionPush, Bye, Error, Messages, NewMessage, NewRole, NewRoom, NewTopic, TopicFollowed, 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, TopicUpdated, PermissionOverwriteTargets, Owners, Ok, DiscoverableSpaces, Emoticons, EmoticonDeleted, NewEmoticon, Bans, ClientData, SpaceSummaryEvent, RoomSummaryEvent, NewRelationship, RelationshipDeleted, Relationships, RoomSummaryUpdated, Pong, MessagesRedacted, UserInfo, AssignRole, GetMessages, CreateMessage, Ack, CreateRole, CreateRoom, CreateSpace, CreateTopic, FollowTopic, UpdateFollowedTopic, GetFollowedTopics, DeassignRole, DeleteRole, DeleteRoom, DeleteSpace, DeleteTopic, SetPermissionOverwrites, GetPermissionOverwrites, GetComputedPermissions, GetRoomMembers, GetSession, GetSpaceMembers, GetSpaceRooms, JoinRoom, JoinSpace, LeaveRoom, LeaveSpace, UpdateRole, UpdateSpace, UpdateRoom, UpdateTopic, GetPermissionOverwriteTargets, CreateOwner, DeleteOwner, GetOwners, Topics, GetTopics, GetDiscoverableSpaces, GetEmoticons, CreateEmoticon, DeleteEmoticon, Ban, Unban, GetBans, Kick, GetClientData, SetClientData, GetSpaceSummary, GetRoomSummary, UpdateSpaceMember, CreateRelationship, DeleteRelationship, GetRelationships, UpdateRoomMember, Ping, ReportAbuse, RedactMessages, GetUserInfo, SetSessionData, };

package/build/types/types/src/schemes/commands/SetSessionData.d.ts

@@ -0,0 +1,8 @@
+export interface SessionPush {
+    token: string;
+    platform: 'ios' | 'android' | 'web';
+}
+export interface SetSessionData {
+    clientFocused?: boolean;
+    push?: SessionPush;
+}

package/package.json

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

package/src/AbstractChatClient.ts

@@ -109,7 +109,7 @@ import {
     UpdateRoomMember,
     GetRelationships,
     GetUserInfo,
-    UserInfo,
+    UserInfo, SetSessionData,
 } from "./types/src";
 import {EventTarget} from "./EventTarget";
 
@@ -259,6 +259,7 @@ export type CommandsMap = {
     Ping: CommandDefinition<Ping, EventsMap['Pong']>,
     ReportAbuse: CommandDefinition<ReportAbuse, EventsMap['Ok']>,
     GetUserInfo: CommandDefinition<GetUserInfo, EventsMap['UserInfo']>,
+    SetSessionData: CommandDefinition<SetSessionData, EventsMap['Ok']>,
      // Space commands
     GetDiscoverableSpaces: CommandDefinition<GetDiscoverableSpaces, EventsMap['DiscoverableSpaces']>,
     JoinSpace: CommandDefinition<JoinSpace, EventsMap['SpaceJoined']>,

package/src/state-tracker/MessagesManager.ts

@@ -57,24 +57,32 @@ export class MessagesManager {
             throw new Error(`You are not in space ${spaceId}`);
         }
 
-        const roomIds = (await this.tracker.rooms.get()).findBy('spaceId', spaceId).items.map(room => room.id);
+        const rooms = await this.tracker.rooms.get();
+        const roomIds = spaceId
+            ? rooms.findBy('spaceId', spaceId).items.map(r => r.id)
+            : rooms.items.filter(r => !r.spaceId).map(r => r.id);
 
-        if (! roomIds.length) {
-            // We don't need to ping server for followed topics for this space, if user has no joined rooms
+        if (!roomIds.length) {
             return;
         }
 
-        const resultPromise = this.tracker.client.send('GetFollowedTopics', {location: {spaceId}});
+        const isAlreadyCached = roomIds.every(roomId => this.followedTopics.has(roomId));
+        if (isAlreadyCached) {
+            return;
+        }
 
-        roomIds.forEach(roomId => this.followedTopicsPromises.register(resultPromise, roomId));
+        const spaceRegistryKey = `space_fetch_${spaceId || 'spaceless'}`;
 
-        const result = await resultPromise;
+        if (this.followedTopicsPromises.notExist(spaceRegistryKey)) {
+            this.followedTopicsPromises.registerByFunction(async () => {
+                const result = await this.tracker.client.send('GetFollowedTopics', {location: {spaceId}});
+                if (result.error) throw result.error;
 
-        if (result.error) {
-            throw result.error;
+                this.setFollowedTopicsArray(roomIds, result.data.followedTopics);
+            }, spaceRegistryKey);
         }
 
-        this.setFollowedTopicsArray(roomIds, result.data.followedTopics);
+        await this.followedTopicsPromises.get(spaceRegistryKey);
     }
 
     /**
@@ -155,6 +163,7 @@ export class MessagesManager {
             await this.cacheSpaceFollowedTopics(location.spaceId);
             roomIds = rooms.findBy('spaceId', location.spaceId).items.map(r => r.id);
         } else {
+            await this.cacheSpaceFollowedTopics(null);
             roomIds = rooms.items.filter(r => !r.spaceId).map(r => r.id);
         }
 

package/src/types/src/index.ts

@@ -133,6 +133,7 @@ import {GetRelationships} from "./schemes/commands/GetRelationships";
 import {GetUserInfo} from "./schemes/commands/GetUserInfo";
 import {UserInfo} from "./schemes/events/UserInfo";
 import {UserInformation} from "./schemes/UserInformation";
+import {SetSessionData, SessionPush} from "./schemes/commands/SetSessionData";
 
 export {
     // objects
@@ -169,6 +170,7 @@ export {
     UserRelationshipType,
     CreateTopicInitialMessage,
     UserInformation,
+    SessionPush,
     // events
     Bye,
     Error,
@@ -283,4 +285,5 @@ export {
     ReportAbuse,
     RedactMessages,
     GetUserInfo,
+    SetSessionData,
 };

package/src/types/src/schemes/commands/SetSessionData.ts

@@ -0,0 +1,9 @@
+export interface SessionPush {
+    token: string;
+    platform: 'ios' | 'android' | 'web';
+}
+
+export interface SetSessionData {
+    clientFocused?: boolean;
+    push?: SessionPush;
+}