Skip to content

Commit e2ce486

Browse files
guonaihongguonaihong
authored
fix golangci-lint 错误 (#27)
* fix golangci-lint 错误 * fix trace * del * fix ci/cd
1 parent 45d8506 commit e2ce486

15 files changed

+760
-203
lines changed

‎autobahn/client/autobahn-client.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ func runTest(caseNo int) {
8080
return
8181
}
8282

83-
go c.ReadLoop()
83+
go func() {
84+
_ = c.ReadLoop()
85+
}()
8486
<-done
8587
}
8688

‎autobahn/server/autobahn-server.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func echoNoContextDecompression(w http.ResponseWriter, r *http.Request) {
6464
return
6565
}
6666

67-
c.ReadLoop()
67+
_ = c.ReadLoop()
6868
}
6969

7070
// 2.测试不接管上下文，压缩和解压
@@ -81,7 +81,7 @@ func echoNoContextDecompressionAndCompression(w http.ResponseWriter, r *http.Req
8181
return
8282
}
8383

84-
c.ReadLoop()
84+
_ = c.ReadLoop()
8585
}
8686

8787
// 3.测试接管上下文，解压
@@ -99,7 +99,7 @@ func echoContextTakeoverDecompression(w http.ResponseWriter, r *http.Request) {
9999
return
100100
}
101101

102-
c.ReadLoop()
102+
_ = c.ReadLoop()
103103
}
104104

105105
// 4.测试接管上下文，压缩/解压缩
@@ -117,7 +117,7 @@ func echoContextTakeoverDecompressionAndCompression(w http.ResponseWriter, r *ht
117117
return
118118
}
119119

120-
c.ReadLoop()
120+
_ = c.ReadLoop()
121121
}
122122
func echoReadTime(w http.ResponseWriter, r *http.Request) {
123123
c, err := quickws.Upgrade(w, r,
@@ -133,7 +133,7 @@ func echoReadTime(w http.ResponseWriter, r *http.Request) {
133133
return
134134
}
135135

136-
c.ReadLoop()
136+
_ = c.ReadLoop()
137137
}
138138

139139
func startTLSServer(mux *http.ServeMux) {

‎benchmark_read_write_message_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func Benchmark_WriteMessage(b *testing.B) {
113113

114114
b.ResetTimer()
115115
for i := 0; i < b.N; i++ {
116-
c.WriteMessage(opcode.Binary, buf)
116+
_ = c.WriteMessage(opcode.Binary, buf)
117117
buf2.Reset()
118118
}
119119
})
@@ -141,8 +141,8 @@ func Benchmark_ReadMessage(b *testing.B) {
141141

142142
b.ResetTimer()
143143
for i := 0; i < b.N; i++ {
144-
c.WriteMessage(opcode.Binary, wbuf)
145-
c.ReadLoop()
144+
_ = c.WriteMessage(opcode.Binary, wbuf)
145+
_ = c.ReadLoop()
146146
buf2.Reset()
147147
}
148148
})

‎callback_test.go

+15-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,12 @@ func Test_DefaultCallback(t *testing.T) {
6666
}
6767
defer con.Close()
6868

69-
con.WriteMessage(Binary, []byte("hello"))
69+
err = con.WriteMessage(Binary, []byte("hello"))
70+
71+
if err != nil {
72+
t.Error(err)
73+
return
74+
}
7075
select {
7176
case <-done:
7277
case <-time.After(1000 * time.Millisecond):
@@ -86,6 +91,10 @@ func Test_DefaultCallback(t *testing.T) {
8691
}
8792
c.StartReadLoop()
8893
err = c.WriteMessage(Binary, []byte("hello"))
94+
if err != nil {
95+
t.Error(err)
96+
return
97+
}
8998
atomic.AddInt32(&run, int32(1))
9099
done <- true
91100
}))
@@ -99,7 +108,11 @@ func Test_DefaultCallback(t *testing.T) {
99108
}
100109
defer con.Close()
101110

102-
con.WriteMessage(Binary, []byte("hello"))
111+
err = con.WriteMessage(Binary, []byte("hello"))
112+
if err != nil {
113+
t.Error(err)
114+
return
115+
}
103116
select {
104117
case <-done:
105118
case <-time.After(100 * time.Millisecond):

‎client.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,9 @@ func (d *DialOption) Dial() (wsCon *Conn, err error) {
297297
bufio2.ClearReader(br)
298298
br = nil
299299
}
300-
// fmt.Println(brw.Reader.Buffered())
301-
conn.SetDeadline(time.Time{})
300+
if err := conn.SetDeadline(time.Time{}); err != nil {
301+
return nil, err
302+
}
302303
wsCon = newConn(conn, true /* client is true*/, &d.Config, fr, br)
303304
wsCon.pd = pd
304305
return wsCon, nil

‎client_option_test.go

+112-15
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"net/http"
2424
"net/http/httptest"
2525
"strings"
26+
"sync"
2627
"sync/atomic"
2728
"testing"
2829
"time"
@@ -206,7 +207,11 @@ func Test_ClientOption(t *testing.T) {
206207
t.Run("18 Dial: WithClientDialFunc.1", func(t *testing.T) {
207208
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
208209
conn, err := Upgrade(w, r, WithServerOnMessageFunc(func(c *Conn, o Opcode, b []byte) {
209-
c.WriteMessage(o, b)
210+
err := c.WriteMessage(o, b)
211+
if err != nil {
212+
t.Error(err)
213+
return
214+
}
210215
c.Close()
211216
}))
212217
if err != nil {
@@ -228,7 +233,11 @@ func Test_ClientOption(t *testing.T) {
228233
t.Error(err)
229234
}
230235

231-
newConn.SetDeadline(time.Now().Add(30 * time.Second))
236+
err = newConn.SetDeadline(time.Now().Add(30 * time.Second))
237+
if err != nil {
238+
t.Error(err)
239+
return
240+
}
232241

233242
buf := make([]byte, 128)
234243
if _, err := io.ReadFull(newConn, buf[:3]); err != nil {
@@ -274,10 +283,19 @@ func Test_ClientOption(t *testing.T) {
274283
defer c2.Close()
275284
done := make(chan struct{})
276285
go func() {
277-
io.Copy(newConn, c2)
286+
_, err := io.Copy(newConn, c2)
287+
if err != nil {
288+
t.Error(err)
289+
return
290+
}
291+
278292
close(done)
279293
}()
280-
io.Copy(c2, newConn)
294+
_, err = io.Copy(c2, newConn)
295+
if err != nil {
296+
t.Error(err)
297+
return
298+
}
281299
<-done
282300
}()
283301

@@ -294,8 +312,12 @@ func Test_ClientOption(t *testing.T) {
294312
}
295313

296314
data := []byte("hello world")
297-
c.WriteMessage(Binary, data)
298-
c.ReadLoop()
315+
err = c.WriteMessage(Binary, data)
316+
if err != nil {
317+
t.Error(err)
318+
return
319+
}
320+
_ = c.ReadLoop()
299321

300322
t.Log("got", string(got), "want", string(data))
301323
if !bytes.Equal(got, data) {
@@ -306,7 +328,11 @@ func Test_ClientOption(t *testing.T) {
306328
t.Run("18 Dial: WithClientDialFunc.2", func(t *testing.T) {
307329
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
308330
conn, err := Upgrade(w, r, WithServerOnMessageFunc(func(c *Conn, o Opcode, b []byte) {
309-
c.WriteMessage(o, b)
331+
err := c.WriteMessage(o, b)
332+
if err != nil {
333+
t.Error(err)
334+
return
335+
}
310336
c.Close()
311337
}))
312338
if err != nil {
@@ -328,7 +354,11 @@ func Test_ClientOption(t *testing.T) {
328354
t.Error(err)
329355
}
330356

331-
newConn.SetDeadline(time.Now().Add(30 * time.Second))
357+
err = newConn.SetDeadline(time.Now().Add(30 * time.Second))
358+
if err != nil {
359+
t.Error(err)
360+
return
361+
}
332362

333363
buf := make([]byte, 128)
334364
if _, err := io.ReadFull(newConn, buf[:3]); err != nil {
@@ -372,13 +402,76 @@ func Test_ClientOption(t *testing.T) {
372402
return
373403
}
374404
defer c2.Close()
375-
done := make(chan struct{})
405+
406+
// done := make(chan struct{})
407+
// newConn = &safeConn{Conn: newConn}
408+
// c2 = &safeConn{Conn: c2}
409+
// go func() {
410+
// _, err = io.Copy(newConn, c2)
411+
// if err != nil {
412+
// t.Error(err)
413+
// return
414+
// }
415+
// close(done)
416+
// }()
417+
// _, err = io.Copy(c2, newConn)
418+
// if err != nil {
419+
// t.Error(err)
420+
// return
421+
// }
422+
// <-done
423+
424+
var (
425+
newConnMu sync.Mutex
426+
c2Mu sync.Mutex
427+
wg sync.WaitGroup
428+
)
429+
430+
wg.Add(2)
431+
376432
go func() {
377-
io.Copy(newConn, c2)
378-
close(done)
433+
defer wg.Done()
434+
buf := make([]byte, 4096)
435+
for {
436+
n, err := c2.Read(buf)
437+
if err != nil {
438+
if err != io.EOF {
439+
t.Error(err)
440+
}
441+
break
442+
}
443+
newConnMu.Lock()
444+
_, err = newConn.Write(buf[:n])
445+
newConnMu.Unlock()
446+
if err != nil {
447+
t.Error(err)
448+
break
449+
}
450+
}
379451
}()
380-
io.Copy(c2, newConn)
381-
<-done
452+
453+
go func() {
454+
defer wg.Done()
455+
buf := make([]byte, 4096)
456+
for {
457+
n, err := newConn.Read(buf)
458+
if err != nil {
459+
if err != io.EOF {
460+
t.Error(err)
461+
}
462+
break
463+
}
464+
c2Mu.Lock()
465+
_, err = c2.Write(buf[:n])
466+
c2Mu.Unlock()
467+
if err != nil {
468+
t.Error(err)
469+
break
470+
}
471+
}
472+
}()
473+
474+
wg.Wait()
382475
}()
383476

384477
got := make([]byte, 0, 128)
@@ -394,8 +487,12 @@ func Test_ClientOption(t *testing.T) {
394487
}
395488

396489
data := []byte("hello world")
397-
c.WriteMessage(Binary, data)
398-
c.ReadLoop()
490+
err = c.WriteMessage(Binary, data)
491+
if err != nil {
492+
t.Error(err)
493+
return
494+
}
495+
_ = c.ReadLoop()
399496

400497
t.Log("got", string(got), "want", string(data))
401498
if !bytes.Equal(got, data) {

0 commit comments

Comments
 (0)