split ConnectionG3(P) in server and client class

app/src/gen3plus/connection_g3p.py

@@ -14,35 +14,6 @@ logger = logging.getLogger('conn')
 
 
 class ConnectionG3P(SolarmanV5):
-
-    def __init__(self, reader: StreamReader, writer: StreamWriter,
-                 addr, rstream: 'ConnectionG3P',
-                 server_side: bool,
-                 client_mode: bool) -> None:
-
-        self.remote = StreamPtr(rstream)
-        if server_side:
-            self._ifc = AsyncStreamServer(reader, writer, addr,
-                                          self.async_publ_mqtt,
-                                          self.async_create_remote,
-                                          self.remote)
-        else:
-            self._ifc = AsyncStreamClient(reader, writer, addr,
-                                          self.remote)
-
-        SolarmanV5.__init__(self, server_side, client_mode, self._ifc)
-
-        self.conn_no = self._ifc.get_conn_no()
-        self.addr = addr
-
-    '''
-    Our puplic methods
-    '''
-    def close(self):
-        self._ifc.close()
-        SolarmanV5.close(self)
-        #  logger.info(f'AsyncStream refs: {gc.get_referrers(self)}')
-
     async def async_create_remote(self) -> None:
         pass  # virtual interface # pragma: no cover
 
@@ -52,3 +23,39 @@ class ConnectionG3P(SolarmanV5):
     def healthy(self) -> bool:
         logger.debug('ConnectionG3P healthy()')
         return self._ifc.healthy()
+
+    def close(self):
+        self._ifc.close()
+        SolarmanV5.close(self)
+        #  logger.info(f'AsyncStream refs: {gc.get_referrers(self)}')
+
+
+class ConnectionG3PServer(ConnectionG3P):
+
+    def __init__(self, reader: StreamReader, writer: StreamWriter,
+                 addr, rstream: 'ConnectionG3PClient',
+                 client_mode: bool) -> None:
+
+        server_side = True
+        self.remote = StreamPtr(rstream)
+        self._ifc = AsyncStreamServer(reader, writer, addr,
+                                      self.async_publ_mqtt,
+                                      self.async_create_remote,
+                                      self.remote)
+        self.conn_no = self._ifc.get_conn_no()
+        self.addr = addr
+        SolarmanV5.__init__(self, server_side, client_mode, self._ifc)
+
+
+class ConnectionG3PClient(ConnectionG3P):
+
+    def __init__(self, reader: StreamReader, writer: StreamWriter,
+                 addr, rstream: 'ConnectionG3PServer') -> None:
+
+        server_side = False
+        client_mode = False
+        self.remote = StreamPtr(rstream)
+        self._ifc = AsyncStreamClient(reader, writer, addr, self.remote)
+        self.conn_no = self._ifc.get_conn_no()
+        self.addr = addr
+        SolarmanV5.__init__(self, server_side, client_mode, self._ifc)

app/src/gen3plus/inverter_g3p.py

@@ -8,19 +8,21 @@ from aiomqtt import MqttCodeError
 if __name__ == "app.src.gen3plus.inverter_g3p":
     from app.src.config import Config
     from app.src.inverter import Inverter
-    from app.src.gen3plus.connection_g3p import ConnectionG3P
+    from app.src.gen3plus.connection_g3p import ConnectionG3PServer
+    from app.src.gen3plus.connection_g3p import ConnectionG3PClient
     from app.src.infos import Infos
 else:  # pragma: no cover
     from config import Config
     from inverter import Inverter
-    from gen3plus.connection_g3p import ConnectionG3P
+    from gen3plus.connection_g3p import ConnectionG3PServer
+    from gen3plus.connection_g3p import ConnectionG3PClient
     from infos import Infos
 
 
 logger_mqtt = logging.getLogger('mqtt')
 
 
-class InverterG3P(Inverter, ConnectionG3P):
+class InverterG3P(Inverter, ConnectionG3PServer):
     '''class Inverter is a derivation of an Async_Stream
 
     The class has some class method for managing common resources like a
@@ -53,7 +55,7 @@ class InverterG3P(Inverter, ConnectionG3P):
     def __init__(self, reader: StreamReader, writer: StreamWriter, addr,
                  client_mode: bool = False):
         super().__init__(reader, writer, addr, None,
-                         server_side=True, client_mode=client_mode)
+                         client_mode=client_mode)
         self.__ha_restarts = -1
         self.addr = addr
 
@@ -68,9 +70,8 @@ class InverterG3P(Inverter, ConnectionG3P):
             logging.info(f'[{self.node_id}] Connect to {addr}')
             connect = asyncio.open_connection(host, port)
             reader, writer = await connect
-            self.remote.stream = ConnectionG3P(reader, writer, addr, self,
-                                               server_side=False,
-                                               client_mode=False)
+            self.remote.stream = ConnectionG3PClient(reader, writer,
+                                                     addr, self)
             logging.info(f'[{self.remote.stream.node_id}:'
                          f'{self.remote.stream.conn_no}] '
                          f'Connected to {addr}')