race

signalclient.go

@@ -174,12 +174,16 @@ func (c *SignalClient) Join(urlPrefix string, token string, params *ConnectParam
 
 func (c *SignalClient) Close() {
 	isStarted := c.IsStarted()
-	if conn := c.websocketConn(); conn != nil {
+	conn := c.websocketConn()
+	if conn != nil {
 		_ = conn.Close()
 	}
 	if isStarted {
 		<-c.readerClosedCh
 	}
+	if conn != nil {
+		c.OnClose()
+	}
 }
 
 func (c *SignalClient) SendICECandidate(candidate webrtc.ICECandidateInit, target livekit.SignalTarget) error {
@@ -348,10 +352,6 @@ func (c *SignalClient) readWorker() {
 		c.isStarted.Store(false)
 		c.conn.Store((*websocket.Conn)(nil))
 		close(c.readerClosedCh)
-
-		if c.OnClose != nil {
-			c.OnClose()
-		}
 	}()
 	if pending := c.pendingResponse; pending != nil {
 		c.handleResponse(pending)