@magic-xpa/engine 4.1300.0-dev4130.161 → 4.1300.0-dev4130.170

package/fesm2022/magic-xpa-engine.mjs

@@ -5,7 +5,6 @@ import { HttpHeaders, HttpErrorResponse } from '@angular/common/http';
 import { timer, Subject } from 'rxjs';
 import * as CryptoJS from 'crypto-js';
 import { io } from 'socket.io-client';
-import { filter } from 'rxjs/operators';
 
 ///
 /// This class is used to hold references to global objects, using their interfaces/base classes. This allows other objects to access those global objects
@@ -13846,8 +13845,6 @@ class SubscriberClient {
     static instance;
     socket;
     subscribedTopics = new Set();
-    messageSubject = new Subject();
-    subscriptionsDataSubject = new Subject();
     constructor(task) {
         // Connect to the Socket.IO server with subscriber role
         const serverUrl = EnvParamsTable.Instance.get(ConstInterface.MG_TAG_PUBSUB_SERVER_URI);
@@ -13860,37 +13857,65 @@ class SubscriberClient {
         });
         // Handle connection
         this.socket.on('connect', () => {
-            console.log('Connected to server as subscriber:', this.socket.id);
+            Logger.Instance.WriteDevToLog("SubscriberClient connected to server : " + this.socket.id);
+            // Case 1: Subscribe to all topics initially
+            // Case 2: Subscribe to topics that were subscribed with previous session (reconnected after a disconnection)
+            if (this.subscribedTopics.size > 0) {
+                this.subscribedTopics.forEach(topic => {
+                    this.socket.emit('subscribe', topic);
+                });
+            }
         });
         // Handle disconnection
-        this.socket.on('disconnect', () => {
-            console.log('Disconnected from server');
-            this.subscribedTopics.clear(); //TODO: Check what happens if we disconnect and reconnect.
+        this.socket.on('disconnect', (reason) => {
+            let disconnectReason;
+            switch (reason) {
+                case "ping timeout":
+                    disconnectReason = "Connection lost due to timeout";
+                    break;
+                case "transport close":
+                    disconnectReason = "Network connection closed";
+                    break;
+                case "io server disconnect":
+                    disconnectReason = "Disconnected by server";
+                    break;
+                default:
+                    disconnectReason = "Disconnected:";
+            }
+            Logger.Instance.WriteDevToLog("SubscriberClient disconnected from server : " + reason + " : " + disconnectReason);
+        });
+        // Handle reconnection
+        this.socket.on("reconnect", (attemptNumber) => {
+            Logger.Instance.WriteDevToLog("Reconnected after " + attemptNumber + "attempts");
+        });
+        // Handle reconnection attempts
+        this.socket.on("reconnect_attempt", (attemptNumber) => {
+            Logger.Instance.WriteDevToLog("Reconnect attempt: " + attemptNumber);
+        });
+        // Handle reconnection errors
+        this.socket.on("connect_error", (err) => {
+            Logger.Instance.WriteDevToLog("Connection error: " + err.name + " Message: " + err.message);
         });
         // Handle subscription confirmation
         this.socket.on('subscribed', (data) => {
             this.subscribedTopics.add(data.topic);
-            console.log('Subscribed to topic:', data.topic, data.message);
+            Logger.Instance.WriteDevToLog("SubscriberClient subscribed to topic : " + data.topic + " : " + data.message);
         });
         // Handle unsubscription confirmation
         this.socket.on('unsubscribed', (data) => {
             this.subscribedTopics.delete(data.topic);
-            console.log('Unsubscribed from topic:', data.topic, data.message);
+            Logger.Instance.WriteDevToLog("SubscriberClient unsubscribed from topic : " + data.topic + " : " + data.message);
         });
         // Handle errors
         this.socket.on('error', (error) => {
-            console.error('Socket error:', error.message);
+            Logger.Instance.WriteErrorToLog("SubscriberClient error : " + error.message);
         });
         // Handle incoming messages
         this.socket.on('message', (data) => {
-            this.messageSubject.next(data);
-            console.warn("message", data);
+            //this.messageSubject.next(data);
+            Logger.Instance.WriteDevToLog("SubscriberClient received message from topic : " + data.topic + " : " + data.message);
             EventsManager.Instance.AddTopicPublishedEvent(taskRef, data.topic, data.message);
         });
-        // Handle subscriptions data
-        this.socket.on('subscriptionsData', (data) => {
-            this.subscriptionsDataSubject.next(data);
-        });
     }
     /**
      * Get the singleton instance of SubscriberClient
@@ -13901,89 +13926,38 @@ class SubscriberClient {
         }
         return SubscriberClient.instance;
     }
-    /**
-     * Subscribe to a specific topic
-     * @param topic The topic to subscribe to
-     */
-    subscribe(topic) {
-        if (!this.subscribedTopics.has(topic)) {
-            this.socket.emit('subscribe', topic);
-        }
-    }
     /**
      * Subscribe to multiple topics at once
      * @param topics Array of topics to subscribe to
      */
-    subscribeToTopics(topics) {
-        topics.forEach(topic => this.subscribe(topic));
-    }
-    /**
-     * Unsubscribe from a specific topic
-     * @param topic The topic to unsubscribe from
-     */
-    unsubscribe(topic) {
-        if (this.subscribedTopics.has(topic)) {
-            this.socket.emit('unsubscribe', topic);
-        }
+    subscribe(topics) {
+        topics.forEach(topic => {
+            if (!this.subscribedTopics.has(topic)) {
+                this.socket.emit('subscribe', topic);
+            }
+        });
     }
     /**
      * Unsubscribe from multiple topics at once
      * @param topics Array of topics to unsubscribe from
      */
-    unsubscribeFromTopics(topics) {
-        topics.forEach(topic => this.unsubscribe(topic));
+    unsubscribe(topics) {
+        topics.forEach(topic => {
+            if (this.subscribedTopics.has(topic)) {
+                this.socket.emit('unsubscribe', topic);
+            }
+        });
     }
     /**
      * Unsubscribe from all topics
+     * TODO: To be called when client explicitly disconnects from the server. Alternately, if middleware receives a disconnect request, it can also unsubscribe from all topics from its own side.
      */
     unsubscribeFromAll() {
-        this.subscribedTopics.forEach(topic => this.unsubscribe(topic));
-    }
-    /**
-     * Check if subscribed to a specific topic
-     * @param topic The topic to check
-     * @returns true if subscribed, false otherwise
-     */
-    isSubscribed(topic) {
-        return this.subscribedTopics.has(topic);
-    }
-    /**
-     * Get all currently subscribed topics
-     * @returns Array of subscribed topics
-     */
-    getSubscribedTopics() {
-        return Array.from(this.subscribedTopics);
-    }
-    /**
-     * Get an Observable for incoming messages from all subscribed topics
-     * @returns Observable that emits message data
-     */
-    onMessage() {
-        return this.messageSubject.asObservable();
-    }
-    /**
-     * Get an Observable for incoming messages from a specific topic
-     * @param topic The topic to filter messages for
-     * @returns Observable that emits message data for the specified topic
-     */
-    onMessageForTopic(topic) {
-        return this.messageSubject.asObservable().pipe(filter((data) => data.topic === topic));
-    }
-    /**
-     * Get current subscriptions (for debugging)
-     */
-    getSubscriptions() {
-        this.socket.emit('getSubscriptions');
-    }
-    /**
-     * Listen for subscriptions data
-     * @returns Observable that emits subscriptions list
-     */
-    onSubscriptionsData() {
-        return this.subscriptionsDataSubject.asObservable();
+        this.subscribedTopics.forEach(topic => this.socket.emit('unsubscribe', topic));
     }
     /**
      * Disconnect from the server
+     * TODO: To be called when client explicitly disconnects from the server.
      */
     disconnect() {
         this.socket.disconnect();
@@ -15631,24 +15605,12 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
                 expStrTracker.resetNullResult();
                 break;
             case ExpressionInterface.EXP_OP_SUBSCRIBE:
-                nArgs = valStack.pop();
-                if (nArgs > 0) {
-                    // get the parameters
-                    Exp_params = new Array(nArgs);
-                    for (j = 0; j < nArgs; j++)
-                        Exp_params[nArgs - 1 - j] = valStack.pop();
-                    this.eval_op_Subscribe(Exp_params, resVal);
-                }
+                resVal.Attr = StorageAttribute.BOOLEAN;
+                resVal.BoolVal = this.eval_op_Subscribe(valStack);
                 break;
             case ExpressionInterface.EXP_OP_UNSUBSCRIBE:
-                nArgs = valStack.pop();
-                if (nArgs > 0) {
-                    // get the parameters
-                    Exp_params = new Array(nArgs);
-                    for (j = 0; j < nArgs; j++)
-                        Exp_params[nArgs - 1 - j] = valStack.pop();
-                    this.eval_op_UnSubscribe(Exp_params, resVal);
-                }
+                resVal.Attr = StorageAttribute.BOOLEAN;
+                resVal.BoolVal = this.eval_op_UnSubscribe(valStack);
                 break;
             default:
                 return;
@@ -18742,19 +18704,44 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
         }
         return CryptoJS.lib.WordArray.create(words, u8.length);
     }
-    eval_op_Subscribe(val1, resVal) {
-        resVal.Attr = StorageAttribute.BOOLEAN;
-        resVal.BoolVal = false;
-        let sc = SubscriberClient.getInstance(this.ExpTask);
-        let topics = this.params2arguments(val1, 0, val1.length);
-        sc.subscribeToTopics(topics);
+    eval_op_Subscribe(valStack) {
+        let nArgs = valStack.pop();
+        let result = false;
+        if (nArgs > 0) {
+            // get the parameters
+            let Exp_params = new Array(nArgs);
+            for (let j = 0; j < nArgs; j++) {
+                Exp_params[nArgs - 1 - j] = valStack.pop();
+            }
+            let sc = SubscriberClient.getInstance(this.ExpTask);
+            let topics = this.params2arguments(Exp_params, 0, Exp_params.length);
+            sc.subscribe(topics);
+            result = true;
+        }
+        else {
+            Logger.Instance.WriteExceptionToLogWithMsg('ExpressionEvaluator.Subscribe() there is problem with the arguments');
+            result = false;
+        }
+        return result;
     }
-    eval_op_UnSubscribe(val1, resVal) {
-        resVal.Attr = StorageAttribute.BOOLEAN;
-        resVal.BoolVal = false;
-        let sc = SubscriberClient.getInstance(this.ExpTask);
-        let topics = this.params2arguments(val1, 0, val1.length);
-        sc.unsubscribeFromTopics(topics);
+    eval_op_UnSubscribe(valStack) {
+        let nArgs = valStack.pop();
+        let result = false;
+        if (nArgs > 0) {
+            // get the parameters
+            let Exp_params = new Array(nArgs);
+            for (let j = 0; j < nArgs; j++) {
+                Exp_params[nArgs - 1 - j] = valStack.pop();
+            }
+            let sc = SubscriberClient.getInstance(this.ExpTask);
+            let topics = this.params2arguments(Exp_params, 0, Exp_params.length);
+            sc.unsubscribe(topics);
+        }
+        else {
+            Logger.Instance.WriteExceptionToLogWithMsg('ExpressionEvaluator.UnSubscribe() there is problem with the arguments');
+            result = false;
+        }
+        return result;
     }
 }
 /// <summary>
@@ -39859,7 +39846,7 @@ class CommandsTable {
     }
 }
 
-let CurrentClientVersion = '4.1300.0-dev4130.161';
+let CurrentClientVersion = '4.1300.0-dev4130.170';
 
 // @dynamic
 class ClientManager {