http-request-manager 18.7.0 → 18.7.2

package/fesm2022/http-request-manager.mjs

@@ -789,7 +789,9 @@ class WebsocketService {
         })();
     }
     sendSubscribe(channelName, user) {
-        if (this.socket?.readyState === WebSocket.OPEN && !this.isSubscribed) {
+        // Check if already subscribed to THIS specific channel (not just any channel)
+        const alreadySubscribed = this.subscribedChannels.value.has(channelName);
+        if (this.socket?.readyState === WebSocket.OPEN && !alreadySubscribed) {
             const message = {
                 type: 'subscribe',
                 subscribedChannel: channelName,
@@ -799,11 +801,15 @@ class WebsocketService {
                 }
             };
             this.socket.send(JSON.stringify(message));
-            this.isSubscribed = true; // Set the flag immediately after sending
+            // Track this channel as subscribed
+            const current = new Set(this.subscribedChannels.value);
+            current.add(channelName);
+            this.subscribedChannels.next(current);
+            this.isSubscribed = true; // Keep for backward compatibility
             console.log(`[CLIENT] Sent initial subscription to: ${channelName}`);
         }
         else {
-            console.warn(`[CLIENT] Subscription prevented. Open: ${this.socket?.readyState === WebSocket.OPEN}, Subscribed: ${this.isSubscribed}`);
+            console.warn(`[CLIENT] Subscription prevented. Open: ${this.socket?.readyState === WebSocket.OPEN}, Already subscribed to ${channelName}: ${alreadySubscribed}`);
         }
     }
     connect(options, jwtToken) {
@@ -3102,12 +3108,19 @@ class HTTPManagerStateService extends ComponentStore {
                     console.log(`ℹ️ Info: ${message.message}`);
                     break;
                 case 'stateMangerMessage':
-                    ;
-                    if (message.data.sessionId !== this.user.value?.id) {
-                        console.log('💬 Message:', message.data);
+                    // Compare sender's session ID with current user's ID
+                    // message.data.sessionId is an object with 'id' property from server
+                    const stateManagerSenderId = message.data.sessionId?.id || message.data.sessionId;
+                    console.log('🔍 State Manager: Sender ID:', stateManagerSenderId, 'Current User ID:', this.user.value?.id);
+                    if (stateManagerSenderId !== this.user.value?.id) {
+                        console.log('💬 State Manager Message:', message.data);
+                        console.log('📥 Fetching record with path:', message.data.content.path, 'method:', message.data.content.method);
                         this.userAction.next(message.data);
                         this.fetchRecord(RequestOptions.adapt({ path: message.data.content.path }), message.data.content.method);
                     }
+                    else {
+                        console.log('⏭️ Skipping own message');
+                    }
                     break;
                 case 'channelMessage':
                     // Handle channel-based messages (from sendChannelMessage)
@@ -3337,19 +3350,27 @@ class HTTPManagerStateService extends ComponentStore {
             return fetchFromAPI();
         })));
         // FETCH RECORD
-        this.fetchRecord = (options, method) => this.effect(() => of(RequestOptions.adapt(options)).pipe(switchMap((options) => {
+        this.fetchRecord = (options, method) => this.effect(() => of(RequestOptions.adapt(options)).pipe(tap(() => console.log('🔄 fetchRecord effect triggered with path:', options?.path, 'method:', method)), switchMap((options) => {
             this.streamedResponse = [];
             const requestOptions = this.updateRequestOptions(options?.headers);
+            console.log('🌐 Making GET request to path:', options?.path);
             return this.httpManagerService.getRequest(requestOptions, options?.path)
                 .pipe(tap((data) => {
+                console.log('📦 fetchRecord received data:', data);
                 data = (!data) ? (this.dataType === DataType.ARRAY) ? [] : {} : data;
                 const id = options.path?.length ? options.path[options.path.length - 1] : null;
-                if (method === 'DELETE')
+                if (method === 'DELETE') {
+                    console.log('🗑️ Deleting record with id:', id);
                     this.deleteData$({ id });
-                if (method === 'UPDATE')
+                }
+                if (method === 'UPDATE') {
+                    console.log('✏️ Updating record:', data);
                     this.updateData$(data);
-                if (method === 'CREATE')
+                }
+                if (method === 'CREATE') {
+                    console.log('➕ Adding record:', data);
                     this.addData$(data);
+                }
             }), concatMap((data) => {
                 if (this.hasDatabase && this.databaseOptions?.table) {
                     const id = options.path?.length ? options.path[options.path.length - 1] : null;