simple-socket-client 1.3__tar.gz → 1.5__tar.gz

{simple-socket-client-1.3/simple_socket_client.egg-info → simple-socket-client-1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple-socket-client
-Version: 1.3
+Version: 1.5
 Summary: Simple TCP socket client
 Home-page: https://github.com/webtoucher/simple-socket-client
 Author: Alexey Kuznetsov
@@ -35,7 +35,7 @@ $ pip install simple-socket-client
 Or you can add it as dependency in requirements.txt file of your python application:
 
 ```
-simple-socket-client~=1.3
+simple-socket-client~=1.5
 ```
 
 ## Usage
@@ -44,7 +44,7 @@ simple-socket-client~=1.3
 from simple_socket_client import SimpleSocketClient
 
 client = SimpleSocketClient('192.168.0.2', 6666)
-client.connect()
+client.connect(timeout=10)
 
 client.send('Test'.encode()) # if you don't need an answer
 answer = client.ask('Hi!'.encode())

{simple-socket-client-1.3 → simple-socket-client-1.5}/README.md

@@ -16,7 +16,7 @@ $ pip install simple-socket-client
 Or you can add it as dependency in requirements.txt file of your python application:
 
 ```
-simple-socket-client~=1.3
+simple-socket-client~=1.5
 ```
 
 ## Usage
@@ -25,7 +25,7 @@ simple-socket-client~=1.3
 from simple_socket_client import SimpleSocketClient
 
 client = SimpleSocketClient('192.168.0.2', 6666)
-client.connect()
+client.connect(timeout=10)
 
 client.send('Test'.encode()) # if you don't need an answer
 answer = client.ask('Hi!'.encode())

{simple-socket-client-1.3 → simple-socket-client-1.5}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 setup(name='simple-socket-client',
-      version='1.3',
+      version='1.5',
       url='https://github.com/webtoucher/simple-socket-client',
       license='BSD-3-Clause',
       author='Alexey Kuznetsov',

{simple-socket-client-1.3 → simple-socket-client-1.5}/simple_socket_client/__init__.py

@@ -20,56 +20,69 @@ class SimpleSocketClientException(socket.error):
 
 class SimpleSocketClient(EventBus):
     def __init__(self, host: str, port: int):
+        super().__init__()
         self.__host = host
         self.__port = port
         self.__socket = None
         self.__thread = None
+        self.__thread_err = None
         self.__outgoing_messages = None
         self.__connected = False
         self.__keep_answer = False
 
-    def connect(self) -> None:
-        self.__thread = Thread(target=self.__threading, args=(self,))
+    def connect(self, timeout=None) -> None:
+        self.__thread_err = None
+        self.__thread = Thread(target=self.__threading, args=(self, timeout))
         self.__thread.start()
         while not self.__connected:
-            pass
+            if self.__thread_err:
+                raise self.__thread_err
 
     def disconnect(self) -> None:
         self.__connected = False
 
     @staticmethod
-    def __threading(client):
-        client.__incoming_messages = queue.Queue()
-        client.__outgoing_messages = queue.Queue()
-        client.__socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        if client.__socket.fileno() < 0:
-            raise SimpleSocketClientException('Error with creating sockets')
-        client.__socket.connect((client.__host, client.__port))
-        client.__connected = True
-        client.emit('connect', (client.__host, client.__port))
-        while client.__connected:
+    def __threading(client, timeout):
+        try:
+            client.__incoming_messages = queue.Queue()
+            client.__outgoing_messages = queue.Queue()
+            client.__socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            if client.__socket.fileno() < 0:
+                raise SimpleSocketClientException('Problem with creating sockets')
+            client.__socket.settimeout(timeout)
             try:
-                if client.__socket.fileno() > 0:
-                    message = client.__outgoing_messages.get_nowait()
-                else:
-                    client.disconnect()
+                client.__socket.connect((client.__host, client.__port))
+            except TimeoutError as err:
+                raise SimpleSocketClientException('Connection timed out') from err
+            client.__socket.settimeout(None)
+            client.__connected = True
+            client.emit('connect', (client.__host, client.__port))
+            while client.__connected:
+                try:
+                    if client.__socket.fileno() > 0:
+                        message = client.__outgoing_messages.get_nowait()
+                    else:
+                        client.disconnect()
+                        continue
+                except queue.Empty:
                     continue
-            except queue.Empty:
-                continue
 
-            try:
-                if message:
-                    client.__socket.sendall(message)
-                    if client.__keep_answer:
-                        client.__receive_message()
-            except ConnectionResetError:
-                client.disconnect()
+                try:
+                    if message:
+                        client.__socket.sendall(message)
+                        if client.__keep_answer:
+                            client.__receive_message()
+                except ConnectionResetError:
+                    client.disconnect()
+        except SimpleSocketClientException as err:
+            client.__thread_err = err
 
         client.emit('disconnect', (client.__host, client.__port))
         client.__incoming_messages = None
         client.__outgoing_messages = None
-        client.__socket.close()
-        client.__socket = None
+        if client.__socket:
+            client.__socket.close()
+            client.__socket = None
 
     def send(self, message: bytes) -> None:
         if not self.__connected:

{simple-socket-client-1.3 → simple-socket-client-1.5/simple_socket_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple-socket-client
-Version: 1.3
+Version: 1.5
 Summary: Simple TCP socket client
 Home-page: https://github.com/webtoucher/simple-socket-client
 Author: Alexey Kuznetsov
@@ -35,7 +35,7 @@ $ pip install simple-socket-client
 Or you can add it as dependency in requirements.txt file of your python application:
 
 ```
-simple-socket-client~=1.3
+simple-socket-client~=1.5
 ```
 
 ## Usage
@@ -44,7 +44,7 @@ simple-socket-client~=1.3
 from simple_socket_client import SimpleSocketClient
 
 client = SimpleSocketClient('192.168.0.2', 6666)
-client.connect()
+client.connect(timeout=10)
 
 client.send('Test'.encode()) # if you don't need an answer
 answer = client.ask('Hi!'.encode())