Increased timeout

And3rsL · Jan 27, 2021 · 6556190 · 6556190
1 parent 6f83709
commit 6556190
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/deebotozmo/__init__.py b/deebotozmo/__init__.py
@@ -116,7 +116,7 @@ def __call_main_api(self, function, *args):
         else:
             url = (EcoVacsAPI.MAIN_URL_FORMAT + "/" + function).format(**self.meta)
 
-        api_response = requests.get(url, self.__sign(params), verify=self.verify_ssl)
+        api_response = requests.get(url, self.__sign(params), timeout=60, verify=self.verify_ssl)
 
         json = api_response.json()
         _LOGGER.debug("got {}".format(json))
@@ -141,7 +141,7 @@ def __call_auth_api(self, device_id, *args):
         else:
             url = (EcoVacsAPI.PORTAL_GLOBAL_AUTHCODE).format(**self.meta)
 
-        api_response = requests.get(url, self.__signAuth(params), verify=self.verify_ssl)
+        api_response = requests.get(url, self.__signAuth(params), timeout=60, verify=self.verify_ssl)
 
         json = api_response.json()
         _LOGGER.debug("got {}".format(json))
@@ -160,7 +160,7 @@ def __call_user_api(self, function, args):
         _LOGGER.debug("calling user api {} with {}".format(function, args))
         params = {'todo': function}
         params.update(args)
-        response = requests.post(EcoVacsAPI.USER_URL_FORMAT.format(continent=self.continent), json=params, verify=self.verify_ssl)
+        response = requests.post(EcoVacsAPI.USER_URL_FORMAT.format(continent=self.continent), json=params, timeout=60, verify=self.verify_ssl)
         json = response.json()
         _LOGGER.debug("got {}".format(json))
         if json['result'] == 'ok':
@@ -189,7 +189,7 @@ def __call_portal_api(self, api, function, args, verify_ssl=True, **kwargs):
         else:
             url = (EcoVacsAPI.PORTAL_URL_FORMAT + "/" + api).format(continent=continent, **self.meta)
 
-        response = requests.post(url, json=params, verify=verify_ssl)        
+        response = requests.post(url, json=params, timeout=60, verify=verify_ssl)        
 
         json = response.json()
         _LOGGER.debug("got {}".format(json))
@@ -451,6 +451,8 @@ def _handle_clean_report(self, event):
             elif response['trigger'] == 'alert':
                 self.vacuum_status = 'STATE_ERROR'
 
+        self.is_available = True
+
         self.statusEvents.notify(self.vacuum_status)
 
     def _handle_map_trace(self, event):
@@ -546,6 +548,7 @@ def _handle_battery_info(self, event):
     def _handle_charge_state(self, event):
         response = event['body']
         status = 'none'
+
         if response['code'] == 0:
             if response['data']['isCharging'] == 1:
                 status = 'STATE_DOCKED'
@@ -562,8 +565,6 @@ def _handle_charge_state(self, event):
         if status != 'none':
             self.vacuum_status = status
             self.is_available = True
-        else:
-            self.is_available = False
 
         self.statusEvents.notify(self.vacuum_status)
 

diff --git a/deebotozmo/ecovacsjson.py b/deebotozmo/ecovacsjson.py
@@ -40,7 +40,7 @@ def __init__(self, user, resource, secret, continent, vacuum, realm, portal_url_
         self.verify_ssl = str_to_bool_or_cert(verify_ssl)
         self.realm = realm
         self.portal_url_format = portal_url_format
-
+        
     def subscribe_to_ctls(self, function):
         self.ctl_subscribers.append(function)   
 
@@ -122,7 +122,7 @@ def CallIOTApi(self, args, verify_ssl=True):
         url = (self.portal_url_format + "/iot/devmanager.do?mid=" + params['toType'] + "&did=" + params['toId'] + "&td=" + params['td'] + "&u=" + params['auth']['userid'] + "&cv=1.67.3&t=a&av=1.3.1").format(continent=self.continent)
 
         try:  
-            with requests.post(url, headers=headers, json=params, timeout=20, verify=verify_ssl) as response:
+            with requests.post(url, headers=headers, json=params, timeout=60, verify=verify_ssl) as response:
                 if response.status_code == 502:
                     _LOGGER.info("Error calling API (502): Unfortunately the ecovacs api is unreliable. Retrying in a few moments")
                     _LOGGER.debug(f"URL was: {str(url)}")
@@ -150,7 +150,7 @@ def CallCleanLogsApi(self, args, verify_ssl=True):
         url = (self.portal_url_format + "/lg/log.do?td=" + params['td'] + "&u=" + params['auth']['userid'] + "&cv=1.67.3&t=a&av=1.3.1").format(continent=self.continent)
 
         try:
-            with requests.post(url, headers=headers, json=params, timeout=20, verify=verify_ssl) as response:
+            with requests.post(url, headers=headers, json=params, timeout=60, verify=verify_ssl) as response:
                 data = response.json()
                 if response.status_code != 200:
                     _LOGGER.warning("Error calling API " + str(url))

diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 
 setup(
     name='deebotozmo',
-    version='1.7.7',
+    version='1.7.8',
 
     description='a library for controlling certain robot vacuums [SUCKS FORK]',
     long_description=long_description,