javonet-nodejs-sdk 2.5.6 → 2.5.8

package/lib/core/interpreter/Interpreter.js

@@ -19,6 +19,10 @@ class Interpreter {
                 const wsClient = new WebSocketClient(connectionData.hostname, null)
 
                 const responseByteArray = await wsClient.send(messageByteArray)
+                if (!responseByteArray) {
+                    // TODO: handle error exception log?
+                    return []
+                } 
                 return new CommandDeserializer(responseByteArray).deserialize()
             }
             else {

package/lib/core/webSocketClient/WebSocketClient.js

@@ -42,19 +42,19 @@ class WebSocketClient {
   }
 
   /**
-   * Sends data through websocket connection
+   * Sends messageArray through websocket connection
    * @async
-   * @param {Buffer|ArrayBuffer|Buffer[]} data
+   * @param {Buffer|ArrayBuffer|Buffer[]} messageArray
    * @returns {Promise<Buffer|ArrayBuffer|Buffer[]>}
    */
-  send(data) {
+  send(messageArray) {
     return new Promise((resolve, reject) => {
       try {
-        if (this.isConnected) {
-          this._sendMessage(data, resolve, reject);
+        if (this.isConnected) { 
+          this._sendMessage(messageArray, resolve, reject);
         } else {
           this._connect().then(() => {
-            this._sendMessage(data, resolve, reject);
+            this._sendMessage(messageArray, resolve, reject);
           });
         }
       } catch (error) {
@@ -81,6 +81,7 @@ class WebSocketClient {
    */
   _connect() {
     return new Promise((resolve, reject) => {
+      console.log('[WebSocketClient] init');
       this.instance = new WebSocket(this.url);
 
       this.instance.on(WebSocketStateEnum.OPEN, () => {
@@ -91,7 +92,7 @@ class WebSocketClient {
 
       this.instance.on(WebSocketStateEnum.ERROR, (error) => {
         console.log('[WebSocketClient] error', error);
-        reject(error);
+        reject(null);
       });
 
       this.instance.on(WebSocketStateEnum.CLOSE, () => {

package/lib/sdk/InvocationContext.js

@@ -519,4 +519,4 @@ class InvocationWsContext extends InvocationContext {
     }
 }
 
-module.exports = InvocationContext;
+module.exports = { InvocationContext, InvocationWsContext};

package/lib/sdk/Javonet.js

@@ -7,7 +7,6 @@ const WsConnectionData = require("../utils/connectionData/WsConnectionData");
 const SDKExceptionHelper = require("./tools/SdkExceptionHelper")
 const RuntimeLogger = require("../utils/RuntimeLogger");
 
-
 //static constructor not supported in nodeJS 12.20
 Transmitter.initialize()
 //SDKExceptionHelper.sendExceptionToAppInsights("SdkMessage", "Javonet SDK initialized");
@@ -90,4 +89,4 @@ module.exports = {
     Javonet,
     TcpConnectionData,
     WsConnectionData
-};
+};

package/lib/sdk/RuntimeContext.js

@@ -1,7 +1,7 @@
 const Interpreter = require("../core/interpreter/Interpreter");
 const Command = require("../utils/Command");
 const CommandType = require("../utils/CommandType");
-const InvocationContext = require("./InvocationContext");
+const { InvocationContext, InvocationWsContext } = require('./InvocationContext');
 const ConnectionType = require("../utils/ConnectionType");
 const GeneratorHandler = require("../core/generator/handler/GeneratorHandler");
 const ExceptionThrower = require("../utils/exception/ExceptionThrower");
@@ -127,6 +127,13 @@ class RuntimeContext {
     getType(typeName, ...args) {
         let localCommand = new Command(this.runtimeName, CommandType.GetType, [typeName, ...args]);
         this.#currentCommand = null;
+        if (this.connectionData.connectionType === ConnectionType.WEB_SOCKET) {
+            return new InvocationWsContext(
+                this.runtimeName,
+                this.connectionData,
+                this.#buildCommand(localCommand)
+            ); 
+        }
         return new InvocationContext(
             this.runtimeName,
             this.connectionData,
@@ -146,6 +153,13 @@ class RuntimeContext {
     cast(...args) {
         let localCommand = new Command(this.runtimeName, CommandType.Cast, args);
         this.#currentCommand = null;
+        if (this.connectionData.connectionType === ConnectionType.WEB_SOCKET) {
+            return new InvocationWsContext(
+                this.runtimeName,
+                this.connectionData,
+                this.#buildCommand(localCommand)
+            ); 
+        }
         return new InvocationContext(
             this.runtimeName,
             this.connectionData,
@@ -169,6 +183,13 @@ class RuntimeContext {
             args
         );
         this.#currentCommand = null;
+        if (this.connectionData.connectionType === ConnectionType.WEB_SOCKET) {
+            return new InvocationWsContext(
+                this.runtimeName,
+                this.connectionData,
+                this.#buildCommand(localCommand)
+            ); 
+        }
         return new InvocationContext(
             this.runtimeName,
             this.connectionData,
@@ -188,6 +209,13 @@ class RuntimeContext {
     asRef(...args) {
         let localCommand = new Command(this.runtimeName, CommandType.AsRef, args);
         this.#currentCommand = null;
+        if (this.connectionData.connectionType === ConnectionType.WEB_SOCKET) {
+            return new InvocationWsContext(
+                this.runtimeName,
+                this.connectionData,
+                this.#buildCommand(localCommand)
+            );
+        }
         return new InvocationContext(
             this.runtimeName,
             this.connectionData,
@@ -207,6 +235,13 @@ class RuntimeContext {
     asOut(...args) {
         let localCommand = new Command(this.runtimeName, CommandType.AsOut, args);
         this.#currentCommand = null;
+        if (this.connectionData.connectionType === ConnectionType.WEB_SOCKET) {
+            return new InvocationWsContext(
+                this.runtimeName,
+                this.connectionData,
+                this.#buildCommand(localCommand)
+            ); 
+        }
         return new InvocationContext(
             this.runtimeName,
             this.connectionData,

package/package.json

@@ -1,28 +1,33 @@
 {
   "name": "javonet-nodejs-sdk",
-  "version": "2.5.6",
+  "version": "2.5.8",
   "description": "Javonet allows you to reference and use modules or packages written in (Java/Kotlin/Groovy/Clojure, C#/VB.NET, Ruby, Perl, Python, JavaScript/TypeScript) like they were created in your technology. It works on Linux/Windows and MacOS for applications created in JVM, CLR/Netcore, Perl, Python, Ruby, NodeJS, C++ or GoLang and gives you unparalleled freedom and flexibility with native performance in building your mixed-technologies products. Let it be accessing best AI or cryptography libraries, devices SDKs, legacy client modules, internal custom packages or anything from public repositories available on NPM, Nuget, PyPI, Maven/Gradle, RubyGems or GitHub. Get free from programming languages barriers today! For more information check out our guides at https://www.javonet.com/guides/v2/",
   "main": "lib/sdk/Javonet.js",
+  "types": "types/sdk/Javonet.d.ts",
   "keywords": [],
   "author": "SdNCenter Sp. z o. o.",
   "license": "ISC",
   "devDependencies": {
+    "@babel/core": "^7.26.0",
+    "@babel/plugin-transform-class-properties": "^7.25.9",
+    "@babel/plugin-transform-runtime": "^7.25.9",
+    "@babel/preset-env": "^7.26.0",
     "@jest/globals": "^29.7.0",
     "jest": "^29.7.0",
     "jest-junit-reporter": "^1.1.0",
-    "prettier": "^3.3.3"
+    "prettier": "^3.3.3",
+    "typescript": "^5.6.3"
   },
   "dependencies": {
-    "@babel/core": "^7.24.7",
-    "@babel/plugin-transform-class-properties": "^7.24.7",
-    "@vercel/ncc": "^0.38.1",
-    "node-gyp": "^10.1.0",
+    "@vercel/ncc": "^0.38.3",
+    "node-gyp": "^10.2.0",
     "reserved-words": "^0.1.2",
     "text-decoding": "^1.0.0",
     "uuid": "^10.0.0",
     "ws": "^8.18.0"
   },
   "scripts": {
+    "build:types": "tsc",
     "test": "jest tests/unitTests tests/functionalTests tests/performanceTests  --maxWorkers=3 --colors",
     "test:watch": "jest tests/unitTests tests/functionalTests tests/performanceTests  --maxWorkers=3 --colors --watch",
     "test:unit": "jest tests/unitTests  --maxWorkers=3 --colors --outputName=\"test-report.xml\"  -t=\"(Unit)\" --coverage ",

package/tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "allowJs": true,
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "outDir": "./types",
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "module": "commonjs",
+    "target": "es6"
+  },
+  "include": ["lib/**/*.js"],
+  "exclude": ["node_modules"]
+}