From 3f14f5cb9e9c13dae13055c601bd7309594a35c9 Mon Sep 17 00:00:00 2001 From: Stefan Allius Date: Thu, 5 Oct 2023 18:47:59 +0200 Subject: [PATCH] make class Proxy to a derivation of class AsyncStream --- app/src/async_stream.py | 59 +++++++++----------------------- app/src/proxy.py | 74 +++++++++++++++++++++++++++++++---------- 2 files changed, 73 insertions(+), 60 deletions(-) diff --git a/app/src/async_stream.py b/app/src/async_stream.py index 9407948..1d0c7ea 100644 --- a/app/src/async_stream.py +++ b/app/src/async_stream.py @@ -1,22 +1,18 @@ -import logging, traceback, aiomqtt, json +import logging, traceback from config import Config from messages import Message, hex_dump_memory -from mqtt import Mqtt logger = logging.getLogger('conn') -logger_mqtt = logging.getLogger('mqtt') class AsyncStream(Message): - def __init__(self, proxy, reader, writer, addr, stream=None, server_side=True): + def __init__(self, reader, writer, addr, remote_stream, server_side: bool) -> None: super().__init__() - self.proxy = proxy self.reader = reader self.writer = writer - self.remoteStream = stream - self.addr = addr + self.remoteStream = remote_stream self.server_side = server_side - self.mqtt = Mqtt() + self.addr = addr self.unique_id = 0 self.node_id = '' @@ -24,26 +20,26 @@ class AsyncStream(Message): Our puplic methods ''' def set_serial_no(self, serial_no : str): - logger_mqtt.info(f'SerialNo: {serial_no}') + logger.info(f'SerialNo: {serial_no}') if self.unique_id != serial_no: inverters = Config.get('inverters') - #logger_mqtt.debug(f'Inverters: {inverters}') + #logger.debug(f'Inverters: {inverters}') if serial_no in inverters: - logger_mqtt.debug(f'SerialNo {serial_no} allowed!') + logger.debug(f'SerialNo {serial_no} allowed!') inv = inverters[serial_no] self.node_id = inv['node_id'] self.sug_area = inv['suggested_area'] else: - logger_mqtt.debug(f'SerialNo {serial_no} not known!') + logger.debug(f'SerialNo {serial_no} not known!') self.node_id = '' self.sug_area = '' if not inverters['allow_all']: self.unique_id = None - logger_mqtt.error('ignore message from unknow inverter!') + logger.error('ignore message from unknow inverter!') return self.unique_id = serial_no @@ -53,18 +49,6 @@ class AsyncStream(Message): self.discovery_prfx = ha['discovery_prefix'] + '/' - async def register_home_assistant(self): - - if self.server_side: - try: - for data_json, component, id in self.db.ha_confs(self.entitiy_prfx + self.node_id, self.unique_id, self.sug_area): - logger_mqtt.debug(f'Register: {data_json}') - await self.mqtt.publish(f"{self.discovery_prfx}{component}/{self.node_id}{id}/config", data_json) - - except Exception: - logging.error( - f"Proxy: Exception:\n" - f"{traceback.format_exc()}") async def loop(self) -> None: @@ -79,7 +63,7 @@ class AsyncStream(Message): if self.unique_id: await self.__async_write() await self.__async_forward() - await self.__async_publ_mqtt() + await self.async_publ_mqtt() except (ConnectionResetError, @@ -104,7 +88,6 @@ class AsyncStream(Message): logger.debug(f'in AsyncStream.close() {self.addr}') self.writer.close() super().close() # call close handler in the parent class - self.proxy = None # clear our refernce to the proxy, to avoid memory leaks if self.remoteStream: # if we have knowledge about a remote stream, we del the references between the two streams self.remoteStream.remoteStream = None @@ -132,8 +115,7 @@ class AsyncStream(Message): async def __async_forward(self) -> None: if self._forward_buffer: if not self.remoteStream: - tsun = Config.get('tsun') - self.remoteStream = await self.proxy.CreateClientStream (self, tsun['host'], tsun['port']) + await self.async_create_remote() # only implmeneted for server side => syncServerStream if self.remoteStream: hex_dump_memory(logging.DEBUG, f'Forward to {self.remoteStream.addr}:', self._forward_buffer, len(self._forward_buffer)) @@ -141,24 +123,15 @@ class AsyncStream(Message): await self.remoteStream.writer.drain() self._forward_buffer = bytearray(0) - async def __async_publ_mqtt(self) -> None: - if self.server_side: - db = self.db.db + async def async_create_remote(self) -> None: + pass - # check if new inverter or collector infos are available or when the home assistant has changed the status back to online - if (self.new_data.keys() & {'inverter', 'collector'}) or self.mqtt.home_assistant_restarted: - await self.register_home_assistant() - self.mqtt.home_assistant_restarted = False # clear flag + async def async_publ_mqtt(self) -> None: + pass - for key in self.new_data: - if self.new_data[key] and key in db: - data_json = json.dumps(db[key]) - logger_mqtt.info(f'{key}: {data_json}') - await self.mqtt.publish(f"{self.entitiy_prfx}{self.node_id}{key}", data_json) - self.new_data[key] = False def __del__ (self): logger.debug ("AsyncStream __del__") super().__del__() - + diff --git a/app/src/proxy.py b/app/src/proxy.py index 41b81ea..a1d165e 100644 --- a/app/src/proxy.py +++ b/app/src/proxy.py @@ -1,42 +1,52 @@ -import asyncio, logging, traceback +import asyncio, logging, traceback, json +from config import Config from async_stream import AsyncStream +from mqtt import Mqtt -class Proxy: - def __init__ (proxy, reader, writer, addr): - proxy.ServerStream = AsyncStream(proxy, reader, writer, addr) - proxy.ClientStream = None +logger = logging.getLogger('conn') - async def server_loop(proxy, addr): + + +class Proxy(AsyncStream): + + def __init__ (self, reader, writer, addr): + super().__init__(reader, writer, addr, None, True) + self.mqtt = Mqtt() + + async def server_loop(self, addr): '''Loop for receiving messages from the inverter (server-side)''' logging.info(f'Accept connection from {addr}') - await proxy.ServerStream.loop() + await self.loop() logging.info(f'Server loop stopped for {addr}') # if the server connection closes, we also disconnect the connection to te TSUN cloud - if proxy.ClientStream: + if self.remoteStream: logging.debug ("disconnect client connection") - proxy.ClientStream.disc() + self.remoteStream.disc() - async def client_loop(proxy, addr): + async def client_loop(self, addr): '''Loop for receiving messages from the TSUN cloud (client-side)''' - await proxy.ClientStream.loop() + await self.remoteStream.loop() logging.info(f'Client loop stopped for {addr}') # if the client connection closes, we don't touch the server connection. Instead we erase the client # connection stream, thus on the next received packet from the inverter, we can establish a new connection # to the TSUN cloud - proxy.ClientStream = None + self.remoteStream = None - async def CreateClientStream (proxy, stream, host, port): + async def async_create_remote(self) -> None: '''Establish a client connection to the TSUN cloud''' + tsun = Config.get('tsun') + host = tsun['host'] + port = tsun['port'] addr = (host, port) try: logging.info(f'Connected to {addr}') connect = asyncio.open_connection(host, port) reader, writer = await connect - proxy.ClientStream = AsyncStream(proxy, reader, writer, addr, stream, server_side=False) - asyncio.create_task(proxy.client_loop(addr)) + self.remoteStream = AsyncStream(reader, writer, addr, self, False) + asyncio.create_task(self.client_loop(addr)) except ConnectionRefusedError as error: logging.info(f'{error}') @@ -44,7 +54,37 @@ class Proxy: logging.error( f"Proxy: Exception for {addr}:\n" f"{traceback.format_exc()}") - return proxy.ClientStream + + + async def async_publ_mqtt(self) -> None: + db = self.db.db + # check if new inverter or collector infos are available or when the home assistant has changed the status back to online + if (self.new_data.keys() & {'inverter', 'collector'}): #or self.mqtt.home_assistant_restarted: + await self.__register_home_assistant() + #self.mqtt.home_assistant_restarted = False # clear flag + for key in self.new_data: + if self.new_data[key] and key in db: + data_json = json.dumps(db[key]) + logger.info(f'{key}: {data_json}') + await self.mqtt.publish(f"{self.entitiy_prfx}{self.node_id}{key}", data_json) + self.new_data[key] = False + + async def __register_home_assistant(self): + try: + for data_json, component, id in self.db.ha_confs(self.entitiy_prfx + self.node_id, self.unique_id, self.sug_area): + logger.debug(f'MQTT Register: {data_json}') + await self.mqtt.publish(f"{self.discovery_prfx}{component}/{self.node_id}{id}/config", data_json) + except Exception: + logging.error( + f"Proxy: Exception:\n" + f"{traceback.format_exc()}") + + def close(self): + logger.debug(f'in AsyncServerStream.close() {self.addr}') + super().close() # call close handler in the parent class + + def __del__ (proxy): - logging.debug ("Proxy __del__") \ No newline at end of file + logging.debug ("Proxy __del__") + super().__del__()