Use ICE servers from API (#406)

deansheather · web-flow · commit 8da2581e9b98 · 2021-08-03T00:10:47.000+10:00
diff --git a/Makefile b/Makefile
@@ -48,4 +48,4 @@ dev: build/linux
 	-rm ./coder
 	@echo "untarring..."
 	@tar -xzf ./ci/bin/coder-cli-linux-amd64.tar.gz
-	@echo "new dev binary ready"
+	@echo "new dev binary ready"
diff --git a/coder-sdk/interface.go b/coder-sdk/interface.go
@@ -5,6 +5,7 @@ import (
 	"net/url"
 
 	"cdr.dev/wsep"
+	"github.com/pion/webrtc/v3"
 	"nhooyr.io/websocket"
 )
 
@@ -242,7 +243,7 @@ type Client interface {
 	// SetPolicyTemplate sets the workspace policy template
 	SetPolicyTemplate(ctx context.Context, templateID string, templateScope TemplateScope, dryRun bool) (*SetPolicyTemplateResponse, error)
 
-	// satellites fetches all satellitess known to the Coder control plane.
+	// Satellites fetches all satellitess known to the Coder control plane.
 	Satellites(ctx context.Context) ([]Satellite, error)
 
 	// CreateSatellite creates a new satellite entity.
@@ -253,4 +254,7 @@ type Client interface {
 
 	// UpdateLastConnectionAt updates the last connection at attribute of a workspace.
 	UpdateLastConnectionAt(ctx context.Context, workspaceID string) error
+
+	// ICEServers fetches the list of ICE servers advertised by the deployment.
+	ICEServers(ctx context.Context) ([]webrtc.ICEServer, error)
 }
diff --git a/coder-sdk/webrtc.go b/coder-sdk/webrtc.go
@@ -0,0 +1,23 @@
+package coder
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/pion/webrtc/v3"
+)
+
+type getICEServersRes struct {
+	Data []webrtc.ICEServer `json:"data"`
+}
+
+// ICEServers fetches the list of ICE servers advertised by the deployment.
+func (c *DefaultClient) ICEServers(ctx context.Context) ([]webrtc.ICEServer, error) {
+	var res getICEServersRes
+	err := c.requestBody(ctx, http.MethodGet, "/api/private/webrtc/ice", nil, &res)
+	if err != nil {
+		return nil, err
+	}
+
+	return res.Data, nil
+}
diff --git a/internal/cmd/tunnel.go b/internal/cmd/tunnel.go
@@ -75,11 +75,18 @@ coder tunnel my-dev 3000 3000
 				return xerrors.Errorf("No workspace found by name '%s'", args[0])
 			}
 
+			iceServers, err := sdk.ICEServers(ctx)
+			if err != nil {
+				return xerrors.Errorf("get ICE servers: %w", err)
+			}
+			log.Debug(ctx, "got ICE servers", slog.F("ice", iceServers))
+
 			c := &tunnneler{
 				log:         log,
 				brokerAddr:  &baseURL,
 				token:       sdk.Token(),
 				workspaceID: workspaceID,
+				iceServers:  iceServers,
 				stdio:       args[2] == "stdio",
 				localPort:   uint16(localPort),
 				remotePort:  uint16(remotePort),
@@ -102,6 +109,7 @@ type tunnneler struct {
 	brokerAddr  *url.URL
 	token       string
 	workspaceID string
+	iceServers  []webrtc.ICEServer
 	remotePort  uint16
 	localPort   uint16
 	stdio       bool
@@ -119,7 +127,7 @@ func (c *tunnneler) start(ctx context.Context) error {
 			TURNProxyAuthToken: c.token,
 			TURNRemoteProxyURL: c.brokerAddr,
 			TURNLocalProxyURL:  c.brokerAddr,
-			ICEServers:         []webrtc.ICEServer{wsnet.TURNProxyICECandidate()},
+			ICEServers:         c.iceServers,
 		},
 		nil,
 	)
