Upgrade modules (#13)

* upgrade websockets

* upgrade rx to reactivex

Author: chylli-deriv

Pipfile

@@ -1,6 +1,6 @@
 [packages]
-websockets = "==9.1"
-rx = "==3.1.1"
+websockets = "==10.3"
+reactivex = "==4.0.*"
 deriv-api = {editable = true, path = "."}
 
 [dev-packages]

Pipfile.lock

@@ -6,11 +6,12 @@
 from typing import Dict, Optional, Union, Coroutine
 
 import websockets
-from rx import operators as op
-from rx.subject import Subject
-from rx import Observable
+from reactivex import operators as op
+from reactivex.subject import Subject
+from reactivex import Observable
 from websockets.legacy.client import WebSocketClientProtocol
 from websockets.exceptions import ConnectionClosedOK, ConnectionClosed
+from websockets.frames import Close
 
 from deriv_api.cache import Cache
 from deriv_api.easy_future import EasyFuture
@@ -351,7 +352,7 @@ async def disconnect(self) -> None:
         """
         if not self.connected.is_resolved():
             return
-        self.connected = EasyFuture().reject(ConnectionClosedOK(1000, 'Closed by disconnect'))
+        self.connected = EasyFuture().reject(ConnectionClosedOK(None, Close(1000, 'Closed by disconnect')))
         self.connected.exception()  # fetch exception to avoid the warning of 'exception never retrieved'
         if self.wsconnection_from_inside:
             # TODO NEXT reconnect feature

deriv_api/deriv_api.py

@@ -1,8 +1,8 @@
 from deriv_api.utils import dict_to_cache_key
 from deriv_api.errors import APIError
-from rx import operators as op
-from rx.subject import Subject
-from rx import Observable
+from reactivex import operators as op
+from reactivex.subject import Subject
+from reactivex import Observable
 from typing import Optional, Union
 
 # streams_list is the list of subscriptions msg_types available.

deriv_api/subscription_manager.py

@@ -8,7 +8,7 @@
     author='Deriv Group Services Ltd',
     author_email='learning+python@deriv.com',
     license='MIT',
-    install_requires=['websockets==9.1', 'rx==3.1.1'],
+    install_requires=['websockets==10.3', 'reactivex==4.0.*'],
     test_suite='tests',
     url='https://github.com/binary-com/python-deriv-api',
     project_urls={

setup.py

@@ -3,13 +3,14 @@
 import traceback
 import pytest
 import pytest_mock
-import rx
+import reactivex
+from websockets.frames import Close
 
 import deriv_api
 from deriv_api.errors import APIError, ConstructionError, ResponseError
 from deriv_api.easy_future import EasyFuture
-from rx.subject import Subject
-import rx.operators as op
+from reactivex.subject import Subject
+import reactivex.operators as op
 import pickle
 import json
 from websockets.exceptions import ConnectionClosedOK, ConnectionClosedError
@@ -362,7 +363,7 @@ async def test_ws_disconnect():
     class MockedWs2(MockedWs):
         def __init__(self):
             self.closed = EasyFuture()
-            self.exception = ConnectionClosedOK(1000, 'test disconnect')
+            self.exception = ConnectionClosedOK(Close(1000, 'test disconnect'), None, None)
             super().__init__()
         async def close(self):
             self.closed.resolve(self.exception)
@@ -376,7 +377,7 @@ async def recv(self):
 
     # closed by api
     wsconnection = MockedWs2()
-    wsconnection.exception = ConnectionClosedOK(1000, 'Closed by api')
+    wsconnection.exception = ConnectionClosedOK(Close(1000, 'Closed by api'), None, None)
     api = deriv_api.DerivAPI(connection=wsconnection)
     await asyncio.sleep(0.1)
     api.wsconnection_from_inside = True
@@ -399,7 +400,7 @@ async def recv(self):
     # closed by remote
     wsconnection = MockedWs2()
     api = deriv_api.DerivAPI(connection=wsconnection)
-    wsconnection.exception = ConnectionClosedError(1234, 'Closed by remote')
+    wsconnection.exception = ConnectionClosedError(Close(1234, 'Closed by remote'), None, None)
     last_error = api.sanity_errors.pipe(op.first(), op.to_future())
     await asyncio.sleep(0.1) # waiting for init finished
     await wsconnection.close() # it will set connected as 'Closed by disconnect', and cause MockedWs2 raising `test disconnect`

tests/test_deriv_api.py

@@ -1,8 +1,8 @@
 import pytest
 
 from deriv_api.subscription_manager import SubscriptionManager, get_msg_type
-from rx.subject import Subject
-from rx import Observable
+from reactivex.subject import Subject
+from reactivex import Observable
 import asyncio
 from deriv_api.errors import APIError