fix(publish): Only send publish msgs to each client once

python/src/wslink/backends/aiohttp/__init__.py

@@ -113,7 +113,7 @@ def create_webserver(server_config):
         routes = []
 
         for route, server_protocol in ws_routes.items():
-            protocol_handler = WslinkHandler(server_protocol)
+            protocol_handler = WslinkHandler(server_protocol, web_app)
             ws_routes[route] = protocol_handler
             routes.append(
                 aiohttp_web.get(_fix_path(route), protocol_handler.handleWsRequest)
@@ -153,13 +153,34 @@ def create_webserver(server_config):
 
 
 class WslinkHandler(object):
-    def __init__(self, protocol=None):
+    def __init__(self, protocol=None, web_app=None):
         self.serverProtocol = protocol
+        self.web_app = web_app
         self.functionMap = {}
         self.attachmentsReceived = {}
         self.attachmentsRecvQueue = []
         self.connections = {}
 
+        # Build the rpc method dictionary, assuming we were given a serverprotocol
+        if self.getServerProtocol():
+            protocolList = self.getServerProtocol().getLinkProtocols()
+            protocolList.append(self.getServerProtocol())
+            for protocolObject in protocolList:
+                protocolObject.init(
+                    self.publish,
+                    self.addAttachment,
+                    lambda: schedule_coroutine(0, _stop_server, self.web_app),
+                )
+                test = lambda x: inspect.ismethod(x) or inspect.isfunction(x)
+                for k in inspect.getmembers(protocolObject.__class__, test):
+                    proc = k[1]
+                    if "_wslinkuris" in proc.__dict__:
+                        uri_info = proc.__dict__["_wslinkuris"][0]
+                        if "uri" in uri_info:
+                            uri = uri_info["uri"]
+                            self.functionMap[uri] = (protocolObject, proc)
+            pub.publishManager.registerProtocol(self)
+
     def setServerProtocol(self, protocol):
         self.serverProtocol = protocol
 
@@ -176,6 +197,8 @@ async def disconnectClients(self):
                 code=aiohttp.WSCloseCode.GOING_AWAY, message="Server shutdown"
             )
 
+        pub.publishManager.unregisterProtocol(self)
+
     async def handleWsRequest(self, request):
         aiohttp_app = request.app
 
@@ -192,7 +215,7 @@ async def handleWsRequest(self, request):
 
         await current_ws.prepare(request)
 
-        await self.onConnect(request)
+        await self.onConnect()
 
         async for msg in current_ws:
             await self.onMessage(msg, client_id)
@@ -209,32 +232,11 @@ async def handleWsRequest(self, request):
 
         return current_ws
 
-    async def onConnect(self, request):
-        aiohttp_app = request.app
-
-        # Build the rpc method dictionary. self.serverProtocol isn't set until connected.
-        if not self.getServerProtocol():
-            return
-        protocolList = self.getServerProtocol().getLinkProtocols()
-        protocolList.append(self.getServerProtocol())
-        for protocolObject in protocolList:
-            protocolObject.init(
-                self.publish,
-                self.addAttachment,
-                lambda: schedule_coroutine(0, _stop_server, aiohttp_app),
-            )
-            test = lambda x: inspect.ismethod(x) or inspect.isfunction(x)
-            for k in inspect.getmembers(protocolObject.__class__, test):
-                proc = k[1]
-                if "_wslinkuris" in proc.__dict__:
-                    uri_info = proc.__dict__["_wslinkuris"][0]
-                    if "uri" in uri_info:
-                        uri = uri_info["uri"]
-                        self.functionMap[uri] = (protocolObject, proc)
-        pub.publishManager.registerProtocol(self)
+    async def onConnect(self):
+        pass
 
     async def onClose(self):
-        pub.publishManager.unregisterProtocol(self)
+        pass
 
     async def handleSystemMessage(self, rpcid, methodName, args, client_id):
         rpcList = rpcid.split(":")