javonet-nodejs-sdk 2.1.0 → 2.1.2

package/Binaries/Nodejs/Linux/X64/core/handler/AbstractHandler.js

@@ -25,6 +25,17 @@ class AbstractHandler {
             }
         }
     }
+
+    process_stack_trace(error, class_name) {
+        let stackTraceArray = error.stack.split('\n').map(frame => frame.trim());
+        stackTraceArray.forEach((str, index) => {
+            if (str.includes(class_name)) {
+                stackTraceArray = stackTraceArray.slice(0, index).filter((s) => !s.includes(class_name));
+            }
+        });
+        error.stack = stackTraceArray.join(" \n ")
+        return error
+    }
 }
 
 module.exports = AbstractHandler

package/Binaries/Nodejs/Linux/X64/core/handler/ArrayGetItemHandler.js

@@ -1,11 +1,15 @@
-const AbstractHandler =  require("./AbstractHandler")
+const AbstractHandler = require("./AbstractHandler")
 
 
 class ArrayGetItemHandler extends AbstractHandler {
     process(command) {
-        let array = command.payload[0]
-        let indexes = command.payload.slice(1)
-        return array[indexes]
+        try {
+            let array = command.payload[0]
+            let indexes = command.payload.slice(1)
+            return array[indexes]
+        } catch (error) {
+            return this.process_stack_trace(error, this.constructor.name)
+        }
     }
 }
 

package/Binaries/Nodejs/Linux/X64/core/handler/ArrayGetRankHandler.js

@@ -1,9 +1,13 @@
-const AbstractHandler =  require("./AbstractHandler")
+const AbstractHandler = require("./AbstractHandler")
 
 
 class ArrayGetRankHandler extends AbstractHandler {
     process(command) {
-        throw new Error("ArrayGetRankHandler not implemented")
+        try {
+            throw new Error("ArrayGetRankHandler not implemented")
+        } catch (error) {
+            return this.process_stack_trace(error, this.constructor.name)
+        }
     }
 }
 

package/Binaries/Nodejs/Linux/X64/core/handler/ArrayGetSizeHandler.js

@@ -1,10 +1,14 @@
-const AbstractHandler =  require("./AbstractHandler")
+const AbstractHandler = require("./AbstractHandler")
 
 
 class ArrayGetSizeHandler extends AbstractHandler {
     process(command) {
-        let array = command.payload[0]
-        return array.length
+        try {
+            let array = command.payload[0]
+            return array.length
+        } catch (error) {
+            return this.process_stack_trace(error, this.constructor.name)
+        }
     }
 }
 

package/Binaries/Nodejs/Linux/X64/core/handler/ArrayHandler.js

@@ -0,0 +1,15 @@
+const AbstractHandler = require("./AbstractHandler")
+
+
+class ArrayHandler extends AbstractHandler {
+    process(command) {
+        try {
+            let array = command.payload
+            return array
+        } catch (error) {
+            return this.process_stack_trace(error, this.constructor.name)
+        }
+    }
+}
+
+module.exports = new ArrayHandler()

package/Binaries/Nodejs/Linux/X64/core/handler/ArraySetItemHandler.js

@@ -1,13 +1,17 @@
-const AbstractHandler =  require("./AbstractHandler")
+const AbstractHandler = require("./AbstractHandler")
 
 
 class ArraySetItemHandler extends AbstractHandler {
     process(command) {
-        let array = command.payload[0]
-        let value = command.payload[1]
-        let indexes = command.payload.slice(2)
-        array[indexes] = value
-        return 0;
+        try {
+            let array = command.payload[0]
+            let value = command.payload[1]
+            let indexes = command.payload.slice(2)
+            array[indexes] = value
+            return 0;
+        } catch (error) {
+            return this.process_stack_trace(error, this.constructor.name)
+        }
     }
 }
 

package/Binaries/Nodejs/Linux/X64/core/handler/CreateClassInstanceHandler.js

@@ -7,7 +7,7 @@ class CreateClassInstanceHandler extends AbstractHandler {
             let methodArguments = command.payload.slice(1)
             return new clazz(...methodArguments)
         } catch (error) {
-            return error
+            return this.process_stack_trace(error, this.constructor.name)
         }
     }
 }

package/Binaries/Nodejs/Linux/X64/core/handler/DestructReferenceHandler.js

@@ -8,8 +8,12 @@ class DestructReferenceHandler extends AbstractHandler {
     }
 
     process(command) {
-        let cache = ReferencesCache.getInstance()
-        return cache.deleteReference(command.payload[0])
+        try {
+            let cache = ReferencesCache.getInstance()
+            return cache.deleteReference(command.payload[0])
+        } catch (error) {
+            return this.process_stack_trace(error, this.constructor.name)
+        }
     }
 }
 

package/Binaries/Nodejs/Linux/X64/core/handler/GetGlobalStaticFieldHandler.js

@@ -17,7 +17,7 @@ class GetGlobalStaticFieldHandler extends AbstractHandler {
             return fieldToGet
 
         } catch (error) {
-            return error
+            return this.process_stack_trace(error, this.constructor.name)
         }
     }
 }

package/Binaries/Nodejs/Linux/X64/core/handler/GetInstanceFieldHandler.js

@@ -13,7 +13,7 @@ class GetInstanceFieldHandler extends AbstractHandler {
 
             return instance[field]
         } catch (error) {
-            return error
+            return this.process_stack_trace(error, this.constructor.name)
         }
     }
 }

package/Binaries/Nodejs/Linux/X64/core/handler/GetStaticFieldHandler.js

@@ -13,7 +13,7 @@ class GetStaticFieldHandler extends AbstractHandler {
 
             return type[field]
         } catch (error) {
-            return error
+            return this.process_stack_trace(error, this.constructor.name)
         }
     }
 }

package/Binaries/Nodejs/Linux/X64/core/handler/GetTypeHandler.js

@@ -17,7 +17,7 @@ class GetTypeHandler extends AbstractHandler {
                 return type
             }
         } catch (error) {
-            return error
+            return this.process_stack_trace(error, this.constructor.name)
         }
 
     }

package/Binaries/Nodejs/Linux/X64/core/handler/Handler.js

@@ -12,10 +12,11 @@ const InvokeInstanceMethodHandler = require('./InvokeInstanceMethodHandler')
 const DestructReferenceHandler = require("./DestructReferenceHandler");
 const CastHandler = require('./CastingHandler')
 const InvokeGlobalMethodHandler = require('./InvokeGlobalMethodHandler')
-const ArrayGetitemHandler = require('./ArrayGetItemHandler')
+const ArrayGetItemHandler = require('./ArrayGetItemHandler')
 const ArrayGetSizeHandler = require('./ArrayGetSizeHandler')
 const ArrayGetRankHandler = require('./ArrayGetRankHandler')
 const ArraySetItemHandler = require('./ArraySetItemHandler')
+const ArrayHandler = require('./ArrayHandler')
 
 
 const ExceptionSerializer = require('../exception/ExceptionSerializer')
@@ -50,10 +51,11 @@ const handlers = {
     [CommandType.InvokeInstanceMethod]: InvokeInstanceMethodHandler,
     [CommandType.InvokeGlobalMethod]: InvokeGlobalMethodHandler,
     [CommandType.DestructReference]: DestructReferenceHandler,
-    [CommandType.ArrayGetItem]: ArrayGetitemHandler,
+    [CommandType.ArrayGetItem]: ArrayGetItemHandler,
     [CommandType.ArrayGetSize]: ArrayGetSizeHandler,
     [CommandType.ArrayGetRank]: ArrayGetRankHandler,
-    [CommandType.ArraySetItem]: ArraySetItemHandler
+    [CommandType.ArraySetItem]: ArraySetItemHandler,
+    [CommandType.Array]: ArrayHandler
 }
 
 class Handler {

package/Binaries/Nodejs/Linux/X64/core/handler/InvokeGlobalMethodHandler.js

@@ -17,7 +17,7 @@ class InvokeGlobalMethodHandler extends AbstractHandler {
             }
             return methodToInvoke(args)
         } catch (error) {
-            return error
+            return this.process_stack_trace(error, this.constructor.name)
         }
     }
 

package/Binaries/Nodejs/Linux/X64/core/handler/InvokeInstanceMethodHandler.js

@@ -14,7 +14,7 @@ class InvokeInstanceMethodHandler extends AbstractHandler {
             return Reflect.apply(instance[methodName], undefined, args)
         }
         catch (error){
-            return error
+            return this.process_stack_trace(error, this.constructor.name)
         }
     }
 }

package/Binaries/Nodejs/Linux/X64/core/handler/InvokeStaticMethodHandler.js

@@ -11,10 +11,9 @@ class InvokeStaticMethodHandler extends AbstractHandler {
             let type = payload[0]
             let methodName = payload[1]
             let args = payload.slice(2)
-
             return Reflect.apply(type[methodName], undefined, args)
         } catch (error) {
-            return error
+            return this.process_stack_trace(error, this.constructor.name)
         }
     }
 }

package/Binaries/Nodejs/Linux/X64/core/handler/LoadLibraryHandler.js

@@ -13,11 +13,11 @@ class LoadLibraryHandler extends AbstractHandler {
         libraryName = libraryName.replace('.js', '')
         try {
             global[libraryName] = require(lib)
-        } catch(error) {
+        } catch (error) {
             try {
                 global[libraryName] = require(`${process.cwd()}/${lib}`)
             } catch {
-                throw `Cannot load ${lib}`
+                return this.process_stack_trace(error, this.constructor.name)
             }
         }
         return 0

package/Binaries/Nodejs/Linux/X64/core/interpreter/Interpreter.js

@@ -20,7 +20,7 @@ class Interpreter {
         else {
             // lazy transmitter loading
             if (!Transmitter) {
-                Transmitter = require('../transmitter/NodejsTransmitter')
+                Transmitter = require('../transmitter/Transmitter')
             }
             responseByteArray = Transmitter.sendCommand(byteMessage)
             return new CommandDecoder(responseByteArray).decode()

package/Binaries/Nodejs/Linux/X64/core/transmitter/{NodejsTransmitter.js → Transmitter.js}

@@ -1,6 +1,6 @@
-const wrapper = require('./NodejsTransmitterWrapper')
+const wrapper = require('./TransmitterWrapper')
 
-class NodejsTransmitter {
+class Transmitter {
 
    static sendCommand(messageArray) {
         return wrapper.sendCommand(messageArray)
@@ -23,4 +23,4 @@ class NodejsTransmitter {
     }
 }
 
-module.exports = NodejsTransmitter
+module.exports = Transmitter

package/Binaries/Nodejs/Linux/X64/core/transmitter/TransmitterWrapper.js

@@ -0,0 +1,25 @@
+let library;
+
+class TransmitterWrapper {
+    static initialize() {
+        if (process.platform === "win32")
+            library = require(`${require('path').resolve(__dirname, '../../../')}/build/Release/JavonetNodejsRuntimeAddon.node`)
+        else if (process.platform === "darwin")
+            library = require(`${require('path').resolve(__dirname, '../../../')}/build/Release/JavonetNodejsRuntimeAddon.node`)
+        else
+            library = require(`${require('path').resolve(__dirname, '../../../')}/build/Release/JavonetNodejsRuntimeAddon.node`)
+        let binariesRootPath = String(`${require('path').resolve(__dirname, '../../../')}`)
+        return library.initializeTransmitter(binariesRootPath)
+    }
+
+    static activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword) {
+        this.initialize()
+        return library.activate(email, licenceKey, proxyHost, proxyUserName, proxyUserPassword)
+    }
+
+    static sendCommand(messageArray) {
+        return library.sendCommand(messageArray)
+    }
+}
+
+module.exports = TransmitterWrapper

package/Binaries/Nodejs/Linux/X64/utils/Command.js

@@ -26,7 +26,7 @@ class Command {
     static createArrayResponse(response, runtimeName) {
         return new Command(
             runtimeName,
-            CommandType.Array,
+            CommandType.ArrayReference,
             [response]
         )
     }

package/Binaries/Nodejs/Linux/X64/utils/CommandType.js

@@ -17,9 +17,10 @@ module.exports = {
     GenerateLib: 15,
     InvokeGlobalMethod: 16,
     DestructReference: 17,
-    Array: 18,
+    ArrayReference: 18,
     ArrayGetItem: 19,
     ArrayGetSize: 20,
     ArrayGetRank: 21,
-    ArraySetItem: 22
+    ArraySetItem: 22,
+    Array: 23
 }

package/Binaries/Nodejs/MacOs/X64/core/handler/AbstractHandler.js

@@ -25,6 +25,17 @@ class AbstractHandler {
             }
         }
     }
+
+    process_stack_trace(error, class_name) {
+        let stackTraceArray = error.stack.split('\n').map(frame => frame.trim());
+        stackTraceArray.forEach((str, index) => {
+            if (str.includes(class_name)) {
+                stackTraceArray = stackTraceArray.slice(0, index).filter((s) => !s.includes(class_name));
+            }
+        });
+        error.stack = stackTraceArray.join(" \n ")
+        return error
+    }
 }
 
 module.exports = AbstractHandler

package/Binaries/Nodejs/MacOs/X64/core/handler/ArrayGetItemHandler.js

@@ -1,11 +1,15 @@
-const AbstractHandler =  require("./AbstractHandler")
+const AbstractHandler = require("./AbstractHandler")
 
 
 class ArrayGetItemHandler extends AbstractHandler {
     process(command) {
-        let array = command.payload[0]
-        let indexes = command.payload.slice(1)
-        return array[indexes]
+        try {
+            let array = command.payload[0]
+            let indexes = command.payload.slice(1)
+            return array[indexes]
+        } catch (error) {
+            return this.process_stack_trace(error, this.constructor.name)
+        }
     }
 }
 

package/Binaries/Nodejs/MacOs/X64/core/handler/ArrayGetRankHandler.js

@@ -1,9 +1,13 @@
-const AbstractHandler =  require("./AbstractHandler")
+const AbstractHandler = require("./AbstractHandler")
 
 
 class ArrayGetRankHandler extends AbstractHandler {
     process(command) {
-        throw new Error("ArrayGetRankHandler not implemented")
+        try {
+            throw new Error("ArrayGetRankHandler not implemented")
+        } catch (error) {
+            return this.process_stack_trace(error, this.constructor.name)
+        }
     }
 }
 

package/Binaries/Nodejs/MacOs/X64/core/handler/ArrayGetSizeHandler.js

@@ -1,10 +1,14 @@
-const AbstractHandler =  require("./AbstractHandler")
+const AbstractHandler = require("./AbstractHandler")
 
 
 class ArrayGetSizeHandler extends AbstractHandler {
     process(command) {
-        let array = command.payload[0]
-        return array.length
+        try {
+            let array = command.payload[0]
+            return array.length
+        } catch (error) {
+            return this.process_stack_trace(error, this.constructor.name)
+        }
     }
 }
 

package/Binaries/Nodejs/MacOs/X64/core/handler/ArrayHandler.js

@@ -0,0 +1,15 @@
+const AbstractHandler = require("./AbstractHandler")
+
+
+class ArrayHandler extends AbstractHandler {
+    process(command) {
+        try {
+            let array = command.payload
+            return array
+        } catch (error) {
+            return this.process_stack_trace(error, this.constructor.name)
+        }
+    }
+}
+
+module.exports = new ArrayHandler()

package/Binaries/Nodejs/MacOs/X64/core/handler/ArraySetItemHandler.js

@@ -1,13 +1,17 @@
-const AbstractHandler =  require("./AbstractHandler")
+const AbstractHandler = require("./AbstractHandler")
 
 
 class ArraySetItemHandler extends AbstractHandler {
     process(command) {
-        let array = command.payload[0]
-        let value = command.payload[1]
-        let indexes = command.payload.slice(2)
-        array[indexes] = value
-        return 0;
+        try {
+            let array = command.payload[0]
+            let value = command.payload[1]
+            let indexes = command.payload.slice(2)
+            array[indexes] = value
+            return 0;
+        } catch (error) {
+            return this.process_stack_trace(error, this.constructor.name)
+        }
     }
 }
 

package/Binaries/Nodejs/MacOs/X64/core/handler/CreateClassInstanceHandler.js

@@ -7,7 +7,7 @@ class CreateClassInstanceHandler extends AbstractHandler {
             let methodArguments = command.payload.slice(1)
             return new clazz(...methodArguments)
         } catch (error) {
-            return error
+            return this.process_stack_trace(error, this.constructor.name)
         }
     }
 }

package/Binaries/Nodejs/MacOs/X64/core/handler/DestructReferenceHandler.js

@@ -8,8 +8,12 @@ class DestructReferenceHandler extends AbstractHandler {
     }
 
     process(command) {
-        let cache = ReferencesCache.getInstance()
-        return cache.deleteReference(command.payload[0])
+        try {
+            let cache = ReferencesCache.getInstance()
+            return cache.deleteReference(command.payload[0])
+        } catch (error) {
+            return this.process_stack_trace(error, this.constructor.name)
+        }
     }
 }
 

package/Binaries/Nodejs/MacOs/X64/core/handler/GetGlobalStaticFieldHandler.js

@@ -17,7 +17,7 @@ class GetGlobalStaticFieldHandler extends AbstractHandler {
             return fieldToGet
 
         } catch (error) {
-            return error
+            return this.process_stack_trace(error, this.constructor.name)
         }
     }
 }

package/Binaries/Nodejs/MacOs/X64/core/handler/GetInstanceFieldHandler.js

@@ -13,7 +13,7 @@ class GetInstanceFieldHandler extends AbstractHandler {
 
             return instance[field]
         } catch (error) {
-            return error
+            return this.process_stack_trace(error, this.constructor.name)
         }
     }
 }

package/Binaries/Nodejs/MacOs/X64/core/handler/GetStaticFieldHandler.js

@@ -13,7 +13,7 @@ class GetStaticFieldHandler extends AbstractHandler {
 
             return type[field]
         } catch (error) {
-            return error
+            return this.process_stack_trace(error, this.constructor.name)
         }
     }
 }