Skip to content

Commit 1a48f44

Browse files
mo3etFGadvancer
andauthored
fix: remove unnecesarry condition in ws. (#620)
* refactor: remove unuse sdk version field. * update reLog field. * fix: add necessary field. * Update log.go * fix: remove unnecesarry condition in ws. * remove unnecessary contents. * add GetSDKVersion. * fix: fix wasm send ping msg. * chore: fix Err contents. --------- Co-authored-by: OpenIM-Gordon <[email protected]>
1 parent 150227b commit 1a48f44

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

internal/interaction/ws_default.go

+2-7
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ func (d *Default) SetWriteDeadline(timeout time.Duration) error {
3838
}
3939

4040
func (d *Default) SetReadLimit(limit int64) {
41-
if !d.isSetConf {
42-
d.conn.SetReadLimit(limit)
43-
}
41+
d.conn.SetReadLimit(limit)
4442

4543
}
4644

@@ -49,10 +47,7 @@ func (d *Default) SetPingHandler(handler PingPongHandler) {
4947
}
5048

5149
func (d *Default) SetPongHandler(handler PingPongHandler) {
52-
if !d.isSetConf {
53-
d.conn.SetPongHandler(handler)
54-
d.isSetConf = true
55-
}
50+
d.conn.SetPongHandler(handler)
5651
}
5752

5853
func (d *Default) LocalAddr() string {

internal/interaction/ws_js.go

+3
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ func (w *JSWebSocket) Close() error {
7171
}
7272

7373
func (w *JSWebSocket) WriteMessage(messageType int, message []byte) error {
74+
if messageType == PingMessage || messageType == PongMessage {
75+
return nil
76+
}
7477
return w.conn.Write(context.Background(), websocket.MessageType(messageType), message)
7578
}
7679

open_im_sdk/init_login.go

+4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ import (
3030
"github.com/openimsdk/tools/mcontext"
3131
)
3232

33+
func GetSdkVersion() string {
34+
return version.Version
35+
}
36+
3337
const (
3438
rotateCount uint = 0
3539
rotationTime uint = 24

pkg/sdkerrs/predefine.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var (
2929
ErrResourceLoad = errs.NewCodeError(ResourceLoadNotCompleteError, "ResourceLoadNotCompleteError")
3030

3131
//消息相关
32-
ErrFileNotFound = errs.NewCodeError(FileNotFoundError, "RecordNotFoundError")
32+
ErrFileNotFound = errs.NewCodeError(FileNotFoundError, "FileNotFoundError")
3333
ErrMsgDecodeBinaryWs = errs.NewCodeError(MsgDecodeBinaryWsError, "MsgDecodeBinaryWsError")
3434
ErrMsgDeCompression = errs.NewCodeError(MsgDeCompressionError, "MsgDeCompressionError")
3535
ErrMsgBinaryTypeNotSupport = errs.NewCodeError(MsgBinaryTypeNotSupportError, "MsgTypeNotSupportError")

0 commit comments

Comments
 (0)