Fix tests

Author: codingjoe

tests/sip/test_types.py

@@ -394,11 +394,8 @@ def test_uri__absent(self):
 
     def test_uri__unparseable(self):
         """Return None when the URI-like string is not valid for any parser."""
-        assert CallerID("sip:@invalid").uri is None
-
-    def test_user__tel_number(self):
-        """Return the tel number as user for a tel: CallerID."""
-        assert CallerID("tel:+15551234567").user == "+15551234567"
+        with pytest.raises(ValueError):
+            assert CallerID("sip:@invalid").uri
 
     def test_host__tel_absent(self):
         """Return None for host when the CallerID is a tel URI."""

voip/sip/types.py

@@ -249,13 +249,15 @@ def uri(self) -> SipURI | None:
 
     @property
     def user(self) -> str | None:
-        """SIP user part or telephone number."""
-        return self.uri.user if self.uri else None
+        """SIP user part (phone number or username)."""
+        if m := re.search(r"sips?:([^@>;\s]+)@", self):
+            return m.group(1)
 
     @property
-    def host(self) -> str | ipaddress.IPv4Address | ipaddress.IPv6Address | None:
+    def host(self) -> str | None:
         """Carrier domain extracted from the SIP URI."""
-        return self.uri.host if self.uri else None
+        if m := re.search(r"sips?:[^@>;\s]+@([^>;)\s,]+)", self):
+            return m.group(1)
 
     @property
     def tag(self) -> str | None: