Merge pull request #43 from slazarov/0.0.7.0

0.0.7.0

Author: slazarov

README.md

@@ -413,6 +413,12 @@ if __name__ == "__main__":
     main()
 ```
 # Change log
+0.0.7.0 - 25/02/2018
+* New reconnection methods implemented. Problem was within `gevent`, because connection failures within it are not raised in the main script.
+* Added wsaccel for better socket performance.
+* Set websocket-client minimum version to 0.47.0
+
+wsaccel
 0.0.6.4 - 24/02/2018
 * Fixed order book syncing bug when more than 1 connection is online due to wrong connection/thread name.
 

bittrex_websocket/_signalr.py

@@ -0,0 +1,37 @@
+import signalr
+import gevent
+from ._exceptions import WebSocketConnectionClosedException
+
+
+class Connection(signalr.Connection):
+    def __init__(self, url, session):
+        super(Connection, self).__init__(url, session)
+        self.error_trap = None
+
+    def start(self):
+        self.starting.fire()
+
+        negotiate_data = self.__transport.negotiate()
+        self.token = negotiate_data['ConnectionToken']
+
+        listener = self.__transport.start()
+
+        def wrapped_listener():
+
+            # listener()
+            # gevent.sleep()
+
+            try:
+                listener()
+                gevent.sleep()
+            except Exception as e:
+                self.close()
+                self.error_trap = e
+
+        self.__greenlet = gevent.spawn(wrapped_listener)
+        self.started = True
+
+    def wait(self, timeout=30):
+        gevent.joinall([self.__greenlet], timeout)
+        if self.error_trap is not None:
+            return self.error_trap

bittrex_websocket/constants.py

@@ -49,5 +49,6 @@
 MSG_ERROR_SOCKET_WEBSOCKETCONNECTIONCLOSED = 'Please report error to ' \
                                              'https://github.com/slazarov/python-bittrex-websocket, ' \
                                              'Error:Init_connection_WebSocketConnectionClosedException'
+MSG_ERROR_GEVENT = _CONN_PREFIX + 'Caught {} in gevent. Don\'t worry.'
 MSG_ERROR_CONN_MISSING_SCHEMA = _CONN_PREFIX + 'Invalid URL: {}'
 MSG_ERROR_CONN_HTTP = _CONN_PREFIX + 'Failed to establish connection through {}'

bittrex_websocket/websocket_client.py

@@ -6,7 +6,8 @@
 
 from __future__ import print_function
 
-from signalr import Connection
+# from signalr import Connection
+from ._signalr import Connection
 import logging
 from abc import ABCMeta, abstractmethod
 from threading import Thread, current_thread
@@ -330,11 +331,15 @@ def is_next_url():
                     # Add handlers
                     corehub.client.on('updateExchangeState', self._on_tick_update)
                     corehub.client.on('updateSummaryState', self._on_ticker_update)
-                    conn.wait(5400)
+                    run = conn.wait(5400)
                     # When we purposely close the connection, the script will exit conn.wait()
                     # so we need to inform the script that it should not try to reconnect.
                     if conn_obj.close_me is True:
                         return
+                    elif run is not None:
+                        logger.error(MSG_ERROR_GEVENT.format(conn_id, type(run)))
+                        self._empty_conn_id(conn_id)
+                        return
                     is_next_url()
                 except HTTPError:
                     # Related to wrong url. Will be raised in case Bittrex changes it's url or you touched it!

requirements.txt

@@ -2,5 +2,6 @@ cfscrape>=1.9.4
 signalr-client==0.0.7
 requests[security]==2.18.4
 Events==0.3
-websocket-client==0.46.0
-gevent>=1.3a1
+websocket-client==0.47.0
+gevent>=1.3a1
+wsaccel>=0.6.2

setup.py

@@ -8,13 +8,14 @@
         'signalr-client==0.0.7',
         'requests[security]==2.18.4',
         'Events==0.3',
-        'websocket-client>=0.46.0',
-        'gevent>=1.3a1'
+        'websocket-client>=0.47.0',
+        'gevent>=1.3a1',
+        'wsaccel>=0.6.2'
     ]
 
 setup(
     name='bittrex_websocket',
-    version='0.0.6.3',
+    version='0.0.7.0',
     author='Stanislav Lazarov',
     author_email='s.a.lazarov@gmail.com',
     license='MIT',