feat(xray): Add Xray 26.7.11 FinalMask xmc settings to hosts/inbound/subscription (UI too). Add sessionID compatibility + add 2 new fields: sessionIDTable + sessionIDLength (and the corresponding UI).

app/core/hosts.py

@@ -267,6 +267,16 @@ async def _prepare_subscription_inbound_data(
                 else inbound_config.get("session_placement")
             ),
             session_key=xs.session_key if xs and xs.session_key is not None else inbound_config.get("session_key"),
+            session_id_table=(
+                xs.session_id_table
+                if xs and xs.session_id_table is not None
+                else inbound_config.get("session_id_table")
+            ),
+            session_id_length=(
+                xs.session_id_length
+                if xs and xs.session_id_length is not None
+                else inbound_config.get("session_id_length")
+            ),
             seq_placement=(
                 xs.seq_placement if xs and xs.seq_placement is not None else inbound_config.get("seq_placement")
             ),

app/core/xray.py

@@ -329,8 +329,14 @@ def get_xhttp_value(key: str):
         settings["x_padding_placement"] = get_xhttp_value("xPaddingPlacement")
         settings["x_padding_method"] = get_xhttp_value("xPaddingMethod")
         settings["uplink_http_method"] = get_xhttp_value("uplinkHTTPMethod")
-        settings["session_placement"] = get_xhttp_value("sessionPlacement")
-        settings["session_key"] = get_xhttp_value("sessionKey")
+        session_id_placement = get_xhttp_value("sessionIDPlacement")
+        settings["session_placement"] = (
+            session_id_placement if session_id_placement else get_xhttp_value("sessionPlacement")
+        )
+        session_id_key = get_xhttp_value("sessionIDKey")
+        settings["session_key"] = session_id_key if session_id_key else get_xhttp_value("sessionKey")
+        settings["session_id_table"] = get_xhttp_value("sessionIDTable")
+        settings["session_id_length"] = get_xhttp_value("sessionIDLength")
         settings["seq_placement"] = get_xhttp_value("seqPlacement")
         settings["seq_key"] = get_xhttp_value("seqKey")
         settings["uplink_data_placement"] = get_xhttp_value("uplinkDataPlacement")
@@ -440,7 +446,8 @@ def _read_inbound(self, inbound: dict):
             self._handle_shadowsocks_settings(inbound["settings"], settings)
 
         if stream := inbound.get("streamSettings"):
-            net = stream.get("network", "tcp")
+            method = stream.get("method")
+            net = method if method else stream.get("network", "tcp")
             net_settings = stream.get(f"{net}Settings", {})
             security = stream.get("security")
             tls_settings = stream.get(f"{security}Settings")

app/models/host.py

@@ -86,6 +86,7 @@ class FinalMaskTcpType(str, Enum):
     header_custom = "header-custom"
     fragment = "fragment"
     sudoku = "sudoku"
+    xmc = "xmc"
 
 
 class FinalMaskUdpType(str, Enum):
@@ -135,6 +136,12 @@ class FinalMaskSudokuSettings(FinalMaskPasswordSettings):
     padding_max: int | None = Field(default=None, alias="paddingMax")
 
 
+class FinalMaskXmcSettings(FinalMaskBaseModel):
+    hostname: str | None = Field(default=None)
+    usernames: list[str] | None = Field(default=None)
+    password: str | None = Field(default=None)
+
+
 class FinalMaskDomainSettings(FinalMaskBaseModel):
     domain: str | None = Field(default=None)
 
@@ -171,7 +178,11 @@ class FinalMaskQuicParams(FinalMaskBaseModel):
 
 
 FinalMaskTcpSettings = (
-    FinalMaskTcpHeaderCustomSettings | XrayFragmentSettings | FinalMaskSudokuSettings | dict[str, Any]
+    FinalMaskTcpHeaderCustomSettings
+    | XrayFragmentSettings
+    | FinalMaskSudokuSettings
+    | FinalMaskXmcSettings
+    | dict[str, Any]
 )
 FinalMaskUdpSettings = (
     FinalMaskUdpHeaderCustomSettings
@@ -188,6 +199,7 @@ class FinalMaskQuicParams(FinalMaskBaseModel):
     FinalMaskTcpType.header_custom: FinalMaskTcpHeaderCustomSettings,
     FinalMaskTcpType.fragment: XrayFragmentSettings,
     FinalMaskTcpType.sudoku: FinalMaskSudokuSettings,
+    FinalMaskTcpType.xmc: FinalMaskXmcSettings,
 }
 
 FINAL_MASK_UDP_SETTINGS_MODELS = {
@@ -299,6 +311,8 @@ class XHttpSettings(BaseModel):
     uplink_http_method: str | None = Field(default=None)
     session_placement: str | None = Field(default=None, pattern=r"^$|^(path|cookie|header|query)$")
     session_key: str | None = Field(default=None)
+    session_id_table: str | None = Field(default=None, pattern=r"^[\x20-\x7E]*$")
+    session_id_length: str | None = Field(default=None, pattern=r"^\d{1,16}(-\d{1,16})?$")
     seq_placement: str | None = Field(default=None, pattern=r"^$|^(path|cookie|header|query)$")
     seq_key: str | None = Field(default=None)
     uplink_data_placement: str | None = Field(default=None, pattern=r"^$|^(body|cookie|header)$")
@@ -320,6 +334,7 @@ def _empty_mode_to_none(cls, v):
         "uplink_chunk_size",
         "sc_max_each_post_bytes",
         "sc_min_posts_interval_ms",
+        "session_id_length",
         mode="before",
     )
     @classmethod
@@ -338,6 +353,7 @@ def normalize_numeric_or_range_fields(cls, value):
         "uplink_http_method",
         "session_placement",
         "session_key",
+        "session_id_table",
         "seq_placement",
         "seq_key",
         "uplink_data_placement",

app/models/subscription.py

@@ -114,6 +114,10 @@ class XHTTPTransportConfig(BaseTransportConfig):
     uplink_http_method: str | None = Field(None, serialization_alias="uplinkHTTPMethod")
     session_placement: str | None = Field(None, serialization_alias="sessionPlacement")
     session_key: str | None = Field(None, serialization_alias="sessionKey")
+    session_id_table: str | None = Field(None, serialization_alias="sessionIDTable")
+    session_id_length: str | None = Field(
+        None, serialization_alias="sessionIDLength", pattern=r"^\d{1,16}(?:-\d{1,16})?$"
+    )
     seq_placement: str | None = Field(None, serialization_alias="seqPlacement")
     seq_key: str | None = Field(None, serialization_alias="seqKey")
     uplink_data_placement: str | None = Field(None, serialization_alias="uplinkDataPlacement")
@@ -131,6 +135,7 @@ class XHTTPTransportConfig(BaseTransportConfig):
         "sc_min_posts_interval_ms",
         "x_padding_bytes",
         "uplink_chunk_size",
+        "session_id_length",
         mode="before",
     )
     @classmethod

app/subscription/links.py

@@ -114,8 +114,10 @@ def _transport_xhttp(self, payload: dict, protocol: str, config: XHTTPTransportC
             "xPaddingPlacement": config.x_padding_placement,
             "xPaddingMethod": config.x_padding_method,
             "uplinkHTTPMethod": config.uplink_http_method,
-            "sessionPlacement": config.session_placement,
-            "sessionKey": config.session_key,
+            "sessionIDPlacement": config.session_placement,
+            "sessionIDKey": config.session_key,
+            "sessionIDTable": config.session_id_table,
+            "sessionIDLength": config.session_id_length,
             "seqPlacement": config.seq_placement,
             "seqKey": config.seq_key,
             "uplinkDataPlacement": config.uplink_data_placement,

app/subscription/xray.py

@@ -148,8 +148,10 @@ def _transport_xhttp(self, config: XHTTPTransportConfig, path: str) -> dict:
             "xPaddingPlacement": config.x_padding_placement,
             "xPaddingMethod": config.x_padding_method,
             "uplinkHTTPMethod": config.uplink_http_method,
-            "sessionPlacement": config.session_placement,
-            "sessionKey": config.session_key,
+            "sessionIDPlacement": config.session_placement,
+            "sessionIDKey": config.session_key,
+            "sessionIDTable": config.session_id_table,
+            "sessionIDLength": config.session_id_length,
             "seqPlacement": config.seq_placement,
             "seqKey": config.seq_key,
             "uplinkDataPlacement": config.uplink_data_placement,