fix: Properly handle data channel timeout

kylecarbs · kylecarbs · commit 42f626fe977e · 2021-04-30T16:10:52.000Z
diff --git a/xwebrtc/dialer.go b/xwebrtc/dialer.go
@@ -116,10 +116,12 @@ func (wc *WorkspaceDialer) peerConnection(ctx context.Context, workspaceID strin
 	}
 	go func() {
 		err = waitForDataChannelOpen(ctx, control)
+		_ = control.Close()
 		if err != nil {
-			wc.log.Fatal(ctx, "waiting for data channel open", slog.Error(err))
+
+			_ = conn.Close(websocket.StatusAbnormalClosure, "data channel timed out")
+			return
 		}
-		_ = control.Close()
 		_ = conn.Close(websocket.StatusNormalClosure, "rtc connected")
 	}()
 

Original file line number	Diff line number	Diff line change
`@@ -116,10 +116,12 @@ func (wc *WorkspaceDialer) peerConnection(ctx context.Context, workspaceID strin`
`116`	`116`	`}`
`117`	`117`	`go func() {`
`118`	`118`	`err = waitForDataChannelOpen(ctx, control)`
	`119`	`+ _ = control.Close()`
`119`	`120`	`if err != nil {`
`120`		`- wc.log.Fatal(ctx, "waiting for data channel open", slog.Error(err))`
	`121`	`+`
	`122`	`+ _ = conn.Close(websocket.StatusAbnormalClosure, "data channel timed out")`
	`123`	`+ return`
`121`	`124`	`}`
`122`		`- _ = control.Close()`
`123`	`125`	`_ = conn.Close(websocket.StatusNormalClosure, "rtc connected")`
`124`	`126`	`}()`
`125`	`127`