Wyoming source repository about rhasspy3 HOT 5 CLOSED

From: Martin Weinelt <[email protected]>
Date: Wed, 12 Jul 2023 19:05:54 +0200
Subject: [PATCH] Use urlparse for uri parsing in server component

Python's builtin urlparsing functionality has fewer edge cases, like
most home-grown url parsing code.

This change allows me to bind a wyoming server to an IPv6 socket.
---
 wyoming/server.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/wyoming/server.py b/wyoming/server.py
index 6dcc4e3..f3905b9 100644
--- a/wyoming/server.py
+++ b/wyoming/server.py
@@ -4,6 +4,7 @@ from abc import ABC, abstractmethod
 from functools import partial
 from pathlib import Path
 from typing import Callable, Set, Union
+from urllib.parser import urlparse
 
 from .event import Event, async_get_stdin, async_read_event, async_write_event
 
@@ -57,16 +58,15 @@ class AsyncServer(ABC):
 
     @staticmethod
     def from_uri(uri: str) -> "AsyncServer":
-        if uri.startswith("unix://"):
-            socket_path = uri[len("unix://") :]
-            return AsyncUnixServer(socket_path)
+        result = urlparse(uri)
 
-        if uri.startswith("tcp://"):
-            host, port_str = uri[len("tcp://") :].split(":")
-            port = int(port_str)
-            return AsyncTcpServer(host, port)
+        if result.scheme == "unix":
+            return AsyncUnixServer(result.path)
 
-        if uri.startswith("stdio://"):
+        if result.scheme == "tcp":
+            return AsyncTcpServer(result.hostname, result.port)
+
+        if result.scheme == "stdio":
             return AsyncStdioServer()
 
         raise ValueError("Only 'stdio://', 'unix://', or 'tcp://' are supported")
-- 
2.41.0