javonet-nodejs-sdk 2.5.7 → 2.5.9

package/lib/sdk/RuntimeContext.js

@@ -1,11 +1,6 @@
-const Interpreter = require("../core/interpreter/Interpreter");
-const Command = require("../utils/Command");
-const CommandType = require("../utils/CommandType");
-const InvocationContext = require("./InvocationContext");
-const ConnectionType = require("../utils/ConnectionType");
-const GeneratorHandler = require("../core/generator/handler/GeneratorHandler");
-const ExceptionThrower = require("../utils/exception/ExceptionThrower");
-
+const { ConnectionType, CommandType, ExceptionThrower, Command, Interpreter } = require('@javonet/core')
+const GeneratorHandler = require('../core/generator/handler/GeneratorHandler')
+const { InvocationWsContext, InvocationContext } = require('./InvocationContext')
 
 /**
  * Represents a single context which allows interaction with a selected technology.
@@ -19,60 +14,62 @@ const ExceptionThrower = require("../utils/exception/ExceptionThrower");
  * @class
  */
 class RuntimeContext {
-    static memoryRuntimeContexts = new Map();
-    static networkRuntimeContexts = new Map();
-    static webSocketRuntimeContexts = new Map();
-    #currentCommand;
-    #responseCommand;
-    #interpreter;
-    #generatorHandler;
+    static memoryRuntimeContexts = new Map()
+    static networkRuntimeContexts = new Map()
+    static webSocketRuntimeContexts = new Map()
+    #currentCommand
+    #responseCommand
+    #interpreter
+    // eslint-disable-next-line no-unused-private-class-members
+    #generatorHandler
 
     constructor(runtimeName, connectionData) {
-        this.runtimeName = runtimeName;
-        this.connectionData = connectionData;
-        this.#currentCommand = null;
-        this.#responseCommand = null;
-        this.#interpreter = new Interpreter();
-        this.#generatorHandler = new GeneratorHandler();
+        this.runtimeName = runtimeName
+        this.connectionData = connectionData
+        this.#currentCommand = null
+        this.#responseCommand = null
+        this.#interpreter = new Interpreter()
+        this.#generatorHandler = new GeneratorHandler()
     }
 
     static getInstance(runtimeName, connectionData) {
         switch (connectionData.connectionType) {
             case ConnectionType.IN_MEMORY:
                 if (runtimeName in RuntimeContext.memoryRuntimeContexts) {
-                    let runtimeCtx = RuntimeContext.memoryRuntimeContexts[runtimeName];
-                    runtimeCtx.currentCommand = null;
-                    return runtimeCtx;
+                    let runtimeCtx = RuntimeContext.memoryRuntimeContexts[runtimeName]
+                    runtimeCtx.currentCommand = null
+                    return runtimeCtx
                 } else {
-                    let runtimeCtx = new RuntimeContext(runtimeName, connectionData);
-                    RuntimeContext.memoryRuntimeContexts[runtimeName] = runtimeCtx;
-                    return runtimeCtx;
+                    let runtimeCtx = new RuntimeContext(runtimeName, connectionData)
+                    RuntimeContext.memoryRuntimeContexts[runtimeName] = runtimeCtx
+                    return runtimeCtx
                 }
-            case ConnectionType.TCP:
-                let key1 = runtimeName + JSON.stringify(connectionData);
+            case ConnectionType.TCP: {
+                let key1 = runtimeName + JSON.stringify(connectionData)
                 if (key1 in RuntimeContext.networkRuntimeContexts) {
-                    let runtimeCtx = RuntimeContext.networkRuntimeContexts[key1];
-                    runtimeCtx.currentCommand = null;
-                    return runtimeCtx;
+                    let runtimeCtx = RuntimeContext.networkRuntimeContexts[key1]
+                    runtimeCtx.currentCommand = null
+                    return runtimeCtx
                 } else {
-                    let runtimeCtx = new RuntimeContext(runtimeName, connectionData);
-                    RuntimeContext.networkRuntimeContexts[key1] = runtimeCtx;
-                    return runtimeCtx;
+                    let runtimeCtx = new RuntimeContext(runtimeName, connectionData)
+                    RuntimeContext.networkRuntimeContexts[key1] = runtimeCtx
+                    return runtimeCtx
                 }
-            case ConnectionType.WEB_SOCKET:
-                let key2 = runtimeName + JSON.stringify(connectionData);
+            }
+            case ConnectionType.WEB_SOCKET: {
+                let key2 = runtimeName + JSON.stringify(connectionData)
                 if (key2 in RuntimeContext.webSocketRuntimeContexts) {
-                    let runtimeCtx = RuntimeContext.webSocketRuntimeContexts[key2];
-                    runtimeCtx.currentCommand = null;
-                    return runtimeCtx;
+                    let runtimeCtx = RuntimeContext.webSocketRuntimeContexts[key2]
+                    runtimeCtx.currentCommand = null
+                    return runtimeCtx
                 } else {
-                    let runtimeCtx = new RuntimeContext(runtimeName, connectionData);
-                    RuntimeContext.webSocketRuntimeContexts[key2] = runtimeCtx;
-                    return runtimeCtx;
+                    let runtimeCtx = new RuntimeContext(runtimeName, connectionData)
+                    RuntimeContext.webSocketRuntimeContexts[key2] = runtimeCtx
+                    return runtimeCtx
                 }
-
+            }
             default:
-                throw new Error("Invalid connection type");
+                throw new Error('Invalid connection type')
         }
     }
 
@@ -86,13 +83,10 @@ class RuntimeContext {
      * @method
      */
     execute() {
-        this.#responseCommand = this.#interpreter.execute(
-            this.#currentCommand,
-            this.connectionData
-        );
-        this.#currentCommand = null;
+        this.#responseCommand = this.#interpreter.execute(this.#currentCommand, this.connectionData)
+        this.#currentCommand = null
         if (this.#responseCommand.commandType === CommandType.Exception) {
-            throw ExceptionThrower.throwException(this.#responseCommand);
+            throw ExceptionThrower.throwException(this.#responseCommand)
         }
     }
 
@@ -107,14 +101,10 @@ class RuntimeContext {
      * @method
      */
     loadLibrary(libraryPath) {
-        let localCommand = new Command(
-            this.runtimeName,
-            CommandType.LoadLibrary,
-            [libraryPath]
-        );
-        this.#currentCommand = this.#buildCommand(localCommand);
-        this.execute();
-        return this;
+        let localCommand = new Command(this.runtimeName, CommandType.LoadLibrary, [libraryPath])
+        this.#currentCommand = this.#buildCommand(localCommand)
+        this.execute()
+        return this
     }
 
     /**
@@ -125,13 +115,16 @@ class RuntimeContext {
      * @method
      */
     getType(typeName, ...args) {
-        let localCommand = new Command(this.runtimeName, CommandType.GetType, [typeName, ...args]);
-        this.#currentCommand = null;
-        return new InvocationContext(
-            this.runtimeName,
-            this.connectionData,
-            this.#buildCommand(localCommand)
-        );
+        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, this.#buildCommand(localCommand))
     }
 
     /**
@@ -144,13 +137,16 @@ class RuntimeContext {
      * @method
      */
     cast(...args) {
-        let localCommand = new Command(this.runtimeName, CommandType.Cast, args);
-        this.#currentCommand = null;
-        return new InvocationContext(
-            this.runtimeName,
-            this.connectionData,
-            this.#buildCommand(localCommand)
-        );
+        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, this.#buildCommand(localCommand))
     }
 
     /**
@@ -163,17 +159,16 @@ class RuntimeContext {
      * @method
      */
     getEnumItem(...args) {
-        let localCommand = new Command(
-            this.runtimeName,
-            CommandType.GetEnumItem,
-            args
-        );
-        this.#currentCommand = null;
-        return new InvocationContext(
-            this.runtimeName,
-            this.connectionData,
-            this.#buildCommand(localCommand)
-        );
+        let localCommand = new Command(this.runtimeName, CommandType.GetEnumItem, 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, this.#buildCommand(localCommand))
     }
 
     /**
@@ -186,13 +181,16 @@ class RuntimeContext {
      * @method
      */
     asRef(...args) {
-        let localCommand = new Command(this.runtimeName, CommandType.AsRef, args);
-        this.#currentCommand = null;
-        return new InvocationContext(
-            this.runtimeName,
-            this.connectionData,
-            this.#buildCommand(localCommand)
-        );
+        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, this.#buildCommand(localCommand))
     }
 
     /**
@@ -205,52 +203,50 @@ class RuntimeContext {
      * @method
      */
     asOut(...args) {
-        let localCommand = new Command(this.runtimeName, CommandType.AsOut, args);
-        this.#currentCommand = null;
-        return new InvocationContext(
-            this.runtimeName,
-            this.connectionData,
-            this.#buildCommand(localCommand)
-        );
+        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, this.#buildCommand(localCommand))
     }
 
     #buildCommand = function (command) {
         for (let i = 0; i < command.payload.length; i++) {
-            command.payload[i] = this.#encapsulatePayloadItem(command.payload[i]);
+            command.payload[i] = this.#encapsulatePayloadItem(command.payload[i])
         }
-        return command.prependArgToPayload(this.#currentCommand);
-    };
+        return command.prependArgToPayload(this.#currentCommand)
+    }
 
     #encapsulatePayloadItem = function (payloadItem) {
-        if (typeof payloadItem === "Command" || payloadItem instanceof Command) {
+        // eslint-disable-next-line valid-typeof
+        if (typeof payloadItem === 'Command' || payloadItem instanceof Command) {
             for (let i = 0; i < payloadItem.payload.length; i++) {
-                payloadItem.payload[i] = this.#encapsulatePayloadItem(
-                    payloadItem.payload[i]
-                );
+                payloadItem.payload[i] = this.#encapsulatePayloadItem(payloadItem.payload[i])
             }
-            return payloadItem;
-        } else if (
-            typeof payloadItem === "InvocationContext" ||
-            payloadItem instanceof InvocationContext
-        ) {
-            return payloadItem.get_current_command();
+            return payloadItem
+            // eslint-disable-next-line valid-typeof
+        } else if (typeof payloadItem === 'InvocationContext' || payloadItem instanceof InvocationContext) {
+            return payloadItem.get_current_command()
         } else if (payloadItem instanceof Array) {
             for (let i = 0; i < payloadItem.length; i++) {
-                payloadItem[i] = this.#encapsulatePayloadItem(payloadItem[i]);
+                payloadItem[i] = this.#encapsulatePayloadItem(payloadItem[i])
             }
-            return new Command(this.runtimeName, CommandType.Array, payloadItem);
+            return new Command(this.runtimeName, CommandType.Array, payloadItem)
         } else {
-            return new Command(this.runtimeName, CommandType.Value, [payloadItem]);
+            return new Command(this.runtimeName, CommandType.Value, [payloadItem])
         }
-    };
+    }
 
     healthCheck() {
-        let localCommand = new Command(this.runtimeName, CommandType.Value, ["health_check"]);
-        this.#currentCommand = this.#buildCommand(localCommand);
-        this.execute();
-    };
-
-
+        let localCommand = new Command(this.runtimeName, CommandType.Value, ['health_check'])
+        this.#currentCommand = this.#buildCommand(localCommand)
+        this.execute()
+    }
 }
 
-module.exports = RuntimeContext;
+module.exports = RuntimeContext

package/lib/sdk/RuntimeFactory.js

@@ -1,5 +1,5 @@
-const Runtime = require("../utils/RuntimeName")
-const RuntimeContext = require("./RuntimeContext")
+const { RuntimeName } = require('@javonet/core')
+const RuntimeContext = require('./RuntimeContext')
 
 /**
  * The RuntimeFactory class provides methods for creating runtime contexts.
@@ -17,7 +17,7 @@ class RuntimeFactory {
      * @see [Javonet Guides](https://www.javonet.com/guides/v2/javascript/foundations/runtime-context)
      */
     clr() {
-        return RuntimeContext.getInstance(Runtime.Clr, this.connectionData)
+        return RuntimeContext.getInstance(RuntimeName.Clr, this.connectionData)
     }
 
     /**
@@ -26,7 +26,7 @@ class RuntimeFactory {
      * @see [Javonet Guides](https://www.javonet.com/guides/v2/javascript/foundations/runtime-context)
      */
     jvm() {
-        return RuntimeContext.getInstance(Runtime.Jvm, this.connectionData)
+        return RuntimeContext.getInstance(RuntimeName.Jvm, this.connectionData)
     }
 
     /**
@@ -35,7 +35,7 @@ class RuntimeFactory {
      * @see [Javonet Guides](https://www.javonet.com/guides/v2/javascript/foundations/runtime-context)
      */
     netcore() {
-        return RuntimeContext.getInstance(Runtime.Netcore, this.connectionData)
+        return RuntimeContext.getInstance(RuntimeName.Netcore, this.connectionData)
     }
 
     /**
@@ -44,7 +44,7 @@ class RuntimeFactory {
      * @see [Javonet Guides](https://www.javonet.com/guides/v2/javascript/foundations/runtime-context)
      */
     perl() {
-        return RuntimeContext.getInstance(Runtime.Perl, this.connectionData)
+        return RuntimeContext.getInstance(RuntimeName.Perl, this.connectionData)
     }
 
     /**
@@ -53,7 +53,7 @@ class RuntimeFactory {
      * @see [Javonet Guides](https://www.javonet.com/guides/v2/javascript/foundations/runtime-context)
      */
     python() {
-        return RuntimeContext.getInstance(Runtime.Python, this.connectionData)
+        return RuntimeContext.getInstance(RuntimeName.Python, this.connectionData)
     }
 
     /**
@@ -62,7 +62,7 @@ class RuntimeFactory {
      * @see [Javonet Guides](https://www.javonet.com/guides/v2/javascript/foundations/runtime-context)
      */
     ruby() {
-        return RuntimeContext.getInstance(Runtime.Ruby, this.connectionData)
+        return RuntimeContext.getInstance(RuntimeName.Ruby, this.connectionData)
     }
 
     /**
@@ -71,8 +71,8 @@ class RuntimeFactory {
      * @see [Javonet Guides](https://www.javonet.com/guides/v2/javascript/foundations/runtime-context)
      */
     nodejs() {
-        return RuntimeContext.getInstance(Runtime.Nodejs, this.connectionData)
+        return RuntimeContext.getInstance(RuntimeName.Nodejs, this.connectionData)
     }
 }
 
-module.exports = RuntimeFactory
+module.exports = RuntimeFactory

package/lib/sdk/tools/JsonFileResolver.js

@@ -1,83 +1,101 @@
-const fs = require('fs');
+const fs = require('fs')
+
+function hasOwnProperty(obj, key) {
+    return Object.prototype.hasOwnProperty.call(obj, key)
+}
 
 class JsonFileResolver {
     constructor(path) {
-        this.path = path;
+        this.path = path
         try {
-            const data = fs.readFileSync(this.path, 'utf8');
-            this.jsonObject = JSON.parse(data);
+            const data = fs.readFileSync(this.path, 'utf8')
+            this.jsonObject = JSON.parse(data)
+            // eslint-disable-next-line no-unused-vars
         } catch (err) {
-            throw new Error(`Configuration file ${this.path} not found. Please check your configuration file.`);
+            throw new Error(
+                `Configuration file ${this.path} not found. Please check your configuration file.`
+            )
         }
     }
-
     getLicenseKey() {
-        if (!this.jsonObject.hasOwnProperty('licenseKey')) {
-            throw new Error("License key not found in configuration file. Please check your configuration file.");
+        if (!hasOwnProperty(this.jsonObject, 'licenseKey')) {
+            throw new Error(
+                'License key not found in configuration file. Please check your configuration file.'
+            )
         }
-        return this.jsonObject.licenseKey;
+        return this.jsonObject.licenseKey
     }
 
     getRuntimes() {
-        return this.jsonObject.runtimes;
+        return this.jsonObject.runtimes
     }
 
     getRuntime(runtimeName, configName) {
-        const runtimes = this.getRuntimes();
-        if (runtimes.hasOwnProperty(runtimeName)) {
-            const runtime = runtimes[runtimeName];
+        const runtimes = this.getRuntimes()
+        if (hasOwnProperty(runtimes, runtimeName)) {
+            const runtime = runtimes[runtimeName]
             if (Array.isArray(runtime)) {
                 for (let item of runtime) {
                     if (item.name === configName) {
-                        return item;
+                        return item
                     }
                 }
             } else if (runtime.name === configName) {
-                return runtime;
+                return runtime
             }
         }
-        throw new Error(`Runtime config ${configName} not found in configuration file for runtime ${runtimeName}. Please check your configuration file.`);
+        throw new Error(
+            `Runtime config ${configName} not found in configuration file for runtime ${runtimeName}. Please check your configuration file.`
+        )
     }
 
     getChannel(runtimeName, configName) {
-        const runtime = this.getRuntime(runtimeName, configName);
-        if (!runtime.hasOwnProperty('channel')) {
-            throw new Error(`Channel key not found in configuration file for config ${configName}. Please check your configuration file.`);
+        const runtime = this.getRuntime(runtimeName, configName)
+        if (!hasOwnProperty(runtime, 'channel')) {
+            throw new Error(
+                `Channel key not found in configuration file for config ${configName}. Please check your configuration file.`
+            )
         }
-        return runtime.channel;
+        return runtime.channel
     }
 
     getChannelType(runtimeName, configName) {
-        const channel = this.getChannel(runtimeName, configName);
-        if (!channel.hasOwnProperty('type')) {
-            throw new Error(`Channel type not found in configuration file for config ${configName}. Please check your configuration file.`);
+        const channel = this.getChannel(runtimeName, configName)
+        if (!hasOwnProperty(channel, 'type')) {
+            throw new Error(
+                `Channel type not found in configuration file for config ${configName}. Please check your configuration file.`
+            )
         }
-        return channel.type;
+        return channel.type
     }
 
     getChannelHost(runtimeName, configName) {
-        const channel = this.getChannel(runtimeName, configName);
-        if (!channel.hasOwnProperty('host')) {
-            throw new Error(`Channel host not found in configuration file for config ${configName}. Please check your configuration file.`);
+        const channel = this.getChannel(runtimeName, configName)
+        if (!hasOwnProperty(channel, 'host')) {
+            throw new Error(
+                `Channel host not found in configuration file for config ${configName}. Please check your configuration file.`
+            )
         }
-        return channel.host;
+        return channel.host
     }
 
     getChannelPort(runtimeName, configName) {
-        const channel = this.getChannel(runtimeName, configName);
-        if (!channel.hasOwnProperty('port')) {
-            throw new Error(`Channel port not found in configuration file for config ${configName}. Please check your configuration file.`);
+        const channel = this.getChannel(runtimeName, configName)
+        if (!hasOwnProperty(channel, 'port')) {
+            throw new Error(
+                `Channel port not found in configuration file for config ${configName}. Please check your configuration file.`
+            )
         }
-        return channel.port;
+        return channel.port
     }
 
     getModules(runtimeName, configName) {
-        const runtime = this.getRuntime(runtimeName, configName);
-        if (runtime.hasOwnProperty('modules')) {
-            return runtime.modules;
+        const runtime = this.getRuntime(runtimeName, configName)
+        if (hasOwnProperty(runtime, 'modules')) {
+            return runtime.modules
         }
-        return "";
+        return ''
     }
 }
 
-module.exports = JsonFileResolver;
+module.exports = JsonFileResolver

package/lib/sdk/tools/SdkExceptionHelper.js

@@ -1,23 +1,27 @@
-const https = require('https');
-const os = require('os');
-const packageJson = require('../../../package.json');
+const https = require('https')
+const os = require('os')
+// const packageJson = require('../../../package.json')
 
+const address = 'https://dc.services.visualstudio.com/v2/track'
 
-const address = 'https://dc.services.visualstudio.com/v2/track';
-
+/**
+ *
+ * @param {any} e
+ * @param {string} licenseKey
+ */
 function sendExceptionToAppInsights(e, licenseKey) {
     return new Promise((resolve, reject) => {
         try {
-            const instrumentationKey = '2c751560-90c8-40e9-b5dd-534566514723';
-            const javonetVersion = packageJson.version ? packageJson.version : '2.0.0';
-            
-            const nodeName = os.hostname();
-            const operationName = 'JavonetSdkException';
-            const osName = os.platform();
-            const callingRuntimeName = 'Nodejs';
-            const eventMessage = e.message;
+            const instrumentationKey = '2c751560-90c8-40e9-b5dd-534566514723'
+            // const javonetVersion = packageJson.version ? packageJson.version : '2.0.0'
+            const javonetVersion = '2.0.0'
+            const nodeName = os.hostname()
+            const operationName = 'JavonetSdkException'
+            const osName = os.platform()
+            const callingRuntimeName = 'Nodejs'
+            const eventMessage = e.message
 
-            const nowGMT = new Date().toISOString();
+            const nowGMT = new Date().toISOString()
             const jsonPayload = JSON.stringify({
                 name: 'AppEvents',
                 time: nowGMT,
@@ -28,7 +32,7 @@ function sendExceptionToAppInsights(e, licenseKey) {
                     'ai.operation.id': '0',
                     'ai.operation.parentId': '0',
                     'ai.operation.name': operationName,
-                    'ai.internal.sdkVersion': 'javonet:'+ javonetVersion,
+                    'ai.internal.sdkVersion': 'javonet:' + javonetVersion,
                     'ai.internal.nodeName': nodeName,
                 },
                 data: {
@@ -43,7 +47,7 @@ function sendExceptionToAppInsights(e, licenseKey) {
                         },
                     },
                 },
-            });
+            })
 
             const options = {
                 method: 'POST',
@@ -51,27 +55,25 @@ function sendExceptionToAppInsights(e, licenseKey) {
                     'Content-Type': 'application/json',
                     'Content-Length': jsonPayload.length,
                 },
-            };
+            }
 
             const req = https.request(address, options, (res) => {
-                console.log('POST Response Code ::', res.statusCode);
-                resolve(res.statusCode);
-            });
+                console.log('POST Response Code ::', res.statusCode)
+                resolve(res.statusCode)
+            })
 
             req.on('error', (error) => {
-                console.error(error);
-                reject(error);
-            });
+                console.error(error)
+                reject(error)
+            })
 
-            req.write(jsonPayload);
-            req.end();
+            req.write(jsonPayload)
+            req.end()
         } catch (error) {
-            console.error(error);
-            reject(error);
+            console.error(error)
+            reject(error)
         }
-    });
+    })
 }
 
-module.exports = {
-    sendExceptionToAppInsights,
-};
+module.exports = sendExceptionToAppInsights