javonet-ruby-sdk 2.5.12 → 2.5.13

data/lib/javonet-ruby-sdk/Binaries/Python/javonet/core/interpreter/Interpreter.py

@@ -1,16 +1,26 @@
+import os
 from javonet.core.handler.Handler import Handler
 from javonet.core.protocol.CommandDeserializer import CommandDeserializer
 from javonet.core.protocol.CommandSerializer import CommandSerializer
 from javonet.utils.ConnectionType import ConnectionType
 from javonet.utils.RuntimeName import RuntimeName
 from javonet.utils.connectionData.IConnectionData import IConnectionData
+from javonet.utils.messageHelper.MessageHelper import MessageHelper
 
 handler = Handler()
 
+
 class Interpreter:
+    # Debug mode flag similar to C# implementation
+    debug_mode = os.environ.get("JAVONET_DEBUG") == "TRUE"
 
     def execute(self, command, connection_data: IConnectionData):
+        if self.debug_mode:
+            print("Sent command: " + str(command))
+            MessageHelper.send_message_to_app_insights("SentCommand", str(command))
+
         message_byte_array = CommandSerializer().serialize(command, connection_data)
+
         if connection_data.connection_type == ConnectionType.WebSocket:
             from javonet.core.webSocketClient.WebSocketClient import WebSocketClient
             response_byte_array = WebSocketClient().send_message(connection_data, message_byte_array)
@@ -22,8 +32,25 @@ class Interpreter:
             from javonet.core.transmitter.Transmitter import Transmitter
             response_byte_array = Transmitter.send_command(message_byte_array)
 
-        return CommandDeserializer(response_byte_array).deserialize()
+        response = CommandDeserializer(response_byte_array).deserialize()
+
+        if self.debug_mode:
+            print("Response command: " + str(response))
+            MessageHelper.send_message_to_app_insights("ResponseCommand", str(response))
+
+        return response
 
     def process(self, message_byte_array):
         received_command = CommandDeserializer(message_byte_array).deserialize()
-        return handler.handle_command(received_command)
+
+        if self.debug_mode:
+            print("Received command: " + str(received_command))
+            MessageHelper.send_message_to_app_insights_sync("ReceivedCommand", str(received_command))
+
+        response = handler.handle_command(received_command)
+
+        if self.debug_mode:
+            print("Response command: " + str(response))
+            MessageHelper.send_message_to_app_insights("ResponseCommand", str(response))
+
+        return response

data/lib/javonet-ruby-sdk/Binaries/Python/javonet/core/receiver/Receiver.py

@@ -1,7 +1,11 @@
+import sys
+import traceback
+
 from javonet.core.interpreter.Interpreter import Interpreter
 from javonet.core.protocol.CommandSerializer import CommandSerializer
 from javonet.utils.RuntimeLogger import RuntimeLogger
 from javonet.utils.connectionData.InMemoryConnectionData import InMemoryConnectionData
+from javonet.utils.messageHelper.MessageHelper import MessageHelper
 
 
 class Receiver:
@@ -9,6 +13,21 @@ class Receiver:
     def __init__(self):
         self.connection_data = InMemoryConnectionData()
 
+        # Store the original excepthook
+        self.original_excepthook = sys.excepthook
+
+        # Set up global exception handler
+        def custom_excepthook(exc_type, exc_value, exc_traceback):
+            # Format the exception
+            exception_string = "".join(traceback.format_exception(exc_type, exc_value, exc_traceback))
+            # Send to App Insights
+            MessageHelper.send_message_to_app_insights_sync("ReceiverUnhandledException", exception_string)
+            # Call the original handler
+            self.original_excepthook(exc_type, exc_value, exc_traceback)
+
+        # Register the custom exception handler
+        sys.excepthook = custom_excepthook
+
     def SendCommand(self, message_byte_array, messageByteArrayLen):
         return bytearray(CommandSerializer().serialize(Interpreter().process(message_byte_array), self.connection_data))
 

data/lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/Command.py

@@ -65,3 +65,26 @@ class Command:
         else:
             self.is_equal = False
         return self.is_equal
+
+    def __str__(self):
+        try:
+            result = "RuntimeName "
+            result += str(self.runtime_name)
+            result += " "
+            result += "CommandType "
+            result += str(self.command_type)
+            result += " "
+            result += "Payload "
+
+            for i, item in enumerate(self.payload):
+                if item is None:
+                    result += "null"
+                else:
+                    result += str(item)
+
+                if i < len(self.payload) - 1:
+                    result += " "
+
+            return result
+        except Exception as ex:
+            return f"Error while converting command to string: {str(ex)}"

data/lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/RuntimeName.py

@@ -11,3 +11,6 @@ class RuntimeName(Enum):
     ruby = 6
     nodejs = 7
     cpp = 8
+
+    def __str__(self):
+        return self.name

data/lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/UtilsConst.py

@@ -0,0 +1,42 @@
+import os
+from pathlib import Path
+
+class UtilsConst:
+    _javonet_working_directory = str(Path().absolute()) + "/"
+    _config_source = ""
+    _license_key = "License key not set"
+
+    @staticmethod
+    def set_javonet_working_directory(path: str) -> None:
+        path = path.replace("\\", "/")
+        if not path.endswith("/"):
+            path = path + "/"
+
+        if not os.path.exists(path):
+            os.makedirs(path)
+            os.chmod(path, 0o700)
+
+        UtilsConst._javonet_working_directory = path
+
+    @staticmethod
+    def get_javonet_working_directory() -> str:
+        return UtilsConst._javonet_working_directory
+
+    @staticmethod
+    def set_config_source(value: str) -> None:
+        UtilsConst._config_source = value
+
+    @staticmethod
+    def get_config_source() -> str:
+        return UtilsConst._config_source
+
+    @staticmethod
+    def set_license_key(value: str) -> None:
+        if not value or value == "" or value == "your-license-key":
+            return
+
+        UtilsConst._license_key = value
+
+    @staticmethod
+    def get_license_key() -> str:
+        return UtilsConst._license_key

data/lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/messageHelper/MessageHelper.py

@@ -0,0 +1,86 @@
+# File: javonet/utils/messageHelper/MessageHelper.py
+import datetime
+import importlib.metadata
+import os
+import platform
+import socket
+import threading
+import urllib.request
+import urllib.error
+import json
+
+from javonet.utils.UtilsConst import UtilsConst
+
+
+def __get_host_name():
+    try:
+        return socket.gethostname()
+    except socket.error:
+        return "Unknown Host"
+
+
+def __get_package_version():
+    try:
+        return importlib.metadata.version("javonet-python-sdk")
+    except importlib.metadata.PackageNotFoundError:
+        return None
+
+
+address = "https://dc.services.visualstudio.com/v2/track"
+instrumentation_key = os.environ.get("JAVONET_INSTRUMENTATION_KEY", "2c751560-90c8-40e9-b5dd-534566514723")
+calling_runtime_name = "Python"
+javonet_version = __get_package_version()
+node_name = __get_host_name()
+os_name = platform.system()
+
+
+class MessageHelper:
+
+    @staticmethod
+    def send_message_to_app_insights(operation_name, message):
+        thread = threading.Thread(target=MessageHelper.send_message_to_app_insights_sync,
+                                  args=(operation_name, message))
+        thread.start()
+
+    @staticmethod
+    def send_message_to_app_insights_sync(operation_name, message):
+        try:
+            formatted_datetime = datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%dT%H:%M:%S")
+            license_key = UtilsConst.get_license_key()
+
+            json_payload = {
+                "name": "AppEvents",
+                "time": formatted_datetime,
+                "iKey": instrumentation_key,
+                "tags": {
+                    "ai.application.ver": javonet_version,
+                    "ai.cloud.roleInstance": node_name,
+                    "ai.operation.id": "0",
+                    "ai.operation.parentId": "0",
+                    "ai.operation.name": operation_name,
+                    "ai.internal.sdkVersion": "javonet:2",
+                    "ai.internal.nodeName": node_name
+                },
+                "data": {
+                    "baseType": "EventData",
+                    "baseData": {
+                        "ver": 2,
+                        "name": message,
+                        "properties": {
+                            "OperatingSystem": os_name,
+                            "LicenseKey": license_key,
+                            "CallingTechnology": calling_runtime_name
+                        }
+                    }
+                }
+            }
+
+            data = json.dumps(json_payload).encode("utf-8")
+            req = urllib.request.Request(address, data=data, headers={'Content-Type': 'application/json'})
+            with urllib.request.urlopen(req) as response:
+                status_code = response.getcode()
+            return status_code
+        except urllib.error.HTTPError as e:
+            return e.code
+        except Exception:
+            pass

data/lib/javonet-ruby-sdk/Binaries/version.txt

@@ -1 +1 @@
-2.5.12
+2.5.13

data/lib/javonet-ruby-sdk/sdk/invocation_context.rb

@@ -22,14 +22,14 @@ class InvocationContext < AbstractInvocationContext
     # ObjectSpace.define_finalizer(self, self.finalize(@current_command, @is_executed, @interpreter, @connection_type, @tcp_ip_address))
   end
 
-#  def finalize(command, is_executed, interpreter, connection_type, tcp_ip_address)
-#    proc do
-#      if command.command_type == CommandType::REFERENCE && is_executed == true
-#        destruct_command = Command.new(@runtime_name, CommandType::DESTRUCT_REFERENCE, command.payload)
-#        interpreter.execute(destruct_command, connection_type, tcp_ip_address)
-#      end
-#    end
-#  end
+  #  def finalize(command, is_executed, interpreter, connection_type, tcp_ip_address)
+  #    proc do
+  #      if command.command_type == CommandType::REFERENCE && is_executed == true
+  #        destruct_command = Command.new(@runtime_name, CommandType::DESTRUCT_REFERENCE, command.payload)
+  #        interpreter.execute(destruct_command, connection_type, tcp_ip_address)
+  #      end
+  #    end
+  #  end
 
   def iterator
     if not [CommandType::REFERENCE, CommandType::ARRAY_GET_ITEM, CommandType::ARRAY_SET_ITEM].include? @current_command.command_type
@@ -69,8 +69,8 @@ class InvocationContext < AbstractInvocationContext
     @response_command = @interpreter.execute(@current_command, @connection_type, @tcp_ip_address)
 
     if @response_command.command_type == CommandType::EXCEPTION
-        exception = ExceptionThrower.throw_exception(@response_command)
-        SdkMessageHelper.send_message_to_app_insights("SdkException",  exception.message)
+      exception = ExceptionThrower.throw_exception(@response_command)
+      SdkMessageHelper.send_message_to_app_insights("SdkException", exception.message)
       raise exception
     end
 
@@ -228,6 +228,14 @@ class InvocationContext < AbstractInvocationContext
     InvocationContext.new(@runtime_name, @connection_type, @tcp_ip_address, build_command(local_command))
   end
 
+  # Retrieves the value of a reference from the target runtime.
+  # @return [InvocationContext] A new InvocationContext instance that wraps the command to get the ref value.
+  # @see Refer to this {https://www.javonet.com/guides/v2/ruby/methods-arguments/passing-arguments-by-reference-with-ref-keyword article on Javonet Guides}
+  def get_ref_value
+    local_command = Command.new(@runtime_name, CommandType::GET_REF_VALUE, [])
+    InvocationContext.new(@runtime_name, @connection_type, @tcp_ip_address, build_command(local_command))
+  end
+
   # Creates a null object of a specific type in the target runtime.
   # @return [InvocationContext] An InvocationContext instance with the command to create a null object.
   # @see Refer to this {https://www.javonet.com/guides/v2/ruby/null-handling/create-null-object article on Javonet Guides}
@@ -236,11 +244,23 @@ class InvocationContext < AbstractInvocationContext
     InvocationContext.new(@runtime_name, @connection_type, @tcp_ip_address, build_command(local_command))
   end
 
-  # Retrieves the value of a reference from the target runtime.
-  # @return [InvocationContext] A new InvocationContext instance that wraps the command to get the ref value.
-  # @see Refer to this {https://www.javonet.com/guides/v2/ruby/methods-arguments/passing-arguments-by-reference-with-ref-keyword article on Javonet Guides}
-  def get_ref_value
-    local_command = Command.new(@runtime_name, CommandType::GET_REF_VALUE, [])
+  # Retrieves a static method as a delegate from the target runtime.
+  # @param method_name [String] The name of the static method to retrieve as a delegate.
+  # @param args [Array] The arguments to pass to the static method.
+  # @return [InvocationContext] An InvocationContext instance with the command to get the static method as a delegate.
+  # @see Refer to this {https://www.javonet.com/guides/v2/ruby/delegates-and-events/using-delegates article on Javonet Guides}
+  def get_static_method_as_delegate(method_name, *args)
+    local_command = Command.new(@runtime_name, CommandType::GET_STATIC_METHOD_AS_DELEGATE, [method_name, *args])
+    InvocationContext.new(@runtime_name, @connection_type, @tcp_ip_address, build_command(local_command))
+  end
+
+  # Retrieves an instance method as a delegate from the target runtime.
+  # @param method_name [String] The name of the instance method to retrieve as a delegate.
+  # @param args [Array] The arguments to pass to the instance method.
+  # @return [InvocationContext] An InvocationContext instance with the command to get the instance method as a delegate.
+  # # @see Refer to this {https://www.javonet.com/guides/v2/ruby/delegates-and-events/using-delegates article on Javonet Guides}
+  def get_instance_method_as_delegate(method_name, *args)
+    local_command = Command.new(@runtime_name, CommandType::GET_INSTANCE_METHOD_AS_DELEGATE, [method_name, *args])
     InvocationContext.new(@runtime_name, @connection_type, @tcp_ip_address, build_command(local_command))
   end
 
@@ -283,10 +303,8 @@ class InvocationContext < AbstractInvocationContext
         payload_item[i] = encapsulate_payload_item(payload_item[i])
       }
       return Command.new(@runtime_name, CommandType::ARRAY, [*payload_item])
-
     else
-      return Command.new(@runtime_name, CommandType::VALUE, [*payload_item])
-
+      return Command.new(@runtime_name, CommandType::VALUE, payload_item.nil? ? [nil] : [*payload_item])
     end
   end
 

data/lib/javonet-ruby-sdk/sdk/runtime_context.rb

@@ -68,8 +68,8 @@ class RuntimeContext < AbstractRuntimeContext
     @current_command = nil
 
     if @response_command.command_type == CommandType::EXCEPTION
-        exception = ExceptionThrower.throw_exception(@response_command)
-        SdkMessageHelper.send_message_to_app_insights("SdkException",  exception.message)
+      exception = ExceptionThrower.throw_exception(@response_command)
+      SdkMessageHelper.send_message_to_app_insights("SdkException", exception.message)
       raise exception
     end
   end
@@ -187,7 +187,7 @@ class RuntimeContext < AbstractRuntimeContext
       return Command.new(@runtime_name, CommandType::ARRAY, [*payload_item])
 
     else
-      return Command.new(@runtime_name, CommandType::VALUE, [*payload_item])
+      return Command.new(@runtime_name, CommandType::VALUE, payload_item.nil? ? [nil] : [*payload_item])
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: javonet-ruby-sdk
 version: !ruby/object:Gem::Version
-  version: 2.5.12
+  version: 2.5.13
 platform: ruby
 authors:
 - SdNCenter Sp. z o. o.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-13 00:00:00.000000000 Z
+date: 2025-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -1569,6 +1569,7 @@ files:
 - lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/RuntimeNameHandler.py
 - lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/StringEncodingMode.py
 - lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/Type.py
+- lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/UtilsConst.py
 - lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/__init__.py
 - lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/__pycache__/Command.cpython-312.pyc
 - lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/__pycache__/CommandType.cpython-312.pyc
@@ -1578,6 +1579,7 @@ files:
 - lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/__pycache__/RuntimeName.cpython-312.pyc
 - lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/__pycache__/StringEncodingMode.cpython-312.pyc
 - lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/__pycache__/Type.cpython-312.pyc
+- lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/__pycache__/UtilsConst.cpython-312.pyc
 - lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/__pycache__/__init__.cpython-312.pyc
 - lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/connectionData/IConnectionData.py
 - lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/connectionData/InMemoryConnectionData.py
@@ -1593,6 +1595,10 @@ files:
 - lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/exception/__init__.py
 - lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/exception/__pycache__/ExceptionSerializer.cpython-312.pyc
 - lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/exception/__pycache__/__init__.cpython-312.pyc
+- lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/messageHelper/MessageHelper.py
+- lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/messageHelper/__init__.py
+- lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/messageHelper/__pycache__/MessageHelper.cpython-312.pyc
+- lib/javonet-ruby-sdk/Binaries/Python/javonet/utils/messageHelper/__pycache__/__init__.cpython-312.pyc
 - lib/javonet-ruby-sdk/Binaries/Ruby/Linux/X64/core/handler/abstract_command_handler.rb
 - lib/javonet-ruby-sdk/Binaries/Ruby/Linux/X64/core/handler/abstract_handler.rb
 - lib/javonet-ruby-sdk/Binaries/Ruby/Linux/X64/core/handler/array_get_item_handler.rb