add post connect backstop, fix ssl references (#1530)

Author: drc38

custom_components/ocpp/__init__.py

@@ -137,7 +137,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
 
 async def async_migrate_entry(hass, config_entry: ConfigEntry):
     """Migrate old entry."""
-    _LOGGER.debug(
+    _LOGGER.info(
         "Migrating configuration from version %s.%s",
         config_entry.version,
         config_entry.minor_version,
@@ -182,14 +182,17 @@ async def async_migrate_entry(hass, config_entry: ConfigEntry):
         new_data = csid_data
         cp_id = hass.states.get(f"sensor.{cpid_data[CONF_CPID]}_id")
         if cp_id is None:
+            _LOGGER.warning(
+                "Could not find charger id during migration, try a clean install"
+            )
             return False
         new_data.update({CONF_CPIDS: [{cp_id: cpid_data}]})
 
         hass.config_entries.async_update_entry(
             config_entry, data=new_data, minor_version=0, version=2
         )
 
-    _LOGGER.debug(
+    _LOGGER.info(
         "Migration to configuration version %s.%s successful",
         config_entry.version,
         config_entry.minor_version,

custom_components/ocpp/api.py

@@ -150,8 +150,8 @@ async def create(hass: HomeAssistant, entry: ConfigEntry):
         if self.settings.ssl:
             self.ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
             # see https://community.home-assistant.io/t/certificate-authority-and-self-signed-certificate-for-ssl-tls/196970
-            localhost_certfile = self.settings.certfile
-            localhost_keyfile = self.settings.keyfile
+            localhost_certfile = self.settings.ssl_certfile_path
+            localhost_keyfile = self.settings.ssl_keyfile_path
             await self.hass.async_add_executor_job(
                 partial(
                     self.ssl_context.load_cert_chain,

custom_components/ocpp/chargepoint.py

@@ -341,6 +341,11 @@ async def monitor_connection(self):
         self._metrics[cstat.latency_pong.value].unit = "ms"
         connection = self._connection
         timeout_counter = 0
+        # Add backstop to start post connect for non-compliant chargers
+        # after 10s to allow for when a boot notification has not been received
+        await asyncio.sleep(10)
+        if not self.post_connect_success:
+            self.hass.async_create_task(self.post_connect())
         while connection.state is State.OPEN:
             try:
                 await asyncio.sleep(self.cs_settings.websocket_ping_interval)
@@ -388,6 +393,7 @@ async def _handle_call(self, msg):
 
     async def start(self):
         """Start charge point."""
+        # post connect now handled on receiving boot notification or with backstop in monitor connection
         await self.run([super().start(), self.monitor_connection()])
 
     async def run(self, tasks):
@@ -424,10 +430,8 @@ async def reconnect(self, connection: ServerConnection):
         self.status = STATE_OK
         self._connection = connection
         self._metrics[cstat.reconnects.value].value += 1
-        if self.post_connect_success is True:
-            await self.run([super().start(), self.monitor_connection()])
-        else:
-            await self.run([super().start(), self.monitor_connection()])
+        # post connect now handled on receiving boot notification or with backstop in monitor connection
+        await self.run([super().start(), self.monitor_connection()])
 
     async def async_update_device_info(
         self, serial: str, vendor: str, model: str, firmware_version: str
@@ -453,7 +457,8 @@ async def async_update_device_info(
     def _register_boot_notification(self):
         if self.triggered_boot_notification is False:
             self.hass.async_create_task(self.notify_ha(f"Charger {self.id} rebooted"))
-            self.hass.async_create_task(self.post_connect())
+            if not self.post_connect_success:
+                self.hass.async_create_task(self.post_connect())
 
     async def update(self, cpid: str):
         """Update sensors values in HA."""