Fix default keep alive interval (#79)

* Fix to use default keep_alive interval

* Add some type hints

---------

Co-authored-by: Chiwon Cho <superdoli@gmail.com>

Author: mksong76

iconsdk/icon_service.py

@@ -521,7 +521,7 @@ def get_btp_source_information(self) -> dict:
         """
         return self.__provider.make_request('btp_getSourceInformation')
 
-    def monitor(self, spec: MonitorSpec, keep_alive: Optional[float]) -> Monitor:
+    def monitor(self, spec: MonitorSpec, keep_alive: Optional[float] = None) -> Monitor:
         """
         Monitor events specified in the spec
 

iconsdk/monitor.py

@@ -25,7 +25,7 @@
 #  limitations under the License.
 from __future__ import annotations
 
-from typing import List
+from typing import List, Dict, Any
 
 from iconsdk.providers.provider import MonitorSpec
 from iconsdk.utils.typing.conversion import object_to_str
@@ -38,7 +38,7 @@ def __init__(self, addr: str, event: str, indexed: int, *args):
         self.__indexed = list(args[0:indexed])
         self.__data = list(args[indexed:])
 
-    def apply_to(self, obj: dict):
+    def apply_to(self, obj: Dict[str, Any]):
         obj.update({
             "event": self.__event,
             "indexed": self.__indexed,
@@ -49,7 +49,7 @@ def apply_to(self, obj: dict):
                 "addr": self.__addr
             })
 
-    def as_dict(self) -> dict:
+    def as_dict(self) -> Dict[str, Any]:
         obj = {}
         self.apply_to(obj)
         return obj
@@ -107,7 +107,7 @@ def __init__(self, height: int | None,
     def get_path(self) -> str:
         return 'block'
 
-    def get_request(self) -> any:
+    def get_request(self) -> Dict[str, Any]:
         params = {}
         if self.__height is not None:
             params["height"] = self.__height
@@ -142,7 +142,7 @@ def __init__(self, height: int | None,
     def get_path(self) -> str:
         return 'btp'
 
-    def get_request(self) -> any:
+    def get_request(self) -> Dict[str, Any]:
         params = {
             "networkID": self.__network_id,
         }

iconsdk/providers/http_provider.py

@@ -155,7 +155,7 @@ def _return_custom_response(response: requests.Response, full_response: bool = F
             return content['result']
         raise JSONRPCException(content["error"])
 
-    def make_monitor(self, spec: MonitorSpec, keep_alive: float = 30.0) -> Monitor:
+    def make_monitor(self, spec: MonitorSpec, keep_alive: Optional[float] = None) -> Monitor:
         if self._WS_MAP is None:
             raise Exception(f'Channel must be set for socket')
         path = spec.get_path()
@@ -166,10 +166,9 @@ def make_monitor(self, spec: MonitorSpec, keep_alive: float = 30.0) -> Monitor:
 
 
 class WebSocketMonitor(Monitor):
-    def __init__(self, url: str, params: dict, keep_alive: float):
+    def __init__(self, url: str, params: dict, keep_alive: Optional[float] = None):
         self.__client = WebSocket()
-        self.__keep_alive = keep_alive
-        self.__client.timeout = keep_alive
+        self.__keep_alive = keep_alive or 30
         self.__client.connect(url)
         self.__client.send(json.dumps(params))
         result = self.__read_json(None)
@@ -181,7 +180,7 @@ def __init__(self, url: str, params: dict, keep_alive: float):
     def close(self):
         self.__client.close()
 
-    def __read_json(self, timeout: Optional[float]) -> any:
+    def __read_json(self, timeout: Optional[float] = None) -> any:
         now = monotonic()
         limit = None
         if timeout is not None:
@@ -202,5 +201,5 @@ def __read_json(self, timeout: Optional[float]) -> any:
                 else:
                     raise MonitorTimeoutException()
 
-    def read(self, timeout: Optional[float]) -> any:
+    def read(self, timeout: Optional[float] = None) -> any:
         return self.__read_json(timeout=timeout)

iconsdk/providers/provider.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from abc import ABCMeta, abstractmethod
-from typing import Optional
+from typing import Optional, Dict, Any
 
 
 class MonitorSpec(metaclass=ABCMeta):
@@ -48,7 +48,7 @@ def close(self):
         pass
 
     @abstractmethod
-    def read(self, timeout: Optional[float]) -> any:
+    def read(self, timeout: Optional[float] = None) -> any:
         """
         Read the notification
 
@@ -62,11 +62,11 @@ class Provider(metaclass=ABCMeta):
     """The provider defines how the IconService connects to RPC server."""
 
     @abstractmethod
-    def make_request(self, method: str, params=None, full_response: bool = False):
+    def make_request(self, method: str, params: Optional[Dict[str, Any]] = None, full_response: bool = False):
         raise NotImplementedError("Providers must implement this method")
 
     @abstractmethod
-    def make_monitor(self, spec: MonitorSpec, keep_alive: float = 30.0) -> Monitor:
+    def make_monitor(self, spec: MonitorSpec, keep_alive: Optional[float] = None) -> Monitor:
         """
         Make monitor for the spec
         :param spec: Monitoring spec