http-request-manager 18.5.20 → 18.5.22

package/fesm2022/http-request-manager.mjs

@@ -736,18 +736,19 @@ class ChannelInfo {
 }
 
 class WSUser {
-    constructor(sessionId = '', ldap = '', name = '', email = '') {
-        this.sessionId = sessionId;
+    constructor(id = '', ldap = '', name = '', email = '') {
+        this.id = id;
         this.ldap = ldap;
         this.name = name;
         this.email = email;
     }
     static adapt(item) {
-        const user = new WSUser(item?.sessionId, item?.ldap, item?.name, item?.email);
+        const user = new WSUser(item?.id || item?.sessionId, // Support both for backward compatibility
+        item?.ldap, item?.name, item?.email);
         // Copy any additional properties
         if (item) {
             Object.keys(item).forEach(key => {
-                if (!['sessionId', 'ldap', 'name', 'email'].includes(key)) {
+                if (!['id', 'sessionId', 'ldap', 'name', 'email'].includes(key)) {
                     user[key] = item[key];
                 }
             });
@@ -789,7 +790,10 @@ class WebsocketService {
             const message = {
                 type: 'subscribe',
                 subscribedChannel: channelName,
-                content: user
+                content: {
+                    id: this.getSessionId(),
+                    ...user
+                }
             };
             this.socket.send(JSON.stringify(message));
             this.isSubscribed = true; // Set the flag immediately after sending
@@ -2884,12 +2888,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.14", ngImpo
         }], ctorParameters: () => [] });
 
 class ChannelMessage {
-    constructor(sessionId = '', content = null) {
+    constructor(sessionId = null, content = null) {
         this.sessionId = sessionId;
         this.content = content;
     }
     static adapt(item) {
-        return new ChannelMessage(item?.sessionId, item?.content);
+        return new ChannelMessage(item?.sessionId || item?.id, // Support both for backward compatibility
+        item?.content);
     }
 }
 
@@ -2899,6 +2904,10 @@ const defaultState = {
     dataObject: null,
 };
 class HTTPManagerStateService extends ComponentStore {
+    // Convenience observable that returns users for a specific channel
+    getUsersForChannel$(channel) {
+        return this.userListByChannel$.pipe(map(channelMap => channelMap.get(channel) || []));
+    }
     constructor(apiOptions = ApiRequest.adapt(), dataType, database) {
         super(defaultState);
         this.apiOptions = apiOptions;
@@ -2924,6 +2933,9 @@ class HTTPManagerStateService extends ComponentStore {
         this.wsRetryAttempts$ = this.wsRetryAttempts.asObservable();
         this.messages = new BehaviorSubject([]);
         this.messages$ = this.messages.asObservable();
+        this.userListByChannel = new BehaviorSubject(new Map());
+        this.userListByChannel$ = this.userListByChannel.asObservable();
+        // Legacy support - returns all unique users across all channels
         this.userList = new BehaviorSubject([]);
         this.userList$ = this.userList.asObservable();
         this.user = new BehaviorSubject(null);
@@ -2959,7 +2971,7 @@ class HTTPManagerStateService extends ComponentStore {
                 this.httpManagerService.disconnect();
             }
             if (message.type === 'success') {
-                if (message.data.sessionId !== this.user.value?.sessionId) {
+                if (message.data.id !== this.user.value?.id) {
                     const user = WSUser.adapt(message.data);
                     this.user.next(user);
                 }
@@ -2987,7 +2999,7 @@ class HTTPManagerStateService extends ComponentStore {
                     break;
                 case 'stateMangerMessage':
                     ;
-                    if (message.data.sessionId !== this.user.value?.sessionId) {
+                    if (message.data.sessionId !== this.user.value?.id) {
                         console.log('💬 Message:', message.data);
                         this.userAction.next(message.data);
                         this.fetchRecord(RequestOptions.adapt({ path: message.data.content.path }), message.data.content.method);
@@ -2995,23 +3007,30 @@ class HTTPManagerStateService extends ComponentStore {
                     break;
                 case 'channelMessage':
                     // Handle channel-based messages (from sendChannelMessage)
-                    // Structure: { type: 'channelMessage', channel, data: { sessionId, content: ChannelMessage } }
+                    // Structure: { type: 'channelMessage', channels: [...], sessionId: {id, ldap, name, email}, content: {message payload} }
                     // Skip messages from self
-                    const senderSessionId = message.data?.content?.sessionId?.sessionId || message.data?.sessionId;
-                    if (senderSessionId === this.user.value?.sessionId) {
+                    const senderSessionId = message.sessionId?.id;
+                    if (senderSessionId === this.user.value?.id) {
                         break;
                     }
                     console.log('💬 Channel Message received:', message);
-                    if (message.data?.content) {
+                    if (message.content) {
                         this.appendMessages(ChannelMessage.adapt({
-                            sessionId: message.data.content.sessionId,
-                            content: message.data.content.content,
+                            sessionId: message.sessionId,
+                            content: message.content,
                         }));
                     }
                     break;
                 case 'usersInChannel':
-                    console.log('👥 Users:', message.data.users);
-                    this.userList.next(message.data.users);
+                    console.log(`👥 Users in channel "${message.channel}":`, message.data.users);
+                    // Update channel-specific user list
+                    const currentMap = new Map(this.userListByChannel.value);
+                    currentMap.set(message.channel, message.data.users);
+                    this.userListByChannel.next(currentMap);
+                    // Update legacy userList with unique users across all channels
+                    const allUsers = Array.from(currentMap.values()).flat();
+                    const uniqueUsers = allUsers.filter((user, index, self) => index === self.findIndex(u => u.id === user.id));
+                    this.userList.next(uniqueUsers);
                     break;
                 default:
                     // Messages are already added at the beginning of the tap
@@ -4529,7 +4548,7 @@ class WsMessagingComponent {
         const selectedChannels = this.channels.value;
         const message = ChannelMessage.adapt({
             sessionId: {
-                sessionId: user.sessionId,
+                id: user.id,
                 ldap: user.ldap,
                 name: user.name,
                 email: user.email,