good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
J
jrpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Trevor Judice
jrpc
Commits
b71d3313
Commit
b71d3313
authored
Sep 17, 2022
by
a
Browse files
Options
Downloads
Patches
Plain Diff
ig
parent
74df5b75
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
client.go
+1
-1
1 addition, 1 deletion
client.go
websocket.go
+6
-6
6 additions, 6 deletions
websocket.go
wsjson/wsjson.go
+1
-1
1 addition, 1 deletion
wsjson/wsjson.go
with
8 additions
and
8 deletions
client.go
+
1
−
1
View file @
b71d3313
...
@@ -467,7 +467,7 @@ func (c *Client) send(ctx context.Context, op *requestOp, msg any) error {
...
@@ -467,7 +467,7 @@ func (c *Client) send(ctx context.Context, op *requestOp, msg any) error {
func
(
c
*
Client
)
write
(
ctx
context
.
Context
,
msg
any
,
retry
bool
)
error
{
func
(
c
*
Client
)
write
(
ctx
context
.
Context
,
msg
any
,
retry
bool
)
error
{
if
c
.
writeConn
==
nil
{
if
c
.
writeConn
==
nil
{
// The previous write failed. Try to establish a new connection.
// The previous write failed. Try to establish a new connection.
time
.
Sleep
(
500
*
time
.
Millisecond
)
//
time.Sleep(500 * time.Millisecond)
err
:=
c
.
reconnect
(
ctx
)
err
:=
c
.
reconnect
(
ctx
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
...
...
This diff is collapsed.
Click to expand it.
websocket.go
+
6
−
6
View file @
b71d3313
...
@@ -49,7 +49,7 @@ func (s *Server) WebsocketHandler(allowedOrigins []string) http.Handler {
...
@@ -49,7 +49,7 @@ func (s *Server) WebsocketHandler(allowedOrigins []string) http.Handler {
conn
,
err
:=
websocket
.
Accept
(
w
,
r
,
&
websocket
.
AcceptOptions
{
conn
,
err
:=
websocket
.
Accept
(
w
,
r
,
&
websocket
.
AcceptOptions
{
OriginPatterns
:
allowedOrigins
,
OriginPatterns
:
allowedOrigins
,
CompressionMode
:
websocket
.
CompressionContextTakeover
,
CompressionMode
:
websocket
.
CompressionContextTakeover
,
CompressionThreshold
:
4096
,
CompressionThreshold
:
512
,
})
})
if
err
!=
nil
{
if
err
!=
nil
{
log
.
Debug
()
.
Err
(
err
)
.
Msg
(
"WebSocket upgrade failed"
)
log
.
Debug
()
.
Err
(
err
)
.
Msg
(
"WebSocket upgrade failed"
)
...
@@ -80,8 +80,8 @@ func DialWebsocketWithDialer(ctx context.Context, endpoint, origin string, opts
...
@@ -80,8 +80,8 @@ func DialWebsocketWithDialer(ctx context.Context, endpoint, origin string, opts
return
nil
,
err
return
nil
,
err
}
}
opts
.
HTTPHeader
=
header
opts
.
HTTPHeader
=
header
return
newClient
(
ctx
,
func
(
c
ctx
context
.
Context
)
(
ServerCodec
,
error
)
{
return
newClient
(
ctx
,
func
(
ctx
context
.
Context
)
(
ServerCodec
,
error
)
{
conn
,
resp
,
err
:=
websocket
.
Dial
(
c
ctx
,
endpoint
,
opts
)
conn
,
resp
,
err
:=
websocket
.
Dial
(
ctx
,
endpoint
,
opts
)
if
err
!=
nil
{
if
err
!=
nil
{
hErr
:=
wsHandshakeError
{
err
:
err
}
hErr
:=
wsHandshakeError
{
err
:
err
}
if
resp
!=
nil
{
if
resp
!=
nil
{
...
@@ -106,7 +106,7 @@ func DialWebsocket(ctx context.Context, endpoint, origin string) (*Client, error
...
@@ -106,7 +106,7 @@ func DialWebsocket(ctx context.Context, endpoint, origin string) (*Client, error
}
}
dialer
:=
&
websocket
.
DialOptions
{
dialer
:=
&
websocket
.
DialOptions
{
CompressionMode
:
websocket
.
CompressionContextTakeover
,
CompressionMode
:
websocket
.
CompressionContextTakeover
,
CompressionThreshold
:
4096
,
CompressionThreshold
:
512
,
HTTPHeader
:
header
,
HTTPHeader
:
header
,
}
}
return
DialWebsocketWithDialer
(
ctx
,
endpoint
,
origin
,
dialer
)
return
DialWebsocketWithDialer
(
ctx
,
endpoint
,
origin
,
dialer
)
...
@@ -160,10 +160,10 @@ func heartbeat(ctx context.Context, c *websocket.Conn, d time.Duration) {
...
@@ -160,10 +160,10 @@ func heartbeat(ctx context.Context, c *websocket.Conn, d time.Duration) {
func
newWebsocketCodec
(
ctx
context
.
Context
,
c
*
websocket
.
Conn
,
host
string
,
req
http
.
Header
)
ServerCodec
{
func
newWebsocketCodec
(
ctx
context
.
Context
,
c
*
websocket
.
Conn
,
host
string
,
req
http
.
Header
)
ServerCodec
{
c
.
SetReadLimit
(
wsMessageSizeLimit
)
c
.
SetReadLimit
(
wsMessageSizeLimit
)
jsonWriter
:=
func
(
v
any
)
error
{
jsonWriter
:=
func
(
v
any
)
error
{
return
wsjson
.
Write
(
c
ontext
.
Background
()
,
c
,
v
)
return
wsjson
.
Write
(
c
tx
,
c
,
v
)
}
}
jsonReader
:=
func
(
v
any
)
error
{
jsonReader
:=
func
(
v
any
)
error
{
return
wsjson
.
Read
(
c
ontext
.
Background
()
,
c
,
v
)
return
wsjson
.
Read
(
c
tx
,
c
,
v
)
}
}
conn
:=
websocket
.
NetConn
(
ctx
,
c
,
websocket
.
MessageText
)
conn
:=
websocket
.
NetConn
(
ctx
,
c
,
websocket
.
MessageText
)
wc
:=
&
websocketCodec
{
wc
:=
&
websocketCodec
{
...
...
This diff is collapsed.
Click to expand it.
wsjson/wsjson.go
+
1
−
1
View file @
b71d3313
...
@@ -18,7 +18,7 @@ var jzon = jsoniter.Config{
...
@@ -18,7 +18,7 @@ var jzon = jsoniter.Config{
DisallowUnknownFields
:
false
,
DisallowUnknownFields
:
false
,
TagKey
:
""
,
TagKey
:
""
,
OnlyTaggedField
:
false
,
OnlyTaggedField
:
false
,
ValidateJsonRawMessage
:
fals
e
,
ValidateJsonRawMessage
:
tru
e
,
ObjectFieldMustBeSimpleString
:
false
,
ObjectFieldMustBeSimpleString
:
false
,
CaseSensitive
:
false
,
CaseSensitive
:
false
,
}
.
Froze
()
}
.
Froze
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment