# HG changeset patch
# User Edouard Tisserant <edouard.tisserant@gmail.com>
# Date 1731966131 -3600
# Node ID af7671a9945a2bd7df2f2db49bb3634df1c02113
# Parent  ea2db66b185f4fd305a4d6b4854f8f25e8f95432
IDE: re-use eRPC URI definitions in connector factory.

Preparing for serial and US eRPC connection.

diff -r ea2db66b185f -r af7671a9945a connectors/ERPC/__init__.py
--- a/connectors/ERPC/__init__.py	Mon Nov 18 13:55:51 2024 +0100
+++ b/connectors/ERPC/__init__.py	Mon Nov 18 22:42:11 2024 +0100
@@ -22,6 +22,7 @@
 import PSKManagement as PSK
 from connectors.ERPC.PSK_Adapter import SSLPSKClientTransport
 from connectors.ConnectorBase import ConnectorBase
+from connectors.ERPC_URI import per_scheme_model
 
 enum_to_PLCstatus = dict(map(lambda t:(t[1],t[0]),getmembers(PLCstatus_enum, lambda x:type(x)==int)))
 
@@ -113,64 +114,71 @@
     # ERPC:///dev/ttyXX:baudrate or ERPC://:COM4:baudrate
 
     try:
-        _scheme, location = uri.split("://",1)
-        locator, *IDhash = location.split('#',1)
-        x = re.match(r'(?P<host>[^\s:]+):?(?P<port>\d+)?', locator)
-        host = x.group('host')
-        port = x.group('port')
-        if port:
-            port = int(port)
-        else:
-            # default port depends on security
-            port = 4000 if IDhash else 3000
-
-        if not IDhash and _scheme=="ERPCS":
-            confnodesroot.logger.write_error(
-                f'Invalid URI "{uri}": ERPCS requires PLC ID after "#"\n')
-            return None
-        elif IDhash and _scheme!="ERPCS":
-            confnodesroot.logger.write_error(
-                f'URI "{uri}": Non-encrypted ERPC does not take a PLC ID after "#"\n')
-            return None
-
+        scheme, location = uri.split("://",1)
+        _model, _useID, parser, _builder = per_scheme_model[scheme]
+        location_data = parser(location)
     except Exception as e:
         confnodesroot.logger.write_error(
             'Malformed URI "%s": %s\n' % (uri, str(e)))
         return None
 
-
     PLCObjectERPCProxy = type(
         "PLCObjectERPCProxy",
         (ConnectorBase, BeremizPLCObjectServiceClient),
         {name: rpc_wrapper(name, confnodesroot)
             for name,_func in getmembers(IBeremizPLCObjectService, isfunction)})
 
-    try:
-        if IDhash:
-            ID = IDhash[0]
-            # load PSK from project
-            secpath = os.path.join(confnodesroot.ProjectPath, 'psk', ID + '.secret')
-            if not os.path.exists(secpath):
+    if scheme in ["ERPCS", "ERPC"]:
+        if scheme=="ERPCS":
+            ID = location_data["ID"]
+            if not ID:
                 confnodesroot.logger.write_error(
-                    'Error: Pre-Shared-Key Secret in %s is missing!\n' % secpath)
+                    f'Invalid URI "{uri}": ERPCS requires PLC ID after "#"\n')
                 return None
-            secret = open(secpath).read().partition(':')[2].rstrip('\n\r').encode()
-            transport = SSLPSKClientTransport(host, port, (secret, ID.encode()))
+            default_port = 4000
         else:
-            # TODO if serial URI then 
-            # transport = erpc.transport.SerialTransport(device, baudrate)
+            ID = None
+            if "#" in location:
+                confnodesroot.logger.write_error(
+                    f'URI "{uri}": Non-encrypted ERPC does not take a PLC ID after "#"\n')
+                return None
+            default_port = 3000
 
-            transport = erpc.transport.TCPTransport(host, port, False)
+        host = location_data["host"]
+        port = location_data["port"]
+        port = int(port) if port else default_port
 
-        clientManager = erpc.client.ClientManager(transport, erpc.basic_codec.BasicCodec)
-        client = PLCObjectERPCProxy(clientManager)
+        try:
+            if ID:
+                # load PSK from project
+                secpath = os.path.join(confnodesroot.ProjectPath, 'psk', ID + '.secret')
+                if not os.path.exists(secpath):
+                    confnodesroot.logger.write_error(
+                        'Error: Pre-Shared-Key Secret in %s is missing!\n' % secpath)
+                    return None
+                secret = open(secpath).read().partition(':')[2].rstrip('\n\r').encode()
+                transport = SSLPSKClientTransport(host, port, (secret, ID.encode())) # type: ignore
+            else:
 
-    except Exception as e:
+                transport = erpc.transport.TCPTransport(host, port, False)
+
+            clientManager = erpc.client.ClientManager(transport, erpc.basic_codec.BasicCodec)
+            client = PLCObjectERPCProxy(clientManager)
+
+        except Exception as e:
+            confnodesroot.logger.write_error(
+                _("Connection to {loc} failed with exception {ex}\n").format(
+                    loc=uri, ex=str(e)))
+            return None
+
+    else:
+        # TODO if serial URI then 
+        # transport = erpc.transport.SerialTransport(device, baudrate)
+
         confnodesroot.logger.write_error(
-            _("Connection to {loc} failed with exception {ex}\n").format(
-                loc=locator, ex=str(e)))
+            _("Unknown scheme {scheme} in URI {uri}\n").format(
+                scheme=scheme, uri=uri))
         return None
-
     # Check connection is effective.
     IDPSK = client.GetPLCID()
     if IDPSK: