chore: merge from main with conflict resolution

Author: u-chaCP

common/clock.py

@@ -5,7 +5,7 @@
 class Clock:
     @staticmethod
     def now() -> int:
-        current_time_millis = time.time() * 1000
-        local_timezone_offset_millis = datetime.now(timezone.utc).astimezone().utcoffset().total_seconds() * 1000
-        current_time_micros = int((current_time_millis + local_timezone_offset_millis) * 1000)
+        current_time_micros = time.time_ns() / 1e3
+        local_timezone_offset_micros = datetime.now(timezone.utc).astimezone().utcoffset().total_seconds() * 1e6
+        current_time_micros = int(current_time_micros + local_timezone_offset_micros)
         return current_time_micros

common/clock_resolution.py

@@ -20,17 +20,13 @@ class Color(Enum):
     # additional colors can be added, syntax is <<colorname>> = RGBAColor(r, g, b)
 
     def get_red(self):
-        return self.value.red
+        return self.value.get_red()
 
     def get_green(self):
-        return self.value.green
+        return self.value.get_green()
 
     def get_blue(self):
-        return self.value.blue
+        return self.value.get_blue()
 
     def get_alpha(self):
-        return self.value.alpha
-
-
-
-
+        return self.value.get_alpha()

common/color/color.py

@@ -4,20 +4,16 @@ def __init__(self, r: int, g: int, b: int, a: int = 0x00):
         value = (a & 255) << 24 | (r & 255) << 16 | (g & 255) << 8 | (b & 255) << 0
         self.__value = value
 
-    @property
-    def red(self):
+    def get_red(self):
         return self.__value >> 16 & 255
 
-    @property
-    def green(self):
+    def get_green(self):
         return self.__value >> 8 & 255
 
-    @property
-    def blue(self):
+    def get_blue(self):
         return self.__value >> 0 & 255
 
-    @property
-    def alpha(self):
+    def get_alpha(self):
         return self.__value >> 24 & 255
 
     @staticmethod

common/color/rgbacolor.py

@@ -1,6 +1,8 @@
 # Copyright (C) Code Partners Pty. Ltd. All rights reserved. #
+import typing
 from typing import Optional
 
+from common.color.rgbacolor import RGBAColor
 from common.file_rotate import FileRotate
 from common.level import Level
 from common.color.color import Color
@@ -27,6 +29,22 @@ class LookupTable:
     __KB_FACTOR = 1024
     __MB_FACTOR = __KB_FACTOR * 1024
     __GB_FACTOR = __MB_FACTOR * 1024
+    __HEX_ID = (
+        "0x",  # C#, Java and Python
+        "&H",  # Visual Basic .NET
+        "$",  # Object Pascal
+    )
+    __HEX_TBL = (
+        0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+        0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+        0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+        0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+        0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+        0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+        0x08, 0x09, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+        0x7f, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x7f
+    )
 
     def __init__(self):
         """
@@ -193,10 +211,10 @@ def __is_valid_integer(cls, value: str) -> bool:
                 pass
         return False
 
-    def get_color_value(self, key: str, default_value: Color) -> Color:
+    def get_color_value(self, key: str, default_value: (Color, RGBAColor)) -> (RGBAColor, Color):
         """
-        Returns a Color value of an element for a given key.
-        Returns either the value converted to a Color value for the given key
+        Returns a Color/RGBAColor value of an element for a given key.
+        Returns either the value converted to a Color/RGBAColor value for the given key
         if an element with the given key exists and the found value has a valid format or default_value otherwise.
 
         The element value must be specified as a hexadecimal string. The hexadecimal value must represent
@@ -217,17 +235,31 @@ def get_color_value(self, key: str, default_value: Color) -> Color:
         found value has an invalid format.
         :raises: TypeError if the default_value is not Color type.
         """
-        if not isinstance(default_value, Color):
-            raise TypeError("default_value must be a Color")
+        if not (isinstance(default_value, Color) or isinstance(default_value, RGBAColor)):
+            raise TypeError("default_value must be a Color or RGBAColor")
 
         value = self.get_string_value(key, "")
 
         if not value:
             return default_value
-
-    @staticmethod
-    def __convert_hex_value(value: str):
-        ...
+        else:
+            b = self.__convert_hex_value(value.strip())
+            if len(b) == 3:
+                return RGBAColor(0xff & b[0],
+                                 0xff & b[1],
+                                 0xff & b[2])
+            elif len(b) == 4:
+                return RGBAColor(0xff & b[0],
+                                 0xff & b[0],
+                                 0xff & b[0],
+                                 0xff & b[0])
+
+    def __convert_hex_value(self, value: str) -> typing.Optional[bytearray]:
+        for prefix in self.__HEX_ID:
+            if value.startswith(prefix):
+                value = value[len(prefix):]
+                return self.__convert_hex_string(value)
+        return None
 
     def get_boolean_value(self, key: str, default_value: bool) -> bool:
         """
@@ -453,3 +485,20 @@ def __convert_unicode_value(value: str) -> Optional[bytes]:
             return value.encode('utf-8')
         except UnicodeEncodeError:
             return None
+
+    def __convert_hex_string(self, value: str) -> typing.Optional[bytes]:
+        value = value.upper()
+        if len(value) % 2 != 0:  # Check if length is odd
+            value += "0"  # Append a '0' nibble
+
+        b = None
+        if self.__is_valid_hex(value):
+            b = bytes.fromhex(value)
+        return b
+
+    def __is_valid_hex(self, value: str) -> bool:
+        for char in value:
+            code_point = ord(char)
+            if code_point >= len(self.__HEX_TBL) or self.__HEX_TBL[code_point] > 0x0f:
+                return False
+        return True

common/lookup_table.py

@@ -0,0 +1,98 @@
+import datetime
+import os
+import threading
+import typing
+
+from smartinspect import SmartInspect
+
+
+class RepetitiveTimer(threading.Timer):
+    """
+    This class is used internally in SmartInspect ConfigurationTimer and is not intended to be used otherwise.
+    It overrides the basic threading.Timer behaviour to run a task in a separate thread repeatedly until
+    stopped by Timer.cancel() method.
+    """
+
+    def __init__(self, interval, function):
+        super().__init__(interval, function)
+
+    def run(self):
+        """
+        Overriden from threading.Timer (which only runs a task once) to run the task repeatedly with
+        given intervals until stopped with .cancel() method
+        """
+        while not self.finished.is_set():
+            self.finished.wait(self.interval)
+            self.function(*self.args, **self.kwargs)
+
+
+class ConfigurationTimer:
+    """
+    A configurable timer for monitoring and reloading SmartInspect configuration files on changes.
+    Use this class to monitor and automatically reload SmartInspect configuration files.
+    This timer periodically checks if the related configuration file has changed (by comparing
+    the last write time) and automatically tries to reload the configuration properties.
+    You can pass the SmartInspect object to configure, the name of the configuration file
+    to monitor and the interval in which this timer should check for changes.
+    For information about SmartInspect configuration files, please refer to the
+    documentation of the SmartInspect.load_configuration() method.
+    This class is fully thread-safe.
+    """
+
+    def __init__(self, smartinspect: SmartInspect, filename: str, period: int):
+        """
+        Initializes a new ConfigurationTimer object.
+
+        :param smartinspect: The SmartInspect instance to configure.
+        :param filename: The name of the configuration file to monitor.
+        :param period: The seconds interval in which this timer should check for changes.
+
+        :raises TypeError: If the smartinspect is not SmartInspect type
+        :raises TypeError: If the filename is not str type
+        :raises TypeError: If the period is not int type
+        :raises ValueError: If the period is not a positive integer
+        """
+        if not isinstance(smartinspect, SmartInspect):
+            raise TypeError("smartinspect must be a SmartInspect type")
+        if not isinstance(filename, str):
+            raise TypeError("filename must be an str")
+        if not isinstance(period, int):
+            raise TypeError("period must be an int")
+        if period <= 0:
+            raise ValueError("period must be a positive integer")
+
+        self._filename: str = filename
+        self._si: SmartInspect = smartinspect
+        self._last_update = self._get_file_age(self._filename)
+        self._timer: typing.Optional[RepetitiveTimer] = RepetitiveTimer(period, self._reload_configuration)
+        self._timer.start()
+
+    def _reload_configuration(self) -> None:
+        last_update = self._get_file_age(self._filename)
+        if last_update is None or last_update <= self._last_update:
+            return
+        self._last_update = last_update
+        self._si.load_configuration(self._filename)
+
+    @staticmethod
+    def _get_file_age(filename: str) -> typing.Optional[datetime.datetime]:
+        result = None
+        try:
+            file = os.path.abspath(filename)
+            last_update = os.path.getmtime(file)
+            if last_update != 0:
+                result = datetime.datetime.fromtimestamp(last_update)
+        except OSError:
+            pass
+
+        return result
+
+    def dispose(self):
+        """
+        Releases all resources of this ConfigurationTimer object
+        and stops monitoring the SmartInspect configuration file for
+        changes.
+        """
+        if self._timer:
+            self._timer.cancel()
+            self._timer = None

configuration_timer.py

@@ -64,4 +64,4 @@ def milliseconds_since_the_first_packet(self) -> int:
 
     @staticmethod
     def _get_nano_time() -> int:
-        return int(time.perf_counter() * 1e9)
+        return int(time.perf_counter_ns())

protocols/cloud/chunk.py

@@ -435,7 +435,7 @@ def _reset(self):
         try:
             self._internal_disconnect()
         finally:
-            self.__reconnect_tick_count = time.time() * 1000
+            self.__reconnect_tick_count = time.time_ns() / 1e6
 
     def _impl_disconnect(self):
         if self._connected:
@@ -735,7 +735,7 @@ def __forward_packet(self, packet: Packet, disconnect: bool) -> None:
 
     def __do_reconnect(self) -> None:
         if self.__reconnect_interval > 0:
-            tick_count = time.time() * 1000
+            tick_count = time.time_ns() / 1e6
             if tick_count - self.__reconnect_tick_count < self.__reconnect_interval:
                 return
 

protocols/protocol.py

@@ -9,6 +9,7 @@
 from typing import Optional, Union
 
 from common.color.color import Color
+from common.color.rgbacolor import RGBAColor
 from common.context.binary_context import BinaryContext
 from common.context.binary_viewer_context import BinaryViewerContext
 from common.context.data_viewer_context import DataViewerContext
@@ -147,13 +148,13 @@ def color(self):
         return self.__color
 
     @color.setter
-    def color(self, color: Color) -> None:
+    def color(self, color: (Color, RGBAColor)) -> None:
         """
         Sets the background color in the SmartInspect Console of this session.
         The session color helps you to identify Log Entries from different sessions
         in the SmartInspect Console by changing the background color.
         """
-        if isinstance(color, Color):
+        if isinstance(color, Color) or isinstance(color, RGBAColor):
             self.__color = color
 
     @property

session/session.py

@@ -1,4 +1,5 @@
 from common.color.color import Color
+from common.color.rgbacolor import RGBAColor
 from session.session import Session
 from common.level import Level
 
@@ -22,9 +23,9 @@ def __init__(self):
         self.__level: Level = Level.DEBUG
 
     def assign(self, session: Session) -> None:
-        self.__active = session.active
-        self.__color = session.color
-        self.__level = session.level
+        session.active = self.__active
+        session.color = self.__color
+        session.level = self.__level
 
     def is_active(self) -> bool:
         """
@@ -40,18 +41,18 @@ def set_active(self, active: bool) -> None:
             raise TypeError("Active must be a boolean")
         self.__active = active
 
-    def get_color(self) -> Color:
+    def get_color(self) -> (Color, RGBAColor):
         """
-        Returns the Color property for created sessions.
+        Returns the color property for created sessions.
         """
         return self.__color
 
-    def set_color(self, color: Color) -> None:
+    def set_color(self, color: (Color, RGBAColor)) -> None:
         """
-        Specifies the default Color property for newly created sessions.
+        Specifies the default color property for newly created sessions.
         """
-        if not isinstance(color, Color):
-            raise TypeError("Color must be a Color")
+        if not isinstance(color, Color) and not isinstance(color, RGBAColor):
+            raise TypeError("Color must be a Color or RGBAColor")
         self.__color = color
 
     def get_level(self) -> Level: