move Establish and Start functions to wireguard agent package

cmd/fly_agent.go

@@ -63,7 +63,7 @@ func runFlyAgentStart(ctx *cmdctx.CmdContext) error {
 		c.Kill()
 	}
 
-	_, err = EstablishFlyAgent(ctx)
+	_, err = agent.Establish(api)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "can't start agent: %s", err)
 	}
@@ -81,17 +81,3 @@ func runFlyAgentStop(ctx *cmdctx.CmdContext) error {
 
 	return err
 }
-
-func EstablishFlyAgent(ctx *cmdctx.CmdContext) (*agent.Client, error) {
-	api := ctx.Client.API()
-
-	c, err := agent.DefaultClient(api)
-	if err == nil {
-		_, err := c.Ping()
-		if err == nil {
-			return c, nil
-		}
-	}
-
-	return StartAgent(api, os.Args[0])
-}

cmd/ssh_terminal.go

@@ -26,7 +26,7 @@ func runSSHConsole(ctx *cmdctx.CmdContext) error {
 		return fmt.Errorf("get app: %w", err)
 	}
 
-	agentclient, err := EstablishFlyAgent(ctx)
+	agentclient, err := agent.Establish(client)
 	if err != nil {
 		return fmt.Errorf("can't establish agent: %s\n", err)
 	}

pkg/agent/agent.go

@@ -393,6 +393,7 @@ func (s *Server) tunnelFor(slug string) (*wg.Tunnel, error) {
 }
 
 func resolve(tunnel *wg.Tunnel, addr string) (string, error) {
+	log.Printf("Resolving %v %s", tunnel, addr)
 	host, port, err := net.SplitHostPort(addr)
 	if err != nil {
 		return "", err
@@ -437,3 +438,18 @@ func captureWireguardConnErr(err error, org string) {
 		&wireGuardConnErr{Org: org, Err: err},
 	)
 }
+
+/// Establish starts the daemon if necessary and returns a client
+func Establish(apiClient *api.Client) (*Client, error) {
+	c, err := DefaultClient(apiClient)
+	if err == nil {
+		_, err := c.Ping()
+		if err == nil {
+			return c, nil
+		}
+	}
+
+	fmt.Println("command", os.Args[0])
+
+	return StartDaemon(apiClient, os.Args[0])
+}

cmd/agent_start.go → pkg/agent/start.go

@@ -1,6 +1,6 @@
 // +build !windows
 
-package cmd
+package agent
 
 import (
 	"fmt"
@@ -9,10 +9,9 @@ import (
 	"time"
 
 	"github.com/superfly/flyctl/api"
-	"github.com/superfly/flyctl/pkg/agent"
 )
 
-func StartAgent(api *api.Client, command string) (*agent.Client, error) {
+func StartDaemon(api *api.Client, command string) (*Client, error) {
 	cmd := exec.Command(command, "agent", "daemon-start")
 	cmd.SysProcAttr = &syscall.SysProcAttr{
 		Setpgid: true,
@@ -25,10 +24,10 @@ func StartAgent(api *api.Client, command string) (*agent.Client, error) {
 
 	// this is gross placeholder logic
 
-	for i := 0; i < 5; i++ {
+	for i := 0; i < 20; i++ {
 		time.Sleep(100 * time.Millisecond)
 
-		c, err := agent.DefaultClient(api)
+		c, err := DefaultClient(api)
 		if err == nil {
 			_, err := c.Ping()
 			if err == nil {

cmd/agent_start_noagent.go → pkg/agent/start_noagent.go

@@ -1,14 +1,13 @@
 // +build windows
 
-package cmd
+package agent
 
 import (
 	"fmt"
 
 	"github.com/superfly/flyctl/api"
-	"github.com/superfly/flyctl/pkg/agent"
 )
 
-func StartAgent(api *api.Client, cmd string) (*agent.Client, error) {
+func StartDaemon(api *api.Client, cmd string) (*Client, error) {
 	return nil, fmt.Errorf("can't start agent on this platform (this is a bug, please report)")
 }