Update

client_s2/compLib/CompLibClient.py

@@ -1,30 +1,65 @@
 import socket
+from threading import Lock
 
 import compLib.CompLib_pb2 as CompLib_pb2
 
-UNIX_SOCKET_PATH = "/tmp/compLib"
-TCP_SOCKET_HOST = "192.168.0.151"
-TCP_SOCKET_PORT = 9090
-
 
 class CompLibClient(object):
+    USE_UNIX_SOCKET = False
+    UNIX_SOCKET_PATH = "/tmp/compLib"
+    USE_TCP_SOCKET = False
+    TCP_SOCKET_HOST = "10.20.5.1"
+    TCP_SOCKET_PORT = 9090
+    SOCKET = None
+    LOCK = Lock()
+
+    @staticmethod
+    def use_unix_socket(socket_path="/tmp/compLib"):
+        CompLibClient.UNIX_SOCKET_PATH = socket_path
+        CompLibClient.USE_UNIX_SOCKET = True
+        CompLibClient.USE_TCP_SOCKET = False
+
+        CompLibClient.SOCKET = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        CompLibClient.SOCKET.connect(CompLibClient.UNIX_SOCKET_PATH)
+
+        from compLib.HealthCheck import HealthUpdater
+        HealthUpdater.start()
+
+    @staticmethod
+    def use_tcp_socket(socket_host, socket_port=TCP_SOCKET_PORT):
+        CompLibClient.TCP_SOCKET_HOST = socket_host
+        CompLibClient.TCP_SOCKET_PORT = socket_port
+        CompLibClient.USE_UNIX_SOCKET = False
+        CompLibClient.USE_TCP_SOCKET = True
+
+        CompLibClient.SOCKET = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        CompLibClient.SOCKET.connect((CompLibClient.TCP_SOCKET_HOST, CompLibClient.TCP_SOCKET_PORT))
+
+        from compLib.HealthCheck import HealthUpdater
+        HealthUpdater.start()
 
     @staticmethod
     def send(data: bytes, size: int) -> bytes:
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
-            sock.connect((TCP_SOCKET_HOST, TCP_SOCKET_PORT))
+        with CompLibClient.LOCK:
+            # if CompLibClient.USE_TCP_SOCKET:
+            #     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            #     sock.connect((CompLibClient.TCP_SOCKET_HOST, CompLibClient.TCP_SOCKET_PORT))
+            #
+            # elif CompLibClient.USE_UNIX_SOCKET:
+            #     sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+            #     sock.connect(CompLibClient.UNIX_SOCKET_PATH)
+            #
+            # else:
+            #     return bytes(0)
 
-            # with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as sock:
-            #     sock.connect(UNIX_SOCKET_PATH)
+            CompLibClient.SOCKET.sendall(size.to_bytes(1, byteorder='big'))
+            CompLibClient.SOCKET.sendall(data)
 
-            sock.sendall(size.to_bytes(1, byteorder='big'))
-            sock.sendall(data)
-
-            response_size_bytes = sock.recv(1)
+            response_size_bytes = CompLibClient.SOCKET.recv(1)
             response_size = int.from_bytes(response_size_bytes, byteorder="big")
             # print(response_size)
 
-            response_bytes = sock.recv(response_size)
+            response_bytes = CompLibClient.SOCKET.recv(response_size)
             # print(response_bytes.hex())
             # print(len(response_bytes))
 
@@ -34,7 +69,7 @@ class CompLibClient(object):
 
     @staticmethod
     def check_response(response_bytes: bytes) -> bool:
-        print(f"{response_bytes}")
+        # print(f"{response_bytes}")
         res = CompLib_pb2.GenericResponse()
         res.ParseFromString(response_bytes)