fix(subscription): handle None case in _get_hysteria_data_from_finalmask and update port selection in XrayConfiguration

Author: x0sina

app/subscription/base.py

@@ -173,9 +173,11 @@ def vless_route(uuid: str, route: str) -> str:
         parts[2] = route
         return "-".join(parts)
 
-    def _get_hysteria_data_from_finalmask(self, finalmask: dict) -> tuple[Any | Literal[""], Any | dict]:
+    def _get_hysteria_data_from_finalmask(self, finalmask: dict | None) -> tuple[Any | Literal[""], Any | dict]:
         """Extract Hysteria obfuscation password and QUIC parameters from finalmask"""
 
+        if finalmask is None:
+            finalmask = {}
         obfs_password = ""
         quic_params: dict = finalmask.get("quicParams", {})
         if udp := finalmask.get("udp"):

app/subscription/xray.py

@@ -569,8 +569,8 @@ def _build_outbound(
                 "tag": "proxy",
                 "settings": {
                     "version": 2,
-                    "address": inbound.address,
-                    "port": inbound.port,
+                    "address": address,
+                    "port": self._select_port(inbound.port),
                 },
             }