http-request-manager 18.7.4 → 18.7.6

package/fesm2022/http-request-manager.mjs

@@ -3002,15 +3002,15 @@ class ChannelMessage {
 const API_OPTS = new InjectionToken('API_OPTS');
 /**
  * Channel type enum for different communication purposes
- * - STATE: Private channels for state synchronization
- * - MESSAGE: Messaging/communication channels
- * - NOTIFICATION: Notification/broadcast channels
+ * - STATE: Private channels for state synchronization (SYS- prefix)
+ * - MESSAGE: Public messaging/communication channels (PUB- prefix)
+ * - NOTIFICATION: Notification channels with DB persistence (MES- prefix)
  */
 var ChannelType;
 (function (ChannelType) {
     ChannelType["STATE"] = "SYS";
-    ChannelType["MESSAGE"] = "MES";
-    ChannelType["NOTIFICATION"] = "PUB";
+    ChannelType["MESSAGE"] = "PUB";
+    ChannelType["NOTIFICATION"] = "MES";
 })(ChannelType || (ChannelType = {}));
 /**
  * Utility function to create prefixed channel name
@@ -3867,10 +3867,10 @@ class HTTPManagerStateService extends ComponentStore {
         }
     }
     // --------------------------------------------------------------------------------------------------
-    // NOTIFICATION CHANNELS (PUB- prefix - managed automatically)
+    // NOTIFICATION CHANNELS (MES- prefix - managed automatically)
     /**
      * Create a notification channel on the server
-     * @param channel - Base channel name (PUB- prefix added automatically)
+     * @param channel - Base channel name (MES- prefix added automatically)
      */
     createNotificationChannel(channel) {
         if (this.wsConnection) {
@@ -3907,7 +3907,7 @@ class HTTPManagerStateService extends ComponentStore {
     }
     /**
      * Subscribe to a notification channel with optional date filters
-     * @param channel - Base channel name (PUB- prefix added automatically)
+     * @param channel - Base channel name (MES- prefix added automatically)
      */
     subscribeToNotificationChannel(channel, options, user) {
         if (this.wsConnection) {
@@ -3921,7 +3921,7 @@ class HTTPManagerStateService extends ComponentStore {
     }
     /**
      * Unsubscribe from a notification channel
-     * @param channel - Base channel name (PUB- prefix added automatically)
+     * @param channel - Base channel name (MES- prefix added automatically)
      */
     unsubscribeFromNotificationChannel(channel) {
         if (this.wsConnection) {
@@ -3935,7 +3935,7 @@ class HTTPManagerStateService extends ComponentStore {
     }
     /**
      * Send a notification to a channel
-     * @param channel - Base channel name (PUB- prefix added automatically)
+     * @param channel - Base channel name (MES- prefix added automatically)
      */
     sendNotification(channel, content) {
         if (this.wsConnection) {
@@ -4820,25 +4820,13 @@ class NotificationServiceDemo {
         // Expose connection status from state service
         this.connectionStatus$ = this.stateService.connectionStatus$;
     }
-    /**
-     * Helper to ensure channel has MES- prefix
-     */
-    toNotificationChannel(channel) {
-        return channel.startsWith('MES-') ? channel : `MES-${channel}`;
-    }
-    /**
-     * Helper to strip MES- prefix for display
-     */
-    fromNotificationChannel(channel) {
-        return channel.startsWith('MES-') ? channel.replace('MES-', '') : channel;
-    }
     /**
      * Create a notification channel
+     * NOTE: MES- prefix is added automatically by HTTPManagerStateService
      */
     createNotificationChannel(channel) {
-        const notifyChannel = this.toNotificationChannel(channel);
-        console.log('📢 createNotificationChannel:', notifyChannel);
-        this.stateService.createNotificationChannel(notifyChannel);
+        console.log('📢 createNotificationChannel:', channel);
+        this.stateService.createNotificationChannel(channel);
     }
     /**
      * Get all notification channels (in-memory)
@@ -4857,38 +4845,42 @@ class NotificationServiceDemo {
     }
     /**
      * Subscribe to a notification channel with optional date filter
-     * @param channel Channel name (MES- prefix will be added if not present)
+     * NOTE: MES- prefix is added automatically by HTTPManagerStateService
+     * @param channel Base channel name (without MES- prefix)
      * @param options { startEpoch?, endEpoch? }
      * @param user User info for subscription
      */
     subscribeToNotificationChannel(channel, options, user) {
-        const notifyChannel = this.toNotificationChannel(channel);
-        console.log('📢 subscribeToNotificationChannel:', notifyChannel, options);
+        // Add MES- prefix for local tracking (to match what state service sends)
+        const prefixedChannel = channel.startsWith('MES-') ? channel : `MES-${channel}`;
+        console.log('📢 subscribeToNotificationChannel:', prefixedChannel, options);
         // Add to local subscribed channels immediately for UI feedback
         const currentSubs = this.subscribedNotificationChannelsSubject.value;
-        currentSubs.add(notifyChannel);
+        currentSubs.add(prefixedChannel);
         this.subscribedNotificationChannelsSubject.next(new Set(currentSubs));
-        // Send subscription request to server
-        this.stateService.subscribeToNotificationChannel(notifyChannel, options, user);
+        // Send subscription request to server (state service adds MES- prefix)
+        this.stateService.subscribeToNotificationChannel(channel, options, user);
     }
     /**
      * Unsubscribe from a notification channel
+     * NOTE: MES- prefix is added automatically by HTTPManagerStateService
      */
     unsubscribeFromNotificationChannel(channel) {
-        const notifyChannel = this.toNotificationChannel(channel);
-        console.log('📢 unsubscribeFromNotificationChannel:', notifyChannel);
+        // Add MES- prefix for local tracking (to match what state service sends)
+        const prefixedChannel = channel.startsWith('MES-') ? channel : `MES-${channel}`;
+        console.log('📢 unsubscribeFromNotificationChannel:', prefixedChannel);
         // Remove from local subscribed channels immediately for UI feedback
         const currentSubs = this.subscribedNotificationChannelsSubject.value;
-        currentSubs.delete(notifyChannel);
+        currentSubs.delete(prefixedChannel);
         this.subscribedNotificationChannelsSubject.next(new Set(currentSubs));
-        // Send unsubscription request to server
-        this.stateService.unsubscribeFromNotificationChannel(notifyChannel);
+        // Send unsubscription request to server (state service adds MES- prefix)
+        this.stateService.unsubscribeFromNotificationChannel(channel);
     }
     /**
      * Send a notification to a channel
+     * NOTE: MES- prefix is added automatically by HTTPManagerStateService
      */
     sendNotification(channel, content, user) {
-        const notifyChannel = this.toNotificationChannel(channel);
         const notificationContent = {
             sessionId: {
                 id: user?.id,
@@ -4898,8 +4890,9 @@ class NotificationServiceDemo {
             },
             ...content
         };
-        console.log('📢 sendNotification:', notifyChannel, notificationContent);
-        this.stateService.sendNotification(notifyChannel, notificationContent);
+        console.log('📢 sendNotification:', channel, notificationContent);
+        // State service adds MES- prefix
+        this.stateService.sendNotification(channel, notificationContent);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: NotificationServiceDemo, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: NotificationServiceDemo, providedIn: 'root' }); }
@@ -5108,12 +5101,6 @@ class WsMessagingComponent {
             return { user: mainUser, messages };
         }));
     }
-    /**
-     * Helper to ensure channel has PUB- prefix for outgoing communication
-     */
-    toPublicChannel(channel) {
-        return channel.startsWith('PUB-') ? channel : `PUB-${channel}`;
-    }
     get selectedChannels() {
         return this.messages.get('selectedChannels');
     }
@@ -5145,35 +5132,36 @@ class WsMessagingComponent {
     }
     /**
      * Create a new public channel without auto-subscribing
-     * Public channels use PUB- prefix, system channels use SYS- prefix
+     * NOTE: PUB- prefix is added by messageService.createChannel
      */
     onCreateChannel() {
         if (this.newChannelName.invalid)
             return;
         const channelName = this.newChannelName.value?.trim();
         if (channelName) {
-            // Add PUB- prefix for public channels
-            const publicChannelName = channelName.startsWith('PUB-') ? channelName : `PUB-${channelName}`;
-            this.messageService.createChannel(publicChannelName);
+            // Pass base channel name - service adds PUB- prefix
+            this.messageService.createChannel(channelName);
             this.newChannelName.reset();
             // Server will broadcast updated channel list to all clients automatically
         }
     }
     /**
      * Subscribe to a channel to receive messages
-     * Auto-adds PUB- prefix for outgoing communication
+     * NOTE: PUB- prefix is added by messageService.subscribeToChannel
      */
     onSubscribeToChannel(channel) {
-        this.messageService.subscribeToChannel(this.toPublicChannel(channel));
+        // Pass base channel name - service adds PUB- prefix
+        this.messageService.subscribeToChannel(channel);
         // Reset channel selection when subscriptions change
         this.selectedChannels.reset([]);
     }
     /**
      * Unsubscribe from a channel
-     * Auto-adds PUB- prefix for outgoing communication
+     * NOTE: PUB- prefix is added by messageService.unsubscribeFromChannel
      */
     onUnsubscribeFromChannel(channel) {
-        this.messageService.unsubscribeFromChannel(this.toPublicChannel(channel));
+        // Pass base channel name - service adds PUB- prefix
+        this.messageService.unsubscribeFromChannel(channel);
         // Reset channel selection when subscriptions change
         this.selectedChannels.reset([]);
     }
@@ -5214,8 +5202,7 @@ class WsMessagingComponent {
         const channelsToSend = this.selectedChannels.value;
         if (channelsToSend.length === 0)
             return;
-        // Add PUB- prefix for outgoing channel communication
-        const publicChannels = channelsToSend.map(ch => this.toPublicChannel(ch));
+        // Pass base channel names - service adds PUB- prefix
         const message = ChannelMessage.adapt({
             sessionId: {
                 id: user.id,
@@ -5225,7 +5212,7 @@ class WsMessagingComponent {
             },
             content: { message: this.messages.value.content },
         });
-        this.messageService.sendMessage(message, publicChannels);
+        this.messageService.sendMessage(message, channelsToSend);
         this.content.reset();
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.14", ngImport: i0, type: WsMessagingComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }