mcpforunityserver 9.3.0b20260129121506__py3-none-any.whl → 9.3.0b20260131003150__py3-none-any.whl

transport/unity_transport.py

@@ -1,34 +1,49 @@
 """Transport helpers for routing commands to Unity."""
 from __future__ import annotations
 
-import asyncio
-import inspect
-import os
+import logging
 from typing import Awaitable, Callable, TypeVar
 
-from fastmcp import Context
-
 from transport.plugin_hub import PluginHub
+from core.config import config
+from core.constants import API_KEY_HEADER
+from services.api_key_service import ApiKeyService
 from models.models import MCPResponse
 from models.unity_response import normalize_unity_response
-from services.tools import get_unity_instance_from_context
 
 T = TypeVar("T")
+logger = logging.getLogger("mcp-for-unity-server")
 
 
 def _is_http_transport() -> bool:
-    return os.environ.get("UNITY_MCP_TRANSPORT", "stdio").lower() == "http"
+    return config.transport_mode.lower() == "http"
 
 
-def _current_transport() -> str:
-    """Expose the active transport mode as a simple string identifier."""
-    return "http" if _is_http_transport() else "stdio"
+async def _resolve_user_id_from_request() -> str | None:
+    """Extract user_id from the current HTTP request's API key header."""
+    if not config.http_remote_hosted:
+        return None
+    if not ApiKeyService.is_initialized():
+        return None
+    try:
+        from fastmcp.server.dependencies import get_http_headers
+        headers = get_http_headers(include_all=True)
+        api_key = headers.get(API_KEY_HEADER.lower())
+        if not api_key:
+            return None
+        service = ApiKeyService.get_instance()
+        result = await service.validate(api_key)
+        return result.user_id if result.valid else None
+    except Exception as e:
+        logger.debug("Failed to resolve user_id from HTTP request: %s", e)
+        return None
 
 
 async def send_with_unity_instance(
     send_fn: Callable[..., Awaitable[T]],
     unity_instance: str | None,
     *args,
+    user_id: str | None = None,
     **kwargs,
 ) -> T:
     if _is_http_transport():
@@ -41,11 +56,27 @@ async def send_with_unity_instance(
         if not isinstance(params, dict):
             raise TypeError(
                 "Command parameters must be a dict for HTTP transport")
+
+        # Auto-resolve user_id from HTTP request API key (remote-hosted mode)
+        if user_id is None:
+            user_id = await _resolve_user_id_from_request()
+
+        # Auth check
+        if config.http_remote_hosted and not user_id:
+            return normalize_unity_response(
+                MCPResponse(
+                    success=False,
+                    error="auth_required",
+                    message="API key required",
+                ).model_dump()
+            )
+
         try:
             raw = await PluginHub.send_command_for_instance(
                 unity_instance,
                 command_type,
                 params,
+                user_id=user_id,
             )
             return normalize_unity_response(raw)
         except Exception as exc: