mcp-proxy-adapter 6.2.9__py3-none-any.whl → 6.2.12__py3-none-any.whl

mcp_proxy_adapter/api/app.py

@@ -7,6 +7,7 @@ import ssl
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Union
 from contextlib import asynccontextmanager
+import asyncio
 
 from fastapi import FastAPI, Body, Depends, HTTPException, Request
 from fastapi.responses import JSONResponse, Response
@@ -41,8 +42,19 @@ def create_lifespan(config_path: Optional[str] = None):
         """
         # Startup events
         from mcp_proxy_adapter.commands.command_registry import registry
-        from mcp_proxy_adapter.core.proxy_registration import register_with_proxy, unregister_from_proxy
+        from mcp_proxy_adapter.core.proxy_registration import (
+            register_with_proxy,
+            unregister_from_proxy,
+            initialize_proxy_registration,
+        )
         
+        # Initialize proxy registration manager WITH CURRENT CONFIG before reload_system
+        # so that registration inside reload_system can work
+        try:
+            initialize_proxy_registration(config.get_all())
+        except Exception as e:
+            logger.error(f"Failed to initialize proxy registration: {e}")
+
         # Initialize system using unified logic
         # This will load config, register custom commands, and discover auto-commands
         # Only reload config if not already loaded from the same path
@@ -54,7 +66,13 @@ def create_lifespan(config_path: Optional[str] = None):
         logger.info(f"Application started with {init_result['total_commands']} commands registered")
         logger.info(f"System initialization result: {init_result}")
         
-        # Register with proxy if enabled
+        # Initialize proxy registration manager with current config
+        try:
+            initialize_proxy_registration(config.get_all())
+        except Exception as e:
+            logger.error(f"Failed to initialize proxy registration: {e}")
+
+        # Register with proxy if enabled (run slightly delayed to ensure server is accepting connections)
         server_config = config.get("server", {})
         server_host = server_config.get("host", "0.0.0.0")
         server_port = server_config.get("port", 8000)
@@ -79,12 +97,19 @@ def create_lifespan(config_path: Optional[str] = None):
         
         server_url = f"{protocol}://{server_host}:{server_port}"
         
-        # Attempt proxy registration
-        registration_success = await register_with_proxy(server_url)
-        if registration_success:
-            logger.info("✅ Proxy registration completed successfully")
-        else:
-            logger.info("ℹ️ Proxy registration is disabled or failed")
+        # Attempt proxy registration in background with small delay
+        async def _delayed_register():
+            try:
+                await asyncio.sleep(0.5)
+                success = await register_with_proxy(server_url)
+                if success:
+                    logger.info("✅ Proxy registration completed successfully")
+                else:
+                    logger.info("ℹ️ Proxy registration is disabled or failed")
+            except Exception as e:
+                logger.error(f"Proxy registration failed: {e}")
+
+        asyncio.create_task(_delayed_register())
         
         yield  # Application is running
         

mcp_proxy_adapter/examples/generate_test_configs.py

@@ -15,6 +15,18 @@ def generate_http_simple_config(port: int = 8000) -> Dict[str, Any]:
         "server": {"host": "127.0.0.1", "port": port},
         "ssl": {"enabled": False},
         "security": {"enabled": False},
+        "registration": {
+            "enabled": True,
+            "auth_method": "token",
+            "server_url": "http://127.0.0.1:3004/proxy",
+            "token": {"enabled": True, "token": "proxy_registration_token_123"},
+            "proxy_info": {
+                "name": "mcp_example_server",
+                "capabilities": ["jsonrpc", "rest", "proxy_registration"],
+                "endpoints": {"jsonrpc": "/api/jsonrpc", "rest": "/cmd", "health": "/health"}
+            },
+            "heartbeat": {"enabled": True, "interval": 30}
+        },
         "protocols": {"enabled": True, "allowed_protocols": ["http"]}
     }
 def generate_http_token_config(port: int = 8001) -> Dict[str, Any]:
@@ -71,7 +83,7 @@ def generate_mtls_no_roles_config(port: int = 8004) -> Dict[str, Any]:
         "security": {
             "enabled": True,
             "auth": {"enabled": True, "methods": ["certificate"]},
-            "permissions": {"enabled": False}
+            "permissions": {"enabled": False, "roles_file": "./roles.json"}
         },
         "protocols": {"enabled": True, "allowed_protocols": ["https", "mtls"]}
     }
@@ -86,6 +98,18 @@ def generate_mtls_with_roles_config(port: int = 8005) -> Dict[str, Any]:
             "ca_cert": "./certs/ca_cert.pem",
             "verify_client": True
         },
+        "registration": {
+            "enabled": True,
+            "auth_method": "token",
+            "server_url": "http://127.0.0.1:3004/proxy",
+            "token": {"enabled": True, "token": "proxy_registration_token_123"},
+            "proxy_info": {
+                "name": "mcp_example_server",
+                "capabilities": ["jsonrpc", "rest", "security", "proxy_registration"],
+                "endpoints": {"jsonrpc": "/api/jsonrpc", "rest": "/cmd", "health": "/health"}
+            },
+            "heartbeat": {"enabled": True, "interval": 30}
+        },
         "security": {
             "enabled": True,
             "auth": {"enabled": True, "methods": ["certificate"]},

mcp_proxy_adapter/examples/run_proxy_server.py

@@ -0,0 +1,144 @@
+#!/usr/bin/env python3
+"""
+Author: Vasiliy Zdanovskiy
+email: vasilyvz@gmail.com
+
+Lightweight local proxy server for MCP Proxy Adapter examples.
+
+This server provides proxy registration endpoints at /proxy for adapter instances
+to register/unregister/heartbeat and for simple discovery.
+"""
+
+import argparse
+import asyncio
+import signal
+import sys
+from typing import Dict, List, Optional
+import json
+from datetime import datetime, timedelta
+
+from fastapi import FastAPI, HTTPException
+from pydantic import BaseModel
+import uvicorn
+
+
+# Simple in-memory storage for registered adapters
+registered_adapters: Dict[str, Dict] = {}
+
+
+class AdapterRegistration(BaseModel):
+    name: str
+    url: str
+    capabilities: List[str]
+    metadata: Optional[Dict] = {}
+
+
+class ProxyRouter:
+    """Simple proxy router for MCP examples."""
+
+    def __init__(self):
+        self.app = FastAPI(title="MCP Local Proxy", version="1.0.0")
+        self._setup_routes()
+
+    def _setup_routes(self):
+        @self.app.post("/proxy/register")
+        async def register_adapter(registration: AdapterRegistration):
+            """Register an adapter with the proxy."""
+            adapter_id = registration.name
+            registered_adapters[adapter_id] = {
+                "name": registration.name,
+                "url": registration.url,
+                "capabilities": registration.capabilities,
+                "metadata": registration.metadata,
+                "registered_at": datetime.now().isoformat(),
+                "last_heartbeat": datetime.now().isoformat(),
+                "status": "active"
+            }
+            print(f"✅ Registered adapter: {adapter_id} at {registration.url}")
+            return {"status": "registered", "adapter_id": adapter_id}
+
+        @self.app.post("/proxy/unregister")
+        async def unregister_adapter(adapter_id: str):
+            """Unregister an adapter from the proxy."""
+            if adapter_id in registered_adapters:
+                del registered_adapters[adapter_id]
+                print(f"✅ Unregistered adapter: {adapter_id}")
+                return {"status": "unregistered", "adapter_id": adapter_id}
+            else:
+                raise HTTPException(status_code=404, detail="Adapter not found")
+
+        @self.app.get("/proxy/list")
+        async def list_adapters():
+            """List all registered adapters."""
+            return {
+                "adapters": list(registered_adapters.values()),
+                "count": len(registered_adapters)
+            }
+
+        @self.app.get("/proxy/health")
+        async def health_check():
+            """Health check endpoint."""
+            return {
+                "status": "healthy",
+                "timestamp": datetime.now().isoformat(),
+                "adapters_count": len(registered_adapters)
+            }
+
+        @self.app.post("/proxy/heartbeat")
+        async def heartbeat(adapter_id: str):
+            """Receive heartbeat from adapter."""
+            if adapter_id in registered_adapters:
+                registered_adapters[adapter_id]["last_heartbeat"] = datetime.now().isoformat()
+                return {"status": "ok", "adapter_id": adapter_id}
+            else:
+                raise HTTPException(status_code=404, detail="Adapter not found")
+
+
+def create_proxy_app() -> FastAPI:
+    """Create FastAPI app with proxy endpoints."""
+    router = ProxyRouter()
+    return router.app
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description="Run local proxy server for MCP examples")
+    parser.add_argument("--host", default="127.0.0.1", help="Host to bind to (default: 127.0.0.1)")
+    parser.add_argument("--port", type=int, default=3004, help="Port to bind to (default: 3004)")
+    parser.add_argument("--log-level", default="info", choices=["debug", "info", "warning", "error"], help="Log level")
+
+    args = parser.parse_args()
+
+    # Create FastAPI app
+    app = create_proxy_app()
+
+    # Setup graceful shutdown
+    def signal_handler(signum, frame):
+        print("\n🛑 Shutting down proxy server...")
+        sys.exit(0)
+
+    signal.signal(signal.SIGINT, signal_handler)
+    signal.signal(signal.SIGTERM, signal_handler)
+
+    print("🚀 Starting MCP Local Proxy Server...")
+    print(f"📡 Server URL: http://{args.host}:{args.port}")
+    print(f"🔗 Proxy endpoints available at: http://{args.host}:{args.port}/proxy")
+    print("📋 Supported endpoints:")
+    print("   POST /proxy/register    - Register adapter")
+    print("   POST /proxy/unregister  - Unregister adapter")
+    print("   GET  /proxy/list        - List registered adapters")
+    print("   GET  /proxy/health      - Health check")
+    print("   POST /proxy/heartbeat   - Heartbeat from adapter")
+    print("⚡ Press Ctrl+C to stop\n")
+
+    # Run server
+    uvicorn.run(
+        app,
+        host=args.host,
+        port=args.port,
+        log_level=args.log_level,
+        access_log=True
+    )
+
+
+if __name__ == "__main__":
+    main()

mcp_proxy_adapter/examples/run_security_tests.py

@@ -42,20 +42,20 @@ class SecurityTestRunner:
             },
             "https": {
                 "config": "configs/https_simple.json",
-                "port": 8443,
-                "url": "https://localhost:8443",
+                "port": 8002,
+                "url": "https://localhost:8002",
                 "auth": "none"
             },
             "https_token": {
                 "config": "configs/https_token.json",
-                "port": 8444,
-                "url": "https://localhost:8444",
+                "port": 8003,
+                "url": "https://localhost:8003",
                 "auth": "api_key"
             },
             "mtls": {
-                "config": "configs/mtls_with_roles.json",
-                "port": 8445,
-                "url": "https://localhost:8445",
+                "config": "configs/mtls_no_roles.json",
+                "port": 8004,
+                "url": "https://localhost:8004",
                 "auth": "certificate"
             }
         }

{mcp_proxy_adapter-6.2.9.dist-info → mcp_proxy_adapter-6.2.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.2.9
+Version: 6.2.12
 Summary: Powerful JSON-RPC microservices framework with built-in security, authentication, and proxy registration
 Home-page: https://github.com/maverikod/mcp-proxy-adapter
 Author: Vasiliy Zdanovskiy

{mcp_proxy_adapter-6.2.9.dist-info → mcp_proxy_adapter-6.2.12.dist-info}/RECORD

@@ -6,7 +6,7 @@ mcp_proxy_adapter/main.py,sha256=_DJwMZdN0393UR-U7xfQh59EpbDDgv1oWPFf-v2MoII,214
 mcp_proxy_adapter/openapi.py,sha256=36vOEbJjGnVZR6hUhl6mHCD29HYOEFKo2bL0JdGSm-4,13952
 mcp_proxy_adapter/version.py,sha256=DBoduPI-4-pzZQM7yaYwnDNFnd9nsp28dIO7Sk1N9CI,75
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_proxy_adapter/api/app.py,sha256=pYrsDWhZAYoYbxujD0MGeOWdTnBUGueIGmZqeAbaB9A,27884
+mcp_proxy_adapter/api/app.py,sha256=khl4kaI4mJ6dNbfAK7hR97Ek-eWC9NBeuXHr6GVbLoU,28911
 mcp_proxy_adapter/api/handlers.py,sha256=DcZT7MVBV33q-0EJ0iFqxE0VgBkFt6d_SqoRkntwyvc,8477
 mcp_proxy_adapter/api/schemas.py,sha256=xOmiSwHaapY6myEFnLu7o-LWVPM7vwmLYZXFo2c6NfE,12381
 mcp_proxy_adapter/api/tool_integration.py,sha256=MrtX7vUXCGBBuZuOs3C6EF67R_U_0xMfOmlmsAz-wuE,10245
@@ -88,10 +88,11 @@ mcp_proxy_adapter/examples/demo_client.py,sha256=inic-FP5qG8oQXUaCrtEhmhac_PDZ1p
 mcp_proxy_adapter/examples/generate_all_certificates.py,sha256=rgcwqIkQ1eDfEIRFRXGIOz-jOSS1w0GPBRhYvMl6Vjc,16948
 mcp_proxy_adapter/examples/generate_certificates.py,sha256=A34OHUEiFvINOHrm3_JiDSbp-WG-eQXIvKCsE8JAeXQ,6616
 mcp_proxy_adapter/examples/generate_certificates_and_tokens.py,sha256=J0qHm_BMY8RYqfuwf7V7xKsHcsRJx8E7x-8JxmW5sPw,15988
-mcp_proxy_adapter/examples/generate_test_configs.py,sha256=AJqsB7sP-tYuOD49MiWBo-CkpdRd92XYQ8m31rPFiFg,8495
+mcp_proxy_adapter/examples/generate_test_configs.py,sha256=JFPays1tluGFpvo8FLjpo5FQ1HK8v1aGbb1knBokp9Q,9651
 mcp_proxy_adapter/examples/proxy_registration_example.py,sha256=g59_QG2D1CCqhIXEvgy2XmgXI3toLmLyH7hL3uHZwC8,12647
 mcp_proxy_adapter/examples/run_example.py,sha256=o8rcy9Xo0UuZG4MpKdex3pFWYdtAi6uW8dEBQE6Yzbw,2539
-mcp_proxy_adapter/examples/run_security_tests.py,sha256=V1DZ3GWx-5FmEPRuGWIJ6cgsog6bBNgdX3HT0xq6j-U,13055
+mcp_proxy_adapter/examples/run_proxy_server.py,sha256=MF5lWqARgeaQN0Eb27rdFquBdbTeSXJDz0kaJTQm62w,4959
+mcp_proxy_adapter/examples/run_security_tests.py,sha256=YX_l69DmNIA36TTaLB_xAA1XraJJjg0Hev-xbICMQxA,13053
 mcp_proxy_adapter/examples/run_security_tests_fixed.py,sha256=fNQsbALf9548xJ0OGPKYx5Crzg1GbcL8CSh1x_oKu_A,10540
 mcp_proxy_adapter/examples/security_test_client.py,sha256=eBy6pZ5Dhdo-qi_7Fk-IWGHq7zAJA-om8RBuOep4XSs,28022
 mcp_proxy_adapter/examples/setup_test_environment.py,sha256=Y6oNaR95Rmn2csupYoGV-_mMF6AtqJ31vwLhY0TQtMk,11319
@@ -113,8 +114,8 @@ mcp_proxy_adapter/examples/full_application/commands/dynamic_calculator_command.
 mcp_proxy_adapter/examples/full_application/hooks/__init__.py,sha256=ORG4cL8cSXEMmZ0CEPz75OVuwg54pdDm2GIBpP4dtcs,200
 mcp_proxy_adapter/examples/full_application/hooks/application_hooks.py,sha256=TYXuHI-KW_mH5r8mSKgNMJCr3moeEKrqC4Eex0U298k,3457
 mcp_proxy_adapter/examples/full_application/hooks/builtin_command_hooks.py,sha256=IaskSrckZS6bE3aGxSBL8aTj-iJTSI2ysfsFjhjncyM,2975
-mcp_proxy_adapter-6.2.9.dist-info/licenses/LICENSE,sha256=6KdtUcTwmTRbJrAmYjVn7e6S-V42ubeDJ-AiVEzZ510,1075
-mcp_proxy_adapter-6.2.9.dist-info/METADATA,sha256=OdRrUBeEOGwjimLhp6GTFH8MnekCJ2DG-9iwf3oc-uk,22198
-mcp_proxy_adapter-6.2.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.2.9.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.2.9.dist-info/RECORD,,
+mcp_proxy_adapter-6.2.12.dist-info/licenses/LICENSE,sha256=6KdtUcTwmTRbJrAmYjVn7e6S-V42ubeDJ-AiVEzZ510,1075
+mcp_proxy_adapter-6.2.12.dist-info/METADATA,sha256=Mvd9YJsmXK-oaTx6VuK5Yi7Dr1yLAfRThSxwF7itzZg,22199
+mcp_proxy_adapter-6.2.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.2.12.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.2.12.dist-info/RECORD,,