@magic-xpa/engine 4.1300.0-dev4130.182 → 4.1300.0-dev4130.184

package/fesm2022/magic-xpa-engine.mjs

@@ -3,8 +3,8 @@ import { XMLConstants, StorageAttribute, ViewRefreshMode, InternalInterface, Log
 import { RecordUtils, GuiFieldBase, ExpVal, BlobType, FieldDef, GuiTaskBase, MgControlBase, PropInterface, GuiDataCollection, CommandType, Commands, HtmlProperties, ControlTable, Modifiers, KeyboardItem, TaskDefinitionIdTableSaxHandler, DisplayConvertor, VectorType, PIC, MgTimer, GuiConstants, RuntimeContextBase, UsernamePasswordCredentials, Styles, Manager, NUM_TYPE, GuiExpressionEvaluator, ExpressionInterface, DataModificationTypes, GuiDataViewBase, ObjectReferencesCollection, EMPTY_DCREF, ObjectReferenceBase, PropTable, FieldsTable as FieldsTable$1, DcValuesBuilderBase, MgFormBase, GuiEnvironment, TaskDefinitionId, Events, Helps, FocusManager, EventsProcessor, UIBridge } from '@magic-xpa/gui';
 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 * as CryptoJS from 'crypto-js';
 
 ///
 /// This class is used to hold references to global objects, using their interfaces/base classes. This allows other objects to access those global objects
@@ -7706,6 +7706,7 @@ class RemoteCommandsProcessor extends CommandsProcessorBase {
         HttpClientEvents.CheckAndSetSessionCounter_Event = this.CheckAndSetSessionCounter.bind(this);
         HttpClientEvents.ComputeAndLogRequestInfo_Event = this.ComputeAndLogRequestInfo.bind(this);
         AccessHelper.eventsManager.SpinnerStopped.subscribe(clientBusyTime => this.ClientActivated());
+        SubscriberClient.SubscribeTopics_Event = this.SubscribeTopics.bind(this);
     }
     /// <summary>
     /// Log the current request information in console
@@ -7826,6 +7827,10 @@ class RemoteCommandsProcessor extends CommandsProcessorBase {
         //let uInt8Array:Uint8Array = new Uint8Array(response);
         return this.ArrayBufferToString(response);
     }
+    async SubscribeTopics(topics, socket) {
+        const token = await RemoteCommandsProcessor.GetInstance().GetSubscriptionTokenFromServer(Array.from(topics));
+        socket.emit('subscribe', Array.from(topics), token, ClientManager.Instance.GetRuntimeCtxID());
+    }
 }
 /// <summary>helper class: details from the runtime-engine - environment values.
 /// Handshake response: <Richclientresponse> <ContextID>...</ContextID> <Environment InputPassword="Y|N"
@@ -13863,6 +13868,7 @@ class SubscriberClient {
     static instance;
     socket;
     subscribedTopics = new Set();
+    static SubscribeTopics_Event = null;
     constructor(task) {
         // Connect to the Socket.IO server with subscriber role
         const serverUrl = EnvParamsTable.Instance.get(ConstInterface.MG_TAG_PUBSUB_SERVER_URI);
@@ -13874,14 +13880,12 @@ class SubscriberClient {
             }
         });
         // Handle connection
-        this.socket.on('connect', () => {
+        this.socket.on('connect', async () => {
             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)
+            // Case 2: Subscribe to topics that were subscribed with previous session between client and pubsub middleware.
+            // (reconnected to middleware after a disconnection)
             if (this.subscribedTopics.size > 0) {
-                this.subscribedTopics.forEach(topic => {
-                    this.socket.emit('subscribe', topic);
-                });
+                await SubscriberClient.SubscribeTopics_Event(this.subscribedTopics, this.socket);
             }
         });
         // Handle disconnection
@@ -13984,6 +13988,10 @@ class SubscriberClient {
     disconnect() {
         this.socket.disconnect();
     }
+    static async SubscribeTopics(topics, socket) {
+        if (this.SubscribeTopics_Event !== null)
+            this.SubscribeTopics_Event(topics, socket);
+    }
 }
 
 class ExpressionEvaluator extends GuiExpressionEvaluator {
@@ -39869,7 +39877,7 @@ class CommandsTable {
     }
 }
 
-let CurrentClientVersion = '4.1300.0-dev4130.182';
+let CurrentClientVersion = '4.1300.0-dev4130.184';
 
 // @dynamic
 class ClientManager {