HAP-python 4.9.0__tar.gz → 4.9.2__tar.gz

{HAP-python-4.9.0 → hap_python-4.9.2}/HAP_python.egg-info/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: HAP-python
-Version: 4.9.0
+Version: 4.9.2
 Summary: HomeKit Accessory Protocol implementation in python
 Home-page: https://github.com/ikalchev/HAP-python
 License: Apache License 2.0
 Project-URL: Bug Reports, https://github.com/ikalchev/HAP-python/issues
 Project-URL: Documentation, http://hap-python.readthedocs.io/en/latest/
 Project-URL: Source, https://github.com/ikalchev/HAP-python/tree/master
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: End Users/Desktop
@@ -24,8 +23,16 @@ Classifier: Topic :: Home Automation
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
-Provides-Extra: QRCode
 License-File: LICENSE
+Requires-Dist: async_timeout
+Requires-Dist: cryptography
+Requires-Dist: chacha20poly1305-reuseable
+Requires-Dist: orjson>=3.7.2
+Requires-Dist: zeroconf>=0.36.2
+Requires-Dist: h11
+Provides-Extra: qrcode
+Requires-Dist: base36; extra == "qrcode"
+Requires-Dist: pyqrcode; extra == "qrcode"
 
 [![PyPI version](https://badge.fury.io/py/HAP-python.svg)](https://badge.fury.io/py/HAP-python) [![Build Status](https://github.com/ikalchev/HAP-python/workflows/CI/badge.svg)](https://github.com/ikalchev/HAP-python) [![codecov](https://codecov.io/gh/ikalchev/HAP-python/branch/master/graph/badge.svg)](https://codecov.io/gh/ikalchev/HAP-python) [![Python Versions](https://img.shields.io/pypi/pyversions/HAP-python.svg)](https://pypi.python.org/pypi/HAP-python/) [![Documentation Status](https://readthedocs.org/projects/hap-python/badge/?version=latest)](http://hap-python.readthedocs.io/en/latest/?badge=latest) [![Downloads](https://pepy.tech/badge/hap-python)](https://pepy.tech/project/hap-python)
 # HAP-python
@@ -302,5 +309,3 @@ please report and I will try to fix them.
 Suggestions are always welcome.
 
 Have fun!
-
-

{HAP-python-4.9.0 → hap_python-4.9.2}/HAP_python.egg-info/SOURCES.txt

@@ -31,4 +31,20 @@ pyhap/tlv.py
 pyhap/util.py
 pyhap/resources/characteristics.json
 pyhap/resources/services.json
-pyhap/resources/snapshot.jpg
+pyhap/resources/snapshot.jpg
+tests/test_accessory.py
+tests/test_accessory_driver.py
+tests/test_camera.py
+tests/test_characteristic.py
+tests/test_encoder.py
+tests/test_hap_crypto.py
+tests/test_hap_handler.py
+tests/test_hap_protocol.py
+tests/test_hap_server.py
+tests/test_hsrp.py
+tests/test_iid_manager.py
+tests/test_loader.py
+tests/test_service.py
+tests/test_state.py
+tests/test_tlv.py
+tests/test_util.py

{HAP-python-4.9.0 → hap_python-4.9.2}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: HAP-python
-Version: 4.9.0
+Version: 4.9.2
 Summary: HomeKit Accessory Protocol implementation in python
 Home-page: https://github.com/ikalchev/HAP-python
 License: Apache License 2.0
 Project-URL: Bug Reports, https://github.com/ikalchev/HAP-python/issues
 Project-URL: Documentation, http://hap-python.readthedocs.io/en/latest/
 Project-URL: Source, https://github.com/ikalchev/HAP-python/tree/master
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: End Users/Desktop
@@ -24,8 +23,16 @@ Classifier: Topic :: Home Automation
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
-Provides-Extra: QRCode
 License-File: LICENSE
+Requires-Dist: async_timeout
+Requires-Dist: cryptography
+Requires-Dist: chacha20poly1305-reuseable
+Requires-Dist: orjson>=3.7.2
+Requires-Dist: zeroconf>=0.36.2
+Requires-Dist: h11
+Provides-Extra: qrcode
+Requires-Dist: base36; extra == "qrcode"
+Requires-Dist: pyqrcode; extra == "qrcode"
 
 [![PyPI version](https://badge.fury.io/py/HAP-python.svg)](https://badge.fury.io/py/HAP-python) [![Build Status](https://github.com/ikalchev/HAP-python/workflows/CI/badge.svg)](https://github.com/ikalchev/HAP-python) [![codecov](https://codecov.io/gh/ikalchev/HAP-python/branch/master/graph/badge.svg)](https://codecov.io/gh/ikalchev/HAP-python) [![Python Versions](https://img.shields.io/pypi/pyversions/HAP-python.svg)](https://pypi.python.org/pypi/HAP-python/) [![Documentation Status](https://readthedocs.org/projects/hap-python/badge/?version=latest)](http://hap-python.readthedocs.io/en/latest/?badge=latest) [![Downloads](https://pepy.tech/badge/hap-python)](https://pepy.tech/project/hap-python)
 # HAP-python
@@ -302,5 +309,3 @@ please report and I will try to fix them.
 Suggestions are always welcome.
 
 Have fun!
-
-

{HAP-python-4.9.0 → hap_python-4.9.2}/pyhap/accessory.py

@@ -207,7 +207,7 @@ class Accessory:
             int(self.driver.state.pincode.replace(b"-", b""), 10) & 0x7FFFFFFF
         )  # pincode
 
-        encoded_payload = base36.dumps(payload).upper()
+        encoded_payload = base36.dumps(payload).upper()  # pylint: disable=possibly-used-before-assignment
         encoded_payload = encoded_payload.rjust(9, "0")
 
         return "X-HM://" + encoded_payload + self.driver.state.setup_id
@@ -241,7 +241,9 @@ class Accessory:
         """
         return {
             HAP_REPR_AID: self.aid,
-            HAP_REPR_SERVICES: [s.to_HAP(include_value=include_value) for s in self.services],
+            HAP_REPR_SERVICES: [
+                s.to_HAP(include_value=include_value) for s in self.services
+            ],
         }
 
     def setup_message(self):
@@ -391,7 +393,10 @@ class Bridge(Accessory):
 
         .. seealso:: Accessory.to_HAP
         """
-        return [acc.to_HAP(include_value=include_value) for acc in (super(), *self.accessories.values())]
+        return [
+            acc.to_HAP(include_value=include_value)
+            for acc in (super(), *self.accessories.values())
+        ]
 
     def get_characteristic(self, aid: int, iid: int) -> Optional["Characteristic"]:
         """.. seealso:: Accessory.to_HAP"""

{HAP-python-4.9.0 → hap_python-4.9.2}/pyhap/accessory_driver.py

@@ -323,7 +323,7 @@ class AccessoryDriver:
                 and os.name != "nt"
             ):
                 logger.debug("Setting child watcher")
-                watcher = asyncio.SafeChildWatcher()
+                watcher = asyncio.SafeChildWatcher() # pylint: disable=deprecated-class
                 watcher.attach_loop(self.loop)
                 asyncio.set_child_watcher(watcher)
             else:
@@ -642,16 +642,19 @@ class AccessoryDriver:
         tmp_filename = None
         try:
             temp_dir = os.path.dirname(self.persist_file)
+            logger.debug("Creating temp persist file in '%s'", temp_dir)
             with tempfile.NamedTemporaryFile(
                 mode="w", dir=temp_dir, delete=False
             ) as file_handle:
                 tmp_filename = file_handle.name
+                logger.debug("Created temp persist file '%s' named '%s'", file_handle, tmp_filename)
                 self.encoder.persist(file_handle, self.state)
             if (
                 os.name == "nt"
             ):  # Or `[WinError 5] Access Denied` will be raised on Windows
                 os.chmod(tmp_filename, 0o644)
-                os.chmod(self.persist_file, 0o644)
+                if os.path.exists(self.persist_file):
+                    os.chmod(self.persist_file, 0o644)
             os.replace(tmp_filename, self.persist_file)
         except Exception:  # pylint: disable=broad-except
             logger.exception("Failed to persist accessory state")

{HAP-python-4.9.0 → hap_python-4.9.2}/pyhap/const.py

@@ -1,7 +1,7 @@
 """This module contains constants used by other modules."""
 MAJOR_VERSION = 4
 MINOR_VERSION = 9
-PATCH_VERSION = 0
+PATCH_VERSION = 2
 __short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__ = f"{__short_version__}.{PATCH_VERSION}"
 REQUIRED_PYTHON_VER = (3, 7)

{HAP-python-4.9.0 → hap_python-4.9.2}/pyhap/hap_crypto.py

@@ -3,7 +3,7 @@ from functools import partial
 import logging
 import struct
 from struct import Struct
-from typing import List
+from typing import Iterable, List
 
 from chacha20poly1305_reuseable import ChaCha20Poly1305Reusable as ChaCha20Poly1305
 from cryptography.hazmat.backends import default_backend
@@ -112,7 +112,7 @@ class HAPCrypto:
 
         return result
 
-    def encrypt(self, data: bytes) -> bytes:
+    def encrypt(self, data: bytes) -> Iterable[bytes]:
         """Encrypt and send the return bytes."""
         result: List[bytes] = []
         offset = 0
@@ -127,7 +127,4 @@ class HAPCrypto:
             offset += length
             self._out_count += 1
 
-        # Join the result once instead of concatenating each time
-        # as this is much faster than generating an new immutable
-        # byte string each time.
-        return b"".join(result)
+        return result

{HAP-python-4.9.0 → hap_python-4.9.2}/pyhap/hap_protocol.py

@@ -46,7 +46,7 @@ class HAPServerProtocol(asyncio.Protocol):
         connections: Dict[str, "HAPServerProtocol"],
         accessory_driver: "AccessoryDriver",
     ) -> None:
-        self.loop: asyncio.AbstractEventLoop = loop
+        self.loop = loop
         self.conn = h11.Connection(h11.SERVER)
         self.connections = connections
         self.accessory_driver = accessory_driver
@@ -55,7 +55,7 @@ class HAPServerProtocol(asyncio.Protocol):
         self.transport: Optional[asyncio.Transport] = None
 
         self.request: Optional[h11.Request] = None
-        self.request_body: Optional[bytes] = None
+        self.request_body: List[bytes] = []
         self.response: Optional[HAPResponse] = None
 
         self.last_activity: Optional[float] = None
@@ -104,7 +104,7 @@ class HAPServerProtocol(asyncio.Protocol):
                 self.handler.client_uuid,
                 data,
             )
-            self.transport.write(result)
+            self.transport.writelines(result)
         else:
             logger.debug(
                 "%s (%s): Send unencrypted: %s",
@@ -246,27 +246,33 @@ class HAPServerProtocol(asyncio.Protocol):
         logger.debug(
             "%s (%s): h11 Event: %s", self.peername, self.handler.client_uuid, event
         )
-        if event in (h11.NEED_DATA, h11.ConnectionClosed):
+        if event is h11.NEED_DATA:
             return False
 
         if event is h11.PAUSED:
             self.conn.start_next_cycle()
             return True
 
-        if isinstance(event, h11.Request):
+        event_type = type(event)
+        if event_type is h11.ConnectionClosed:
+            return False
+
+        if event_type is h11.Request:
             self.request = event
-            self.request_body = b""
+            self.request_body = []
             return True
 
-        if isinstance(event, h11.Data):
-            self.request_body += event.data
+        if event_type is h11.Data:
+            if TYPE_CHECKING:
+                assert isinstance(event, h11.Data)  # nosec
+            self.request_body.append(event.data)
             return True
 
-        if isinstance(event, h11.EndOfMessage):
-            response = self.handler.dispatch(self.request, bytes(self.request_body))
+        if event_type is h11.EndOfMessage:
+            response = self.handler.dispatch(self.request, b"".join(self.request_body))
             self._process_response(response)
             self.request = None
-            self.request_body = None
+            self.request_body = []
             return True
 
         return self._handle_invalid_conn_state(f"Unexpected event: {event}")

{HAP-python-4.9.0 → hap_python-4.9.2}/pyhap/hap_server.py

@@ -3,15 +3,20 @@
 The HAPServer is the point of contact to and from the world.
 """
 
+import asyncio
 import logging
 import time
+from typing import TYPE_CHECKING, Dict, Optional, Tuple
 
 from .hap_protocol import HAPServerProtocol
 from .util import callback
 
+if TYPE_CHECKING:
+    from .accessory_driver import AccessoryDriver
+
 logger = logging.getLogger(__name__)
 
-IDLE_CONNECTION_CHECK_INTERVAL_SECONDS = 120
+IDLE_CONNECTION_CHECK_INTERVAL_SECONDS = 300
 
 
 class HAPServer:
@@ -28,17 +33,18 @@ class HAPServer:
     implements exclusive access to the send methods.
     """
 
-    def __init__(self, addr_port, accessory_handler):
+    def __init__(
+        self, addr_port: Tuple[str, int], accessory_handler: "AccessoryDriver"
+    ) -> None:
         """Create a HAP Server."""
         self._addr_port = addr_port
-        self.connections = {}  # (address, port): socket
+        self.connections: Dict[Tuple[str, int], HAPServerProtocol] = {}
         self.accessory_handler = accessory_handler
-        self.server = None
-        self._serve_task = None
-        self._connection_cleanup = None
-        self.loop = None
+        self.server: Optional[asyncio.Server] = None
+        self._connection_cleanup: Optional[asyncio.TimerHandle] = None
+        self.loop: Optional[asyncio.AbstractEventLoop] = None
 
-    async def async_start(self, loop):
+    async def async_start(self, loop: asyncio.AbstractEventLoop) -> None:
         """Start the http-hap server."""
         self.loop = loop
         self.server = await loop.create_server(
@@ -49,7 +55,7 @@ class HAPServer:
         self.async_cleanup_connections()
 
     @callback
-    def async_cleanup_connections(self):
+    def async_cleanup_connections(self) -> None:
         """Cleanup stale connections."""
         now = time.time()
         for hap_proto in list(self.connections.values()):
@@ -59,7 +65,7 @@ class HAPServer:
         )
 
     @callback
-    def async_stop(self):
+    def async_stop(self) -> None:
         """Stop the server.
 
         This method must be run in the event loop.
@@ -70,10 +76,12 @@ class HAPServer:
         self.server.close()
         self.connections.clear()
 
-    def push_event(self, data, client_addr, immediate=False):
+    def push_event(
+        self, data: bytes, client_addr: Tuple[str, int], immediate: bool = False
+    ) -> bool:
         """Queue an event to the current connection with the provided data.
 
-        :param data: The charateristic changes
+        :param data: The characteristic changes
         :type data: dict
 
         :param client_addr: A client (address, port) tuple to which to send the data.

{HAP-python-4.9.0 → hap_python-4.9.2}/pyhap/iid_manager.py

@@ -1,5 +1,12 @@
 """Module for the IIDManager class."""
 import logging
+from typing import TYPE_CHECKING, Dict, Optional, Union
+
+if TYPE_CHECKING:
+    from .characteristic import Characteristic
+    from .service import Service
+
+    ServiceOrCharType = Union[Service, Characteristic]
 
 logger = logging.getLogger(__name__)
 
@@ -7,13 +14,13 @@ logger = logging.getLogger(__name__)
 class IIDManager:
     """Maintains a mapping between Service/Characteristic objects and IIDs."""
 
-    def __init__(self):
+    def __init__(self) -> None:
         """Initialize an empty instance."""
         self.counter = 0
-        self.iids = {}
-        self.objs = {}
+        self.iids: Dict["ServiceOrCharType", int] = {}
+        self.objs: Dict[int, "ServiceOrCharType"] = {}
 
-    def assign(self, obj):
+    def assign(self, obj: "ServiceOrCharType") -> None:
         """Assign an IID to given object. Print warning if already assigned.
 
         :param obj: The object that will be assigned an IID.
@@ -32,7 +39,7 @@ class IIDManager:
         self.iids[obj] = iid
         self.objs[iid] = obj
 
-    def get_iid_for_obj(self, obj):
+    def get_iid_for_obj(self, obj: "ServiceOrCharType") -> int:
         """Get the IID for the given object.
 
         Override this method to provide custom IID assignment.
@@ -40,15 +47,15 @@ class IIDManager:
         self.counter += 1
         return self.counter
 
-    def get_obj(self, iid):
+    def get_obj(self, iid: int) -> "ServiceOrCharType":
         """Get the object that is assigned the given IID."""
         return self.objs.get(iid)
 
-    def get_iid(self, obj):
+    def get_iid(self, obj: "ServiceOrCharType") -> int:
         """Get the IID assigned to the given object."""
         return self.iids.get(obj)
 
-    def remove_obj(self, obj):
+    def remove_obj(self, obj: "ServiceOrCharType") -> Optional[int]:
         """Remove an object from the IID list."""
         iid = self.iids.pop(obj, None)
         if iid is None:
@@ -57,7 +64,7 @@ class IIDManager:
         del self.objs[iid]
         return iid
 
-    def remove_iid(self, iid):
+    def remove_iid(self, iid: int) -> Optional["ServiceOrCharType"]:
         """Remove an object with an IID from the IID list."""
         obj = self.objs.pop(iid, None)
         if obj is None:

{HAP-python-4.9.0 → hap_python-4.9.2}/pyproject.toml

@@ -77,6 +77,7 @@ disable = [
     "too-many-return-statements",
     "too-many-statements",
     "too-many-boolean-expressions",
+    "too-many-positional-arguments",
     "unused-argument",
     "wrong-import-order",
     "unused-argument",