pyhive-integration 1.0.8.dev0__tar.gz → 1.0.8.dev2__tar.gz

{pyhive_integration-1.0.8.dev0/pyhive_integration.egg-info → pyhive_integration-1.0.8.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhive-integration
-Version: 1.0.8.dev0
+Version: 1.0.8.dev2
 Summary: A Python library to interface with the Hive API
 Home-page: https://github.com/Pyhive/pyhiveapi
 Author: KJonline24

{pyhive_integration-1.0.8.dev0 → pyhive_integration-1.0.8.dev2/pyhive_integration.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhive-integration
-Version: 1.0.8.dev0
+Version: 1.0.8.dev2
 Summary: A Python library to interface with the Hive API
 Home-page: https://github.com/Pyhive/pyhiveapi
 Author: KJonline24

{pyhive_integration-1.0.8.dev0 → pyhive_integration-1.0.8.dev2}/setup.py

@@ -17,7 +17,7 @@ def requirements_from_file(filename="requirements.txt"):
 
 
 setup(
-    version="1.0.8_dev",
+    version="1.0.8.dev2",
     packages=["apyhiveapi", "apyhiveapi.api", "apyhiveapi.helper"],
     package_dir={"apyhiveapi": "src"},
     package_data={"data": ["*.json"]},

{pyhive_integration-1.0.8.dev0 → pyhive_integration-1.0.8.dev2}/src/api/hive_async_api.py

@@ -10,8 +10,8 @@ import urllib3
 from aiohttp import ClientResponse, ClientSession, web_exceptions
 from pyquery import PyQuery
 
-from ..helper.const import HTTP_UNAUTHORIZED
-from ..helper.hive_exceptions import FileInUse, HiveApiError, NoApiToken
+from ..helper.const import HTTP_FORBIDDEN, HTTP_UNAUTHORIZED
+from ..helper.hive_exceptions import FileInUse, HiveApiError, HiveAuthError, NoApiToken
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -56,45 +56,52 @@ class HiveApiAsync:
         _LOGGER.debug("API %s request to %s", method.upper(), url)
         data = kwargs.get("data", None)
 
+        headers = {
+            "content-type": "application/json",
+            "Accept": "*/*",
+            "User-Agent": "Hive/12.04.0 iOS/18.3.1 Apple",
+        }
         try:
             if camera:
-                headers = {
-                    "content-type": "application/json",
-                    "Accept": "*/*",
-                    "Authorization": f"Bearer {self.session.tokens.tokenData['token']}",
-                    "x-jwt-token": self.session.tokens.tokenData["token"],
-                    "User-Agent": "Hive/12.04.0 iOS/18.3.1 Apple",
-                }
+                headers["Authorization"] = (
+                    f"Bearer {self.session.tokens.tokenData['token']}"
+                )
+                headers["x-jwt-token"] = self.session.tokens.tokenData["token"]
             else:
-                headers = {
-                    "content-type": "application/json",
-                    "Accept": "*/*",
-                    "Authorization": self.session.tokens.tokenData["token"],
-                    "User-Agent": "Hive/12.04.0 iOS/18.3.1 Apple",
-                }
+                headers["Authorization"] = self.session.tokens.tokenData["token"]
         except KeyError:
             if "sso" in url:
                 pass
             else:
                 raise NoApiToken
 
+        auth_token = headers.get("Authorization", "")
+        _LOGGER.debug(
+            "Using token (len=%d, tail=…%s)",
+            len(auth_token),
+            auth_token[-4:] if len(auth_token) >= 4 else auth_token,
+        )
+
         async with self.websession.request(
             method, url, headers=headers, data=data
         ) as resp:
-            await resp.text()
+            resp_body = await resp.text()
             if str(resp.status).startswith("20"):
                 _LOGGER.debug("API response %s from %s", resp.status, url)
                 return resp
 
-        if resp.status == HTTP_UNAUTHORIZED:
+        if resp.status in (HTTP_UNAUTHORIZED, HTTP_FORBIDDEN):
             _LOGGER.error(
-                f"Hive token has expired when calling {url} - "
-                f"HTTP status is - {resp.status}"
+                f"Hive token rejected calling {url} - "
+                f"HTTP {resp.status} — response: {resp_body[:200]}"
+            )
+            raise HiveAuthError(
+                f"Token expired or forbidden calling {url} — HTTP {resp.status}"
             )
         elif url is not None and resp.status is not None:
             _LOGGER.error(
                 f"Something has gone wrong calling {url} - "
-                f"HTTP status is - {resp.status}"
+                f"HTTP status is - {resp.status} — response: {resp_body[:200]}"
             )
 
         raise HiveApiError

{pyhive_integration-1.0.8.dev0 → pyhive_integration-1.0.8.dev2}/src/helper/hive_exceptions.py

@@ -27,6 +27,14 @@ class HiveApiError(Exception):
     """
 
 
+class HiveAuthError(HiveApiError):
+    """Auth error (401/403) — token may be expired or invalid.
+
+    Args:
+        HiveApiError (object): Parent API error class
+    """
+
+
 class HiveRefreshTokenExpired(Exception):
     """Refresh token expired.
 

{pyhive_integration-1.0.8.dev0 → pyhive_integration-1.0.8.dev2}/src/session.py

@@ -17,6 +17,7 @@ from .device_attributes import HiveAttributes
 from .helper.const import ACTIONS, DEVICES, HIVE_TYPES, PRODUCTS
 from .helper.hive_exceptions import (
     HiveApiError,
+    HiveAuthError,
     HiveFailedToRefreshTokens,
     HiveInvalid2FACode,
     HiveInvalidDeviceAuthentication,
@@ -73,7 +74,7 @@ class HiveSession:
         self.tokens = Map(
             {
                 "tokenData": {},
-                "tokenCreated": datetime.now() - timedelta(seconds=4000),
+                "tokenCreated": datetime.min,
                 "tokenExpiry": timedelta(seconds=3600),
             }
         )
@@ -407,12 +408,16 @@ class HiveSession:
                 if datetime.now() < ep:
                     return updated
                 _LOGGER.debug("Polling Hive API for device updates.")
-                await self.getDevices(device["hiveID"])
-                if len(self.deviceList["camera"]) > 0:
+                updated = await self.getDevices(device["hiveID"])
+                if updated and len(self.deviceList["camera"]) > 0:
                     for camera in self.data.camera:
                         await self.getCamera(self.devices[camera])
-                updated = True
-                _LOGGER.debug("Device update completed successfully.")
+                if updated:
+                    _LOGGER.debug("Device update completed successfully.")
+                else:
+                    _LOGGER.debug(
+                        "Device update failed, will retry after scan interval."
+                    )
 
         return updated
 
@@ -505,7 +510,18 @@ class HiveSession:
             elif self.tokens is not None:
                 await self.hiveRefreshTokens()
                 _LOGGER.debug("Fetching all devices from Hive API.")
-                api_resp_d = await self.api.getAll()
+                try:
+                    api_resp_d = await self.api.getAll()
+                except HiveAuthError:
+                    _LOGGER.warning(
+                        "Auth error (401/403) after token refresh, "
+                        "falling back to full device re-login."
+                    )
+                    await self._retryDeviceLogin()
+                    try:
+                        api_resp_d = await self.api.getAll()
+                    except HiveAuthError as retry_err:
+                        raise HiveReauthRequired from retry_err
                 if operator.contains(str(api_resp_d["original"]), "20") is False:
                     raise HTTPException
                 elif api_resp_d["parsed"] is None:
@@ -551,6 +567,10 @@ class HiveSession:
                 await self.getAlarm()
             self.config.lastUpdate = datetime.now()
             get_nodes_successful = True
+        except HiveReauthRequired:
+            _LOGGER.error("Reauthentication required, propagating to caller.")
+            self.config.lastUpdate = datetime.now()
+            raise
         except (
             OSError,
             RuntimeError,
@@ -559,6 +579,9 @@ class HiveSession:
             HTTPException,
         ) as err:
             _LOGGER.error("Failed to fetch devices: %s", err)
+            self.config.lastUpdate = (
+                datetime.now() - self.config.scanInterval + timedelta(seconds=30)
+            )
             get_nodes_successful = False
 
         return get_nodes_successful