Refactor Connections / Websocket / Other cleanup

README.md

@@ -260,26 +260,26 @@ It’s also possible to use push notifications based on a websocket connection:
 
 ```python
     # Example function to display incoming events.
-    def print_events(event_list):
-        for event in event_list:
-            print("EventType: {} Data: {}".format(event["eventType"], event["data"]))
-
-
-    # Initialise the API.
-    config = homematicip.find_and_load_config_file()
-    home = Home()
-    home.set_auth_token(config.auth_token)
-    home.init(config.access_point)
-
-    # Add function to handle events and start the connection.
-    home.onEvent += print_events
-    home.enable_events()
-
-    try:
-        while True:
-            time.sleep(1)
-    except KeyboardInterrupt:
-        print("Interrupt.")
+def print_events(event_list):
+  for event in event_list:
+    print("EventType: {} Data: {}".format(event["eventType"], event["data"]))
+
+
+# Initialise the API.
+config = homematicip.find_and_load_config_file()
+home = Home()
+home.set_auth_token(config.auth_token)
+home.init(config.access_point)
+
+# Add function to handle events and start the connection.
+home.onEvent += print_events
+home.enable_events()
+
+try:
+  while True:
+    time.sleep(1)
+except KeyboardInterrupt:
+  print("Interrupt.")
 ```
 
 ## Pathes for config.ini

bin/homematicip_cli_async.py

@@ -6,7 +6,7 @@
 from pprint import pprint
 import homematicip
 
-from homematicip.aio.home import AsyncHome
+from homematicip.async_home import AsyncHome
 from homematicip.base.base_connection import HmipConnectionError
 
 
@@ -31,7 +31,7 @@ async def get_home(loop):
 
     home = AsyncHome(loop)
     home.set_auth_token(_config.auth_token)
-    await home.init(_config.access_point)
+    await home.init_async(_config.access_point)
     return home
 
 

homematicip_demo/client.pem

@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIByjCCAW+gAwIBAgIUQDAh8y47NcnO/WWc3/nkrU7IV9MwCgYIKoZIzj0EAwIw
+QDEXMBUGA1UECgwOdHJ1c3RtZSB2MS4yLjAxJTAjBgNVBAsMHFRlc3RpbmcgQ0Eg
+I1EtenFyeGh3Vl8zV01NWEYwIBcNMDAwMTAxMDAwMDAwWhgPMzAwMDAxMDEwMDAw
+MDBaMEAxFzAVBgNVBAoMDnRydXN0bWUgdjEuMi4wMSUwIwYDVQQLDBxUZXN0aW5n
+IENBICNRLXpxcnhod1ZfM1dNTVhGMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
+kKHIZlTL0OPtVRzmqskzQeDBChB/PH7T0hOAxZ21iPY5ZIU0g803huQinL/qE8T6
+EZR3JiZPsi0snTLEWfejf6NFMEMwHQYDVR0OBBYEFPRnOfQB4OXdgHNiBfjeZhEd
+wHT2MBIGA1UdEwEB/wQIMAYBAf8CAQkwDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49
+BAMCA0kAMEYCIQCd3KQr2apEcvYBWrqrfVxyi5TPBrVVgEkVjrsoM8V7PgIhAM/t
+YBsqJyPLz8TXXnaAYbvkG/5fJ6y33nsFU2gUMKWD
+-----END CERTIFICATE-----

homematicip_demo/fake_cloud_server.py

@@ -301,6 +301,10 @@ async def post_hmip_home_heating_deactivateVacation(
 
         return web.json_response(None)
 
+    @validate_authorization
+    async def post_hmip_home_heating_setCooling(self, request: web.Request) -> web.Response:
+        return web.json_response()
+
     # endregion
 
     # region rule

homematicip_demo/server.key

@@ -1,27 +1,5 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA5SCSfeNf+x2DoYa54YMcIz6ychRVjd8zoPiNePIGGdPdOoob
-WUnAIZhHXUAP7ZIlimlT7DhBoXphnAx5kErL6ZVD34KtVjIpATuP0fxeA0QdX0FD
-OitqBPyWJrx4Llo5DNR5fwDEJJJuyfJP9f5LUgp13S3Es55k4PqlbAmhzd2kMQuC
-WTZvW3OHI3YaNC/dpEePnk/HvXbsx5nJFfA4MWleulufCKHg6qQDgRi2aoVtm20Y
-TMyF3hjmaRvK5FsYz4gT32hAky+ciSMB9SjRoqcOtwAiRYKTAshyL1Mgbq7dHU/Z
-Of4dhWe3NBngGfFqdsU1DlL0BF3fnb0SY7cHNQIDAQABAoIBAG9BJ6B03VADfrzZ
-vDwh+3Gpqd/2u6wNqvYIejk123yDATLBiJIMW3x0goJm7tT+V7gjeJqEnmmYEPlC
-nWxQxT6AOdq3iw8FgB+XGjhuAAA5/MEZ4VjHZ81QEGBytzBaosT2DqB6cMMJTz5D
-qEvb1Brb9WsWJCLLUFRloBkbfDOG9lMvt34ixYTTmqjsVj5WByD5BhzKH51OJ72L
-00IYpvrsEOtSev1hNV4199CHPYE90T/YQVooRBiHtTcfN+/KNVJu6Rf/zcaJ3WMS
-1l3MBI8HwMimjKKkbddpoMHyFMtSNmS9Yq+4a9w7XZo1F5rt88hYSCtAF8HRAarX
-0VBCJmkCgYEA9HenBBnmfDoN857femzoTHdWQQrZQ4YPAKHvKPlcgudizE5tQbs0
-iTpwm+IsecgJS2Rio7zY+P7A5nKFz3N5c0IX3smYo0J2PoakkLAm25KMxFZYBuz4
-MFWVdfByAU7d28BdNfyOVbA2kU2eal9lJ0yPLpMLbH8+bbvw5uBS808CgYEA7++p
-ftwib3DvKWMpl6G5eA1C2xprdbE0jm2fSr3LYp/vZ4QN2V6kK2YIlyUqQvhYCnxX
-oIP3v2MWDRHKKwJtBWR4+t23PaDaSXS2Ifm0qhRxwSm/oqpAJQXbR7VzxXp4/4FP
-1SgkLe51bubc4h+cDngqBLcplCanvj52CqhqzDsCgYAEIhG8zANNjl22BLWaiETV
-Jh9bMifCMH4IcLRuaOjbfbX55kmKlvOobkiBGi3OUUd28teIFSVF8GiqfL0uaLFg
-9XkZ1yaxe+or3HLjz1aY171xhFQwqcj4aDoCqHIE+6Rclr/8raxqXnRNuJY5DivT
-okO5cdr7lpsjl83W2WwNmQKBgCPXi1xWChbXqgJmu8nY8NnMMVaFpdPY+t7j5U3G
-+GDtP1gZU/BKwP9yqInblWqXqp82X+isjg/a/2pIZAj0vdB2Z9Qh1sOwCau7cZG1
-uZVGpI+UavojsJ1XOKCHrJmtZ/HTIVfYPT9XRdehSRHGYwuOS8iUi/ODqr8ymXOS
-IRINAoGBAMEmhTihgFz6Y8ezRK3QTubguehHZG1zIvtgVhOk+8hRUTSJPI9nBJPC
-4gOZsPx4g2oLK6PiudPR79bhxRxPACCMnXkdwZ/8FaIdmvRHsWVs8T80wID0wthI
-r5hW4uqi9CcKZrGWH7mx9cVJktspeGUczvKyzNMfCaojwzA/49Z1
------END RSA PRIVATE KEY-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIK5/HnR9nKOUN6khHKmBi+cFBAuyNvXxKdNRbB5+HaDOoAoGCCqGSM49
+AwEHoUQDQgAEJRnuDisT95DvNlxQ51HowkWJRuDholQOG+axoZAmxmndcadKbyff
+ToQ2CUFJXIlRVXjIh9PMNdE1YrnEFMahFw==
+-----END EC PRIVATE KEY-----

homematicip_demo/server.pem

@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICRjCCAeugAwIBAgIUfbtenV+j6flJfAJo5rSbvTbxPHMwCgYIKoZIzj0EAwIw
+QDEXMBUGA1UECgwOdHJ1c3RtZSB2MS4yLjAxJTAjBgNVBAsMHFRlc3RpbmcgQ0Eg
+I1EtenFyeGh3Vl8zV01NWEYwIBcNMDAwMTAxMDAwMDAwWhgPMzAwMDAxMDEwMDAw
+MDBaMEIxFzAVBgNVBAoMDnRydXN0bWUgdjEuMi4wMScwJQYDVQQLDB5UZXN0aW5n
+IGNlcnQgI3Vwd1RCS2xXS1ZndkctbFUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC
+AAQlGe4OKxP3kO82XFDnUejCRYlG4OGiVA4b5rGhkCbGad1xp0pvJ99OhDYJQUlc
+iVFVeMiH08w10TViucQUxqEXo4G+MIG7MB0GA1UdDgQWBBR1tKNvUFqIzl/NYJiA
+RrF4gswtPzAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaAFPRnOfQB4OXdgHNiBfje
+ZhEdwHT2MC8GA1UdEQEB/wQlMCOCCWxvY2FsaG9zdIcEfwAAAYcQAAAAAAAAAAAA
+AAAAAAAAATAOBgNVHQ8BAf8EBAMCBaAwKgYDVR0lAQH/BCAwHgYIKwYBBQUHAwIG
+CCsGAQUFBwMBBggrBgEFBQcDAzAKBggqhkjOPQQDAgNJADBGAiEAyqU1lqcvBeHO
+xnASqRqpPNjarM9BitPvUfJwVhrDvLwCIQDy6mzQrRdsw79fuO4lzeEgpZqWW4aP
+OM+hFmEYXiBmIg==
+-----END CERTIFICATE-----