@@ -33,6 +33,7 @@ import (
3333
3434"cdr.dev/slog"
3535"github.com/coder/coder/agent/usershell"
36+ "github.com/coder/coder/codersdk"
3637"github.com/coder/coder/pty"
3738"github.com/coder/coder/tailnet"
3839"github.com/coder/retry"
@@ -49,55 +50,41 @@ const (
4950MagicSessionErrorCode = 229
5051)
5152
52- var (
53- // tailnetIP is a static IPv6 address with the Tailscale prefix that is used to route
54- // connections from clients to this node. A dynamic address is not required because a Tailnet
55- // client only dials a single agent at a time.
56- tailnetIP = netip .MustParseAddr ("fd7a:115c:a1e0:49d6:b259:b7ac:b1b2:48f4" )
57- tailnetSSHPort = 1
58- tailnetReconnectingPTYPort = 2
59- tailnetSpeedtestPort = 3
60- )
61-
6253type Options struct {
63- CoordinatorDialer CoordinatorDialer
64- FetchMetadata FetchMetadata
65-
66- StatsReporter StatsReporter
67- ReconnectingPTYTimeout time.Duration
68- EnvironmentVariables map [string ]string
69- Logger slog.Logger
70- }
71-
72- type Metadata struct {
73- DERPMap * tailcfg.DERPMap `json:"derpmap"`
74- EnvironmentVariables map [string ]string `json:"environment_variables"`
75- StartupScript string `json:"startup_script"`
76- Directory string `json:"directory"`
54+ CoordinatorDialer CoordinatorDialer
55+ FetchMetadata FetchMetadata
56+ StatsReporter StatsReporter
57+ WorkspaceAgentApps WorkspaceAgentApps
58+ PostWorkspaceAgentAppHealth PostWorkspaceAgentAppHealth
59+ ReconnectingPTYTimeout time.Duration
60+ EnvironmentVariables map [string ]string
61+ Logger slog.Logger
7762}
7863
7964// CoordinatorDialer is a function that constructs a new broker.
8065// A dialer must be passed in to allow for reconnects.
81- type CoordinatorDialer func (ctx Context ) (net.Conn ,error )
66+ type CoordinatorDialer func (context.Context ) (net.Conn ,error )
8267
8368// FetchMetadata is a function to obtain metadata for the agent.
84- type FetchMetadata func (ctx Context ) (Metadata ,error )
69+ type FetchMetadata func (context.Context ) (codersdk. WorkspaceAgentMetadata ,error )
8570
8671func New (options Options ) io.Closer {
8772if options .ReconnectingPTYTimeout == 0 {
8873options .ReconnectingPTYTimeout = 5 * time .Minute
8974}
9075ctx ,cancelFunc := context .WithCancel (context .Background ())
9176server := & agent {
92- reconnectingPTYTimeout :options .ReconnectingPTYTimeout ,
93- logger :options .Logger ,
94- closeCancel :cancelFunc ,
95- closed :make (chan struct {}),
96- envVars :options .EnvironmentVariables ,
97- coordinatorDialer :options .CoordinatorDialer ,
98- fetchMetadata :options .FetchMetadata ,
99- stats :& Stats {},
100- statsReporter :options .StatsReporter ,
77+ reconnectingPTYTimeout :options .ReconnectingPTYTimeout ,
78+ logger :options .Logger ,
79+ closeCancel :cancelFunc ,
80+ closed :make (chan struct {}),
81+ envVars :options .EnvironmentVariables ,
82+ coordinatorDialer :options .CoordinatorDialer ,
83+ fetchMetadata :options .FetchMetadata ,
84+ stats :& Stats {},
85+ statsReporter :options .StatsReporter ,
86+ workspaceAgentApps :options .WorkspaceAgentApps ,
87+ postWorkspaceAgentAppHealth :options .PostWorkspaceAgentAppHealth ,
10188}
10289server .init (ctx )
10390return server
@@ -120,14 +107,16 @@ type agent struct {
120107fetchMetadata FetchMetadata
121108sshServer * ssh.Server
122109
123- network * tailnet.Conn
124- coordinatorDialer CoordinatorDialer
125- stats * Stats
126- statsReporter StatsReporter
110+ network * tailnet.Conn
111+ coordinatorDialer CoordinatorDialer
112+ stats * Stats
113+ statsReporter StatsReporter
114+ workspaceAgentApps WorkspaceAgentApps
115+ postWorkspaceAgentAppHealth PostWorkspaceAgentAppHealth
127116}
128117
129118func (a * agent )run (ctx context.Context ) {
130- var metadata Metadata
119+ var metadata codersdk. WorkspaceAgentMetadata
131120var err error
132121// An exponential back-off occurs when the connection is failing to dial.
133122// This is to prevent server spam in case of a coderd outage.
@@ -168,6 +157,10 @@ func (a *agent) run(ctx context.Context) {
168157if metadata .DERPMap != nil {
169158go a .runTailnet (ctx ,metadata .DERPMap )
170159}
160+
161+ if a .workspaceAgentApps != nil && a .postWorkspaceAgentAppHealth != nil {
162+ go NewWorkspaceAppHealthReporter (a .logger ,a .workspaceAgentApps ,a .postWorkspaceAgentAppHealth )(ctx )
163+ }
171164}
172165
173166func (a * agent )runTailnet (ctx context.Context ,derpMap * tailcfg.DERPMap ) {
@@ -182,7 +175,7 @@ func (a *agent) runTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) {
182175}
183176var err error
184177a .network ,err = tailnet .NewConn (& tailnet.Options {
185- Addresses : []netip.Prefix {netip .PrefixFrom (tailnetIP ,128 )},
178+ Addresses : []netip.Prefix {netip .PrefixFrom (codersdk . TailnetIP ,128 )},
186179DERPMap :derpMap ,
187180Logger :a .logger .Named ("tailnet" ),
188181})
@@ -199,7 +192,7 @@ func (a *agent) runTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) {
199192})
200193go a .runCoordinator (ctx )
201194
202- sshListener ,err := a .network .Listen ("tcp" ,":" + strconv .Itoa (tailnetSSHPort ))
195+ sshListener ,err := a .network .Listen ("tcp" ,":" + strconv .Itoa (codersdk . TailnetSSHPort ))
203196if err != nil {
204197a .logger .Critical (ctx ,"listen for ssh" ,slog .Error (err ))
205198return
@@ -213,7 +206,7 @@ func (a *agent) runTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) {
213206go a .sshServer .HandleConn (a .stats .wrapConn (conn ))
214207}
215208}()
216- reconnectingPTYListener ,err := a .network .Listen ("tcp" ,":" + strconv .Itoa (tailnetReconnectingPTYPort ))
209+ reconnectingPTYListener ,err := a .network .Listen ("tcp" ,":" + strconv .Itoa (codersdk . TailnetReconnectingPTYPort ))
217210if err != nil {
218211a .logger .Critical (ctx ,"listen for reconnecting pty" ,slog .Error (err ))
219212return
@@ -239,15 +232,15 @@ func (a *agent) runTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) {
239232if err != nil {
240233continue
241234}
242- var msg reconnectingPTYInit
235+ var msg codersdk. ReconnectingPTYInit
243236err = json .Unmarshal (data ,& msg )
244237if err != nil {
245238continue
246239}
247240go a .handleReconnectingPTY (ctx ,msg ,conn )
248241}
249242}()
250- speedtestListener ,err := a .network .Listen ("tcp" ,":" + strconv .Itoa (tailnetSpeedtestPort ))
243+ speedtestListener ,err := a .network .Listen ("tcp" ,":" + strconv .Itoa (codersdk . TailnetSpeedtestPort ))
251244if err != nil {
252245a .logger .Critical (ctx ,"listen for speedtest" ,slog .Error (err ))
253246return
@@ -272,6 +265,15 @@ func (a *agent) runTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) {
272265
273266// runCoordinator listens for nodes and updates the self-node as it changes.
274267func (a * agent )runCoordinator (ctx context.Context ) {
268+ for {
269+ reconnect := a .runCoordinatorWithRetry (ctx )
270+ if ! reconnect {
271+ return
272+ }
273+ }
274+ }
275+
276+ func (a * agent )runCoordinatorWithRetry (ctx context.Context ) (reconnect bool ) {
275277var coordinator net.Conn
276278var err error
277279// An exponential back-off occurs when the connection is failing to dial.
@@ -280,38 +282,38 @@ func (a *agent) runCoordinator(ctx context.Context) {
280282coordinator ,err = a .coordinatorDialer (ctx )
281283if err != nil {
282284if errors .Is (err ,context .Canceled ) {
283- return
285+ return false
284286}
285287if a .isClosed () {
286- return
288+ return false
287289}
288290a .logger .Warn (context .Background (),"failed to dial" ,slog .Error (err ))
289291continue
290292}
293+ //nolint:revive // Defer is ok because we're exiting this loop.
294+ defer coordinator .Close ()
291295a .logger .Info (context .Background (),"connected to coordination server" )
292296break
293297}
294298select {
295299case <- ctx .Done ():
296- return
300+ return false
297301default :
298302}
299- defer coordinator .Close ()
300303sendNodes ,errChan := tailnet .ServeCoordinator (coordinator ,a .network .UpdateNodes )
301304a .network .SetNodeCallback (sendNodes )
302305select {
303306case <- ctx .Done ():
304- return
307+ return false
305308case err := <- errChan :
306309if a .isClosed () {
307- return
310+ return false
308311}
309312if errors .Is (err ,context .Canceled ) {
310- return
313+ return false
311314}
312315a .logger .Debug (ctx ,"node broker accept exited; restarting connection" ,slog .Error (err ))
313- a .runCoordinator (ctx )
314- return
316+ return true
315317}
316318}
317319
@@ -434,7 +436,7 @@ func (a *agent) init(ctx context.Context) {
434436
435437go a .run (ctx )
436438if a .statsReporter != nil {
437- cl ,err := a .statsReporter (ctx ,a .logger ,func ()* Stats {
439+ cl ,err := a .statsReporter (ctx ,a .logger ,func ()* codersdk. AgentStats {
438440return a .stats .Copy ()
439441})
440442if err != nil {
@@ -469,7 +471,7 @@ func (a *agent) createCommand(ctx context.Context, rawCommand string, env []stri
469471if rawMetadata == nil {
470472return nil ,xerrors .Errorf ("no metadata was provided: %w" ,err )
471473}
472- metadata ,valid := rawMetadata .(Metadata )
474+ metadata ,valid := rawMetadata .(codersdk. WorkspaceAgentMetadata )
473475if ! valid {
474476return nil ,xerrors .Errorf ("metadata is the wrong type: %T" ,metadata )
475477}
@@ -625,7 +627,7 @@ func (a *agent) handleSSHSession(session ssh.Session) (retErr error) {
625627return cmd .Wait ()
626628}
627629
628- func (a * agent )handleReconnectingPTY (ctx context.Context ,msg reconnectingPTYInit ,conn net.Conn ) {
630+ func (a * agent )handleReconnectingPTY (ctx context.Context ,msg codersdk. ReconnectingPTYInit ,conn net.Conn ) {
629631defer conn .Close ()
630632
631633var rpty * reconnectingPTY
@@ -766,7 +768,7 @@ func (a *agent) handleReconnectingPTY(ctx context.Context, msg reconnectingPTYIn
766768rpty .activeConnsMutex .Unlock ()
767769}()
768770decoder := json .NewDecoder (conn )
769- var req ReconnectingPTYRequest
771+ var req codersdk. ReconnectingPTYRequest
770772for {
771773err = decoder .Decode (& req )
772774if xerrors .Is (err ,io .EOF ) {