javonet-nodejs-sdk 2.5.20 → 2.6.1

package/dist/utils/exception/ExceptionSerializer.cjs

@@ -28,19 +28,31 @@ var import_ExceptionType = require("../ExceptionType.cjs");
 class ExceptionSerializer {
   static serializeException(exception, command) {
     let exceptionCommand = new import_Command.Command(import_RuntimeName.RuntimeName.Nodejs, import_CommandType.CommandType.Exception, []);
-    exceptionCommand = exceptionCommand.addArgToPayload(this.getExceptionCode(exception));
-    exceptionCommand = exceptionCommand.addArgToPayload(command.toString());
-    exceptionCommand = exceptionCommand.addArgToPayload(exception.name);
-    exceptionCommand = exceptionCommand.addArgToPayload(exception.message);
     let stackClasses = [];
     let stackMethods = [];
     let stackLines = [];
     let stackFiles = [];
-    this.serializeStackTrace(exception, stackClasses, stackMethods, stackLines, stackFiles);
-    exceptionCommand = exceptionCommand.addArgToPayload(stackClasses.join("|"));
-    exceptionCommand = exceptionCommand.addArgToPayload(stackMethods.join("|"));
-    exceptionCommand = exceptionCommand.addArgToPayload(stackLines.join("|"));
-    exceptionCommand = exceptionCommand.addArgToPayload(stackFiles.join("|"));
+    try {
+      this.serializeStackTrace(exception, stackClasses, stackMethods, stackLines, stackFiles);
+      exceptionCommand = exceptionCommand.addArgToPayload(this.getExceptionCode(exception));
+      exceptionCommand = exceptionCommand.addArgToPayload(command ? command.toString() : "Command is null");
+      exceptionCommand = exceptionCommand.addArgToPayload(exception.name);
+      exceptionCommand = exceptionCommand.addArgToPayload(exception.message);
+      exceptionCommand = exceptionCommand.addArgToPayload(stackClasses.join("|"));
+      exceptionCommand = exceptionCommand.addArgToPayload(stackMethods.join("|"));
+      exceptionCommand = exceptionCommand.addArgToPayload(stackLines.join("|"));
+      exceptionCommand = exceptionCommand.addArgToPayload(stackFiles.join("|"));
+    } catch (e) {
+      exceptionCommand = new import_Command.Command(import_RuntimeName.RuntimeName.Nodejs, import_CommandType.CommandType.Exception, []);
+      exceptionCommand = exceptionCommand.addArgToPayload(this.getExceptionCode(e));
+      exceptionCommand = exceptionCommand.addArgToPayload(command ? command.toString() : "Command is null");
+      exceptionCommand = exceptionCommand.addArgToPayload("Node.js Exception Serialization Error");
+      exceptionCommand = exceptionCommand.addArgToPayload(e.message);
+      exceptionCommand = exceptionCommand.addArgToPayload("ExceptionSerializer");
+      exceptionCommand = exceptionCommand.addArgToPayload("serializeException");
+      exceptionCommand = exceptionCommand.addArgToPayload("unknown");
+      exceptionCommand = exceptionCommand.addArgToPayload("ExceptionSerializer.js");
+    }
     return exceptionCommand;
   }
   static getExceptionCode(exception) {
@@ -56,22 +68,35 @@ class ExceptionSerializer {
     }
   }
   static serializeStackTrace(exception, stackClasses, stackMethods, stackLines, stackFiles) {
+    if (!exception || typeof exception.stack !== "string") {
+      return;
+    }
     const stackTrace = exception.stack.split("\n").slice(1);
-    for (let i = 0; i < stackTrace.length; i++) {
-      const parts = stackTrace[i].trim().match(/at\s(.*)\s\((.*):(\d+):(\d+)\)/);
+    for (const line of stackTrace) {
+      const trimmedLine = line.trim();
+      if (trimmedLine.includes("Javonet.Node.js")) {
+        continue;
+      }
+      let parts = trimmedLine.match(/at\s+(.*?)\s+\((.*?):(\d+):\d+\)/);
       if (parts) {
-        stackClasses.push(parts[1]);
-        stackMethods.push("unknown");
-        stackLines.push(parts[3]);
-        stackFiles.push(parts[2]);
-      } else {
-        const parts2 = stackTrace[i].trim().match(/at\s(.*):(\d+):(\d+)/);
-        if (parts2) {
+        const classAndMethod = parts[1].split(".");
+        if (classAndMethod.length > 1) {
+          stackClasses.push(classAndMethod[0]);
+          stackMethods.push(classAndMethod.slice(1).join("."));
+        } else {
           stackClasses.push("unknown");
-          stackMethods.push("unknown");
-          stackLines.push(parts2[2]);
-          stackFiles.push(parts2[1]);
+          stackMethods.push(parts[1]);
         }
+        stackFiles.push(parts[2]);
+        stackLines.push(parts[3]);
+        continue;
+      }
+      parts = trimmedLine.match(/at\s+(.*?):(\d+):\d+/);
+      if (parts) {
+        stackClasses.push("unknown");
+        stackMethods.push("unknown");
+        stackFiles.push(parts[1]);
+        stackLines.push(parts[2]);
       }
     }
   }

package/lib/core/handler/Handler.js

@@ -100,8 +100,8 @@ class Handler {
             }
             let response = handlers[command.commandType].handleCommand(command)
             return this.parseCommand(response, command.runtimeName)
-        } catch (error) {
-            return ExceptionSerializer.serializeException(error, command)
+        } catch (e) {
+            return ExceptionSerializer.serializeException(e, command)
         }
     }
 

package/lib/core/handler/ResolveReferenceHandler.js

@@ -1,10 +1,10 @@
 // @ts-check
 import { ReferencesCache } from '../referenceCache/ReferencesCache.js'
 import { AbstractHandler } from './AbstractHandler.js'
+import { CommandType } from '../../utils/CommandType.js'
+import { RuntimeName } from '../../utils/RuntimeName.js'
+import { Command } from '../../utils/Command.js'
 
-/**
- * @typedef {import('../../utils/Command.js').Command} Command
- */
 
 class ResolveReferenceHandler extends AbstractHandler {
     constructor() {
@@ -16,7 +16,12 @@ class ResolveReferenceHandler extends AbstractHandler {
      * @returns {any}
      */
     process(command) {
-        return ReferencesCache.getInstance().resolveReference(command.payload[0])
+        if (command.runtimeName === RuntimeName.Nodejs) {
+            return ReferencesCache.getInstance().resolveReference(command.payload[0])
+        }
+        else {
+            return new Command(command.runtimeName, CommandType.Reference, command.payload[0])
+        }
     }
 }
 

package/lib/core/interpreter/Interpreter.js

@@ -29,7 +29,16 @@ const requireDynamic = getRequire(import.meta.url)
 
 export class Interpreter {
     /** @type {Handler | null} */
-    handler = null
+    _handler = null
+
+    /** @type {Handler} */
+    get handler() {
+        if (!this._handler) {
+            this._handler = new Handler(this)
+        }
+        return this._handler
+    }
+
     /**
      *
      * @param {Command} command
@@ -38,57 +47,42 @@ export class Interpreter {
      */
     async executeAsync(command, connectionData) {
         try {
-            if (!this.handler) {
-                this.handler = new Handler(this)
-            }
             let messageByteArray = new CommandSerializer().serialize(command, connectionData)
             /** @type {Int8Array | undefined} */
             let responseByteArray = undefined
 
-            if (
-                command.runtimeName === RuntimeName.Nodejs &&
-                connectionData.connectionType === ConnectionType.IN_MEMORY
-            ) {
-                if (isNodejsRuntime()) {
-                    // lazy receiver loading
+            if (connectionData.connectionType === ConnectionType.WEB_SOCKET) {
+                const _response = await _TransmitterWebsocket?.sendCommand(messageByteArray, connectionData)
+                if (_response) {
+                    const command = new CommandDeserializer(_response).deserialize()
+                    return command
+                } else {
+                    throw new Error('Response not received from TransmitterWebsocket')
+                }
+            } else {
+                if (!isNodejsRuntime()) {
+                    throw new Error('InMemory is only allowed in Nodejs runtime')
+                }
+
+                if (command.runtimeName === RuntimeName.Nodejs) {
                     if (!_Receiver) {
                         const { Receiver } = requireDynamic('../receiver/Receiver.js')
                         _Receiver = Receiver
                     }
-                    responseByteArray = _Receiver?.sendCommand(messageByteArray)
+                    responseByteArray = await _Receiver?.sendCommand(messageByteArray)
                 } else {
-                    throw new Error('Node.js runtime not found')
-                }
-            } else if (connectionData.connectionType === ConnectionType.WEB_SOCKET) {
-                try {
-                    const _response = await _TransmitterWebsocket?.sendCommand(
-                        messageByteArray,
-                        connectionData
-                    )
-                    if (_response) {
-                        const command = new CommandDeserializer(_response).deserialize()
-                        return command
-                    } else {
-                        throw new Error('Response not received from TransmitterWebsocket')
-                    }
-                } catch (error) {
-                    throw error
-                }
-            } else {
-                if (isNodejsRuntime()) {
-                    // lazy transmitter loading
                     if (!_Transmitter) {
                         const { Transmitter } = requireDynamic('../transmitter/Transmitter.js')
                         _Transmitter = Transmitter
                     }
                     responseByteArray = await _Transmitter?.sendCommand(messageByteArray)
-                } else {
-                    throw new Error('Allowed only to run in nodejs runtime')
                 }
             }
+
             if (!responseByteArray) {
                 throw new Error('No response received from Transmitter')
             }
+
             return new CommandDeserializer(responseByteArray).deserialize()
         } catch (error) {
             throw error
@@ -103,60 +97,37 @@ export class Interpreter {
      */
     execute(command, connectionData) {
         try {
-            if (!this.handler) {
-                this.handler = new Handler(this)
-            }
             let messageByteArray = new CommandSerializer().serialize(command, connectionData)
             /** @type {Int8Array | undefined} */
             let responseByteArray = undefined
 
-            if (
-                command.runtimeName === RuntimeName.Nodejs &&
-                connectionData.connectionType === ConnectionType.IN_MEMORY
-            ) {
-                if (isNodejsRuntime()) {
-                    // lazy receiver loading
+            if (connectionData.connectionType === ConnectionType.WEB_SOCKET) {
+                throw new Error('Not supported')
+            }
+            if (connectionData.connectionType === ConnectionType.IN_MEMORY) {
+                if (!isNodejsRuntime()) {
+                    throw new Error('InMemory is only allowed in Nodejs runtime')
+                }
+
+                if (command.runtimeName === RuntimeName.Nodejs) {
                     if (!_Receiver) {
                         const { Receiver } = requireDynamic('../receiver/Receiver.js')
                         _Receiver = Receiver
                     }
                     responseByteArray = _Receiver?.sendCommand(messageByteArray)
-                }
-            } else if (connectionData.connectionType === ConnectionType.WEB_SOCKET) {
-                // lazy transmitter websocket loading
-                const promise = _TransmitterWebsocket?.sendCommand(messageByteArray, connectionData)
-
-                if (!promise) {
-                    throw new Error('TransmitterWebsocket not found')
-                }
-
-                return promise
-                    .then((_response) => {
-                        if (_response) {
-                            const command = new CommandDeserializer(_response).deserialize()
-                            return command
-                        } else {
-                            throw new Error('Response not received from TransmitterWebsocket')
-                        }
-                    })
-                    .catch((error) => {
-                        throw error
-                    })
-            } else {
-                if (isNodejsRuntime()) {
+                } else {
                     if (!_Transmitter) {
                         const { Transmitter } = requireDynamic('../transmitter/Transmitter.js')
                         _Transmitter = Transmitter
                     }
-
                     responseByteArray = _Transmitter?.sendCommand(messageByteArray)
-                } else {
-                    throw new Error('Allowed only to run in nodejs runtime')
                 }
             }
+
             if (!responseByteArray) {
                 throw new Error('No response received from Transmitter')
             }
+
             return new CommandDeserializer(responseByteArray).deserialize()
         } catch (error) {
             throw error
@@ -170,9 +141,6 @@ export class Interpreter {
      */
     process(messageByteArray) {
         try {
-            if (!this.handler) {
-                this.handler = new Handler(this)
-            }
             const receivedCommand = new CommandDeserializer(messageByteArray).deserialize()
             return this.handler?.handleCommand(receivedCommand)
         } catch (error) {

package/lib/core/receiver/Receiver.js

@@ -3,30 +3,38 @@ import { Interpreter } from '../interpreter/Interpreter.js'
 import { CommandSerializer } from '../protocol/CommandSerializer.js'
 import { getRequire } from '../../utils/Runtime.js'
 import { InMemoryConnectionData } from '../../utils/connectionData/InMemoryConnectionData.js'
-
-/** @type {typeof import('../../utils/RuntimeLogger.js').RuntimeLogger | null} */
-let _RuntimeLogger = null
-
-const requireDynamic = getRequire(import.meta.url)
+import { ExceptionSerializer } from '../../utils/exception/ExceptionSerializer.js'
+import { Command } from '../../utils/Command.js'
+import { CommandType } from '../../utils/CommandType.js'
+import { RuntimeName } from '../../utils/RuntimeName.js'
+import { RuntimeLogger } from '../../utils/RuntimeLogger.js'
 
 export class Receiver {
     static connectionData = new InMemoryConnectionData()
     Receiver() {
-        if (!_RuntimeLogger) {
-            const { RuntimeLogger } = requireDynamic('../../utils/RuntimeLogger.js')
-            _RuntimeLogger = RuntimeLogger
-        }
-        _RuntimeLogger?.printRuntimeInfo()
+
+    }
+
+    static getRuntimeInfo() {
+        return RuntimeLogger.getRuntimeInfo()
     }
 
     /**
      * @param {Int8Array} messageByteArray
      */
     static sendCommand(messageByteArray) {
-        return new CommandSerializer().serialize(
-            new Interpreter().process(messageByteArray),
-            this.connectionData
-        )
+        try {
+            return new CommandSerializer().serialize(
+              new Interpreter().process(messageByteArray),
+              this.connectionData
+            )
+        } catch (error) {
+            const exceptionCommand = ExceptionSerializer.serializeException(
+              error,
+              new Command(RuntimeName.Nodejs, CommandType.Exception, [])
+            )
+            return new CommandSerializer().serialize(exceptionCommand, this.connectionData)
+        }
     }
 
     /**

package/lib/core/webSocketClient/WebSocketClient.js

@@ -36,6 +36,12 @@ let WebSocket = null
 /** @type {Record<string, wsClient>} */
 export const clients = {}
 
+/** @type {Record<string, Array<{resolve: Function, reject: Function, messageArray: Int8Array}>>} */
+export const messageQueue = {}
+
+/** @type {Record<string, boolean>} */
+export const processingQueues = {}
+
 /**
  * WebSocketClient class that handles WebSocket connection, message sending, and automatic disconnection.
  */
@@ -61,16 +67,65 @@ class WebSocketClient {
     }
 
     /**
-     * Sends messageArray through websocket connection
+     * Sends messageArray through websocket connection with guaranteed order preservation
      * @async
      * @param {Int8Array} messageArray
      * @returns {Promise<Int8Array>}
      */
     send(messageArray) {
+        return new Promise((resolve, reject) => {
+            if (!messageQueue[this.url]) {
+                messageQueue[this.url] = []
+            }
+            messageQueue[this.url].push({ resolve, reject, messageArray })
+
+            this._processMessage()
+        })
+    }
+
+    /**
+     * Processes message queue sequentially to maintain order
+     * @private
+     * @async
+     */
+    async _processMessage() {
+        if (processingQueues[this.url]) {
+            return
+        }
+        processingQueues[this.url] = true
+
+        try {
+            while (messageQueue[this.url] && messageQueue[this.url].length > 0) {
+                const item = messageQueue[this.url].shift()
+                if (!item) break
+
+                const { resolve, reject, messageArray } = item
+
+                try {
+                    const response = await this._send(messageArray)
+                    resolve(response)
+                } catch (error) {
+                    reject(error)
+                }
+            }
+        } finally {
+            processingQueues[this.url] = false
+        }
+    }
+
+    /**
+     * Sends a single message through websocket connection
+     * @private
+     * @async
+     * @param {Int8Array} messageArray
+     * @returns {Promise<Int8Array>}
+     */
+    _send(messageArray) {
         return new Promise((resolve, reject) => {
             const client = this.instance
-            if (client) {
+            if (client && this.isConnected) {
                 client.send(/** @type {any} */ (messageArray))
+
                 const messageHandler = (/** @type {any} */ message) => {
                     resolve(message)
                     if (this.isDisconnectedAfterMessage) {
@@ -81,16 +136,16 @@ class WebSocketClient {
                 client.on(WebSocketStateEvent.MESSAGE, messageHandler)
             } else {
                 this._connect()
-                    .then((ws) => {
-                        ws.send(/** @type {any} */ (messageArray))
+                    .then((client) => {
+                        client.send(/** @type {any} */ (messageArray))
                         const messageHandler = (/** @type {any} */ message) => {
                             resolve(message)
                             if (this.isDisconnectedAfterMessage) {
                                 this.disconnect()
                             }
-                            ws.removeListener(WebSocketStateEvent.MESSAGE, messageHandler)
+                            client.removeListener(WebSocketStateEvent.MESSAGE, messageHandler)
                         }
-                        ws.on(WebSocketStateEvent.MESSAGE, messageHandler)
+                        client.on(WebSocketStateEvent.MESSAGE, messageHandler)
                     })
                     .catch(reject)
             }
@@ -98,13 +153,24 @@ class WebSocketClient {
     }
 
     /**
-     * Disconnects the WebSocket by terminating the connection.
+     * Disconnects the WebSocket by terminating the connection and cleans up queues.
      */
     disconnect() {
         if (this.instance) {
             this.instance.close()
             delete clients[this.url]
         }
+
+        // Clean up message queue and processing state
+        if (messageQueue[this.url]) {
+            // Reject any pending messages
+            messageQueue[this.url].forEach(({ reject }) => {
+                reject(new Error('WebSocket disconnected'))
+            })
+            delete messageQueue[this.url]
+        }
+
+        delete processingQueues[this.url]
     }
 
     /**

package/lib/core/webSocketClient/WebSocketClientBrowser.js

@@ -25,6 +25,12 @@ if (isBrowserRuntime()) {
 /** @type {Record<string, WebSocket>} */
 export const clients = {}
 
+/** @type {Record<string, Array<{resolve: Function, reject: Function, messageArray: Int8Array}>>} */
+export const messageQueue = {}
+
+/** @type {Record<string, boolean>} */
+export const processingQueues = {}
+
 /**
  * WebSocketClient class that handles WebSocket connection, message sending, and automatic disconnection.
  */
@@ -51,12 +57,59 @@ class WebSocketClientBrowser {
     }
 
     /**
-     * Sends messageArray through websocket connection
+     * Sends messageArray through websocket connection with guaranteed order preservation
      * @async
      * @param {Int8Array} messageArray
      * @returns {Promise<Int8Array>}
      */
     send(messageArray) {
+        return new Promise((resolve, reject) => {
+            if (!messageQueue[this.url]) {
+                messageQueue[this.url] = []
+            }
+            messageQueue[this.url].push({ resolve, reject, messageArray })
+
+            this._processMessage()
+        })
+    }
+
+    /**
+     * Processes message queue sequentially to maintain order
+     * @private
+     * @async
+     */
+    async _processMessage() {
+        if (processingQueues[this.url]) {
+            return
+        }
+        processingQueues[this.url] = true
+        
+        try {
+            while (messageQueue[this.url] && messageQueue[this.url].length > 0) {
+                const item = messageQueue[this.url].shift()
+                if (!item) break
+                
+                const { resolve, reject, messageArray } = item
+                try {
+                    const response = await this._sendSingle(messageArray)
+                    resolve(response)
+                } catch (error) {
+                    reject(error)
+                }
+            }
+        } finally {
+            processingQueues[this.url] = false
+        }
+    }
+
+    /**
+     * Sends a single message through websocket connection
+     * @private
+     * @async
+     * @param {Int8Array} messageArray
+     * @returns {Promise<Int8Array>}
+     */
+    _sendSingle(messageArray) {
         return new Promise((resolve, reject) => {
             const client = this.instance
             if (client && this.isConnected) {
@@ -72,7 +125,7 @@ class WebSocketClientBrowser {
     }
 
     /**
-     * Disconnects the WebSocket by terminating the connection.
+     * Disconnects the WebSocket by terminating the connection and cleans up queues.
      */
     disconnect() {
         const client = this.instance
@@ -80,6 +133,14 @@ class WebSocketClientBrowser {
             client.close()
             delete clients[this.url]
         }
+
+        if (messageQueue[this.url]) {
+            messageQueue[this.url].forEach(({ reject }) => {
+                reject(new Error('WebSocket disconnected'))
+            })
+            delete messageQueue[this.url]
+        }
+        delete processingQueues[this.url]
     }
 
     /**

package/lib/sdk/InvocationContext.js

@@ -122,7 +122,9 @@ class InvocationContext {
             throw new Error('currentCommand is undefined in Invocation Context execute method')
         }
 
-        this.#interpreter = new Interpreter()
+        if (!this.#interpreter) {
+            this.#interpreter = new Interpreter()
+        }
         //@ts-expect-error
         this.#responseCommand = this.#interpreter.execute(this.#currentCommand, this.#connectionData)
 
@@ -137,6 +139,7 @@ class InvocationContext {
             this.#isExecuted = true
             return this
         }
+
         return new InvocationContext(this.#runtimeName, this.#connectionData, this.#responseCommand, true)
     }
 
@@ -531,7 +534,9 @@ class InvocationWsContext extends InvocationContext {
             throw new Error('currentCommand is undefined in Invocation Context execute method')
         }
 
-        this.#interpreter = new Interpreter()
+        if (!this.#interpreter) {
+            this.#interpreter = new Interpreter()
+        }
         this.#responseCommand = await this.#interpreter.executeAsync(
             this.#currentCommand,
             this.#connectionData
@@ -548,6 +553,7 @@ class InvocationWsContext extends InvocationContext {
             this.#isExecuted = true
             return this
         }
+
         return new InvocationWsContext(this.#runtimeName, this.#connectionData, this.#responseCommand, true)
     }
 }

package/lib/utils/CommandType.js

@@ -42,4 +42,7 @@ export const CommandType = /** @type {const} */ ({
     PassDelegate: 39,
     InvokeDelegate: 40,
     ConvertType: 41,
+    AddEventListener: 42,
+    PluginWrapper: 43,
+    GetAsyncOperationResult: 44,
 })