feat: update subscription user agent on raw request

Author: M03ED

app/operation/subscription.py

@@ -230,18 +230,18 @@ def create_info_response_headers(user: UsersResponseWithInbounds, sub_settings:
         # Only include headers that have values
         return {k: v for k, v in headers.items() if v}
 
-    async def fetch_config(self, user: UsersResponseWithInbounds, client_type: ConfigFormat) -> tuple[str, str]:
+    async def fetch_config(self, user: UsersResponseWithInbounds, client_type: ConfigFormat) -> tuple[str | bytes, str]:
         # Get client configuration
-        config = client_config.get(client_type)
+        config = client_config.get(client_type, {})
         sub_settings = await subscription_settings()
         randomize_order = sub_settings.randomize_order
 
         # Generate subscription content
         return (
             await generate_subscription(
                 user=user,
-                config_format=config["config_format"],
-                as_base64=config["as_base64"],
+                config_format=config.get("config_format", ""),
+                as_base64=config.get("as_base64", ""),
                 randomize_order=randomize_order,
             ),
             config["media_type"],
@@ -386,10 +386,20 @@ def _build_raw_subscription_payload(
             "apps": self._make_apps_import_urls(sub_settings.applications, format_variables),
         }
 
-    async def user_subscription_raw(self, db: AsyncSession, token: str):
+    async def user_subscription_raw(
+        self,
+        db: AsyncSession,
+        token: str,
+        update_user_agent: str = "",
+        ip: str | None = None,
+    ):
         sub_settings: SubSettings = await subscription_settings()
         db_user = await self.get_validated_sub(db, token)
         user = await self.validated_user(db_user)
+
+        if update_user_agent:
+            await user_sub_update(db, db_user.id, update_user_agent, ip=ip)
+
         links = []
         if sub_settings.allow_browser_config:
             conf, _ = await self.fetch_config(user, ConfigFormat.links)

app/routers/subscription.py

@@ -8,6 +8,7 @@
 from app.operation import OperatorType
 from app.operation.subscription import SubscriptionOperation
 from config import subscription_env_settings
+
 from .dependencies import get_subscription_usage_query
 
 router = APIRouter(tags=["Subscription"], prefix=f"/{subscription_env_settings.path}")
@@ -43,8 +44,18 @@ async def user_subscription_info(request: Request, token: str, db: AsyncSession
 
 
 @router.get("/{token}/raw")
-async def user_subscription_raw(token: str, db: AsyncSession = Depends(get_db)):
-    return await subscription_operator.user_subscription_raw(db, token=token)
+async def user_subscription_raw(
+    request: Request,
+    token: str,
+    db: AsyncSession = Depends(get_db),
+    update_user_agent: str = Header(default="", alias="X-Subscription-User-Agent"),
+):
+    return await subscription_operator.user_subscription_raw(
+        db,
+        token=token,
+        update_user_agent=update_user_agent,
+        ip=request.client.host if request.client else None,
+    )
 
 
 @router.get("/{token}/apps", response_model=list[Application])

app/subscription/share.py

@@ -341,7 +341,7 @@ async def process_inbounds_and_tags(
     client_templates: dict[str, str],
     xray_template_overrides: dict[int, str] | None = None,
     randomize_order: bool = False,
-) -> list | str | bytes:
+) -> str | bytes:
     proxy_settings = user.proxy_settings.dict()
     proxy_settings["_user_id"] = user.id
     hosts = await filter_hosts(list((await host_manager.get_hosts()).values()), user.status)