added thread safety

Author: jath03

openrgb/network.py

@@ -31,6 +31,7 @@ def __init__(self, update_callback: Callable, address: str = "127.0.0.1", port:
         :param port: the port of the SDK server
         :param name: the string that will be displayed on the OpenRGB SDK tab's list of clients
         '''
+        self.lock = threading.Lock()
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.sock.connect((address, port))
 
@@ -44,7 +45,7 @@ def __init__(self, update_callback: Callable, address: str = "127.0.0.1", port:
         # Sending the client name
         name = bytes(f"{name}\0", 'utf-8')
         self.send_header(0, utils.PacketType.NET_PACKET_ID_SET_CLIENT_NAME, len(name))
-        self.sock.send(name, NOSIGNAL)
+        self.send_data(name)
 
         # Requesting the number of devices
         self.send_header(0, utils.PacketType.NET_PACKET_ID_REQUEST_CONTROLLER_COUNT, 0)
@@ -99,8 +100,14 @@ def send_header(self, device_id: int, packet_type: int, packet_size: int):
         :param packet_type: a utils.PacketType
         :param packet_size: the full size of the data to be send after the header
         '''
+        if packet_size > 0:
+            self.lock.acquire()
         self.sock.send(struct.pack('ccccIII', b'O', b'R', b'G', b'B', device_id, packet_type, packet_size), NOSIGNAL)
 
+    def send_data(self, data: bytes):
+        self.sock.send(data, NOSIGNAL)
+        self.lock.release()
+
     def timeout(self):
         while self.state == Status.WAITING:
             sleep(.05)

openrgb/orgb.py

@@ -28,7 +28,7 @@ def set_color(self, color: utils.RGBColor, fast: bool = False):
         '''
         self.comms.send_header(self.device_id, utils.PacketType.NET_PACKET_ID_RGBCONTROLLER_UPDATESINGLELED, struct.calcsize("i3bx"))
         buff = struct.pack("i", self.id) + color.pack()
-        self.comms.sock.send(buff)
+        self.comms.send_data(buff)
         if not fast:
             self.comms.requestDeviceData(self.device_id)
 
@@ -64,7 +64,7 @@ def set_color(self, color: utils.RGBColor, start: int = 0, end: int = 0, fast: b
         self.comms.send_header(self.device_id, utils.PacketType.NET_PACKET_ID_RGBCONTROLLER_UPDATEZONELEDS, struct.calcsize(f"IIH{3*(end - start)}b{(end - start)}x"))
         buff = struct.pack("IH", self.id, end - start) + (color.pack())*(end - start)
         buff = struct.pack("I", len(buff)) + buff
-        self.comms.sock.send(buff)
+        self.comms.send_data(buff)
         if not fast:
             self.comms.requestDeviceData(self.device_id)
 
@@ -84,7 +84,7 @@ def set_colors(self, colors: List[utils.RGBColor], start: int = 0, end: int = 0,
         self.comms.send_header(self.device_id, utils.PacketType.NET_PACKET_ID_RGBCONTROLLER_UPDATEZONELEDS, struct.calcsize(f"IIH{3*(end - start)}b{(end - start)}x"))
         buff = struct.pack("IH", self.id, end - start) + b''.join((color.pack() for color in colors))
         buff = struct.pack("I", len(buff)) + buff
-        self.comms.sock.send(buff)
+        self.comms.send_data(buff)
         if not fast:
             self.comms.requestDeviceData(self.device_id)
 
@@ -128,7 +128,7 @@ def set_color(self, color: utils.RGBColor, start: int = 0, end: int = 0, fast: b
         )
         buff = struct.pack("H", end - start) + (color.pack())*(end - start)
         buff = struct.pack("I", len(buff)) + buff
-        self.comms.sock.send(buff)
+        self.comms.send_data(buff)
         if not fast:
             self.comms.requestDeviceData(self.id)
 
@@ -152,7 +152,7 @@ def set_colors(self, colors: List[utils.RGBColor], start: int = 0, end: int = 0,
         )
         buff = struct.pack("H", end - start) + b''.join((color.pack() for color in colors))
         buff = struct.pack("I", len(buff)) + buff
-        self.comms.sock.send(buff)
+        self.comms.send_data(buff)
         if not fast:
             self.comms.requestDeviceData(self.id)
 
@@ -174,7 +174,7 @@ def set_mode(self, mode: Union[int, str, utils.ModeData]):
             utils.PacketType.NET_PACKET_ID_RGBCONTROLLER_UPDATEMODE,
             len(data)
         )
-        self.comms.sock.send(data)
+        self.comms.send_data(data)
         self.active_mode = mode.id
         self.data.active_mode = self.active_mode
         if len(mode.colors) == len(self.colors):

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="openrgb-python",
-    version='0.1.1',
+    version='0.1.2',
     author="jath03",
     description="A python client for the OpenRGB SDK",
     long_description=long_description,