latest

Author: mvberg

README.md

@@ -29,6 +29,8 @@ of_client.add_symbol_subscription("AAPL", callback=on_message)
 
 # sub to markets by exchange
 of_client.add_exchange_subscription("NYSE", callback=on_message)
+
+of_client.start()
 ```
 
 ### Expected Output

openfeed/__init__.py

@@ -1,3 +1,11 @@
+
+import sys
+from pathlib import Path
+sys.path.append(str(Path(__file__).parent)) 
+
+# https://github.com/protocolbuffers/protobuf/issues/1491#issuecomment-547504972
+# FIXME
+
 from .openfeed_client import OpenfeedClient
 
-VERSION = '1.0.0'
+VERSION = '1.0.2'

openfeed/generated/__init__.py

@@ -18,7 +18,6 @@ def __init__(self, username, password, server="openfeed.aws.barchart.com", debug
         self.password = password
         self.debug = debug
         self.ws = websocket.WebSocket()
-        self.stop = True
         self.token = None
 
         self.instrument_definitions = {}
@@ -27,18 +26,22 @@ def __init__(self, username, password, server="openfeed.aws.barchart.com", debug
         self.exchange_handlers = {}
         self.heartbeat_handlers = []
 
-        self.login_req = openfeed_api_pb2.OpenfeedGatewayRequest(
-            loginRequest=openfeed_api_pb2.LoginRequest(
-                username=username, password=password))
-
         self.on_connected = None
         self.on_disconnected = None
         self.on_error = None
 
         websocket.enableTrace(self.debug)
 
-    def start(self):
-        self.__connect()
+    def start(self, blocking=True):
+        if self.token is None:
+            if blocking is not True:
+                thread.start_new_thread(self.__connect, ())
+            else:
+                self.__connect()
+
+    def stop(self):
+        if self.token is not None:
+            self.__reset()
 
     def add_heartbeat_subscription(self, callback):
         self.heartbeat_handlers.append(callback)
@@ -70,8 +73,12 @@ def get_instrument_definition_by_symbol(self, symbol):
     def _send_message(self, msg):
         self.ws.send(msg.SerializeToString(), websocket.ABNF.OPCODE_BINARY)
 
+    def __reset(self):
+        self.ws.close()
+        self.token = None
+        self.ws = websocket.WebSocket()
+
     def __connect(self):
-        self.stop = False
 
         def handleLogin(msg):
 
@@ -148,19 +155,21 @@ def on_message(ws, message):
         def on_error(ws, error):
             if self.debug:
                 print("WS Error: ", error)
+
             self.__callback(self.on_error, error)
 
         def on_close(ws):
             if self.debug:
                 print("WS Close")
+
+            self.__reset()
             self.__callback(self.on_disconnected, ws)
 
         def on_open(ws):
             if self.debug:
                 print("WS Open")
 
-            self._send_message(self.login_req)
-
+            self._send_message(self.__create_login_request())
             self.__callback(self.on_connected, ws)
 
         self.ws = websocket.WebSocketApp("ws://" + self.server + "/ws",
@@ -223,6 +232,11 @@ def __create_exchange_request(self, exchanges):
 
         return of_req
 
+    def __create_login_request(self):
+        return openfeed_api_pb2.OpenfeedGatewayRequest(
+            loginRequest=openfeed_api_pb2.LoginRequest(
+                username=self.username, password=self.password))
+
     def __callback(self, callback, *args):
         try:
             if callback is not None:
@@ -251,13 +265,7 @@ def handle_heartbeat(msg):
     of_client.on_connected = lambda x: print("of-client: connected")
 
     # blocking mode
-
-    of_client.start()
-
-    # non-blocking mode
-    # thread.start_new_thread(of_client.start, ())
-
-    # print("Started Openfeed Client")
+    of_client.start(blocking=True)
 
     # while True:
-    #   time.sleep(1000)
+    #    time.sleep(3)

openfeed/generated/openfeed_api_pb2.py

@@ -17,7 +17,7 @@
 
 setup(
     name='openfeed',
-    version='1.0.0',
+    version='1.0.2',
     author='Barchart',
     author_email='[email protected]',
     license='MIT',