wyzeapy 0.5.21__tar.gz → 0.5.22.post1__tar.gz

{wyzeapy-0.5.21 → wyzeapy-0.5.22.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wyzeapy
-Version: 0.5.21
+Version: 0.5.22.post1
 Summary: A library for interacting with Wyze devices
 License: GPL-3.0-only
 Author: Katie Mulliken

{wyzeapy-0.5.21 → wyzeapy-0.5.22.post1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wyzeapy"
-version = "0.5.21"
+version = "0.5.22-1"
 description = "A library for interacting with Wyze devices"
 authors = ["Katie Mulliken <katie@mulliken.net>"]
 license = "GPL-3.0-only"

{wyzeapy-0.5.21 → wyzeapy-0.5.22.post1}/src/wyzeapy/__init__.py

@@ -20,7 +20,6 @@ from .services.sensor_service import SensorService
 from .services.switch_service import SwitchService, SwitchUsageService
 from .services.thermostat_service import ThermostatService
 from .services.wall_switch_service import WallSwitchService
-from .utils import check_for_errors_standard
 from .wyze_auth_lib import WyzeAuthLib, Token
 
 _LOGGER = logging.getLogger(__name__)
@@ -84,8 +83,8 @@ class Wyzeapy:
                 email, password, key_id, api_key, token, self.execute_token_callbacks
             )
             if token:
-                # User token supplied, lets go ahead and use it and refresh the access token if needed.
-                await self._auth_lib.refresh_if_should()
+                # User token supplied, refresh on startup
+                await self._auth_lib.refresh()
             else:
                 await self._auth_lib.get_token_with_username_password(
                     email, password, key_id, api_key

{wyzeapy-0.5.21 → wyzeapy-0.5.22.post1}/src/wyzeapy/services/base_service.py

@@ -73,7 +73,7 @@ class BaseService:
 
         response_json = await self._auth_lib.post(url, json=payload)
 
-        check_for_errors_standard(response_json)
+        check_for_errors_standard(self, response_json)
 
     async def get_user_profile(self) -> Dict[Any, Any]:
         await self._auth_lib.refresh_if_should()
@@ -119,7 +119,7 @@ class BaseService:
         response_json = await self._auth_lib.post("https://api.wyzecam.com/app/v2/home_page/get_object_list",
                                                   json=payload)
 
-        check_for_errors_standard(response_json)
+        check_for_errors_standard(self, response_json)
 
         # Cache the devices so that update calls can pull more recent device_params
         BaseService._devices = [Device(device) for device in response_json['data']['device_list']]
@@ -164,7 +164,7 @@ class BaseService:
         response_json = await self._auth_lib.post("https://api.wyzecam.com/app/v2/device/get_property_list",
                                                   json=payload)
 
-        check_for_errors_standard(response_json)
+        check_for_errors_standard(self, response_json)
         properties = response_json['data']['property_list']
 
         property_list = []
@@ -209,7 +209,7 @@ class BaseService:
         response_json = await self._auth_lib.post("https://api.wyzecam.com/app/v2/device/set_property_list",
                                                   json=payload)
 
-        check_for_errors_standard(response_json)
+        check_for_errors_standard(self, response_json)
 
     async def _run_action_list(self, device: Device, plist: List[Dict[Any, Any]]) -> None:
         """
@@ -250,7 +250,7 @@ class BaseService:
         response_json = await self._auth_lib.post("https://api.wyzecam.com/app/v2/auto/run_action_list",
                                                   json=payload)
 
-        check_for_errors_standard(response_json)
+        check_for_errors_standard(self, response_json)
 
     async def _get_event_list(self, count: int) -> Dict[Any, Any]:
         """
@@ -291,7 +291,7 @@ class BaseService:
         response_json = await self._auth_lib.post("https://api.wyzecam.com/app/v2/device/get_event_list",
                                                   json=payload)
 
-        check_for_errors_standard(response_json)
+        check_for_errors_standard(self, response_json)
         return response_json
 
     async def _run_action(self, device: Device, action: str) -> None:
@@ -325,7 +325,7 @@ class BaseService:
         response_json = await self._auth_lib.post("https://api.wyzecam.com/app/v2/auto/run_action",
                                                   json=payload)
 
-        check_for_errors_standard(response_json)
+        check_for_errors_standard(self, response_json)
 
     async def _set_property(self, device: Device, pid: str, pvalue: str) -> None:
         """
@@ -356,7 +356,7 @@ class BaseService:
         response_json = await self._auth_lib.post("https://api.wyzecam.com/app/v2/device/set_property",
                                                   json=payload)
 
-        check_for_errors_standard(response_json)
+        check_for_errors_standard(self, response_json)
 
     async def _monitoring_profile_active(self, hms_id: str, home: int, away: int) -> None:
         """
@@ -393,7 +393,7 @@ class BaseService:
             }
         ]
         response_json = await self._auth_lib.patch(url, headers=headers, params=query, json=payload)
-        check_for_errors_hms(response_json)
+        check_for_errors_hms(self, response_json)
 
     async def _get_plan_binding_list_by_user(self) -> Dict[Any, Any]:
         """
@@ -419,7 +419,7 @@ class BaseService:
         }
 
         response_json = await self._auth_lib.get(url, headers=headers, params=payload)
-        check_for_errors_hms(response_json)
+        check_for_errors_hms(self, response_json)
         return response_json
 
     async def _disable_reme_alarm(self, hms_id: str) -> None:
@@ -441,7 +441,7 @@ class BaseService:
 
         response_json = await self._auth_lib.delete(url, headers=headers, json=payload)
 
-        check_for_errors_hms(response_json)
+        check_for_errors_hms(self, response_json)
 
     async def _monitoring_profile_state_status(self, hms_id: str) -> Dict[Any, Any]:
         """
@@ -469,7 +469,7 @@ class BaseService:
 
         response_json = await self._auth_lib.get(url, headers=headers, params=query)
 
-        check_for_errors_hms(response_json)
+        check_for_errors_hms(self, response_json)
         return response_json
 
     async def _lock_control(self, device: Device, action: str) -> None:
@@ -489,7 +489,7 @@ class BaseService:
 
         response_json = await self._auth_lib.post(url, json=payload)
 
-        check_for_errors_lock(response_json)
+        check_for_errors_lock(self, response_json)
 
     async def _get_lock_info(self, device: Device) -> Dict[str, Optional[Any]]:
         await self._auth_lib.refresh_if_should()
@@ -509,7 +509,7 @@ class BaseService:
 
         response_json = await self._auth_lib.get(url, params=payload)
 
-        check_for_errors_lock(response_json)
+        check_for_errors_lock(self, response_json)
 
         return response_json
 
@@ -533,7 +533,7 @@ class BaseService:
         response_json = await self._auth_lib.post("https://api.wyzecam.com/app/v2/device/get_device_Info",
                                                   json=payload)
 
-        check_for_errors_standard(response_json)
+        check_for_errors_standard(self, response_json)
 
         return response_json
 
@@ -554,7 +554,7 @@ class BaseService:
 
         response_json = await self._auth_lib.get(url, headers=headers, params=payload)
 
-        check_for_errors_iot(response_json)
+        check_for_errors_iot(self, response_json)
 
         return response_json
 
@@ -579,7 +579,7 @@ class BaseService:
 
         response_json = await self._auth_lib.post(url, headers=headers, data=payload_str)
 
-        check_for_errors_iot(response_json)
+        check_for_errors_iot(self, response_json)
 
     async def _local_bulb_command(self, bulb, plist):
         # await self._auth_lib.refresh_if_should()
@@ -640,6 +640,6 @@ class BaseService:
             "https://api.wyzecam.com/app/v2/plug/usage_record_list", json=payload
         )
 
-        check_for_errors_standard(response_json)
+        check_for_errors_standard(self, response_json)
 
         return response_json["data"]["usage_record_list"]

{wyzeapy-0.5.21 → wyzeapy-0.5.22.post1}/src/wyzeapy/utils.py

@@ -72,36 +72,45 @@ def create_password(password: str) -> str:
     return hashlib.md5(hex2.encode()).hexdigest()
 
 
-def check_for_errors_standard(response_json: Dict[str, Any]) -> None:
+def check_for_errors_standard(service, response_json: Dict[str, Any]) -> None:
     if response_json['code'] != ResponseCodes.SUCCESS.value:
         if response_json['code'] == ResponseCodes.PARAMETER_ERROR.value:
             raise ParameterError(response_json)
         elif response_json['code'] == ResponseCodes.ACCESS_TOKEN_ERROR.value:
-            raise AccessTokenError
+            service._auth_lib.token.expired = True
+            raise AccessTokenError("Access Token expired, attempting to refresh")
         elif response_json['code'] == ResponseCodes.DEVICE_OFFLINE.value:
             return
         else:
             raise UnknownApiError(response_json)
 
 
-def check_for_errors_lock(response_json: Dict[str, Any]) -> None:
+def check_for_errors_lock(service, response_json: Dict[str, Any]) -> None:
     if response_json['ErrNo'] != 0:
         if response_json.get('code') == ResponseCodes.PARAMETER_ERROR.value:
             raise ParameterError
         elif response_json.get('code') == ResponseCodes.ACCESS_TOKEN_ERROR.value:
-            raise AccessTokenError
+            service._auth_lib.token.expired = True
+            raise AccessTokenError("Access Token expired, attempting to refresh")
         else:
             raise UnknownApiError(response_json)
 
 
-def check_for_errors_iot(response_json: Dict[Any, Any]) -> None:
+def check_for_errors_iot(service, response_json: Dict[Any, Any]) -> None:
     if response_json['code'] != 1:
-        raise UnknownApiError(response_json)
-
+        if str(response_json['code']) == ResponseCodes.ACCESS_TOKEN_ERROR.value:
+            service._auth_lib.token.expired = True
+            raise AccessTokenError("Access Token expired, attempting to refresh")
+        else:
+            raise UnknownApiError(response_json)
 
-def check_for_errors_hms(response_json: Dict[Any, Any]) -> None:
-    if response_json['message'] is None:
-        raise AccessTokenError
+def check_for_errors_hms(service, response_json: Dict[Any, Any]) -> None:
+    if response_json['code'] != 1:
+        if str(response_json['code']) == ResponseCodes.ACCESS_TOKEN_ERROR.value:
+            service._auth_lib.token.expired = True
+            raise AccessTokenError("Access Token expired, attempting to refresh")
+        else:
+            raise UnknownApiError(response_json)
 
 
 def return_event_for_device(device: Device, events: List[Event]) -> Optional[Event]:

{wyzeapy-0.5.21 → wyzeapy-0.5.22.post1}/src/wyzeapy/wyze_auth_lib.py

@@ -22,12 +22,13 @@ _LOGGER = logging.getLogger(__name__)
 
 
 class Token:
-    # Token is good for 216,000 seconds (60 hours) but 48 hours seems like a reasonable refresh interval
-    REFRESH_INTERVAL = 172800
+    # Token is apparently good for 24 hours, so refresh after 23
+    REFRESH_INTERVAL = 82800
 
     def __init__(self, access_token, refresh_token, refresh_time: float = None):
         self._access_token: str = access_token
         self._refresh_token: str = refresh_token
+        self.expired = False
         if refresh_time:
             self._refresh_time: float = refresh_time
         else:
@@ -206,9 +207,9 @@ class WyzeAuthLib:
         return time.time() >= self.token.refresh_time
 
     async def refresh_if_should(self):
-        if self.should_refresh:
+        if self.should_refresh or self.token.expired:
             async with self.refresh_lock:
-                if self.should_refresh:
+                if self.should_refresh or self.token.expired:
                     _LOGGER.debug("Should refresh. Refreshing...")
                     await self.refresh()
 
@@ -233,11 +234,12 @@ class WyzeAuthLib:
             response = await _session.post("https://api.wyzecam.com/app/user/refresh_token", headers=headers,
                                            json=payload)
         response_json = await response.json()
-        check_for_errors_standard(response_json)
+        check_for_errors_standard(self, response_json)
 
         self.token.access_token = response_json['data']['access_token']
         self.token.refresh_token = response_json['data']['refresh_token']
         await self.token_callback(self.token)
+        self.token.expired = False
 
     def sanitize(self, data):
         if data and type(data) is dict: