@magic-xpa/engine 4.1300.0-dev4130.177 → 4.1300.0-dev4130.180

package/fesm2022/magic-xpa-engine.mjs

@@ -609,6 +609,7 @@ class ConstInterface {
     static RC_TOKEN_CACHED_FILE = "CACHE=";
     //For PuSub
     static MG_TAG_PUBSUB_SERVER_URI = "PubSubServerURI";
+    static WC_TOKEN_PUBSUB_SUBSCRIBE = "PubsubToken=Y&";
 }
 
 /// <summary>
@@ -7808,6 +7809,23 @@ class RemoteCommandsProcessor extends CommandsProcessorBase {
         await AccessHelper.mgDataTable.processRecovery();
         AccessHelper.eventsManager.popNewExecStacks();
     }
+    // <summary> Get the subscription token from server </summary>
+    // <param name="topics">List of topics to be subscribed to.</param>
+    // <returns> Return subscription token to authenticate xpa client </returns>
+    async GetSubscriptionTokenFromServer(topics) {
+        const sessionID = this.SessionId;
+        let queryStr = `${ConstInterface.REQ_ARG_START}${ConstInterface.RC_INDICATION}${ConstInterface.RC_TOKEN_CTX_ID}${ClientManager.Instance.GetRuntimeCtxID()}`;
+        if (!isNullOrUndefined(sessionID))
+            queryStr += `${ConstInterface.REQ_ARG_SEPARATOR}${ConstInterface.RC_TOKEN_SESSION_ID}${sessionID}`;
+        queryStr += `${ConstInterface.REQ_ARG_SEPARATOR}${ConstInterface.RC_TOKEN_SESSION_COUNT}${this.GetSessionCounter()}${ConstInterface.REQ_ARG_SEPARATOR}${ConstInterface.WC_TOKEN_PUBSUB_SUBSCRIBE}`;
+        //queryStr += `${ConstInterface.REQ_ARG_SEPARATOR}${ConstInterface.RC_TOKEN_SESSION_COUNT}${this.GetSessionCounter()}${ConstInterface.REQ_ARG_SEPARATOR}${ConstInterface.RC_TOKEN_TARGET_FILE}`;
+        const url = ServerConfig.Instance.getServerURL() + queryStr;
+        //queryStr += `${ConstInterface.REQ_ARG_SEPARATOR}${ConstInterface.RC_TOKEN_SESSION_COUNT}${this.GetSessionCounter()}${ConstInterface.REQ_ARG_SEPARATOR}${ConstInterface.WC_TOKEN_PUBSUB_SUBSCRIBE}`;
+        //const url = ServerConfig.Instance.getServerURL() + queryStr;
+        let response = await this.GetContent(url, false, null, null);
+        //let uInt8Array:Uint8Array = new Uint8Array(response);
+        return this.ArrayBufferToString(response);
+    }
 }
 /// <summary>helper class: details from the runtime-engine - environment values.
 /// Handshake response: <Richclientresponse> <ContextID>...</ContextID> <Environment InputPassword="Y|N"
@@ -13930,12 +13948,16 @@ class SubscriberClient {
      * Subscribe to multiple topics at once
      * @param topics Array of topics to subscribe to
      */
-    subscribe(topics) {
-        topics.forEach(topic => {
-            if (!this.subscribedTopics.has(topic)) {
-                this.socket.emit('subscribe', topic);
-            }
-        });
+    subscribe(topics, token) {
+        let ctxID = ClientManager.Instance.GetRuntimeCtxID();
+        this.socket.emit('subscribe', topics, token, ctxID);
+        // topics.forEach(topic => {
+        //   if (!this.subscribedTopics.has(topic)) {
+        //
+        //     let ctxID = ClientManager.Instance.GetRuntimeCtxID()
+        //     this.socket.emit('subscribe', topic, token, ctxID);
+        //   }
+        // });
     }
     /**
      * Unsubscribe from multiple topics at once
@@ -15606,7 +15628,7 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
                 break;
             case ExpressionInterface.EXP_OP_SUBSCRIBE:
                 resVal.Attr = StorageAttribute.BOOLEAN;
-                resVal.BoolVal = this.eval_op_Subscribe(valStack);
+                this.eval_op_Subscribe(valStack);
                 break;
             case ExpressionInterface.EXP_OP_UNSUBSCRIBE:
                 resVal.Attr = StorageAttribute.BOOLEAN;
@@ -18704,7 +18726,7 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
         }
         return CryptoJS.lib.WordArray.create(words, u8.length);
     }
-    eval_op_Subscribe(valStack) {
+    async eval_op_Subscribe(valStack) {
         let nArgs = valStack.pop();
         let result = false;
         if (nArgs > 0) {
@@ -18713,9 +18735,10 @@ class ExpressionEvaluator extends GuiExpressionEvaluator {
             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);
+            let token = await RemoteCommandsProcessor.GetInstance().GetSubscriptionTokenFromServer(topics);
+            let sc = SubscriberClient.getInstance(this.ExpTask);
+            sc.subscribe(topics, token);
             result = true;
         }
         else {
@@ -39846,7 +39869,7 @@ class CommandsTable {
     }
 }
 
-let CurrentClientVersion = '4.1300.0-dev4130.177';
+let CurrentClientVersion = '4.1300.0-dev4130.180';
 
 // @dynamic
 class ClientManager {