javonet-ruby-sdk 2.5.18 → 2.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90c23113b7611eb7faec96cc85d143161c37de74e241a1cee13fd9319f0a7f8a
-  data.tar.gz: f781b42b74e30fd53f5267a072756ccd065e5cafd1e90bf11759ee3b123d1bb1
+  metadata.gz: ac3d03cef32f6ce3f06d9e65d6d2bb4999b84cce9a9e02b08320792057086bba
+  data.tar.gz: e02b41c2dcbbe53407a3d31085378b526cf0cfff53319db0e7b0226e52276ddb
 SHA512:
-  metadata.gz: 7de94bd42570a44c872137d27ec9e1dc58ab0b4dc89f6c76a36dcfa5ecc59d297c21406e506d4cc4d9f24cc510bb831cdf12f408644d869c45004025256c4250
-  data.tar.gz: ae752b6cf4d3fb0326a129dfcbae0108488b81e556bdcbe5de5b52822a04e8673b318844133b1b7a5bd9e6fa7243ff64dd0abb80001803653cba27bb40886971
+  metadata.gz: 2d8637213103a5bd22df6ada5d9f734ea13e6f2eee638d9e44eecb58df9e423b883610f07e2f8b10e0da4de8295524bc6bde8658a830391a0639eb14b9bb9992
+  data.tar.gz: 97bcc0987e2086a7ab944c349004cf9cdc3c6844913f439980b734429a52c090e7ca77fc8b2bbe5c59bec8480bfc23e5fd07cee3b36c965310be1229686e6318

data/Gemfile

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in ruby.gemspec
-gemspec
+gemspec

data/VERSION

@@ -1 +1 @@
-2.5.18
+2.5.20

data/javonet-ruby-sdk.gemspec

@@ -26,12 +26,11 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "securerandom", '~> 0.3.1'
   spec.add_runtime_dependency "rexml", "~> 3.2"
 
-  spec.add_development_dependency "bundler", '~> 2.5'
+  spec.add_development_dependency "bundler", '~> 2.6'
   spec.add_development_dependency "rake", '~> 13.2'
   spec.add_development_dependency "rspec", '~> 3.13'
   spec.add_development_dependency "rspec_junit_formatter", '~> 0.6'
   #spec.add_development_dependency "simplecov", '~> 0.22'
   #spec.add_development_dependency "simplecov-cobertura", '~> 2.1'
-  spec.add_development_dependency "http", '~> 5.2'
-
+  spec.add_development_dependency "http", '~> 5.2.0'
 end

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

@@ -1 +1 @@
-2.5.18
+2.5.20

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

@@ -1 +1 @@
-2.5.18
+2.5.20

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

@@ -1 +1 @@
-2.5.18
+2.5.20

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

@@ -1 +1 @@
-'2.5.18' 
+'2.5.20' 

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

@@ -1 +1 @@
-'2.5.18' 
+'2.5.20' 

data/lib/javonet-ruby-sdk/Binaries/Nodejs/dist/core/transmitter/TransmitterWebsocket.cjs

@@ -47,7 +47,7 @@ class TransmitterWebsocket {
   static sendCommand(messageByteArray, connectionData) {
     const { hostname } = connectionData;
     const options = {
-      isDisconnectedAfterMessage: true
+      isDisconnectedAfterMessage: false
     };
     return new import_WebSocketClient.WebSocketClient(hostname, options).send(messageByteArray);
   }

data/lib/javonet-ruby-sdk/Binaries/Nodejs/dist/core/transmitter/TransmitterWebsocketBrowser.cjs

@@ -41,8 +41,7 @@ class TransmitterWebsocketBrowser {
    */
   static async sendCommand(messageByteArray, connectionData) {
     const { hostname } = connectionData;
-    const response = new import_WebSocketClientBrowser.WebSocketClientBrowser(hostname).send(messageByteArray);
-    return response;
+    return new import_WebSocketClientBrowser.WebSocketClientBrowser(hostname).send(messageByteArray);
   }
   /**
    * @async

data/lib/javonet-ruby-sdk/Binaries/Nodejs/dist/core/webSocketClient/WebSocketClient.cjs

@@ -18,18 +18,27 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var WebSocketClient_exports = {};
 __export(WebSocketClient_exports, {
-  WebSocketClient: () => WebSocketClient
+  WebSocketClient: () => WebSocketClient,
+  clients: () => clients
 });
 module.exports = __toCommonJS(WebSocketClient_exports);
 var import_Runtime = require("../../utils/Runtime.cjs");
 const import_meta = {};
 const requireDynamic = (0, import_Runtime.getRequire)(import_meta.url);
 const WebSocketStateEnum = {
+  CONNECTING: 0,
+  OPEN: 1,
+  CLOSING: 2,
+  CLOSED: 3
+};
+const WebSocketStateEvent = {
   OPEN: "open",
   CLOSE: "close",
-  ERROR: "error"
+  ERROR: "error",
+  MESSAGE: "message"
 };
 let WebSocket = null;
+const clients = {};
 class WebSocketClient {
   /**
    * @param {string} url
@@ -37,45 +46,14 @@ class WebSocketClient {
    */
   constructor(url, options) {
     this.url = url;
-    this.instance = null;
-    this.isConnected = false;
-    this.isDisconnectedAfterMessage = options?.isDisconnectedAfterMessage ?? true;
+    this.isDisconnectedAfterMessage = options?.isDisconnectedAfterMessage ?? false;
   }
-  /**
-   * Connects to the WebSocket server.
-   * @async
-   * @returns {Promise<wsClient>} - A promise that resolves when the connection is established.
-   */
-  async connect() {
-    if (!WebSocket) {
-      if ((0, import_Runtime.isNodejsRuntime)()) {
-        try {
-          WebSocket = requireDynamic("ws");
-        } catch (error) {
-          if (typeof error === "object" && error && "code" in error && error.code === "MODULE_NOT_FOUND") {
-            throw new Error("ws module not found. Please install it using npm install ws");
-          }
-          throw error;
-        }
-      }
-    }
-    return new Promise((resolve, reject) => {
-      if (!WebSocket) {
-        reject(new Error("ws client is null"));
-        return;
-      }
-      const client = new WebSocket(this.url);
-      client.on(WebSocketStateEnum.OPEN, () => {
-        this.instance = client;
-        resolve(client);
-      });
-      client.on(WebSocketStateEnum.ERROR, (error) => {
-        reject(error);
-      });
-      client.on(WebSocketStateEnum.CLOSE, () => {
-        reject(new Error("Connection closed before receiving message"));
-      });
-    });
+  /** @type {wsClient | null} */
+  get instance() {
+    return clients[this.url] || null;
+  }
+  get isConnected() {
+    return this.instance ? this.instance?.readyState === WebSocketStateEnum.OPEN : false;
   }
   /**
    * Sends messageArray through websocket connection
@@ -85,21 +63,36 @@ class WebSocketClient {
    */
   send(messageArray) {
     return new Promise((resolve, reject) => {
-      ;
-      (this.instance ? Promise.resolve(this.instance) : this._connect()).then((client) => {
+      const client = this.instance;
+      if (client) {
         client.send(
           /** @type {any} */
           messageArray
         );
-        client.on("message", (message) => {
+        const messageHandler = (message) => {
           resolve(message);
           if (this.isDisconnectedAfterMessage) {
             this.disconnect();
           }
-        });
-      }).catch((error) => {
-        reject(error);
-      });
+          client.removeListener(WebSocketStateEvent.MESSAGE, messageHandler);
+        };
+        client.on(WebSocketStateEvent.MESSAGE, messageHandler);
+      } else {
+        this._connect().then((ws) => {
+          ws.send(
+            /** @type {any} */
+            messageArray
+          );
+          const messageHandler = (message) => {
+            resolve(message);
+            if (this.isDisconnectedAfterMessage) {
+              this.disconnect();
+            }
+            ws.removeListener(WebSocketStateEvent.MESSAGE, messageHandler);
+          };
+          ws.on(WebSocketStateEvent.MESSAGE, messageHandler);
+        }).catch(reject);
+      }
     });
   }
   /**
@@ -108,9 +101,8 @@ class WebSocketClient {
   disconnect() {
     if (this.instance) {
       this.instance.close();
-      this.instance = null;
+      delete clients[this.url];
     }
-    this.isConnected = false;
   }
   /**
    * Connects to the WebSocket server.
@@ -119,36 +111,31 @@ class WebSocketClient {
    * @returns {Promise<wsClient>} - A promise that resolves when the connection is established.
    */
   _connect() {
-    if (!WebSocket) {
-      if ((0, import_Runtime.isNodejsRuntime)()) {
-        try {
-          WebSocket = requireDynamic("ws");
-        } catch (error) {
-          if (
-            /** @type {{ code?: string }} */
-            error.code === "MODULE_NOT_FOUND"
-          ) {
-            throw new Error("ws module not found. Please install it using npm install ws");
-          }
-          throw error;
+    if (!WebSocket && (0, import_Runtime.isNodejsRuntime)()) {
+      try {
+        WebSocket = requireDynamic("ws");
+      } catch (error) {
+        if (
+          /** @type {{ code?: string }} */
+          error.code === "MODULE_NOT_FOUND"
+        ) {
+          throw new Error("ws module not found. Please install it using npm install ws");
         }
+        throw error;
       }
     }
     return new Promise((resolve, reject) => {
       if (!WebSocket) {
-        reject(new Error("ws client is null"));
-        return;
+        return reject(new Error("ws client is null"));
       }
-      const client = new WebSocket(this.url);
-      client.on(WebSocketStateEnum.OPEN, () => {
-        this.isConnected = true;
-        this.instance = client;
-        resolve(client);
-      });
-      client.on(WebSocketStateEnum.ERROR, (error) => {
-        reject(error);
-      });
-      client.on(WebSocketStateEnum.CLOSE, () => {
+      let client = clients[this.url];
+      if (!client) {
+        client = new WebSocket(this.url);
+        clients[this.url] = client;
+      }
+      client.on(WebSocketStateEvent.OPEN, () => resolve(client));
+      client.on(WebSocketStateEvent.ERROR, (error) => reject(error));
+      client.on(WebSocketStateEvent.CLOSE, () => {
         reject(new Error("Connection closed before receiving message"));
       });
     });
@@ -156,5 +143,6 @@ class WebSocketClient {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  WebSocketClient
+  WebSocketClient,
+  clients
 });