pynintendoparental 0.7.0__tar.gz → 0.7.2__tar.gz

{pynintendoparental-0.7.0 → pynintendoparental-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pynintendoparental
-Version: 0.7.0
+Version: 0.7.2
 Summary: A Python module to interact with Nintendo Parental Controls
 Home-page: http://github.com/pantherale0/pynintendoparental
 Author: pantherale0

pynintendoparental-0.7.2/pynintendoparental/_version.py

@@ -0,0 +1 @@
+__version__ = "0.7.2"

{pynintendoparental-0.7.0 → pynintendoparental-0.7.2}/pynintendoparental/api.py

@@ -1,7 +1,5 @@
 """API handler."""
 
-from datetime import datetime, timedelta
-
 import aiohttp
 
 from .authenticator import Authenticator
@@ -25,20 +23,11 @@ def _check_http_success(status: int) -> bool:
 class Api:
     """Nintendo Parental Controls API."""
 
-    def __init__(self, auth, tz, lang, session: aiohttp.ClientSession=None):
+    def __init__(self, auth, tz, lang):
         """INIT"""
         self._auth: Authenticator = auth
         self._tz = tz
         self._language = lang
-        if session is None:
-            session = aiohttp.ClientSession()
-            self._session_created_internally = True
-        self._session = session
-
-    @property
-    def _auth_token(self) -> str:
-        """Returns the auth token."""
-        return f"Bearer {self._auth.access_token}"
 
     @property
     def account_id(self):
@@ -59,15 +48,9 @@ class Api:
             "X-Moon-TimeZone": self._tz,
             "X-Moon-Os-Language": self._language,
             "X-Moon-App-Language": self._language,
-            "Authorization": self._auth_token
+            "Authorization": self._auth.access_token
         }
 
-    async def async_close(self):
-        """Closes the underlying aiohttp.ClientSession if it was created by this instance."""
-        if hasattr(self, '_session_created_internally') and self._session_created_internally and self._session and not self._session.closed:
-            await self._session.close()
-            self._session = None # Optional: clear the session attribute
-
     async def send_request(self, endpoint: str, body: object=None, **kwargs):
         """Sends a request to a given endpoint."""
         _LOGGER.debug("Sending request to %s", endpoint)
@@ -76,7 +59,7 @@ class Api:
         if e_point is None:
             raise ValueError("Endpoint does not exist")
         # refresh the token if it has expired.
-        if self._auth.expires < (datetime.now()+timedelta(seconds=30)):
+        if self._auth.access_token_expired:
             _LOGGER.debug("Access token expired, requesting refresh.")
             await self._auth.perform_refresh()
         # format the URL using the kwargs
@@ -89,11 +72,11 @@ class Api:
             "json": "",
             "headers": ""
         }
-        self._session.headers.update(self._headers)
-        async with self._session.request(
+        async with self._auth.client_session.request(
             method=e_point.get("method"),
             url=url,
-            json=body
+            json=body,
+            headers=self._headers
         ) as response:
             _LOGGER.debug("%s request to %s status code %s",
                             e_point.get("method"),

{pynintendoparental-0.7.0 → pynintendoparental-0.7.2}/pynintendoparental/authenticator/__init__.py

@@ -2,7 +2,6 @@
 from __future__ import annotations
 
 import logging
-import re
 import base64
 import hashlib
 import random
@@ -60,11 +59,16 @@ def _rand():
 class Authenticator:
     """Authentication functions."""
 
-    def __init__(self, session_token = None, auth_code_verifier = None):
+    def __init__(
+            self,
+            session_token = None,
+            auth_code_verifier = None,
+            client_session: aiohttp.ClientSession = None
+        ):
         """Basic init."""
         _LOGGER.debug(">> Init authenticator.")
-        self.expires: datetime = None
-        self.access_token: str = None
+        self._at_expiry: datetime = None
+        self._access_token: str = None
         self.available_scopes: dict = None
         self.account_id: str = None
         self.account: dict = None
@@ -73,12 +77,25 @@ class Authenticator:
         self._id_token: str = None
         self._session_token: str = session_token
         self.login_url: str = None
+        if client_session is None:
+            client_session = aiohttp.ClientSession()
+        self.client_session: aiohttp.ClientSession = client_session
 
     @property
     def get_session_token(self) -> str:
         """Return the session token."""
         return self._session_token
 
+    @property
+    def access_token(self) -> str:
+        """Return the formatted access token."""
+        return f"Bearer {self._access_token}"
+
+    @property
+    def access_token_expired(self) -> bool:
+        """Check if the access token has expired."""
+        return self._at_expiry < (datetime.now()+timedelta(minutes=1))
+
     async def _request_handler(self, method, url, json=None, data=None, headers: dict=None):
         """Send a HTTP request"""
         if headers is None:
@@ -89,28 +106,25 @@ class Authenticator:
             "json": "",
             "headers": ""
         }
-        async with aiohttp.ClientSession() as session:
-            session.headers.add("Accept", "application/json")
-            for header in headers.keys():
-                session.headers.add(header, headers[header])
-            async with session.request(
-                method=method,
-                url=url,
-                json=json,
-                data=data
-            ) as resp:
-                response["status"] = resp.status
-                response["text"] = await resp.text()
-                response["json"] = await resp.json()
-                response["headers"] = resp.headers
+        async with self.client_session.request(
+            method=method,
+            url=url,
+            json=json,
+            data=data,
+            headers=headers
+        ) as resp:
+            response["status"] = resp.status
+            response["text"] = await resp.text()
+            response["json"] = await resp.json()
+            response["headers"] = resp.headers
         return response
 
     def _read_tokens(self, tokens: dict):
         """Reads tokens into self."""
         self.available_scopes = tokens.get("scope")
-        self.expires = datetime.now() + timedelta(seconds=tokens.get("expires_in"))
+        self._at_expiry = datetime.now() + timedelta(seconds=tokens.get("expires_in"))
         self._id_token = tokens.get("id_token")
-        self.access_token = tokens.get("access_token")
+        self._access_token = tokens.get("access_token")
 
     async def perform_login(self, session_token_code):
         """Retrieves initial tokens."""
@@ -159,7 +173,7 @@ class Authenticator:
                 method="GET",
                 url=MY_ACCOUNT_ENDPOINT,
                 headers={
-                    "Authorization": f"Bearer {self.access_token}"
+                    "Authorization": self.access_token
                 }
             )
             if account["status"] != 200:
@@ -168,11 +182,13 @@ class Authenticator:
             self.account = account["json"]
 
     @classmethod
-    def generate_login(cls) -> 'Authenticator':
+    def generate_login(
+        cls,
+        client_session: aiohttp.ClientSession | None = None) -> 'Authenticator':
         """Starts configuration of the authenticator."""
         verifier = _rand()
 
-        auth = cls(auth_code_verifier=verifier)
+        auth = cls(auth_code_verifier=verifier, client_session=client_session)
 
         query = {
             "client_id": CLIENT_ID,
@@ -193,10 +209,11 @@ class Authenticator:
     async def complete_login(cls,
                      auth: Authenticator | None,
                      response_token: str,
-                     is_session_token: bool=False) -> Authenticator:
+                     is_session_token: bool=False,
+                     client_session: aiohttp.ClientSession | None = None) -> Authenticator:
         """Creates and logs into Nintendo APIs"""
         if is_session_token:
-            auth = cls(session_token=response_token)
+            auth = cls(session_token=response_token, client_session=client_session)
             await auth.perform_refresh()
         else:
             response_token = _parse_response_token(response_token)

{pynintendoparental-0.7.0 → pynintendoparental-0.7.2}/pynintendoparental/device.py

@@ -76,6 +76,13 @@ class Device:
         if callback not in self._callbacks:
             self._callbacks.append(callback)
 
+    def remove_device_callback(self, callback):
+        """Remove a given device callback."""
+        if not callable(callback):
+            raise ValueError("Object must be callable.")
+        if callback in self._callbacks:
+            self._callbacks.remove(callback)
+
     async def set_new_pin(self, pin: str):
         """Updates the pin for the device."""
         _LOGGER.debug(">> Device.set_new_pin(pin=REDACTED)")
@@ -273,7 +280,7 @@ class Device:
                 time_remaining_by_bedtime = 0.0
                 if bedtime_dt > now: # Bedtime is in the future today
                     time_remaining_by_bedtime = (bedtime_dt - now).total_seconds() / 60
-                    time_remaining_by_bedtime = max(0.0, time_remaining_by_bedtime) 
+                    time_remaining_by_bedtime = max(0.0, time_remaining_by_bedtime)
                 # else: Bedtime has passed for today or is now, so time_remaining_by_bedtime remains 0.0
 
                 effective_remaining_time = min(effective_remaining_time, time_remaining_by_bedtime)

{pynintendoparental-0.7.0 → pynintendoparental-0.7.2}/pynintendoparental.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pynintendoparental
-Version: 0.7.0
+Version: 0.7.2
 Summary: A Python module to interact with Nintendo Parental Controls
 Home-page: http://github.com/pantherale0/pynintendoparental
 Author: pantherale0

pynintendoparental-0.7.0/pynintendoparental/_version.py

@@ -1 +0,0 @@
-__version__ = "0.7.0"