Merge branch 'main' into wip-nix

Author: niechen

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.13.3](https://github.com/pathintegral-institute/mcpm.sh/compare/v1.13.2...v1.13.3) (2025-06-05)
+
+
+### Bug Fixes
+
+* remove stdout stream handling for share ([#167](https://github.com/pathintegral-institute/mcpm.sh/issues/167)) ([11fddcc](https://github.com/pathintegral-institute/mcpm.sh/commit/11fddcc1ce68e96105cd33f1050f3dd0814ce9e0))
+
+## [1.13.2](https://github.com/pathintegral-institute/mcpm.sh/compare/v1.13.1...v1.13.2) (2025-06-05)
+
+
+### Bug Fixes
+
+* trigger semantic release for Windows compatibility fix ([16b5e44](https://github.com/pathintegral-institute/mcpm.sh/commit/16b5e44f01c34422c8f8c72528b781cd5f908e44))
+
 ## [1.13.1](https://github.com/pathintegral-institute/mcpm.sh/compare/v1.13.0...v1.13.1) (2025-05-29)
 
 

README.md

@@ -146,6 +146,31 @@ mcpm router share                 # Share the router to public
 mcpm router unshare               # Unshare the router
 ```
 
+### 🤝 Share Management (`share`)
+
+The `mcpm share` command allows you to take any shell command that starts an MCP server and instantly expose it as an SSE (Server-Sent Events) server. It uses `mcp-proxy` to handle the server transformation and then creates a secure tunnel for remote access, making your local MCP server accessible from anywhere.
+
+This is particularly useful for quickly sharing a development server, a custom MCP server, or even a standard server with specific configurations without needing to deploy it publicly.
+
+```bash
+# 🚀 Share a local MCP server
+mcpm share "COMMAND" # Replace COMMAND with your actual server start command
+
+# ⚙️ Options
+# COMMAND: The shell command that starts your MCP server (e.g., "uvx mcp-server-fetch", "npx mcp-server"). This must be enclosed in quotes if it contains spaces.
+# --port PORT: Specify a local port for the mcp-proxy to listen on. Defaults to a random available port.
+# --address ADDRESS: Specify a public address for the tunnel (e.g., yourdomain.com:7000). If not provided, a random tunnel URL will be generated.
+# --http: If set, the tunnel will use HTTP instead of HTTPS. Use with caution.
+# --timeout TIMEOUT: Timeout in seconds for the mcp-proxy to wait for the server to start. Defaults to 60.
+# --retry RETRY: Number of times to retry starting the server if it fails. Defaults to 0.
+
+# 💡 Usage Examples
+mcpm share "uvx mcp-server-fetch"
+mcpm share "npx mcp-server" --port 5000
+mcpm share "uv run my-mcp-server" --address myserver.com:7000
+mcpm share "npx -y @modelcontextprotocol/server-everything" --retry 3
+```
+
 ### 🛠️ Utilities (`util`)
 
 ```bash

README.zh-CN.md

@@ -179,6 +179,31 @@ mcpm router share                 # 将router分享到公网
 mcpm router unshare               # 取消分享
 ```
 
+### 🤝 共享管理 (`share`)
+
+`mcpm share` 命令允许您将任何启动 MCP 服务器的 shell 命令，并立即将其公开为 SSE (Server-Sent Events) 服务器。它使用 `mcp-proxy` 处理服务器转换，然后创建一个安全隧道进行远程访问，使您的本地 MCP 服务器可以从任何地方访问。
+
+这对于快速共享开发服务器、自定义 MCP 服务器，甚至具有特定配置的标准服务器（无需公开部署）特别有用。
+
+```bash
+# 🚀 共享本地 MCP 服务器
+mcpm share "COMMAND" # 将 COMMAND 替换为您的实际服务器启动命令
+
+# ⚙️ 选项
+# COMMAND: 启动 MCP 服务器的 shell 命令 (例如 "uvx mcp-server-fetch", "npx mcp-server")。如果包含空格，则必须用引号括起来。
+# --port PORT: 指定 mcp-proxy 监听的本地端口。默认为随机可用端口。
+# --address ADDRESS: 指定隧道的公共地址 (例如 yourdomain.com:7000)。如果未提供，将生成随机隧道 URL。
+# --http: 如果设置，隧道将使用 HTTP 而不是 HTTPS。请谨慎使用。
+# --timeout TIMEOUT: mcp-proxy 等待服务器启动的超时时间（秒）。默认为 60。
+# --retry RETRY: 如果服务器启动失败，重试启动服务器的次数。默认为 0。
+
+# 💡 使用示例
+mcpm share "uvx mcp-server-fetch"
+mcpm share "npx mcp-server" --port 5000
+mcpm share "uv run my-mcp-server" --address myserver.com:7000
+mcpm share "npx -y @modelcontextprotocol/server-everything" --retry 3
+```
+
 ### 🛠️ 实用工具 (`util`)
 
 ```bash

pages/index.html

@@ -1001,6 +1001,27 @@ <h3><span><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox
             </div>
         </div>
 
+        <h2><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-share-2"><circle cx="18" cy="5" r="3"></circle><circle cx="6" cy="12" r="3"></circle><circle cx="18" cy="19" r="3"></circle><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"></line><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"></line></svg> Share MCP Servers (<code>mcpm share</code>)</h2>
+        <p>Share a local MCP server with a public URL. MCPM uses mcp-proxy to expose a stdio MCP server as an SSE server and then creates a tunnel to make it accessible remotely.</p>
+        <div class="features">
+            <div class="feature">
+                <h3><span><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-terminal"><polyline points="4 17 10 17 10 7"></polyline><line x1="20" y1="17" x2="4" y2="17"></line></svg></span> Share a Server</h3>
+                <p>Share a server using a specific command:</p>
+                <div class="code-block">
+                    <code><span class="command-prompt">$</span> mcpm share "uvx mcp-server-fetch"</code>
+                    <button class="copy-button" data-command='mcpm share "uvx mcp-server-fetch"'><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path></svg></button>
+                </div>
+            </div>
+            <div class="feature">
+                <h3><span><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-zap"><polygon points="13 2 3 14 12 14 11 22 21 10 12 10 13 2"></polygon></svg></span> Share with Options</h3>
+                <p>Share a server and specify a port:</p>
+                <div class="code-block">
+                    <code><span class="command-prompt">$</span> mcpm share "npx mcp-server" --port 5000</code>
+                    <button class="copy-button" data-command='mcpm share "npx mcp-server" --port 5000'><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="9" y="9" width="13" height="13" rx="2" ry="2"></rect><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"></path></svg></button>
+                </div>
+            </div>
+        </div>
+
         <h2>Client Management</h2>
         <div class="features">
             <div class="feature">

src/mcpm/commands/share.py

@@ -2,9 +2,7 @@
 Share command for MCPM - Share a single MCP server through a tunnel
 """
 
-import os
 import secrets
-import select
 import shlex
 import shutil
 import signal
@@ -27,15 +25,6 @@ def find_mcp_proxy() -> Optional[str]:
     return shutil.which("mcp-proxy")
 
 
-def make_non_blocking(file_obj):
-    """Make a file object non-blocking."""
-    import fcntl
-
-    fd = file_obj.fileno()
-    fl = fcntl.fcntl(fd, fcntl.F_GETFL)
-    fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
-
-
 def wait_for_random_port(process: subprocess.Popen, timeout: int = 20) -> Optional[int]:
     """
     Wait for mcp-proxy to output the random port information.
@@ -70,39 +59,26 @@ def wait_for_random_port(process: subprocess.Popen, timeout: int = 20) -> Option
             console.print(f"[red]Error output:[/]\n{stderr_output}")
             sys.exit(1)
 
-        # Use select to wait for data to be available without blocking
-        readable = []
-        if process.stdout:
-            readable.append(process.stdout)
-        if process.stderr:
-            readable.append(process.stderr)
-
-        if readable:
-            # Wait for up to 1 second for output
-            r, _, _ = select.select(readable, [], [], 1.0)
-
-            # Process available output
-            for stream in r:
-                try:
-                    line = stream.readline()
-                    if line:
-                        print(line.rstrip())
-
-                        # Check for port information
-                        if "Uvicorn running on http://" in line:
-                            try:
-                                url_part = line.split("Uvicorn running on ")[1].split(" ")[0]
-                                actual_port = int(url_part.split(":")[-1].strip())
-                                port_found = True
-                                console.print(
-                                    f"[cyan]mcp-proxy SSE server running on port [bold]{actual_port}[/bold][/]"
-                                )
-                                break
-                            except (ValueError, IndexError):
-                                pass
-                except (IOError, OSError):
-                    # Resource temporarily unavailable - this is normal for non-blocking IO
-                    pass
+        # Process available output
+        try:
+            if process.stderr:
+                line = process.stderr.readline()
+                if line:
+                    console.print(line.rstrip())
+
+                # Check for port information
+                if "Uvicorn running on http://" in line:
+                    try:
+                        url_part = line.split("Uvicorn running on ")[1].split(" ")[0]
+                        actual_port = int(url_part.split(":")[-1].strip())
+                        port_found = True
+                        console.print(f"[cyan]mcp-proxy SSE server running on port [bold]{actual_port}[/bold][/]")
+                        break
+                    except (ValueError, IndexError):
+                        pass
+        except (IOError, OSError):
+            # Resource temporarily unavailable - this is normal for non-blocking IO
+            pass
         else:
             # No streams to read from, just wait a bit
             time.sleep(0.5)
@@ -144,12 +120,6 @@ def start_mcp_proxy(command: str, port: Optional[int] = None) -> Tuple[subproces
     console.print(f"[cyan]Running command: [bold]{' '.join(cmd_parts)}[/bold][/]")
     process = subprocess.Popen(cmd_parts, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, bufsize=1)
 
-    # Make stdout and stderr non-blocking
-    if process.stdout:
-        make_non_blocking(process.stdout)
-    if process.stderr:
-        make_non_blocking(process.stderr)
-
     # If port is None, we need to parse the output to find the random port
     actual_port = port
     if not actual_port:
@@ -348,45 +318,31 @@ def signal_handler(sig, frame):
                     if tunnel:
                         tunnel.kill()
                     break
-
-                # Use select to check for available output without blocking
-                readable = []
-                if server_process.stdout:
-                    readable.append(server_process.stdout)
-                if server_process.stderr:
-                    readable.append(server_process.stderr)
-
-                if readable:
-                    # Wait for up to 1 second for output
-                    r, _, _ = select.select(readable, [], [], 1.0)
-
-                    # Process available output
-                    for stream in r:
-                        try:
-                            line = stream.readline()
-                            if line:
-                                line_str = line.rstrip()
-                                print(line_str)
-                                last_activity_time = time.time()
-
-                                # Check for error messages
-                                error_msg = monitor_for_errors(line_str)
-                                if error_msg and error_msg not in error_messages:
-                                    console.print(f"[bold red]Error:[/] {error_msg}")
-                                    error_messages.append(error_msg)
-                                    server_error_detected = True
-
-                                    # If this is a critical error and we have retries left, restart
-                                    if "Protocol initialization error" in error_msg and retries_left > 0:
-                                        console.print(
-                                            f"[yellow]Will attempt to restart ({retries_left} retries left)[/]"
-                                        )
-                                        # Break out of the loop to trigger a restart
-                                        server_process.terminate()
-                                        break
-                        except (IOError, OSError):
-                            # Resource temporarily unavailable - this is normal for non-blocking IO
-                            pass
+                # Process available output
+                try:
+                    if server_process.stderr:
+                        line = server_process.stderr.readline()
+                        if line:
+                            line_str = line.rstrip()
+                            console.print(line_str)
+                            last_activity_time = time.time()
+
+                            # Check for error messages
+                            error_msg = monitor_for_errors(line_str)
+                            if error_msg and error_msg not in error_messages:
+                                console.print(f"[bold red]Error:[/] {error_msg}")
+                                error_messages.append(error_msg)
+                                server_error_detected = True
+
+                                # If this is a critical error and we have retries left, restart
+                                if "Protocol initialization error" in error_msg and retries_left > 0:
+                                    console.print(f"[yellow]Will attempt to restart ({retries_left} retries left)[/]")
+                                    # Break out of the loop to trigger a restart
+                                    server_process.terminate()
+                                    break
+                except (IOError, OSError):
+                    # Resource temporarily unavailable - this is normal for non-blocking IO
+                    pass
                 else:
                     # No streams to read from, just wait a bit
                     time.sleep(0.5)

src/mcpm/router/router.py

@@ -7,6 +7,7 @@
 from collections import defaultdict
 from contextlib import asynccontextmanager
 from typing import Literal, Optional, Sequence, TextIO
+import asyncio
 
 import uvicorn
 from deprecated import deprecated
@@ -46,6 +47,21 @@
 logger = logging.getLogger(__name__)
 
 
+class NoOpsResponse(Response):
+    def __init__(self):
+        super().__init__(content=b"", status_code=204)
+
+    async def __call__(self, scope, receive, send):
+        await send(
+            {
+                "type": "http.response.start",
+                "status": self.status_code,
+                "headers": self.render_headers(),
+            }
+        )
+        await send({"type": "http.response.body", "body": b"", "more_body": False})
+
+
 class MCPRouter:
     """
     A router that aggregates multiple MCP servers (SSE/STDIO) and
@@ -615,17 +631,29 @@ async def get_sse_server_app(
         sse = RouterSseTransport("/messages/", api_key=api_key)
 
         async def handle_sse(request: Request) -> Response:
-            async with sse.connect_sse(
-                request.scope,
-                request.receive,
-                request._send,  # noqa: SLF001
-            ) as (read_stream, write_stream):
-                await self.aggregated_server.run(
-                    read_stream,
-                    write_stream,
-                    self.aggregated_server.initialization_options,
-                )
-            return Response()
+            try:
+                async with sse.connect_sse(
+                    request.scope,
+                    request.receive,
+                    request._send,  # noqa: SLF001
+                ) as (read_stream, write_stream):
+                    await self.aggregated_server.run(
+                        read_stream,
+                        write_stream,
+                        self.aggregated_server.initialization_options,
+                    )
+                    # Keep alive while client connected.
+                    # EventSourceResponse (inside connect_sse) manages the stream,
+                    # but this loop ensures this handler itself stays alive until disconnect.
+                    while not await request.is_disconnected():
+                        await asyncio.sleep(0.1)
+
+            except asyncio.CancelledError:
+                raise
+            except Exception as e:
+                logger.error(f"Unexpected error in handle_sse (router.py): {e}", exc_info=True)
+            finally:
+                return NoOpsResponse()
 
         lifespan_handler: t.Optional[Lifespan[Starlette]] = None
         if include_lifespan:

src/mcpm/router/transport.py

@@ -225,11 +225,11 @@ async def handle_post_message(self, scope: Scope, receive: Receive, send: Send):
                 logger.warning(f"Failed to send error due to pipe issue: {pipe_err}")
             return
 
-        logger.debug(f"Sending message to writer: {message}")
-        response = Response("Accepted", status_code=202)
-        await response(scope, receive, send)
+        # Send the 202 Accepted response
+        accepted_response = Response("Accepted", status_code=202)
+        await accepted_response(scope, receive, send)
 
-        # add error handling, catch possible pipe errors
+        # Attempt to send the message to the writer
         try:
             await writer.send(SessionMessage(message=message))
         except (BrokenPipeError, ConnectionError, OSError) as e:
@@ -241,6 +241,9 @@ async def handle_post_message(self, scope: Scope, receive: Receive, send: Send):
                 self._read_stream_writers.pop(session_id, None)
                 self._session_id_to_identifier.pop(session_id, None)
 
+        # Implicitly return None. The original 'return response' is removed.
+        return
+
     def _validate_api_key(self, scope: Scope, api_key: str | None) -> bool:
         # If api_key is explicitly set to None, disable API key validation
         if self.api_key is None:

src/mcpm/version.py

@@ -1 +1 @@
-__version__ = "1.13.1"
+__version__ = "1.13.3"