@@ -192,24 +192,20 @@ type Dialer struct {
192192func (d * Dialer )negotiate (ctx context.Context ) (err error ) {
193193var (
194194decoder = json .NewDecoder (d .conn )
195- errCh = make (chan error )
195+ errCh = make (chan error , 1 )
196196// If candidates are sent before an offer, we place them here.
197197// We currently have no assurances to ensure this can't happen,
198198// so it's better to buffer and process than fail.
199199pendingCandidates = []webrtc.ICECandidateInit {}
200200)
201201go func () {
202202defer close (errCh )
203- defer func () {
204- _ = d .conn .Close ()
205- }()
203+ defer func () {_ = d .conn .Close () }()
206204
207205err := waitForConnectionOpen (context .Background (),d .rtc )
208206if err != nil {
209207d .log .Debug (ctx ,"negotiation error" ,slog .Error (err ))
210- if errors .Is (err ,context .DeadlineExceeded ) {
211- _ = d .conn .Close ()
212- }
208+
213209errCh <- fmt .Errorf ("wait for connection to open: %w" ,err )
214210return
215211}
@@ -325,23 +321,28 @@ func (d *Dialer) Ping(ctx context.Context) error {
325321return err
326322}
327323}
324+
328325d .pingMut .Lock ()
329326defer d .pingMut .Unlock ()
327+
330328d .log .Debug (ctx ,"sending ping" )
331329_ ,err = d .ctrlrw .Write ([]byte {'a' })
332330if err != nil {
333331return fmt .Errorf ("write: %w" ,err )
334332}
335- errCh := make (chan error )
333+
334+ errCh := make (chan error ,1 )
336335go func () {
337336// There's a race in which connections can get lost-mid ping
338337// in which case this would block forever.
339338defer close (errCh )
340339_ ,err = d .ctrlrw .Read (make ([]byte ,4 ))
341340errCh <- err
342341}()
343- ctx ,cancelFunc := context .WithTimeout (ctx ,time .Second * 15 )
344- defer cancelFunc ()
342+
343+ ctx ,cancel := context .WithTimeout (ctx ,time .Second * 15 )
344+ defer cancel ()
345+
345346select {
346347case err := <- errCh :
347348return err