mcp-proxy-adapter 6.6.9__py3-none-any.whl → 6.7.1__py3-none-any.whl

mcp_proxy_adapter/examples/generate_config.py

@@ -12,10 +12,10 @@ import sys
 from pathlib import Path
 from typing import Dict, Any, Optional
 
-# Add the project root to the path to import config_builder
-sys.path.insert(0, str(Path(__file__).parent.parent.parent))
+# Add the current directory to the path to import config_builder
+sys.path.insert(0, str(Path(__file__).parent))
 
-from mcp_proxy_adapter.examples.config_builder import ConfigBuilder, ConfigFactory, Protocol, AuthMethod
+from config_builder import ConfigBuilder, ConfigFactory, Protocol, AuthMethod
 
 
 def create_config_from_flags(
@@ -28,7 +28,9 @@ def create_config_from_flags(
     key_dir: str = "./keys",
     output_dir: str = "./configs",
     proxy_registration: bool = False,
-    proxy_url: str = "http://localhost:3004"
+    proxy_url: str = "http://localhost:3004",
+    auto_registration: bool = False,
+    server_id: str = "mcp_proxy_adapter"
 ) -> Dict[str, Any]:
     """
     Create configuration based on command line flags.
@@ -46,10 +48,10 @@ def create_config_from_flags(
     Returns:
         Configuration dictionary
     """
-    # Use the simplified config builder
-    from config_builder import create_config_from_flags as simple_create_config
+    # Use the enhanced config builder
+    from config_builder import create_config_from_flags as enhanced_create_config
     
-    return simple_create_config(protocol, token, roles, port, proxy_registration, proxy_url)
+    return enhanced_create_config(protocol, token, roles, port, proxy_registration, proxy_url, auto_registration, server_id)
 
 
 def save_config(config: Dict[str, Any], filename: str, output_dir: str) -> Path:
@@ -262,6 +264,8 @@ Examples:
                        help="Proxy URL for registration (default: http://localhost:3004)")
     parser.add_argument("--auto-registration", action="store_true",
                        help="Enable automatic proxy registration (same as --proxy-registration)")
+    parser.add_argument("--server-id", default="mcp_proxy_adapter",
+                       help="Server ID for registration (default: mcp_proxy_adapter)")
     parser.add_argument("--all", action="store_true", 
                        help="Generate all standard configurations")
     parser.add_argument("--full-config", action="store_true", 
@@ -313,15 +317,16 @@ Examples:
                 print(f"✅ Full configuration saved to: {config_file}")
         elif args.protocol:
             # Generate specific configuration
-                config = create_config_from_flags(
-                    protocol=args.protocol,
-                    token=args.token,
-                    roles=args.roles,
-                    port=args.port,
-                    proxy_registration=args.proxy_registration,
-                    proxy_url=args.proxy_url,
-                    auto_registration=args.auto_registration
-                )
+            config = create_config_from_flags(
+                protocol=args.protocol,
+                token=args.token,
+                roles=args.roles,
+                port=args.port,
+                proxy_registration=args.proxy_registration,
+                proxy_url=args.proxy_url,
+                auto_registration=args.auto_registration,
+                server_id=args.server_id
+            )
             
             if args.stdout:
                 # Output to stdout

mcp_proxy_adapter/main.py

@@ -21,6 +21,7 @@ if not str(Path(__file__).parent.parent) in sys.path:
 from mcp_proxy_adapter.api.app import create_app
 from mcp_proxy_adapter.config import Config
 from mcp_proxy_adapter.core.config_validator import ConfigValidator
+from mcp_proxy_adapter.core.signal_handler import setup_signal_handling, is_shutdown_requested
 
 
 def main():
@@ -52,6 +53,30 @@ def main():
         sys.exit(1)
     print("✅ Configuration validation passed")
 
+    # Setup signal handling for graceful shutdown
+    def shutdown_callback():
+        """Callback for graceful shutdown with proxy unregistration."""
+        print("\n🛑 Graceful shutdown initiated...")
+        try:
+            from mcp_proxy_adapter.core.async_proxy_registration import (
+                stop_async_registration,
+                get_registration_status,
+            )
+            
+            # Get final status
+            final_status = get_registration_status()
+            print(f"📊 Final registration status: {final_status}")
+            
+            # Stop async registration (this will unregister from proxy)
+            stop_async_registration()
+            print("✅ Proxy unregistration completed")
+            
+        except Exception as e:
+            print(f"❌ Error during shutdown: {e}")
+    
+    setup_signal_handling(shutdown_callback)
+    print("🔧 Signal handling configured for graceful shutdown")
+
     # Create application (pass config_path so reload uses same file)
     app = create_app(app_config=config.get_all(), config_path=args.config)
 
@@ -64,8 +89,23 @@ def main():
     verify_client = config.get("transport.verify_client", False)
     chk_hostname = config.get("transport.chk_hostname", False)
     
-    # SSL enabled if protocol is HTTPS or mTLS (verify_client=True)
-    ssl_enabled = protocol in ["https", "mtls"] or verify_client
+    # Check if mTLS is required
+    is_mtls_mode = protocol == "mtls" or verify_client
+    
+    if is_mtls_mode:
+        # mTLS mode: hypercorn on localhost, mTLS proxy on external port
+        hypercorn_host = "127.0.0.1"  # localhost only
+        hypercorn_port = port + 1000   # internal port
+        mtls_proxy_port = port         # external port
+        ssl_enabled = True
+        print(f"🔐 mTLS Mode: hypercorn on {hypercorn_host}:{hypercorn_port}, mTLS proxy on {host}:{mtls_proxy_port}")
+    else:
+        # Regular mode: hypercorn on external port (no proxy needed)
+        hypercorn_host = host
+        hypercorn_port = port
+        mtls_proxy_port = None
+        ssl_enabled = protocol == "https"
+        print(f"🌐 Regular Mode: hypercorn on {hypercorn_host}:{hypercorn_port}")
     
     # SSL configuration based on protocol
     ssl_cert_file = None
@@ -93,7 +133,11 @@ def main():
     print("🔍 Source: configuration")
 
     print("🚀 Starting MCP Proxy Adapter")
-    print(f"🌐 Server: {host}:{port}")
+    if mtls_proxy_port:
+        print(f"🔐 mTLS Proxy: {host}:{mtls_proxy_port}")
+        print(f"🌐 Internal Server: {hypercorn_host}:{hypercorn_port}")
+    else:
+        print(f"🌐 Server: {hypercorn_host}:{hypercorn_port}")
     print(f"🔒 Protocol: {protocol}")
     if ssl_enabled:
         print("🔐 SSL: Enabled")
@@ -106,7 +150,7 @@ def main():
 
     # Configure hypercorn using framework
     config_hypercorn = hypercorn.config.Config()
-    config_hypercorn.bind = [f"{host}:{port}"]
+    config_hypercorn.bind = [f"{hypercorn_host}:{hypercorn_port}"]
 
     if ssl_enabled and ssl_cert_file and ssl_key_file:
         # Use framework to convert SSL configuration
@@ -170,9 +214,46 @@ def main():
         print("🔐 Starting HTTPS server with hypercorn...")
     else:
         print("🌐 Starting HTTP server with hypercorn...")
+    
+    print("🛑 Use Ctrl+C or send SIGTERM for graceful shutdown")
+    print("=" * 50)
 
     # Run the server
-    asyncio.run(hypercorn.asyncio.serve(app, config_hypercorn))
+    try:
+        if is_mtls_mode:
+            # mTLS mode: start hypercorn and mTLS proxy
+            print("🔐 Starting mTLS mode with proxy...")
+            
+            async def run_mtls_mode():
+                # Start hypercorn server on localhost
+                hypercorn_task = asyncio.create_task(
+                    hypercorn.asyncio.serve(app, config_hypercorn)
+                )
+                
+                # Start mTLS proxy on external port
+                from mcp_proxy_adapter.core.mtls_proxy import start_mtls_proxy
+                proxy = await start_mtls_proxy(config.get_all())
+                
+                if proxy:
+                    print("✅ mTLS proxy started successfully")
+                else:
+                    print("⚠️  mTLS proxy not started, running hypercorn only")
+                
+                # Wait for hypercorn
+                await hypercorn_task
+                
+            asyncio.run(run_mtls_mode())
+        else:
+            # Regular mode: start hypercorn only (no proxy needed)
+            print("🌐 Starting regular mode...")
+            asyncio.run(hypercorn.asyncio.serve(app, config_hypercorn))
+    except KeyboardInterrupt:
+        print("\n🛑 Server stopped by user (Ctrl+C)")
+        if is_shutdown_requested():
+            print("✅ Graceful shutdown completed")
+    except Exception as e:
+        print(f"\n❌ Server error: {e}")
+        sys.exit(1)
 
 
 if __name__ == "__main__":

mcp_proxy_adapter/version.py

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

{mcp_proxy_adapter-6.6.9.dist-info → mcp_proxy_adapter-6.7.1.dist-info}/METADATA

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

@@ -2,11 +2,11 @@ mcp_proxy_adapter/__init__.py,sha256=iH0EBBsRj_cfZJpAIsgN_8tTdfefhnl6uUKHjLHhWDQ
 mcp_proxy_adapter/__main__.py,sha256=sq3tANRuTd18euamt0Bmn1sJeAyzXENZ5VvsMwbrDFA,579
 mcp_proxy_adapter/config.py,sha256=QpoPaUKcWJ-eu6HYphhIZmkc2M-p1JgpLFAgolf_l5s,20161
 mcp_proxy_adapter/custom_openapi.py,sha256=XRviX-C-ZkSKdBhORhDTdeN_1FWyEfXZADiASft3t9I,28149
-mcp_proxy_adapter/main.py,sha256=eXIRMLgDgCox9p2WDcOS9D6tiZjcFit8ePbFCfGbs3Q,5849
+mcp_proxy_adapter/main.py,sha256=ILdGeikcZls2y9Uro0bQLi53FPSuJv_yZBio-3WD2zM,9233
 mcp_proxy_adapter/openapi.py,sha256=2UZOI09ZDRJuBYBjKbMyb2U4uASszoCMD5o_4ktRpvg,13480
-mcp_proxy_adapter/version.py,sha256=pH0kWWmS9r3S0jad0_WC4dTh-tN3xrYetvbhd5KZyJM,74
+mcp_proxy_adapter/version.py,sha256=f7P2CcobyBU9CJovfKbOnqeKTQDfipyBZBpKBXU94nM,74
 mcp_proxy_adapter/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_proxy_adapter/api/app.py,sha256=ll9jBR7OeU-USe8XPzbULlHqP2sLmo1lEm7i-1l4N-4,35820
+mcp_proxy_adapter/api/app.py,sha256=GGhA5X7HQPLJFxeaWHu5YUwi2ldPvPvJD2YcaL9Nbo0,37874
 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
@@ -22,7 +22,7 @@ mcp_proxy_adapter/api/middleware/protocol_middleware.py,sha256=lFqGuT5M-USCTIVvZ
 mcp_proxy_adapter/api/middleware/transport_middleware.py,sha256=VG1rWyuh-O2pdc0kQ3SADFvyh286o5Wrnkt8OFQ0WQw,4274
 mcp_proxy_adapter/api/middleware/unified_security.py,sha256=QX4WUde03-T002Z3TgzhX0Tj2x7BFULOvOkCftsWqw8,8114
 mcp_proxy_adapter/api/middleware/user_info_middleware.py,sha256=-N6cZOc7z6FUE7xRZ8xGgI4PnMyrJq0Jzpde9VNq6Zs,11077
-mcp_proxy_adapter/commands/__init__.py,sha256=eStfu2UrLfMvMTY6x20GD8sMPmPB1so-0QZQYV53nqo,1565
+mcp_proxy_adapter/commands/__init__.py,sha256=3BOfAiep__ftpx2hMfwj96vtDFdcVf3P3nm-vZWGohE,1700
 mcp_proxy_adapter/commands/auth_validation_command.py,sha256=p4UrAaHyoCxMy98G1BUUlFJWjoelEJzX3OAWIiQaGls,14593
 mcp_proxy_adapter/commands/base.py,sha256=0_hu8t89-2vWBPFpEMokr27A-IifKI32rkQwZfc2Grk,15162
 mcp_proxy_adapter/commands/builtin_commands.py,sha256=8kYLWIr4JvhZtqaVM9Jhqr_-ySPiy40njYUNxBUWtug,3316
@@ -42,6 +42,7 @@ mcp_proxy_adapter/commands/load_command.py,sha256=euv9KSeO2zjtQiYfnl4xhZYXARt4x1
 mcp_proxy_adapter/commands/plugins_command.py,sha256=0FazJGI9_wK_Ac_eFfmzhJGRLxMzKdpLqNMu-mwsqMI,8763
 mcp_proxy_adapter/commands/protocol_management_command.py,sha256=8Uv6WXrj_W1Sl9JCIT6hl8wo_qYuHWZYq-nBMYOQ4qw,8429
 mcp_proxy_adapter/commands/proxy_registration_command.py,sha256=owKWQRN96vpEBj-yGF-q1T_FiS9wF525bNw08NfVixs,14774
+mcp_proxy_adapter/commands/registration_status_command.py,sha256=oQkgjxiGFxkuaJ_DyO19LaWj0SecfwHwSAxYI2VsStI,4399
 mcp_proxy_adapter/commands/reload_command.py,sha256=GrdmSRBrN77TaeXJak6csmSi_Wa8wwGSPzFD1NQjTKE,7508
 mcp_proxy_adapter/commands/result.py,sha256=uWHdLCwwn2_ylXLtIn-yXGiXxWRcbzMSlkgGtpkXQCg,5470
 mcp_proxy_adapter/commands/role_test_command.py,sha256=3y1pOKwrBFGpfqhQEWEBKxGkuMHa9MqHFlzaqPxM3ik,4181
@@ -54,7 +55,8 @@ mcp_proxy_adapter/commands/transport_management_command.py,sha256=HEnUyL4S014jhe
 mcp_proxy_adapter/commands/unload_command.py,sha256=6CUM9B9c-mNxw7uvt2vcvZSnxMySfoMT5UmDhzNXq38,4984
 mcp_proxy_adapter/core/__init__.py,sha256=3yt0CFZdsIG8Ln4bg-r4ISYzipm3ZUAxTn0twYTs9FI,867
 mcp_proxy_adapter/core/app_factory.py,sha256=Ywq-RN2o5B86nJpqImnaXNf_g366lVK1fXeIbIr49DM,21625
-mcp_proxy_adapter/core/app_runner.py,sha256=1t9p_UkWb1IvZDTD7FOCRMNSpOSgtNeHM3i7PP7x6xc,10605
+mcp_proxy_adapter/core/app_runner.py,sha256=n8_rBojzKUpHLN5ksiXcR8UWoBYk6Tt5OtWk-X2kVPc,11868
+mcp_proxy_adapter/core/async_proxy_registration.py,sha256=hM_ZV2YoKM8n0MakVMBd2KnYTJBh1igDeb4DYutfHnE,11387
 mcp_proxy_adapter/core/auth_validator.py,sha256=q8TNkdolvP-gM6Bvecc6nrVG9al5J31pocdwhguhTBk,19742
 mcp_proxy_adapter/core/certificate_utils.py,sha256=yeDwi-j42CxK_g-r5_ragGFY_HdSgDfTWHVUjDHF6nI,38480
 mcp_proxy_adapter/core/client.py,sha256=qIbPl8prEwK2U65kl-vGJW2_imo1E4i6HxG_VpPeWpQ,21168
@@ -67,6 +69,7 @@ mcp_proxy_adapter/core/errors.py,sha256=UNEfdmK0zPGJrWH1zUMRjHIJMcoVDcBO4w8xxKHB
 mcp_proxy_adapter/core/logging.py,sha256=gNI6vfPQC7jrUtVu6NeDsmU72JPlrRRBhtJipL1eVrI,9560
 mcp_proxy_adapter/core/mtls_asgi.py,sha256=tvk0P9024s18dcCHY9AaQIecT4ojOTv21EuQWXwooU0,5200
 mcp_proxy_adapter/core/mtls_asgi_app.py,sha256=DT_fTUH1RkvBa3ThbyCyNb-XUHyCb4DqaKA1gcZC6z4,6538
+mcp_proxy_adapter/core/mtls_proxy.py,sha256=5APlWs0ImiHGEC65W_7F-PbVO3NZ2BVSj9r14AcUtTE,6011
 mcp_proxy_adapter/core/mtls_server.py,sha256=_hj6QWuExKX2LRohYvjPGFC2qTutS7ObegpEc09QijM,10117
 mcp_proxy_adapter/core/protocol_manager.py,sha256=iaXWsfm1XSfemz5QQBesMluc4cwf-LtuZVi9bm1uj28,14680
 mcp_proxy_adapter/core/proxy_client.py,sha256=CB6KBhV3vH2GU5nZ27VZ_xlNbYTAU_tnYFrkuK5He58,6094
@@ -78,6 +81,7 @@ mcp_proxy_adapter/core/security_integration.py,sha256=-5I4i9so_yMjc-zuGO-7zzIsMX
 mcp_proxy_adapter/core/server_adapter.py,sha256=jz8ztIfe82N5DE3XHRYpD6CwNcJy7ksh0l8l-towHBE,9755
 mcp_proxy_adapter/core/server_engine.py,sha256=qmxdkBv-YsQsvxVVQ-_xiAyDshxtnrKBquPJoUjo2fw,9471
 mcp_proxy_adapter/core/settings.py,sha256=D6cF4R_5gJ0XFGxzXUIzeqe-_muu6HL561TAei9wwZ0,10521
+mcp_proxy_adapter/core/signal_handler.py,sha256=ryL4bLzV6ERrXPx19K4ApFGMzFI8iwlI0timj-GQ1YI,5324
 mcp_proxy_adapter/core/ssl_utils.py,sha256=Rjl79d5LdhDzxiMtaIRd9OFh0hTeRANItYFXk-7c5pA,9498
 mcp_proxy_adapter/core/transport_manager.py,sha256=eJbGa3gDVFUBFUzMK5KEmpbUDXOOShtzszUIEf7Jk0A,9292
 mcp_proxy_adapter/core/unified_config_adapter.py,sha256=zBGYdLDZ3G8f3Y9tmtm0Ne0UXIfEaNHR4Ik2W3ErkLc,22814
@@ -86,14 +90,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=-xMrB_aF7Ag9rDT_gWOkvjZHdIr6NMrW2qTpsuylEBg,16884
+mcp_proxy_adapter/examples/config_builder.py,sha256=U7nKfuNlSoJ6B8IN9QjBcvEJdpgC8I7NBJNLYYHjbrU,32298
 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=HybYtDE4qKGwWudVgTB-Dx7wTYwN-Ha_snyFokv4new,12473
+mcp_proxy_adapter/examples/generate_config.py,sha256=9zImMfIM88OQz12mE5k0_RnVV5ZmhlIKO2fRldiNCok,12709
 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 +134,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.9.dist-info/METADATA,sha256=0KA1wwYDSxDGjOyimknzEwtygTuYTxw2dLiBVUf9oq4,8510
-mcp_proxy_adapter-6.6.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mcp_proxy_adapter-6.6.9.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
-mcp_proxy_adapter-6.6.9.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
-mcp_proxy_adapter-6.6.9.dist-info/RECORD,,
+mcp_proxy_adapter-6.7.1.dist-info/METADATA,sha256=82G1E37shptreMST_9zGo9VaqSyFShYmAiOUSvI9x2o,8510
+mcp_proxy_adapter-6.7.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mcp_proxy_adapter-6.7.1.dist-info/entry_points.txt,sha256=Bf-O5Aq80n22Ayu9fI9BgidzWqwzIVaqextAddTuHZw,563
+mcp_proxy_adapter-6.7.1.dist-info/top_level.txt,sha256=JZT7vPLBYrtroX-ij68JBhJYbjDdghcV-DFySRy-Nnw,18
+mcp_proxy_adapter-6.7.1.dist-info/RECORD,,