Merge branch 'main' into webterm

coder · kylecarbs · Apr 29, 2022 · Apr 26, 2022 · Apr 27, 2022 · Apr 28, 2022
commit 19c7b54e166586c0158d02aae734110aefb6fcce
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -62,9 +62,7 @@ func (api *api) workspaceAgentDial(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	conn, err := websocket.Accept(rw, r, &websocket.AcceptOptions{
-		CompressionMode: websocket.CompressionDisabled,
-	})
+	conn, err := websocket.Accept(rw, r, nil)
 	if err != nil {
 		httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
 			Message: fmt.Sprintf("accept websocket: %s", err),
@@ -378,6 +376,7 @@ func (api *api) workspaceAgentPTY(rw http.ResponseWriter, r *http.Request) {
 	wsNetConn := websocket.NetConn(r.Context(), conn, websocket.MessageBinary)
 	agentConn, err := api.dialWorkspaceAgent(r, workspaceAgent.ID)
 	if err != nil {
+		_ = conn.Close(websocket.StatusInternalError, httpapi.WebsocketCloseSprintf("dial workspace agent: %s", err))
 		return
 	}
 	defer agentConn.Close()

diff --git a/codersdk/workspaceagents.go b/codersdk/workspaceagents.go
@@ -359,8 +359,6 @@ func (c *Client) WorkspaceAgentReconnectingPTY(ctx context.Context, agentID, rec
 	}
 	conn, res, err := websocket.Dial(ctx, serverURL.String(), &websocket.DialOptions{
 		HTTPClient: httpClient,
-		// Need to disable compression to avoid a data-race.
-		CompressionMode: websocket.CompressionDisabled,
 	})
 	if err != nil {
 		if res == nil {

diff --git a/site/src/pages/TerminalPage/TerminalPage.tsx b/site/src/pages/TerminalPage/TerminalPage.tsx
@@ -53,6 +53,7 @@ export const TerminalPage: React.FC<{
     },
   })
   const isConnected = terminalState.matches("connected")
+  const isDisconnected = terminalState.matches("disconnected")
   const { organizationsError, workspaceError, workspaceAgentError, workspaceAgent, websocketError } =
     terminalState.context
 
@@ -191,7 +192,7 @@ export const TerminalPage: React.FC<{
     <>
       {/* This overlay makes it more obvious that the terminal is disconnected. */}
       {/* It's nice for situations where Coder restarts, and they are temporarily disconnected. */}
-      <div className={`${styles.overlay} ${isConnected ? "connected" : ""}`}>
+      <div className={`${styles.overlay} ${isDisconnected ? "" : "connected"}`}>
         <span>Disconnected</span>
       </div>
       <div className={styles.terminal} ref={xtermRef} data-testid="terminal" />
@@ -214,7 +215,7 @@ const useStyles = makeStyles(() => ({
     color: "white",
     fontFamily: MONOSPACE_FONT_FAMILY,
     fontSize: 18,
-    backgroundColor: "rgba(0, 0, 0, 0.5)",
+    backgroundColor: "rgba(0, 0, 0, 0.2)",
     "&.connected": {
       opacity: 0,
     },