@@ -33,6 +33,7 @@ import (
3333"golang.org/x/mod/semver"
3434"golang.org/x/oauth2"
3535xgithub"golang.org/x/oauth2/github"
36+ "golang.org/x/sync/errgroup"
3637"golang.org/x/xerrors"
3738"google.golang.org/api/idtoken"
3839"google.golang.org/api/option"
@@ -86,7 +87,7 @@ func server() *cobra.Command {
8687tlsKeyFile string
8788tlsMinVersion string
8889turnRelayAddress string
89- tunnel bool
90+ shouldTunnel bool
9091stunServers []string
9192trace bool
9293secureAuthCookie bool
@@ -165,18 +166,18 @@ func server() *cobra.Command {
165166accessURL = localURL .String ()
166167}else {
167168// If an access URL is specified, always skip tunneling.
168- tunnel = false
169+ shouldTunnel = false
169170}
170171
171172var (
172- tunnelErrChan <- chan error
173173ctxTunnel ,closeTunnel = context .WithCancel (cmd .Context ())
174+ tunnel = & devtunnel.Tunnel {ErrorChan :make (chan error ,1 )}
174175)
175176defer closeTunnel ()
176177
177178// If we're attempting to tunnel in dev-mode, the access URL
178179// needs to be changed to use the tunnel.
179- if dev && tunnel {
180+ if dev && shouldTunnel {
180181_ ,_ = fmt .Fprintln (cmd .ErrOrStderr (),cliui .Styles .Wrap .Render (
181182"Coder requires a URL accessible by workspaces you provision. " +
182183"A free tunnel can be created for simple setup. This will " +
@@ -195,10 +196,11 @@ func server() *cobra.Command {
195196}
196197}
197198if err == nil {
198- accessURL , tunnelErrChan , err = devtunnel .New (ctxTunnel ,localURL )
199+ tunnel , err = devtunnel .New (ctxTunnel ,logger . Named ( "devtunnel" ) )
199200if err != nil {
200201return xerrors .Errorf ("create tunnel: %w" ,err )
201202}
203+ accessURL = tunnel .URL
202204}
203205_ ,_ = fmt .Fprintln (cmd .ErrOrStderr ())
204206}
@@ -327,7 +329,25 @@ func server() *cobra.Command {
327329return shutdownConnsCtx
328330},
329331}
330- errCh <- server .Serve (listener )
332+
333+ wg := errgroup.Group {}
334+ wg .Go (func ()error {
335+ if dev && shouldTunnel {
336+ defer tunnel .Listener .Close ()
337+ }
338+
339+ return server .Serve (listener )
340+ })
341+
342+ if dev && shouldTunnel {
343+ wg .Go (func ()error {
344+ defer listener .Close ()
345+
346+ return server .Serve (tunnel .Listener )
347+ })
348+ }
349+
350+ errCh <- wg .Wait ()
331351}()
332352
333353config := createConfig (cmd )
@@ -393,7 +413,7 @@ func server() *cobra.Command {
393413case <- cmd .Context ().Done ():
394414coderAPI .Close ()
395415return cmd .Context ().Err ()
396- case err := <- tunnelErrChan :
416+ case err := <- tunnel . ErrorChan :
397417if err != nil {
398418return err
399419}
@@ -455,10 +475,10 @@ func server() *cobra.Command {
455475spin .Stop ()
456476}
457477
458- if dev && tunnel {
478+ if dev && shouldTunnel {
459479_ ,_ = fmt .Fprintf (cmd .OutOrStdout (),cliui .Styles .Prompt .String ()+ "Waiting for dev tunnel to close...\n " )
460480closeTunnel ()
461- <- tunnelErrChan
481+ <- tunnel . ErrorChan
462482}
463483
464484_ ,_ = fmt .Fprintf (cmd .OutOrStdout (),cliui .Styles .Prompt .String ()+ "Waiting for WebSocket connections to close...\n " )
@@ -504,7 +524,7 @@ func server() *cobra.Command {
504524"Specifies the path to the private key for the certificate. It requires a PEM-encoded file" )
505525cliflag .StringVarP (root .Flags (),& tlsMinVersion ,"tls-min-version" ,"" ,"CODER_TLS_MIN_VERSION" ,"tls12" ,
506526`Specifies the minimum supported version of TLS. Accepted values are "tls10", "tls11", "tls12" or "tls13"` )
507- cliflag .BoolVarP (root .Flags (),& tunnel ,"tunnel" ,"" ,"CODER_DEV_TUNNEL" ,true ,
527+ cliflag .BoolVarP (root .Flags (),& shouldTunnel ,"tunnel" ,"" ,"CODER_DEV_TUNNEL" ,true ,
508528"Specifies whether the dev tunnel will be enabled or not. If specified, the interactive prompt will not display." )
509529cliflag .StringArrayVarP (root .Flags (),& stunServers ,"stun-server" ,"" ,"CODER_STUN_SERVERS" , []string {
510530"stun:stun.l.google.com:19302" ,