pyhive-integration 1.0.8.dev7__tar.gz → 1.0.8.dev9__tar.gz

{pyhive_integration-1.0.8.dev7/pyhive_integration.egg-info → pyhive_integration-1.0.8.dev9}/PKG-INFO

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

{pyhive_integration-1.0.8.dev7 → pyhive_integration-1.0.8.dev9/pyhive_integration.egg-info}/PKG-INFO

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

{pyhive_integration-1.0.8.dev7 → pyhive_integration-1.0.8.dev9}/setup.py

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

{pyhive_integration-1.0.8.dev7 → pyhive_integration-1.0.8.dev9}/src/session.py

@@ -108,6 +108,8 @@ class HiveSession:
         self.deviceList = {}
         self.hub_id = None
         self._lastPollSlow = False
+        self._slowPollThreshold = 3
+        self._refreshThreshold = 0.90
 
     def openFile(self, file: str):
         """Open a file.
@@ -226,6 +228,29 @@ class HiveSession:
         if "ExpiresIn" in data:
             self.tokens.tokenExpiry = timedelta(seconds=data["ExpiresIn"])
 
+        _LOGGER.debug(
+            "updateTokens — IdToken: len=%d tail=…%s | "
+            "AccessToken: len=%d tail=…%s | "
+            "RefreshToken: %s | "
+            "ExpiresIn: %s | tokenCreated: %s | tokenExpiry: %s",
+            len(self.tokens.tokenData.get("token", "")),
+            self.tokens.tokenData.get("token", "")[-4:],
+            len(self.tokens.tokenData.get("accessToken", "")),
+            self.tokens.tokenData.get("accessToken", "")[-4:],
+            (
+                "present (len=%d tail=…%s)"
+                % (
+                    len(self.tokens.tokenData.get("refreshToken", "")),
+                    self.tokens.tokenData.get("refreshToken", "")[-4:],
+                )
+                if self.tokens.tokenData.get("refreshToken")
+                else "not present"
+            ),
+            data.get("ExpiresIn", "N/A"),
+            self.tokens.tokenCreated,
+            self.tokens.tokenExpiry,
+        )
+
         return self.tokens
 
     async def login(self):
@@ -255,7 +280,8 @@ class HiveSession:
             raise
 
         if result and "AuthenticationResult" in result:
-            _LOGGER.debug("Login successful, tokens received.")
+            auth_keys = list(result["AuthenticationResult"].keys())
+            _LOGGER.debug("Login successful — AuthenticationResult keys: %s", auth_keys)
             await self.updateTokens(result)
         return result
 
@@ -284,7 +310,10 @@ class HiveSession:
             raise
 
         if result and "AuthenticationResult" in result:
-            _LOGGER.debug("2FA login successful, tokens received.")
+            auth_keys = list(result["AuthenticationResult"].keys())
+            _LOGGER.debug(
+                "2FA login successful — AuthenticationResult keys: %s", auth_keys
+            )
             await self.updateTokens(result)
         return result
 
@@ -311,9 +340,11 @@ class HiveSession:
             raise
 
         if result and "AuthenticationResult" in result:
-            _LOGGER.debug("Device login successful, tokens received.")
+            auth_keys = list(result["AuthenticationResult"].keys())
+            _LOGGER.debug(
+                "Device login successful — AuthenticationResult keys: %s", auth_keys
+            )
             await self.updateTokens(result)
-            self.tokens.tokenExpiry = timedelta(seconds=0)
         return result
 
     async def _retryDeviceLogin(self):
@@ -345,9 +376,14 @@ class HiveSession:
             )
             raise HiveReauthRequired from last_err
 
-    async def hiveRefreshTokens(self):
+        await self.hiveRefreshTokens(force_refresh=True)
+
+    async def hiveRefreshTokens(self, force_refresh: bool = False):
         """Refresh Hive tokens.
 
+        Args:
+            force_refresh (bool): Whether to force a token refresh regardless of expiry.
+
         Returns:
             boolean: True/False if update was successful
         """
@@ -356,29 +392,33 @@ class HiveSession:
         if self.config.file:
             return None
         else:
-            expiry_time = self.tokens.tokenCreated + (self.tokens.tokenExpiry * 0.95)
-            # Refresh at 95% of token lifetime to prevent expiration during API calls
+            expiry_time = self.tokens.tokenCreated + (
+                self.tokens.tokenExpiry * self._refreshThreshold
+            )
+            # Refresh at 90% of token lifetime to prevent expiration during API calls
             _LOGGER.debug(
                 "Session token expiry time ( Current: %s | Expiry: %s)",
                 datetime.now(),
                 expiry_time,
             )
-            if datetime.now() >= expiry_time:
+            if datetime.now() >= expiry_time or force_refresh:
                 async with self._refreshLock:
                     # Re-check after acquiring lock — another caller may have already refreshed
                     expiry_time = self.tokens.tokenCreated + (
-                        self.tokens.tokenExpiry * 0.95
+                        self.tokens.tokenExpiry * self._refreshThreshold
                     )
-                    if datetime.now() < expiry_time:
+                    if datetime.now() < expiry_time and not force_refresh:
                         return result
                     actual_expiry = self.tokens.tokenCreated + self.tokens.tokenExpiry
                     _LOGGER.debug(
                         "Session Token created: %s | Actual expiry: %s | "
-                        "Early refresh (×0.95): %s | Now: %s",
+                        "Early refresh (×%s): %s | Now: %s | Force refresh: %s",
                         self.tokens.tokenCreated,
                         actual_expiry,
+                        self._refreshThreshold,
                         expiry_time,
                         datetime.now(),
+                        force_refresh,
                     )
                     try:
                         result = await self.auth.refresh_token(
@@ -386,6 +426,11 @@ class HiveSession:
                         )
 
                         if result and "AuthenticationResult" in result:
+                            auth_keys = list(result["AuthenticationResult"].keys())
+                            _LOGGER.debug(
+                                "Token refresh — AuthenticationResult keys: %s",
+                                auth_keys,
+                            )
                             await self.updateTokens(result)
                             new_expiry = (
                                 self.tokens.tokenCreated + self.tokens.tokenExpiry
@@ -399,7 +444,13 @@ class HiveSession:
                             "Session Token refresh failed (%s), falling back to device login.",
                             type(exc).__name__,
                         )
-                        await self._retryDeviceLogin()
+                        if not force_refresh:
+                            await self._retryDeviceLogin()
+                        else:
+                            _LOGGER.error(
+                                "Token refresh failed during retry attempt, giving up."
+                            )
+                            raise HiveReauthRequired from exc
                     except HiveApiError:
                         _LOGGER.error("API error during token refresh.")
                         raise
@@ -535,12 +586,28 @@ class HiveSession:
                         "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
+                    last_auth_err = None
+                    for api_retry_delay in (0, 2, 5):
+                        try:
+                            if api_retry_delay:
+                                _LOGGER.debug(
+                                    "Retrying API call in %ss after device re-login.",
+                                    api_retry_delay,
+                                )
+                                await asyncio.sleep(api_retry_delay)
+                            api_resp_d = await self.api.getAll()
+                            last_auth_err = None
+                            break
+                        except HiveAuthError as retry_err:
+                            _LOGGER.warning(
+                                "API call still rejected after device re-login (attempt delay=%ss).",
+                                api_retry_delay,
+                            )
+                            last_auth_err = retry_err
+                    if last_auth_err is not None:
+                        raise HiveReauthRequired from last_auth_err
                 api_call_duration = time.monotonic() - api_call_start
-                if api_call_duration > 3:
+                if api_call_duration > self._slowPollThreshold:
                     _LOGGER.warning(
                         "Hive API response took %.1fs — marking poll as slow.",
                         api_call_duration,