support SSL ws session

hbd/ws.py

@@ -20,11 +20,9 @@ _verbose = False
 
 
 async def _handler(websocket, path=None):
-    # Some versions of the websockets library call handler(connection) only;
-    # accept optional path and fall back to websocket.path when missing.
     global _connections
     _connections.add(websocket)
-    remote_address = getattr(websocket, "remote_address", None)
+    remote_address = websocket.remote_address
     if path is None:
         path = getattr(websocket, "path", None)
     if _verbose:
@@ -76,36 +74,25 @@ async def start(host: str, ws_port: int, wss_port: Optional[int] = None, ssl_con
 
     servers = []
     # plain WebSocket
-    ws_server = websockets.serve(_handler, host, ws_port) #, subprotocols=["hbd"])
     websockets_logger = logging.getLogger("websockets.server")
-    websockets_logger.setLevel(logging.INFO)
+    websockets_logger.setLevel(logging.DEBUG if verbose else logging.INFO)
+    # regular WebSocket
+    ws_server = websockets.serve(_handler, host, ws_port) #, subprotocols=["hbd"])
     servers.append(ws_server)
-
     # secure WebSocket (optional)
     if wss_port and ssl_context:
-        wss_server = websockets.serve(_handler, host, wss_port, ssl=ssl_context) #, subprotocols=["hbd"])
+        wss_server = websockets.serve(_handler, host, wss_port, ssl=ssl_context ) #, subprotocols=["hbd"])
         servers.append(wss_server)
 
     # await starting of all servers
-    try:
-        for srv in servers:
-            await srv
+    for srv in servers:
+        await srv
 
-        if _verbose:
-            logger.info("WebSocket server started on port %s (wss %s)", ws_port, wss_port)
+    if _verbose:
+        logger.info("WebSocket server(s) started on port %s (wss %s)", ws_port, wss_port)
 
-        # block forever (until loop is stopped or cancelled)
-        await asyncio.Future()
-    except asyncio.CancelledError:
-        logger.info("WebSocket server shutting down...")
-        # Close all active connections
-        for conn in list(_connections):
-            try:
-                await conn.close()
-            except Exception:
-                pass
-        _connections.clear()
-        raise
+    # block forever (until loop is stopped or cancelled)
+    await asyncio.Future()
 
 
 def broadcast(typ: str, data) -> bool:
@@ -115,7 +102,7 @@ def broadcast(typ: str, data) -> bool:
     connected websockets. Returns False if server was not running.
     """
     global _loop
-
+    
     if not _loop:
         return False
     jmsg = json.dumps({"type": typ, "data": data})