feat: router share with https by default

Author: JoJoJoJoJoJoJo

.gitignore

@@ -59,6 +59,7 @@ logs/
 .env.test
 .env.production
 .envrc
+*.ini
 
 # MCP specific
 .mcp/

docs/dev_guide.md

@@ -51,3 +51,12 @@ docker run --rm -it -v "$PWD:/srv/jekyll" jekyll/jekyll:4.2.0 jekyll build
 ```
 
 The built site will be in `pages/_site/`.
+
+
+## Debug mode for mcpm router
+Set environment variable `MCPM_DEBUG` to `true` to enable debug mode.
+
+```bash
+export MCPM_DEBUG=true
+```
+

src/mcpm/commands/router.py

@@ -289,7 +289,8 @@ def router_status():
 @click.help_option("-h", "--help")
 @click.option("-a", "--address", type=str, required=False, help="Remote address to bind the tunnel to")
 @click.option("-p", "--profile", type=str, required=False, help="Profile to share")
-def share(address, profile):
+@click.option("-http", type=bool, flag_value=True, required=False, help="Use HTTP instead of HTTPS")
+def share(address, profile, http):
     """Create a share link for the MCPRouter daemon process.
 
     Example:
@@ -301,6 +302,7 @@ def share(address, profile):
     # check if there is a router already running
     pid = read_pid_file()
     config_manager = ConfigManager()
+    config = config_manager.get_router_config()
     if not pid:
         console.print("[yellow]MCPRouter is not running.[/]")
         return
@@ -324,22 +326,22 @@ def share(address, profile):
     # get share address
     if not address:
         console.print("[cyan]Using share address from config...[/]")
-        config = config_manager.get_router_config()
         address = config["share_address"]
 
     # create share link
     remote_host, remote_port = address.split(":")
 
     # start tunnel
     # TODO: tls certificate if necessary
-    tunnel = Tunnel(remote_host, remote_port, config["host"], config["port"], secrets.token_urlsafe(32), None)
+    tunnel = Tunnel(remote_host, remote_port, config["host"], config["port"], secrets.token_urlsafe(32), http, None)
     share_url = tunnel.start_tunnel()
     share_pid = tunnel.proc.pid if tunnel.proc else None
     # generate random api key
     api_key = str(uuid.uuid4())
     console.print(f"[bold green]Generated secret for share link: {api_key}[/]")
-    # TODO: https is not supported yet
-    share_url = share_url.replace("https://", "http://") + "/sse"
+    if http:
+        share_url = share_url.replace("https://", "http://")
+    share_url = share_url + "/sse"
     # save share pid and link to config
     config_manager.save_share_config(share_url, share_pid, api_key)
     profile = profile or "<your_profile>"

src/mcpm/router/app.py

@@ -24,7 +24,7 @@
 CORS_ENABLED = os.environ.get("MCPM_ROUTER_CORS")
 
 logging.basicConfig(
-    level=logging.INFO,
+    level=logging.INFO if not os.environ.get("MCPM_DEBUG") else logging.DEBUG,
     format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
     handlers=[logging.FileHandler(LOG_FILE), logging.StreamHandler()],
 )
@@ -137,7 +137,7 @@ async def lifespan(app):
     )
 
 app = Starlette(
-    debug=False,
+    debug=os.environ.get("MCPM_DEBUG") == "true",
     middleware=middlewares,
     routes=[
         Route("/sse", endpoint=handle_sse),

src/mcpm/router/share.py

@@ -64,6 +64,7 @@ def __init__(
         local_host: str,
         local_port: int,
         share_token: str,
+        http: bool,
         share_server_tls_certificate: str | None,
     ):
         self.proc = None
@@ -73,6 +74,7 @@ def __init__(
         self.local_host = local_host
         self.local_port = local_port
         self.share_token = share_token
+        self.http = http
         self.share_server_tls_certificate = share_server_tls_certificate
 
     @staticmethod
@@ -142,6 +144,8 @@ def _start_tunnel(self, binary: str) -> str:
                     self.share_server_tls_certificate,
                 ]
             )
+        if not self.http:
+            command.append("--tls_enable")
         self.proc = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, start_new_session=True)
         return self._read_url_from_tunnel_stream()