pynintendoparental 0.6.9__py3-none-any.whl → 0.7.0__py3-none-any.whl

pynintendoparental/__init__.py

@@ -30,10 +30,7 @@ class NintendoParental:
                               dev.device_id,
                               err)
 
-        response = await self._api.send_request(
-            endpoint="get_account_devices",
-            ACCOUNT_ID=self.account_id
-        )
+        response = await self._api.async_get_account_devices()
 
         for dev_raw in response["json"]["items"]:
             device: Device = Device.from_device_response(dev_raw, self._api)

pynintendoparental/_version.py

@@ -1 +1 @@
-__version__ = "0.6.9"
+__version__ = "0.7.0"

pynintendoparental/api.py

@@ -25,11 +25,15 @@ def _check_http_success(status: int) -> bool:
 class Api:
     """Nintendo Parental Controls API."""
 
-    def __init__(self, auth, tz, lang):
+    def __init__(self, auth, tz, lang, session: aiohttp.ClientSession=None):
         """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:
@@ -41,6 +45,29 @@ class Api:
         """Return the account id."""
         return self._auth.account_id
 
+    @property
+    def _headers(self) -> dict:
+        """Return web request headers."""
+        return {
+            "User-Agent": USER_AGENT,
+            "X-Moon-App-Id": MOBILE_APP_PKG,
+            "X-Moon-Os": OS_NAME,
+            "X-Moon-Os-Version": OS_VERSION,
+            "X-Moon-Model": DEVICE_MODEL,
+            "X-Moon-App-Display-Version": MOBILE_APP_VERSION,
+            "X-Moon-App-Internal-Version": MOBILE_APP_BUILD,
+            "X-Moon-TimeZone": self._tz,
+            "X-Moon-Os-Language": self._language,
+            "X-Moon-App-Language": self._language,
+            "Authorization": self._auth_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)
@@ -62,35 +89,134 @@ class Api:
             "json": "",
             "headers": ""
         }
-        async with aiohttp.ClientSession() as session:
-            # Add auth header
-            session.headers.add("Authorization", self._auth_token)
-            session.headers.add("User-Agent", USER_AGENT)
-            session.headers.add("X-Moon-App-Id", MOBILE_APP_PKG)
-            session.headers.add("X-Moon-Os", OS_NAME)
-            session.headers.add("X-Moon-Os-Version", OS_VERSION)
-            session.headers.add("X-Moon-Model", DEVICE_MODEL)
-            session.headers.add("X-Moon-TimeZone", self._tz)
-            session.headers.add("X-Moon-Os-Language", self._language)
-            session.headers.add("X-Moon-App-Language", self._language)
-            session.headers.add("X-Moon-App-Display-Version", MOBILE_APP_VERSION)
-            session.headers.add("X-Moon-App-Internal-Version", MOBILE_APP_BUILD)
-            async with session.request(
-                method=e_point.get("method"),
-                url=url,
-                json=body
-            ) as response:
-                _LOGGER.debug("%s request to %s status code %s",
-                              e_point.get("method"),
-                              url,
-                              response.status)
-                if _check_http_success(response.status):
-                    resp["status"] = response.status
-                    resp["text"] = await response.text()
+        self._session.headers.update(self._headers)
+        async with self._session.request(
+            method=e_point.get("method"),
+            url=url,
+            json=body
+        ) as response:
+            _LOGGER.debug("%s request to %s status code %s",
+                            e_point.get("method"),
+                            url,
+                            response.status)
+            if _check_http_success(response.status):
+                resp["status"] = response.status
+                resp["text"] = await response.text()
+                try:
                     resp["json"] = await response.json()
-                    resp["headers"] = response.headers
-                else:
-                    raise HttpException("HTTP Error", response.status, await response.text())
+                except (aiohttp.ContentTypeError, ValueError) as e:
+                    _LOGGER.warning(
+                        """Failed to decode JSON response from %s.
+                        Status: %s, Error: %s.
+                        Response text: %s...""",
+                        url, response.status, e, resp['text'][:200]
+                    )
+                    resp["json"] = {}
+                resp["headers"] = response.headers
+            else:
+                raise HttpException("HTTP Error", response.status, await response.text())
 
         # now return the resp dict
         return resp
+
+    async def async_get_account_details(self) -> dict:
+        """Get account details."""
+        return await self.send_request(
+            endpoint="get_account_details",
+            ACCOUNT_ID=self.account_id
+        )
+
+    async def async_get_account_devices(self) -> dict:
+        """Get account devices."""
+        return await self.send_request(
+            endpoint="get_account_devices",
+            ACCOUNT_ID=self.account_id
+        )
+
+    async def async_get_account_device(self, device_id: str) -> dict:
+        """Get account device."""
+        return await self.send_request(
+            endpoint="get_account_device",
+            ACCOUNT_ID=self.account_id,
+            DEVICE_ID=device_id
+        )
+
+    async def async_get_device_daily_summaries(self, device_id: str) -> dict:
+        """Get device daily summaries."""
+        return await self.send_request(
+            endpoint="get_device_daily_summaries",
+            DEVICE_ID=device_id
+        )
+
+    async def async_get_device_monthly_summaries(self, device_id: str) -> dict:
+        """Get device monthly summaries."""
+        return await self.send_request(
+            endpoint="get_device_monthly_summaries",
+            DEVICE_ID=device_id
+        )
+
+    async def async_get_device_parental_control_setting(self, device_id: str) -> dict:
+        """Get device parental control setting."""
+        return await self.send_request(
+            endpoint="get_device_parental_control_setting",
+            DEVICE_ID=device_id
+        )
+
+    async def async_get_device_parental_control_setting_state(self, device_id: str) -> dict:
+        """Get device parental control setting state."""
+        return await self.send_request(
+            endpoint="get_device_parental_control_setting_state",
+            DEVICE_ID=device_id
+        )
+
+    async def async_get_device_alarm_setting_state(self, device_id: str) -> dict:
+        """Get device alarm setting state."""
+        return await self.send_request(
+            endpoint="get_device_alarm_setting_state",
+            DEVICE_ID=device_id
+        )
+
+    async def async_get_device_monthly_summary(self, device_id: str, year: int, month: int) -> dict:
+        """Get device monthly summary."""
+        return await self.send_request(
+            endpoint="get_device_monthly_summary",
+            DEVICE_ID=device_id,
+            YEAR=year,
+            MONTH=f"{month:02d}"
+        )
+
+    async def async_set_device_parental_control_setting(
+            self,
+            device_id: str,
+            settings: dict
+        ) -> dict:
+        """Update device parental control setting."""
+        return await self.send_request(
+            endpoint="update_device_parental_control_setting",
+            DEVICE_ID=device_id,
+            body=settings
+        )
+
+    async def async_set_device_whitelisted_applications(
+            self,
+            device_id: str,
+            applications: dict
+        ) -> dict:
+        """Update device whitelisted applications."""
+        return await self.send_request(
+            endpoint="update_device_whitelisted_applications",
+            DEVICE_ID=device_id,
+            body=applications
+        )
+
+    async def async_set_device_alarm_setting_state(
+            self,
+            device_id: str,
+            alarm_state: dict
+        ) -> dict:
+        """Update device alarm setting state."""
+        return await self.send_request(
+            endpoint="update_device_alarm_setting_state",
+            DEVICE_ID=device_id,
+            body=alarm_state
+        )

pynintendoparental/device.py

@@ -115,10 +115,9 @@ class Device:
     async def _set_parental_control_setting(self):
         """Shortcut method to deduplicate code used to update parental control settings."""
         _LOGGER.debug(">> Device._set_parental_control_setting()")
-        await self._api.send_request(
-            endpoint="update_device_parental_control_setting",
-            body=self._get_update_parental_control_setting_body(),
-            DEVICE_ID=self.device_id
+        await self._api.async_set_device_parental_control_setting(
+            settings=self._get_update_parental_control_setting_body(),
+            device_id=self.device_id
         )
         await self._get_parental_control_setting()
 
@@ -209,9 +208,8 @@ class Device:
     async def _get_parental_control_setting(self):
         """Retreives parental control settings from the API."""
         _LOGGER.debug(">> Device._get_parental_control_setting()")
-        response = await self._api.send_request(
-            endpoint="get_device_parental_control_setting",
-            DEVICE_ID=self.device_id
+        response = await self._api.async_get_device_parental_control_setting(
+            device_id=self.device_id
         )
         self.parental_control_settings = response["json"]
         if "bedtimeStartingTime" in self.parental_control_settings["playTimerRegulations"]:
@@ -235,9 +233,8 @@ class Device:
     async def _get_daily_summaries(self):
         """Retrieve daily summaries."""
         _LOGGER.debug(">> Device._get_daily_summaries()")
-        response = await self._api.send_request(
-            endpoint="get_device_daily_summaries",
-            DEVICE_ID = self.device_id
+        response = await self._api.async_get_device_daily_summaries(
+            device_id = self.device_id
         )
         self.daily_summaries = response["json"]["items"]
         _LOGGER.debug("New daily summary %s", self.daily_summaries)
@@ -334,10 +331,8 @@ class Device:
         _LOGGER.debug(">> Device._get_extras()")
         if self.alarms_enabled is not None:
             # first refresh can come from self.extra without http request
-            response = await self._api.send_request(
-                endpoint="get_account_device",
-                ACCOUNT_ID = self._api.account_id,
-                DEVICE_ID = self.device_id
+            response = await self._api.async_get_account_device(
+                device_id = self.device_id
             )
             self.extra = response["json"]
         status = self.extra["device"]["alarmSetting"]["visibility"]
@@ -351,9 +346,8 @@ class Device:
         _LOGGER.debug(">> Device.get_monthly_summary(search_date=%s)", search_date)
         latest = False
         if search_date is None:
-            response = await self._api.send_request(
-                endpoint="get_device_monthly_summaries",
-                DEVICE_ID=self.device_id
+            response = await self._api.async_get_device_monthly_summaries(
+                device_id=self.device_id
             )
             _LOGGER.debug("Available monthly summaries: %s", response)
             response = response["json"]["indexes"][0]
@@ -362,11 +356,10 @@ class Device:
             latest = True
 
         try:
-            response = await self._api.send_request(
-                endpoint="get_device_monthly_summary",
-                DEVICE_ID = self.device_id,
-                YEAR=search_date.year,
-                MONTH=str(search_date.month).zfill(2)
+            response = await self._api.async_get_device_monthly_summary(
+                device_id = self.device_id,
+                year=search_date.year,
+                month=search_date.month
             )
             _LOGGER.debug("Monthly summary query complete for device %s: %s",
                         self.device_id,
@@ -385,12 +378,11 @@ class Device:
         """Updates the alarm state for the device."""
         _LOGGER.debug(">> Device.set_alarm_state(state=%s)",
                       state)
-        await self._api.send_request(
-            endpoint="update_device_alarm_setting_state",
-            body={
+        await self._api.async_set_device_alarm_setting_state(
+            alarm_state={
                 "status": str(state)
             },
-            DEVICE_ID = self.device_id
+            device_id = self.device_id
         )
 
     async def set_whitelisted_application(self, app_id: str, allowed: bool):
@@ -403,10 +395,9 @@ class Device:
         # take a snapshot of the whitelisted apps state
         current_state = self.parental_control_settings["whitelistedApplications"]
         current_state[app_id]["safeLaunch"] = "ALLOW" if allowed else "NONE"
-        await self._api.send_request(
-            endpoint="update_device_whitelisted_applications",
-            body=current_state,
-            DEVICE_ID=self.device_id
+        await self._api.async_set_device_whitelisted_applications(
+            applications=current_state,
+            device_id=self.device_id
         )
         await self._get_parental_control_setting()
 

{pynintendoparental-0.6.9.dist-info → pynintendoparental-0.7.0.dist-info}/METADATA

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

{pynintendoparental-0.6.9.dist-info → pynintendoparental-0.7.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-pynintendoparental/__init__.py,sha256=MxAtlYxXhWS4pQ1q_lbEqHGxcBXc78i2-uVN9cjrpvc,2107
-pynintendoparental/_version.py,sha256=FSdOAp4_p3PglR9eAbJRAD3r0Xzv4uXsvcGDSQGm7Wo,22
-pynintendoparental/api.py,sha256=ze-3svIUmEjXqz-VTLrpL1ZB7DtGecQrbrbN9w-tbkU,3463
+pynintendoparental/__init__.py,sha256=bvsCZ4_n8Ud6M1u3whiN14tAW5KSTnVH57CAUvWCIwk,2028
+pynintendoparental/_version.py,sha256=RaANGbRu5e-vehwXI1-Qe2ggPPfs1TQaZj072JdbLk4,22
+pynintendoparental/api.py,sha256=z26VnHFDQzGSUKAiWKLL1dmhbZbSZGwj7qKT4yYCy4k,7810
 pynintendoparental/application.py,sha256=l-oVwM4hrVVUf_2djQ7rJVya7LQP38yhaLPAWt8V8TY,3941
 pynintendoparental/const.py,sha256=41Mn9ptZVFhQ2h6QcyFgcp5UaDyst0jED7wCn5w6kxQ,2313
-pynintendoparental/device.py,sha256=436XlFMt7yqP1gyuqQM93FpGR-LtcotF7X3cecTXQwc,22489
+pynintendoparental/device.py,sha256=w-AHD0c6bNU_thnJbeIzgRNE8SRP-tvIWMqpolM6cog,22174
 pynintendoparental/enum.py,sha256=lzacGti7fcQqAOROjB9782De7bOMYKSEM61SQd6aYG4,401
 pynintendoparental/exceptions.py,sha256=5M3y0OLSRvX9Ly8D4981HqiKTNxxVqeyzPIuAekQ6J8,410
 pynintendoparental/player.py,sha256=n0wabGjCZumVT84sL8_Wag738A7OQlPnnL1H49U64Bg,1713
@@ -11,8 +11,8 @@ pynintendoparental/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pynintendoparental/utils.py,sha256=5-EP_rmPnSSWtbi18Y226GtjLhF3PLONKwmRdiy7m2c,198
 pynintendoparental/authenticator/__init__.py,sha256=SPnvXhcpZeikL_-0Wmw2h3SEkBYbQfY6GfYMv9WtDdU,6964
 pynintendoparental/authenticator/const.py,sha256=4QhojJ_dTAFwlS9LPnRxm6wWc_wjrme8cICvMnKGwVE,823
-pynintendoparental-0.6.9.dist-info/licenses/LICENSE,sha256=zsxHgHVMnyWq121yND8zBl9Rl9H6EF2K9N51B2ZSm_k,1071
-pynintendoparental-0.6.9.dist-info/METADATA,sha256=GZn92uRz0YibeTs7oTOK7dCip3JvGk78sVCUtYaxUlM,1871
-pynintendoparental-0.6.9.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-pynintendoparental-0.6.9.dist-info/top_level.txt,sha256=QQ5bAl-Ljso16P8KLf1NHrFmKk9jLT7bVJG_rVlIXWk,19
-pynintendoparental-0.6.9.dist-info/RECORD,,
+pynintendoparental-0.7.0.dist-info/licenses/LICENSE,sha256=zsxHgHVMnyWq121yND8zBl9Rl9H6EF2K9N51B2ZSm_k,1071
+pynintendoparental-0.7.0.dist-info/METADATA,sha256=5euaNXOHNlETRkKWipmX8Kgc24xY__9an2ZqRiUBa-k,1871
+pynintendoparental-0.7.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+pynintendoparental-0.7.0.dist-info/top_level.txt,sha256=QQ5bAl-Ljso16P8KLf1NHrFmKk9jLT7bVJG_rVlIXWk,19
+pynintendoparental-0.7.0.dist-info/RECORD,,