wip: more tunnel fixes

cmd/sst/mosaic.go

@@ -18,7 +18,6 @@ import (
 	"github.com/sst/ion/cmd/sst/mosaic/dev"
 	"github.com/sst/ion/cmd/sst/mosaic/multiplexer"
 	"github.com/sst/ion/cmd/sst/mosaic/socket"
-	"github.com/sst/ion/cmd/sst/mosaic/tunnel"
 	"github.com/sst/ion/cmd/sst/mosaic/watcher"
 	"github.com/sst/ion/internal/util"
 	"github.com/sst/ion/pkg/bus"
@@ -156,11 +155,6 @@ func CmdMosaic(c *cli.Cli) error {
 		return socket.Start(c.Context, p, server)
 	})
 
-	wg.Go(func() error {
-		defer c.Cancel()
-		return tunnel.Start(c.Context, p)
-	})
-
 	wg.Go(func() error {
 		evts := bus.Subscribe(&runtime.BuildInput{})
 		for {
@@ -246,6 +240,9 @@ func CmdMosaic(c *cli.Cli) error {
 								append([]string{"SST_CHILD=" + d.Name}, multiEnv...)...,
 							)
 						}
+						for range evt.Tunnels {
+							multi.AddProcess("tunnel", []string{currentExecutable, "tunnel", "--stage", p.App().Stage}, "⇄", "Tunnel", "", true, true, os.Environ()...)
+						}
 						break
 					}
 				}

cmd/sst/mosaic/multiplexer/process.go

@@ -68,9 +68,6 @@ func (p *process) start() error {
 }
 
 func (p *process) Kill() {
-	if p.cmd != nil && p.cmd.Process != nil {
-		util.TerminateProcess(p.cmd.Process.Pid)
-	}
 	p.vt.Close()
 }
 

cmd/sst/mosaic/multiplexer/tcell-term/vt.go

@@ -15,6 +15,7 @@ import (
 	"github.com/creack/pty"
 	"github.com/gdamore/tcell/v2"
 	"github.com/mattn/go-runewidth"
+	"github.com/sst/ion/internal/util"
 )
 
 type (
@@ -460,7 +461,7 @@ func (vt *VT) Close() {
 	vt.mu.Lock()
 	defer vt.mu.Unlock()
 	if vt.cmd != nil && vt.cmd.Process != nil {
-		vt.cmd.Process.Kill()
+		util.TerminateProcess(vt.cmd.Process.Pid)
 		vt.cmd.Wait()
 	}
 	vt.pty.Close()

cmd/sst/tunnel.go

@@ -7,7 +7,6 @@ import (
 	"os/exec"
 	"os/user"
 	"strings"
-	"time"
 
 	"github.com/sst/ion/cmd/sst/cli"
 	"github.com/sst/ion/cmd/sst/mosaic/ui"
@@ -42,7 +41,8 @@ var CmdTunnel = &cli.Command{
 		}
 		subnets := strings.Join(tun.Subnets, ",")
 		// run as root
-		tunnelCmd := exec.Command(
+		tunnelCmd := exec.CommandContext(
+			c.Context,
 			"sudo", "-n", "-E",
 			tunnel.BINARY_PATH, "tunnel", "start",
 			"--subnets", subnets,
@@ -53,16 +53,13 @@ var CmdTunnel = &cli.Command{
 		tunnelCmd.Stdout = os.Stdout
 		tunnelCmd.Stderr = os.Stderr
 		util.SetProcessGroupID(tunnelCmd)
+		util.SetProcessCancel(tunnelCmd)
 		slog.Info("starting tunnel", "cmd", tunnelCmd.Args)
-		err = tunnelCmd.Start()
-		time.Sleep(time.Second * 1)
 		fmt.Println("tunneling through", tun.IP, "for")
 		for _, subnet := range tun.Subnets {
 			fmt.Println("-", subnet)
 		}
-		<-c.Context.Done()
-		util.TerminateProcess(tunnelCmd.Process.Pid)
-		tunnelCmd.Wait()
+		err = tunnelCmd.Run()
 		return nil
 	},
 	Children: []*cli.Command{
@@ -169,7 +166,10 @@ var CmdTunnel = &cli.Command{
 					return tunnel.Start(c.Context, subnets...)
 				})
 				slog.Info("tunnel started")
-				wg.Wait()
+				err = wg.Wait()
+				if err != nil {
+					slog.Error("failed to start tunnel", "error", err)
+				}
 				return nil
 			},
 		},

internal/util/util_linux.go

@@ -20,3 +20,9 @@ func SetProcessGroupID(cmd *exec.Cmd) {
 	// without killing this process (i.e. this code here).
 	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 }
+
+func SetProcessCancel(cmd *exec.Cmd) {
+	cmd.Cancel = func() error {
+		return TerminateProcess(cmd.Process.Pid)
+	}
+}

pkg/runtime/node/node.go

@@ -106,10 +106,7 @@ func (r *Runtime) Run(ctx context.Context, input *runtime.RunInput) (runtime.Wor
 		input.WorkerID,
 	)
 	util.SetProcessGroupID(cmd)
-	cmd.Cancel = func() error {
-		return util.TerminateProcess(cmd.Process.Pid)
-	}
-
+	util.SetProcessCancel(cmd)
 	cmd.Env = input.Env
 	cmd.Env = append(cmd.Env, "NODE_OPTIONS="+os.Getenv("NODE_OPTIONS"))
 	cmd.Env = append(cmd.Env, "VSCODE_INSPECTOR_OPTIONS="+os.Getenv("VSCODE_INSPECTOR_OPTIONS"))

pkg/runtime/python/python.go

@@ -121,7 +121,6 @@ func (r *PythonRuntime) Build(ctx context.Context, input *runtime.BuildInput) (*
 		slog.Info("Copied file %s to %s", file, destPath)
 	}
 
-
 	// Find the closest pyproject.toml
 	startingPath := filepath.Dir(file)
 	pyProjectFile, err := FindClosestPyProjectToml(startingPath)
@@ -142,7 +141,7 @@ func (r *PythonRuntime) Build(ctx context.Context, input *runtime.BuildInput) (*
 
 	// We need to check if a deployment instead of dev
 	rpcBuildEnabled := false
-	if !input.Dev && rpcBuildEnabled{
+	if !input.Dev && rpcBuildEnabled {
 		// Handle zip and containers differently
 		// TODO: walln - handle container flag (not sure how the RPC call is shaped from component?)
 
@@ -172,11 +171,8 @@ func (r *PythonRuntime) Build(ctx context.Context, input *runtime.BuildInput) (*
 				ctx,
 				"uv",
 				"sync")
-
 			util.SetProcessGroupID(uvSyncCmd)
-			uvSyncCmd.Cancel = func() error {
-				return util.TerminateProcess(uvSyncCmd.Process.Pid)
-			}
+			util.SetProcessCancel(uvSyncCmd)
 
 			// use the output pyproject.toml directory as the working directory
 			workDir := filepath.Dir(filepath.Join(targetDir, filepath.Base(pyProjectFile)))
@@ -197,9 +193,7 @@ func (r *PythonRuntime) Build(ctx context.Context, input *runtime.BuildInput) (*
 				filepath.Join(workDir, ".venv", "lib", "python3.*", "site-packages", "*"),
 				filepath.Join(targetDir))
 			util.SetProcessGroupID(sitePackagesCmd)
-			sitePackagesCmd.Cancel = func() error {
-				return util.TerminateProcess(sitePackagesCmd.Process.Pid)
-			}
+			util.SetProcessCancel(sitePackagesCmd)
 
 			slog.Info("starting build site packages", "env", sitePackagesCmd.Env, "args", sitePackagesCmd.Args)
 			sitePackagesCmd.Dir = workDir
@@ -215,8 +209,8 @@ func (r *PythonRuntime) Build(ctx context.Context, input *runtime.BuildInput) (*
 				"rm",
 				"-rf",
 				filepath.Join(workDir, ".venv"))
-
 			util.SetProcessGroupID(removeVirtualEnvCmd)
+			util.SetProcessCancel(removeVirtualEnvCmd)
 			removeVirtualEnvCmd.Cancel = func() error {
 				return util.TerminateProcess(removeVirtualEnvCmd.Process.Pid)
 			}
@@ -349,8 +343,8 @@ func (r *PythonRuntime) Run(ctx context.Context, input *runtime.RunInput) (runti
 		ctx,
 		"uv",
 		args...)
-
 	util.SetProcessGroupID(cmd)
+	util.SetProcessCancel(cmd)
 	cmd.Cancel = func() error {
 		return util.TerminateProcess(cmd.Process.Pid)
 	}
@@ -489,13 +483,12 @@ func getPythonFiles(filePath string) ([]string, error) {
 	}
 
 	return pythonFiles, nil
-	}
-
+}
 
 func writeResourcesFile(resourcesFile string, links map[string]json.RawMessage) error {
 	jsonData, err := json.MarshalIndent(links, "", "  ")
 	if err != nil {
-			return fmt.Errorf("failed to marshal links to JSON: %v", err)
+		return fmt.Errorf("failed to marshal links to JSON: %v", err)
 	}
 
 	// determine the directory of the resources file
@@ -513,4 +506,5 @@ func writeResourcesFile(resourcesFile string, links map[string]json.RawMessage)
 	}
 
 	return nil
-}
+}
+

pkg/tunnel/tunnel_darwin.go

@@ -15,10 +15,7 @@ func Start(ctx context.Context, routes ...string) error {
 	slog.Info("creating interface", "name", name, "os", runtime.GOOS)
 	socksCmd := exec.CommandContext(ctx, "tun2socks", "-device", name, "-proxy", "socks5://127.0.0.1:1080")
 	util.SetProcessGroupID(socksCmd)
-	socksCmd.Cancel = func() error {
-		util.TerminateProcess(socksCmd.Process.Pid)
-		return nil
-	}
+	util.SetProcessCancel(socksCmd)
 	socksCmd.Start()
 	time.Sleep(time.Second * 1)
 	cmds := [][]string{

pkg/tunnel/tunnel_linux.go

@@ -5,6 +5,8 @@ import (
 	"log/slog"
 	"os/exec"
 	"runtime"
+
+	"github.com/sst/ion/internal/util"
 )
 
 func Start(ctx context.Context, routes ...string) error {
@@ -27,7 +29,15 @@ func Start(ctx context.Context, routes ...string) error {
 	}
 	defer destroy()
 	socksCmd := exec.CommandContext(ctx, "tun2socks", "-device", name, "-proxy", "socks5://127.0.0.1:1080")
-	return socksCmd.Run()
+	util.SetProcessGroupID(socksCmd)
+	util.SetProcessCancel(socksCmd)
+	slog.Info("running tun2socks", "cmd", socksCmd.Args)
+	err = socksCmd.Run()
+	if err != nil {
+		slog.Error("failed to run tun2socks", "error", err)
+		return err
+	}
+	return nil
 }
 
 func destroy() error {