fix: wsnet.(*Dialer).DialContext hangs forever if ctx is cancelled (#425)

coadler · deansheather · commit a0606d58b16d · 2021-09-13T22:18:29.000Z
(cherry picked from commit cce7843) (cherry picked from commit ac1fdd7)
diff --git a/wsnet/dial.go b/wsnet/dial.go
@@ -386,19 +386,22 @@ func (d *Dialer) DialContext(ctx context.Context, network, address string) (net.
 	ctx, cancel := context.WithTimeout(ctx, time.Second*5)
 	defer cancel()
 
-	errCh := make(chan error)
+	errCh := make(chan error, 1)
 	go func() {
+		defer close(errCh)
+
 		var res DialChannelResponse
 		err = json.NewDecoder(rw).Decode(&res)
 		if err != nil {
 			errCh <- fmt.Errorf("read dial response: %w", err)
 			return
 		}
+
 		d.log.Debug(ctx, "dial response", slog.F("res", res))
 		if res.Err == "" {
-			close(errCh)
 			return
 		}
+
 		err := errors.New(res.Err)
 		if res.Code == CodeDialErr {
 			err = &net.OpError{
