javonet-ruby-sdk 2.6.6 → 2.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc4db9be4d5355239f2f3075f5e4b69df7138dd6ba981a041158c112f7de3108
-  data.tar.gz: 9dd14af19a2cc86ff283ab90354867737d4bd00dc9d026217a2b877a289b5cfd
+  metadata.gz: 466353207c739c6ba5c4d38e2a53bb28042cffdd78575f29b26e0ad8a81da1b4
+  data.tar.gz: 79b9909c9c744c49079fee11f843675ff775e23f0dd13ca986b74aee7e516986
 SHA512:
-  metadata.gz: 8b94c624e8e3ae5b186ae61b993993ec8c578492ee98a6b63bb59a6ecf4e2682d55e439796f3e9fc2f66094c15faf306cc7d3cbe128db3baf0c095c739ae9548
-  data.tar.gz: b7d342b393b165dc3f31cf13c25a5288dc52c8c28d572e3f6185da8e96b30b20d8c63e0e41526bcae6bedb6baa902a23ce14ee68b61b31fa10766d54c1090a0e
+  metadata.gz: c77ba581bee1edcd67a550280b4e949314bf4443ea02c59665ef354ddbebf79945031467c398678449d7285b0565daa9349048b7b09d861592e78f46d82671dd
+  data.tar.gz: 224d457dd4dfaf531ce71c061dd3ac6923ed20f45ac16a759d87af0fd5711bb241f6ec89b79aca6d4489bfe376f9b28b2052da41d30938bd7c251f2587ceb415

data/VERSION

@@ -1 +1 @@
-2.6.6
+2.6.7

data/lib/javonet-ruby-sdk/Binaries/Native/Linux/ARM64/version.txt

@@ -1 +1 @@
-2.6.6
+2.6.7

data/lib/javonet-ruby-sdk/Binaries/Native/Linux/X64/version.txt

@@ -1 +1 @@
-2.6.6
+2.6.7

data/lib/javonet-ruby-sdk/Binaries/Native/MacOs/ARM64/version.txt

@@ -1 +1 @@
-2.6.6
+2.6.7

data/lib/javonet-ruby-sdk/Binaries/Native/MacOs/X64/version.txt

@@ -1 +1 @@
-2.6.6
+2.6.7

data/lib/javonet-ruby-sdk/Binaries/Native/Windows/X64/version.txt

@@ -1 +1 @@
-'2.6.6' 
+'2.6.7' 

data/lib/javonet-ruby-sdk/Binaries/Native/Windows/X86/version.txt

@@ -1 +1 @@
-'2.6.6' 
+'2.6.7' 

data/lib/javonet-ruby-sdk/Binaries/Nodejs/dist/core/handler/LoadLibraryHandler.cjs

@@ -23,10 +23,10 @@ __export(LoadLibraryHandler_exports, {
 module.exports = __toCommonJS(LoadLibraryHandler_exports);
 var import_Runtime = require("../../utils/Runtime.cjs");
 var import_AbstractHandler = require("./AbstractHandler.cjs");
-var import_fs = require("fs");
-var import_path = require("path");
 const import_meta = {};
-const dynamicImport = (0, import_Runtime.getRequire)(import_meta.url);
+let _existsSync = null;
+let _resolve = null;
+const requireDynamic = (0, import_Runtime.getRequire)(import_meta.url);
 class LoadLibraryHandler extends import_AbstractHandler.AbstractHandler {
   requiredParametersCount = 1;
   /** @type {string[]} */
@@ -46,8 +46,16 @@ class LoadLibraryHandler extends import_AbstractHandler.AbstractHandler {
     if (!lib) {
       throw new Error("Cannot load module: Library path is required but was not provided");
     }
-    const absolutePath = (0, import_path.resolve)(lib);
-    if (!(0, import_fs.existsSync)(lib) && !(0, import_fs.existsSync)(absolutePath)) {
+    if (!_existsSync) {
+      const { existsSync } = requireDynamic("fs");
+      _existsSync = existsSync;
+    }
+    if (!_resolve) {
+      const { resolve } = requireDynamic("path");
+      _resolve = resolve;
+    }
+    const absolutePath = _resolve?.(lib);
+    if (!_existsSync?.(lib ?? "") && !_existsSync?.(absolutePath ?? "")) {
       throw new Error(`Cannot load module: Library not found: ${lib}`);
     }
     let pathArray = lib.split(/[/\\]/);
@@ -55,7 +63,7 @@ class LoadLibraryHandler extends import_AbstractHandler.AbstractHandler {
     libraryName = libraryName.replace(".js", "");
     let moduleExports;
     try {
-      moduleExports = dynamicImport(lib);
+      moduleExports = requireDynamic(lib);
       LoadLibraryHandler.loadedLibraries.push(lib);
     } catch (error) {
       throw Error("Cannot load module: " + lib + "\n" + error);

data/lib/javonet-ruby-sdk/Binaries/Nodejs/dist/core/interpreter/Interpreter.cjs

@@ -32,10 +32,7 @@ var import_Handler = require("../handler/Handler.cjs");
 const import_meta = {};
 let _Receiver;
 let _Transmitter;
-let _TransmitterWebsocket = null;
-if (!_TransmitterWebsocket) {
-  _TransmitterWebsocket = (0, import_Runtime.isNodejsRuntime)() ? import_TransmitterWebsocket.TransmitterWebsocket : import_TransmitterWebsocketBrowser.TransmitterWebsocketBrowser;
-}
+let _TransmitterWebsocket = (0, import_Runtime.isNodejsRuntime)() ? import_TransmitterWebsocket.TransmitterWebsocket : import_TransmitterWebsocketBrowser.TransmitterWebsocketBrowser;
 const requireDynamic = (0, import_Runtime.getRequire)(import_meta.url);
 class Interpreter {
   /** @type {Handler | null} */
@@ -51,106 +48,66 @@ class Interpreter {
    *
    * @param {Command} command
    * @param {IConnectionData} connectionData
-   * @returns
+   * @returns {Command | Promise<Command>}
    */
-  async executeAsync(command, connectionData) {
+  execute(command, connectionData) {
     try {
       let messageByteArray = new import_CommandSerializer.CommandSerializer().serialize(command, connectionData);
+      if (!(messageByteArray instanceof Uint8Array) && !(messageByteArray instanceof Promise)) {
+        throw new Error("Serialized message is neither Uint8Array nor Promise<Uint8Array>");
+      }
       let responseByteArray = void 0;
-      if (connectionData.connectionType === import_ConnectionType.ConnectionType.WEB_SOCKET) {
-        const _response = await _TransmitterWebsocket?.sendCommand(
-          await messageByteArray,
-          connectionData
-        );
-        if (_response) {
-          const command2 = new import_CommandDeserializer.CommandDeserializer(_response).deserialize();
-          return command2;
-        } else {
-          throw new Error("Response not received from TransmitterWebsocket");
+      if (!(0, import_Runtime.isNodejsRuntime)() && connectionData.connectionType === import_ConnectionType.ConnectionType.IN_MEMORY) {
+        throw new Error("Nodejs Core Error: inMemory is only allowed in Nodejs runtime, not in browser");
+      }
+      if (command.runtimeName === import_RuntimeName.RuntimeName.Nodejs && connectionData.connectionType === import_ConnectionType.ConnectionType.IN_MEMORY) {
+        if (!_Receiver) {
+          const { Receiver } = require("../receiver/Receiver.cjs");
+          _Receiver = Receiver;
         }
-      } else {
-        if (!(0, import_Runtime.isNodejsRuntime)()) {
-          throw new Error("InMemory is only allowed in Nodejs runtime");
+        if (!_Receiver) {
+          throw new Error("Nodejs Core Error: Receiver is undefined");
+        }
+        if (messageByteArray instanceof Promise) {
+          responseByteArray = messageByteArray.then((resolvedMessage) => {
+            return _Receiver.sendCommand(resolvedMessage);
+          });
+        } else if (messageByteArray instanceof Uint8Array) {
+          responseByteArray = _Receiver.sendCommand(messageByteArray);
         }
-        if (command.runtimeName === import_RuntimeName.RuntimeName.Nodejs) {
-          if (!_Receiver) {
-            const { Receiver } = require("../receiver/Receiver.cjs");
-            _Receiver = Receiver;
-          }
-          responseByteArray = await _Receiver?.sendCommand(await messageByteArray);
+      } else if (connectionData.connectionType === import_ConnectionType.ConnectionType.IN_MEMORY || connectionData.connectionType === import_ConnectionType.ConnectionType.TCP) {
+        if (!_Transmitter) {
+          const { Transmitter } = require("../transmitter/Transmitter.cjs");
+          _Transmitter = Transmitter;
+        }
+        if (!_Transmitter) {
+          throw new Error("Nodejs Core Error: Transmitter is undefined");
+        }
+        if (messageByteArray instanceof Uint8Array) {
+          responseByteArray = _Transmitter.sendCommand(messageByteArray);
         } else {
-          if (!_Transmitter) {
-            const { Transmitter } = require("../transmitter/Transmitter.cjs");
-            _Transmitter = Transmitter;
-          }
-          responseByteArray = await _Transmitter?.sendCommand(await messageByteArray);
+          responseByteArray = messageByteArray.then((resolvedMessage) => {
+            return _Transmitter.sendCommand(resolvedMessage);
+          });
+        }
+      } else if (connectionData.connectionType === import_ConnectionType.ConnectionType.WEB_SOCKET) {
+        if (messageByteArray instanceof Uint8Array) {
+          responseByteArray = _TransmitterWebsocket.sendCommand(messageByteArray, connectionData);
+        } else {
+          responseByteArray = messageByteArray.then((resolvedMessage) => {
+            return _TransmitterWebsocket.sendCommand(resolvedMessage, connectionData);
+          });
         }
       }
       if (!responseByteArray) {
         throw new Error("No response received from Transmitter");
       }
-      return new import_CommandDeserializer.CommandDeserializer(responseByteArray).deserialize();
-    } catch (error) {
-      throw error;
-    }
-  }
-  /**
-   *
-   * @param {Command} command
-   * @param {IConnectionData} connectionData
-   * @returns {Command | Promise<Command>}
-   */
-  execute(command, connectionData) {
-    try {
-      let messageByteArray = new import_CommandSerializer.CommandSerializer().serialize(command, connectionData);
-      let responseByteArray = void 0;
-      if (connectionData.connectionType === import_ConnectionType.ConnectionType.WEB_SOCKET) {
-        throw new Error("Not supported");
+      if (responseByteArray instanceof Promise) {
+        return responseByteArray.then((resolvedResponse) => {
+          return new import_CommandDeserializer.CommandDeserializer(resolvedResponse).deserialize();
+        });
       } else {
-        if (!(0, import_Runtime.isNodejsRuntime)()) {
-          throw new Error("InMemory is only allowed in Nodejs runtime");
-        }
-        if (command.runtimeName === import_RuntimeName.RuntimeName.Nodejs && connectionData.connectionType === import_ConnectionType.ConnectionType.IN_MEMORY) {
-          if (!_Receiver) {
-            const { Receiver } = require("../receiver/Receiver.cjs");
-            _Receiver = Receiver;
-          }
-          if (!_Receiver) {
-            throw new Error("Receiver is undefined");
-          }
-          if (messageByteArray instanceof Uint8Array) {
-            responseByteArray = _Receiver.sendCommand(messageByteArray);
-          } else {
-            responseByteArray = messageByteArray.then((resolvedMessage) => {
-              return _Receiver.sendCommand(resolvedMessage);
-            });
-          }
-        } else {
-          if (!_Transmitter) {
-            const { Transmitter } = require("../transmitter/Transmitter.cjs");
-            _Transmitter = Transmitter;
-          }
-          if (!_Transmitter) {
-            throw new Error("Transmitter is undefined");
-          }
-          if (messageByteArray instanceof Uint8Array) {
-            responseByteArray = _Transmitter.sendCommand(messageByteArray);
-          } else {
-            responseByteArray = messageByteArray.then((resolvedMessage) => {
-              return _Transmitter.sendCommand(resolvedMessage);
-            });
-          }
-        }
-        if (!responseByteArray) {
-          throw new Error("No response received from Transmitter");
-        }
-        if (responseByteArray instanceof Promise) {
-          return responseByteArray.then((resolvedResponse) => {
-            return new import_CommandDeserializer.CommandDeserializer(resolvedResponse).deserialize();
-          });
-        } else {
-          return new import_CommandDeserializer.CommandDeserializer(responseByteArray).deserialize();
-        }
+        return new import_CommandDeserializer.CommandDeserializer(responseByteArray).deserialize();
       }
     } catch (error) {
       throw error;