mcp-proxy-adapter 6.6.4__py3-none-any.whl → 6.6.7__py3-none-any.whl

mcp_proxy_adapter/api/app.py

@@ -86,10 +86,20 @@ def create_lifespan(config_path: Optional[str] = None):
         public_port = reg_cfg.get("public_port")
 
         # Check SSL configuration from new structure
-        protocol = config.get("server.protocol", "http")
-        verify_client = config.get("transport.verify_client", False)
-        ssl_enabled = protocol in ["https", "mtls"] or verify_client
-        protocol = "https" if ssl_enabled else "http"
+        # Priority: registration.protocol > server.protocol > fallback to http
+        reg_cfg = config.get("registration", {})
+        registration_protocol = reg_cfg.get("protocol")
+        server_protocol = config.get("server.protocol", "http")
+        
+        if registration_protocol:
+            # Use protocol from registration configuration
+            # Convert mtls to https for URL construction (mTLS is still HTTPS)
+            protocol = "https" if registration_protocol == "mtls" else registration_protocol
+        else:
+            # Fallback to server protocol
+            verify_client = config.get("transport.verify_client", False)
+            ssl_enabled = server_protocol in ["https", "mtls"] or verify_client
+            protocol = "https" if ssl_enabled else "http"
 
         import os
         docker_host_addr = os.getenv("DOCKER_HOST_ADDR", "172.17.0.1")
@@ -135,10 +145,20 @@ def create_lifespan(config_path: Optional[str] = None):
             public_port = reg_cfg.get("public_port")
 
             # Determine protocol using the new configuration structure
-            protocol_cfg = final_config.get("server", {}).get("protocol", "http")
-            verify_client_cfg = final_config.get("transport", {}).get("verify_client", False)
-            ssl_enabled_final = protocol_cfg in ["https", "mtls"] or verify_client_cfg
-            protocol = "https" if ssl_enabled_final else "http"
+            # Priority: registration.protocol > server.protocol > fallback to http
+            reg_cfg = final_config.get("registration", final_config.get("proxy_registration", {}))
+            registration_protocol = reg_cfg.get("protocol")
+            server_protocol = final_config.get("server", {}).get("protocol", "http")
+            
+            if registration_protocol:
+                # Use protocol from registration configuration
+                # Convert mtls to https for URL construction (mTLS is still HTTPS)
+                protocol = "https" if registration_protocol == "mtls" else registration_protocol
+            else:
+                # Fallback to server protocol
+                verify_client_cfg = final_config.get("transport", {}).get("verify_client", False)
+                ssl_enabled_final = server_protocol in ["https", "mtls"] or verify_client_cfg
+                protocol = "https" if ssl_enabled_final else "http"
 
             import os
             docker_host_addr = os.getenv("DOCKER_HOST_ADDR", "172.17.0.1")

mcp_proxy_adapter/examples/config_builder.py

@@ -76,9 +76,27 @@ class ConfigBuilder:
             },
             "transport": {
                 "type": "http",
-                        "port": None,
+                "port": None,
                 "verify_client": False,
                 "chk_hostname": False
+            },
+            "registration": {
+                "enabled": False,
+                "proxy_url": "http://localhost:3004",
+                "public_host": None,
+                "public_port": None,
+                "protocol": None,  # Will be set based on server protocol
+                "server_id": "mcp_proxy_adapter",
+                "server_name": "MCP Proxy Adapter",
+                "description": "JSON-RPC API for interacting with MCP Proxy",
+                "version": "6.6.7",
+                "heartbeat": {
+                    "enabled": True,
+                    "interval": 30,
+                    "timeout": 10,
+                    "retry_attempts": 3,
+                    "retry_delay": 5
+                }
             }
         }
     
@@ -86,6 +104,9 @@ class ConfigBuilder:
         """Set protocol configuration (HTTP, HTTPS, or mTLS)."""
         self.config["server"]["protocol"] = protocol.value
         
+        # Set registration protocol to match server protocol
+        self.config["registration"]["protocol"] = protocol.value
+        
         if protocol == Protocol.HTTP:
             # HTTP - no SSL, no client verification
             self.config["transport"]["verify_client"] = False
@@ -150,6 +171,25 @@ class ConfigBuilder:
         self.config["security"]["roles_file"] = roles_file
         return self
     
+    def set_proxy_registration(self, enabled: bool = True, proxy_url: str = "http://localhost:3004", 
+                              public_host: Optional[str] = None, public_port: Optional[int] = None,
+                              server_id: str = "mcp_proxy_adapter", server_name: str = "MCP Proxy Adapter",
+                              description: str = "JSON-RPC API for interacting with MCP Proxy"):
+        """Set proxy registration configuration."""
+        self.config["registration"]["enabled"] = enabled
+        self.config["registration"]["proxy_url"] = proxy_url
+        self.config["registration"]["public_host"] = public_host
+        self.config["registration"]["public_port"] = public_port
+        self.config["registration"]["server_id"] = server_id
+        self.config["registration"]["server_name"] = server_name
+        self.config["registration"]["description"] = description
+        
+        # Set protocol to match server protocol if not explicitly set
+        if self.config["registration"]["protocol"] is None:
+            self.config["registration"]["protocol"] = self.config["server"]["protocol"]
+        
+        return self
+    
     def build(self) -> Dict[str, Any]:
         """Build and return the configuration."""
         return self.config.copy()
@@ -240,9 +280,37 @@ class ConfigFactory:
                 .set_auth(AuthMethod.TOKEN_ROLES)
                 .set_server(port=port)
                 .build())
+    
+    @staticmethod
+    def create_http_with_proxy_config(port: int = 8009, proxy_url: str = "http://localhost:3004") -> Dict[str, Any]:
+        """Create HTTP configuration with proxy registration."""
+        return (ConfigBuilder()
+                .set_protocol(Protocol.HTTP)
+                .set_server(port=port)
+                .set_proxy_registration(proxy_url=proxy_url)
+                .build())
+    
+    @staticmethod
+    def create_https_with_proxy_config(port: int = 8010, proxy_url: str = "https://localhost:3004") -> Dict[str, Any]:
+        """Create HTTPS configuration with proxy registration."""
+        return (ConfigBuilder()
+                .set_protocol(Protocol.HTTPS)
+                .set_server(port=port)
+                .set_proxy_registration(proxy_url=proxy_url)
+                .build())
+    
+    @staticmethod
+    def create_mtls_with_proxy_config(port: int = 8011, proxy_url: str = "https://localhost:3004") -> Dict[str, Any]:
+        """Create mTLS configuration with proxy registration."""
+        return (ConfigBuilder()
+                .set_protocol(Protocol.MTLS)
+                .set_server(port=port)
+                .set_proxy_registration(proxy_url=proxy_url)
+                .build())
 
 
-def create_config_from_flags(protocol: str, token: bool = False, roles: bool = False, port: int = 8000) -> Dict[str, Any]:
+def create_config_from_flags(protocol: str, token: bool = False, roles: bool = False, port: int = 8000, 
+                           proxy_registration: bool = False, proxy_url: str = "http://localhost:3004") -> Dict[str, Any]:
     """
     Create configuration from command line flags.
     
@@ -251,6 +319,8 @@ def create_config_from_flags(protocol: str, token: bool = False, roles: bool = F
         token: Enable token authentication
         roles: Enable role-based access control
         port: Server port
+        proxy_registration: Enable proxy registration
+        proxy_url: Proxy URL for registration
         
     Returns:
         Configuration dictionary
@@ -273,6 +343,10 @@ def create_config_from_flags(protocol: str, token: bool = False, roles: bool = F
     else:
         builder.set_auth(AuthMethod.NONE)
     
+    # Enable proxy registration if requested
+    if proxy_registration:
+        builder.set_proxy_registration(proxy_url=proxy_url)
+    
     return builder.build()
 
 

mcp_proxy_adapter/examples/generate_config.py

@@ -26,7 +26,9 @@ def create_config_from_flags(
     port: int = 8000,
     cert_dir: str = "./certs",
     key_dir: str = "./keys",
-    output_dir: str = "./configs"
+    output_dir: str = "./configs",
+    proxy_registration: bool = False,
+    proxy_url: str = "http://localhost:3004"
 ) -> Dict[str, Any]:
     """
     Create configuration based on command line flags.
@@ -47,7 +49,7 @@ def create_config_from_flags(
     # Use the simplified config builder
     from config_builder import create_config_from_flags as simple_create_config
     
-    return simple_create_config(protocol, token, roles, port)
+    return simple_create_config(protocol, token, roles, port, proxy_registration, proxy_url)
 
 
 def save_config(config: Dict[str, Any], filename: str, output_dir: str) -> Path:
@@ -238,6 +240,9 @@ Examples:
   
   # Generate mTLS configuration with roles
   python generate_config.py --protocol mtls --roles
+  
+  # Generate mTLS configuration with proxy registration
+  python generate_config.py --protocol mtls --proxy-registration --proxy-url https://mcp-proxy:3004
         """
     )
     
@@ -248,6 +253,10 @@ Examples:
                        help="Enable token authentication")
     parser.add_argument("--roles", action="store_true", 
                        help="Enable role-based access control")
+    parser.add_argument("--proxy-registration", action="store_true", 
+                       help="Enable proxy registration")
+    parser.add_argument("--proxy-url", default="http://localhost:3004", 
+                       help="Proxy URL for registration (default: http://localhost:3004)")
     parser.add_argument("--all", action="store_true", 
                        help="Generate all standard configurations")
     parser.add_argument("--full-config", action="store_true", 
@@ -307,7 +316,9 @@ Examples:
                 port=args.port,
                 cert_dir=args.cert_dir,
                 key_dir=args.key_dir,
-                output_dir=args.output_dir
+                output_dir=args.output_dir,
+                proxy_registration=args.proxy_registration,
+                proxy_url=args.proxy_url
             )
             
             if args.stdout:

mcp_proxy_adapter/version.py

@@ -2,4 +2,4 @@
 Version information for MCP Proxy Adapter.
 """
 
-__version__ = "6.6.4"
+__version__ = "6.6.7"

{mcp_proxy_adapter-6.6.4.dist-info → mcp_proxy_adapter-6.6.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-proxy-adapter
-Version: 6.6.4
+Version: 6.6.7
 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.6.4.dist-info → mcp_proxy_adapter-6.6.7.dist-info}/RECORD

@@ -4,9 +4,9 @@ mcp_proxy_adapter/config.py,sha256=QpoPaUKcWJ-eu6HYphhIZmkc2M-p1JgpLFAgolf_l5s,2
 mcp_proxy_adapter/custom_openapi.py,sha256=XRviX-C-ZkSKdBhORhDTdeN_1FWyEfXZADiASft3t9I,28149
 mcp_proxy_adapter/main.py,sha256=eXIRMLgDgCox9p2WDcOS9D6tiZjcFit8ePbFCfGbs3Q,5849
 mcp_proxy_adapter/openapi.py,sha256=2UZOI09ZDRJuBYBjKbMyb2U4uASszoCMD5o_4ktRpvg,13480
-mcp_proxy_adapter/version.py,sha256=iHKhx47r6lqg0YU6oEtF4CqcNCHws1gitETKpsxxgRs,74
+mcp_proxy_adapter/version.py,sha256=1KGkkI9iAy3ZsUkZ-JR6TtuRIwky4wIxyf7FsGAVGeQ,74
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_proxy_adapter/api/app.py,sha256=c6QgiKBYC4YlPW-a8ZnsQ05CJqjtGEMfEnbvdp19ylE,35148
+mcp_proxy_adapter/api/app.py,sha256=WxSQeYSSDrh-Z3A4TzqNRDaTCsWGZNdhR7qiB7Psk1I,36306
 mcp_proxy_adapter/api/handlers.py,sha256=X-hcMNVeTAu4yVkKJEChEsj2bFptUS6sLNN-Wysjkow,10011
 mcp_proxy_adapter/api/schemas.py,sha256=mevUvQnYgWQfkJAs3-vq3HalBzh6-Saa-Au1VVf0peE,12377
 mcp_proxy_adapter/api/tool_integration.py,sha256=AeUyvJVN-c3FrX5fHdagHL51saRH5d1ZKqc2YEx0rTE,10147
@@ -86,14 +86,14 @@ mcp_proxy_adapter/examples/__init__.py,sha256=k1F-EotAFbJ3JvK_rNgiH4bUztmxIWtYn0
 mcp_proxy_adapter/examples/bugfix_certificate_config.py,sha256=YGBE_SI6wYZUJLWl7-fP1OWXiSH4mHJAZHApgQWvG7s,10529
 mcp_proxy_adapter/examples/cert_manager_bugfix.py,sha256=UWUwItjqHqSnOMHocsz40_3deoZE8-vdROLW9y2fEns,7259
 mcp_proxy_adapter/examples/check_config.py,sha256=oDP3cymq76TqEpPztPihH-_sBktiEb2cG0MdVrY1Sj8,14104
-mcp_proxy_adapter/examples/config_builder.py,sha256=Bd4Opggi9Nut4yQ5Mo_qETMcWRTls3BwwnNZd33Mvjs,9652
+mcp_proxy_adapter/examples/config_builder.py,sha256=Vczefn_kqvdDzgmj0RMop3gfw_db4Gn8IqrWNZ-xhcE,13240
 mcp_proxy_adapter/examples/config_cli.py,sha256=ZhVG6XEpTFe5-MzELByVsUh0AD4bHPBZeoXnGWbqifs,11059
 mcp_proxy_adapter/examples/create_test_configs.py,sha256=9TrvLa4-bWLPu0SB1JXwWuCsjj-4Vz3yAdowcHtCSSA,8228
 mcp_proxy_adapter/examples/debug_request_state.py,sha256=Z3Gy2-fWtu7KIV9OkzGDLVz7TpL_h9V_99ica40uQBU,4489
 mcp_proxy_adapter/examples/debug_role_chain.py,sha256=GLVXC2fJUwP8UJnXHchd1t-H53cjWLJI3RqTPrKmaak,8750
 mcp_proxy_adapter/examples/demo_client.py,sha256=en2Rtb70B1sQmhL-vdQ4PDpKNNl_mfll2YCFT_jFCAg,10191
 mcp_proxy_adapter/examples/generate_certificates.py,sha256=cIfTHBziGiOTy9vldAmaULD6bXBpl2a5KfB8MLIRSww,16391
-mcp_proxy_adapter/examples/generate_config.py,sha256=hkjfCY7OdgMcqAJZH6I3JSKWI1VB64IEyT7RaokTb48,11461
+mcp_proxy_adapter/examples/generate_config.py,sha256=Q0jxMnOh4U6f7MAxn0yTfqjRP5CNokXqeyTKcQhDlO8,12128
 mcp_proxy_adapter/examples/proxy_registration_example.py,sha256=vemRhftnjbiOBCJkmtDGqlWQ8syTG0a8755GCOnaQsg,12503
 mcp_proxy_adapter/examples/required_certificates.py,sha256=YW9-V78oFiZ-FmHlGP-8FQFS569VdDVyq9hfvCv31pk,7133
 mcp_proxy_adapter/examples/run_example.py,sha256=yp-a6HIrSk3ddQmbn0KkuKwErId0aNfj028TE6U-zmY,2626
@@ -130,8 +130,8 @@ mcp_proxy_adapter/schemas/base_schema.json,sha256=v9G9cGMd4dRhCZsOQ_FMqOi5VFyVbI
 mcp_proxy_adapter/schemas/openapi_schema.json,sha256=C3yLkwmDsvnLW9B5gnKKdBGl4zxkeU-rEmjTrNVsQU0,8405
 mcp_proxy_adapter/schemas/roles.json,sha256=pgf_ZyqKyXbfGUxvobpiLiSJz9zzxrMuoVWEkEpz3N8,764
 mcp_proxy_adapter/schemas/roles_schema.json,sha256=deHgI7L6GwfBXacOlNtDgDJelDThppClC3Ti4Eh8rJY,5659
-mcp_proxy_adapter-6.6.4.dist-info/METADATA,sha256=EEJhXaGOOOhiN-esLAqkguvXi_XGuyEDexIW1WqXSE0,8510
-mcp_proxy_adapter-6.6.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.6.4.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
-mcp_proxy_adapter-6.6.4.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.6.4.dist-info/RECORD,,
+mcp_proxy_adapter-6.6.7.dist-info/METADATA,sha256=Njb1B_VRuEjYawCnTtUicbRkYAb8q-iH7DHWd6bgeRI,8510
+mcp_proxy_adapter-6.6.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.6.7.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
+mcp_proxy_adapter-6.6.7.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.6.7.dist-info/RECORD,,