polfan-server-js-client 0.1.99913 → 0.1.99914

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

@@ -1,4 +1,4 @@
-import { Message, MessageReference } from "../types/src";
+import { Message, Topic } from "../types/src";
 import { ChatStateTracker } from "./ChatStateTracker";
 import { ObservableIndexedObjectCollection } from "../IndexedObjectCollection";
 export declare enum WindowState {
@@ -63,7 +63,7 @@ export declare class TopicHistoryWindow extends TraversableRemoteCollection<Mess
      * For internal use.
      * @internal
      */
-    _setTopicReference(ref: MessageReference): void;
+    _updateMessageReference(refTopic: Topic): void;
     private handleNewMessage;
     private handleSession;
     protected fetchItemsAfter(): Promise<Message[] | null>;

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

@@ -75,7 +75,6 @@ import { DeleteOwner } from "./schemes/commands/DeleteOwner";
 import { GetOwners } from "./schemes/commands/GetOwners";
 import { Owners } from "./schemes/events/Owners";
 import { Ok } from "./schemes/events/Ok";
-import { MessageReference } from "./schemes/commands/CreateTopic";
 import { FollowTopic } from "./schemes/commands/FollowTopic";
 import { FollowedTopics } from "./schemes/events/FollowedTopics";
 import { FollowedTopic } from "./schemes/FollowedTopic";
@@ -88,4 +87,4 @@ import { GetMessages } from "./schemes/commands/GetMessages";
 import { Messages } from "./schemes/events/Messages";
 import { Topics } from "./schemes/events/Topics";
 import { GetTopics } from "./schemes/commands/GetTopics";
-export { Envelope, Message, MessageType, Role, Room, RoomFlag, RoomType, RoomMember, RoomSummary, Space, SpaceMember, Topic, FollowedTopic, User, UserState, PermissionOverwritesValue, ChatLocation, MessageReference, Bye, Error, Messages, 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, GetMessages, 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, Topics, GetTopics, };
+export { Envelope, Message, MessageType, Role, Room, RoomFlag, RoomType, RoomMember, RoomSummary, Space, SpaceMember, Topic, FollowedTopic, User, UserState, PermissionOverwritesValue, ChatLocation, Bye, Error, Messages, 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, GetMessages, 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, Topics, GetTopics, };

package/build/types/types/src/schemes/Message.d.ts

@@ -1,13 +1,9 @@
 import { User } from "./User";
-export declare enum MessageType {
-    Text = "Text",
-    RoomJoin = "RoomJoin",
-    RoomLeave = "RoomLeave",
-    SpaceJoin = "SpaceJoin",
-    SpaceLeave = "SpaceLeave"
-}
+import { ChatLocation } from "./ChatLocation";
+export type MessageType = 'Text' | 'RoomJoin' | 'RoomLeave' | 'SpaceJoin' | 'SpaceLeave';
 export interface Message {
     id: string;
+    location: ChatLocation;
     createdAt: string;
     type: MessageType;
     user: User;

package/build/types/types/src/schemes/Topic.d.ts

@@ -1,9 +1,8 @@
-import { MessageReference } from "./commands/CreateTopic";
 import { Message } from "./Message";
 export interface Topic {
     id: string;
     name: string;
     messageCount: number;
-    messageRef?: MessageReference;
+    refMessage?: Message;
     lastMessage?: Message;
 }

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

@@ -1,12 +1,8 @@
 import { ChatLocation } from "../ChatLocation";
 import { CreateMessage } from "./CreateMessage";
-export interface MessageReference {
-    topicId: string;
-    messageId: string;
-}
 export interface CreateTopic {
     location: ChatLocation;
     name: string;
-    messageRef?: MessageReference;
+    refMessageId?: string;
     initialMessage?: Omit<CreateMessage, 'location'>;
 }

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

@@ -1,6 +1,4 @@
 import { Message } from "../Message";
-import { ChatLocation } from "../ChatLocation";
 export interface NewMessage {
-    location: ChatLocation;
     message: Message;
 }

package/package.json

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

package/src/state-tracker/MessagesManager.ts

@@ -207,8 +207,8 @@ export class MessagesManager {
     }
 
     private updateLocallyFollowedTopicOnNewMessage(ev: NewMessage): void {
-        const roomFollowedTopics = this.followedTopics.get(ev.location.roomId);
-        const followedTopic = roomFollowedTopics?.get(ev.location.topicId);
+        const roomFollowedTopics = this.followedTopics.get(ev.message.location.roomId);
+        const followedTopic = roomFollowedTopics?.get(ev.message.location.topicId);
 
         if (! roomFollowedTopics || ! followedTopic) {
             // Skip if we don't follow this room or targeted topic

package/src/state-tracker/RoomMessagesHistory.ts

@@ -66,13 +66,9 @@ export class RoomMessagesHistory {
         this.historyWindows.set([topic.id, new TopicHistoryWindow(this.room.id, topic.id, this.tracker)]);
 
         // If new topic refers to some message from this room, update other structures
-        if (topic.messageRef) {
-            const refHistoryWindow = this.historyWindows.get(topic.messageRef.topicId);
-
-            refHistoryWindow._setTopicReference({
-                topicId: topic.id, // Reverse the reference
-                messageId: topic.messageRef.messageId,
-            });
+        if (topic.refMessage) {
+            const refHistoryWindow = this.historyWindows.get(topic.refMessage.location.topicId);
+            refHistoryWindow?._updateMessageReference(topic);
         }
     }
 }

package/src/state-tracker/RoomsManager.ts

@@ -302,8 +302,8 @@ export class RoomsManager {
     }
 
     private handleNewMessage(ev: NewMessage): void {
-        const topics = this.topics.get(ev.location.roomId);
-        const topic = topics?.get(ev.location.topicId);
+        const topics = this.topics.get(ev.message.location.roomId);
+        const topic = topics?.get(ev.message.location.topicId);
 
         if (topic) {
             topics.set({

package/src/state-tracker/TopicHistoryWindow.ts

@@ -1,4 +1,4 @@
-import {Message, MessageReference, NewMessage, Session, Topic} from "../types/src";
+import {Message, NewMessage, Session, Topic} from "../types/src";
 import {ChatStateTracker} from "./ChatStateTracker";
 import {ObservableIndexedObjectCollection} from "../IndexedObjectCollection";
 
@@ -201,20 +201,20 @@ export class TopicHistoryWindow extends TraversableRemoteCollection<Message> {
      * For internal use.
      * @internal
      */
-    public _setTopicReference(ref: MessageReference): void {
-        const refMessage = this.get(ref.messageId);
+    public _updateMessageReference(refTopic: Topic): void {
+        const refMessage = this.get(refTopic.refMessage.id);
 
         if (refMessage) {
             // Update referenced topic ID in message
-            this.set({...refMessage, topicRef: ref.topicId});
+            this.set({...refMessage, topicRef: refTopic.id});
         }
     }
 
     private async handleNewMessage(ev: NewMessage): Promise<void> {
         if (
             [WindowState.LATEST, WindowState.LIVE].includes(this.state)
-            && ev.location.roomId === this.roomId
-            && ev.location.topicId === this.topicId
+            && ev.message.location.roomId === this.roomId
+            && ev.message.location.topicId === this.topicId
         ) {
             this.addItems([ev.message], 'tail');
         }

package/src/types/src/index.ts

@@ -75,7 +75,6 @@ import { DeleteOwner } from "./schemes/commands/DeleteOwner";
 import { GetOwners } from "./schemes/commands/GetOwners";
 import { Owners } from "./schemes/events/Owners";
 import { Ok } from "./schemes/events/Ok";
-import {MessageReference} from "./schemes/commands/CreateTopic";
 import {FollowTopic} from "./schemes/commands/FollowTopic";
 import {FollowedTopics} from "./schemes/events/FollowedTopics";
 import {FollowedTopic} from "./schemes/FollowedTopic";
@@ -108,7 +107,6 @@ export {
     UserState,
     PermissionOverwritesValue,
     ChatLocation,
-    MessageReference,
     // events
     Bye,
     Error,

package/src/types/src/schemes/Message.ts

@@ -1,15 +1,11 @@
 import {User} from "./User";
+import {ChatLocation} from "./ChatLocation";
 
-export enum MessageType {
-    Text = 'Text',
-    RoomJoin = 'RoomJoin',
-    RoomLeave = 'RoomLeave',
-    SpaceJoin = 'SpaceJoin',
-    SpaceLeave = 'SpaceLeave',
-}
+export type MessageType = 'Text'|'RoomJoin'|'RoomLeave'|'SpaceJoin'|'SpaceLeave';
 
 export interface Message {
     id: string;
+    location: ChatLocation;
     createdAt: string;
     type: MessageType;
     user: User;

package/src/types/src/schemes/Topic.ts

@@ -1,10 +1,9 @@
-import {MessageReference} from "./commands/CreateTopic";
 import {Message} from "./Message";
 
 export interface Topic {
     id: string;
     name: string;
     messageCount: number;
-    messageRef?: MessageReference;
+    refMessage?: Message;
     lastMessage?: Message;
 }

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

@@ -1,14 +1,9 @@
 import {ChatLocation} from "../ChatLocation";
 import {CreateMessage} from "./CreateMessage";
 
-export interface MessageReference {
-    topicId: string;
-    messageId: string;
-}
-
 export interface CreateTopic {
     location: ChatLocation;
     name: string;
-    messageRef?: MessageReference;
+    refMessageId?: string;
     initialMessage?: Omit<CreateMessage, 'location'>;
 }

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

@@ -1,7 +1,5 @@
 import {Message} from "../Message";
-import {ChatLocation} from "../ChatLocation";
 
 export interface NewMessage {
-    location: ChatLocation;
     message: Message;
 }