Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

thorclient WS Raw Connect Public #973

Merged
merged 2 commits into from
Feb 10, 2025
Merged

thorclient WS Raw Connect Public #973

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f724b9
thorclient WS Raw Connect Public
otherview Feb 7, 2025
8c6d443
Merge branch 'master' into pedro/public_ws_connect
otherview Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions thorclient/wsclient/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func (c *Client) SubscribeEvents(pos string, filter *subscriptions.EventFilter)
queryValues.Add("topic4", filter.Topic4.String())
}
}
conn, err := c.connect("/subscriptions/event", queryValues)
conn, _, err := c.Connect("/subscriptions/event", queryValues)
if err != nil {
return nil, fmt.Errorf("unable to connect - %w", err)
}
Expand All @@ -91,7 +91,7 @@ func (c *Client) SubscribeEvents(pos string, filter *subscriptions.EventFilter)
func (c *Client) SubscribeBlocks(pos string) (*common.Subscription[*subscriptions.BlockMessage], error) {
queryValues := &url.Values{}
queryValues.Add("pos", pos)
conn, err := c.connect("/subscriptions/block", queryValues)
conn, _, err := c.Connect("/subscriptions/block", queryValues)
if err != nil {
return nil, fmt.Errorf("unable to connect - %w", err)
}
Expand All @@ -115,7 +115,7 @@ func (c *Client) SubscribeTransfers(pos string, filter *subscriptions.TransferFi
queryValues.Add("recipient", filter.Recipient.String())
}
}
conn, err := c.connect("/subscriptions/transfer", queryValues)
conn, _, err := c.Connect("/subscriptions/transfer", queryValues)
if err != nil {
return nil, fmt.Errorf("unable to connect - %w", err)
}
Expand All @@ -131,7 +131,7 @@ func (c *Client) SubscribeTxPool(txID *thor.Bytes32) (*common.Subscription[*subs
queryValues.Add("id", txID.String())
}

conn, err := c.connect("/subscriptions/txpool", queryValues)
conn, _, err := c.Connect("/subscriptions/txpool", queryValues)
if err != nil {
return nil, fmt.Errorf("unable to connect - %w", err)
}
Expand All @@ -144,7 +144,7 @@ func (c *Client) SubscribeTxPool(txID *thor.Bytes32) (*common.Subscription[*subs
func (c *Client) SubscribeBeats2(pos string) (*common.Subscription[*subscriptions.Beat2Message], error) {
queryValues := &url.Values{}
queryValues.Add("pos", pos)
conn, err := c.connect("/subscriptions/beat2", queryValues)
conn, _, err := c.Connect("/subscriptions/beat2", queryValues)
if err != nil {
return nil, fmt.Errorf("unable to connect - %w", err)
}
Expand Down Expand Up @@ -198,19 +198,19 @@ func subscribe[T any](conn *websocket.Conn) *common.Subscription[*T] {
}
}

// connect establishes a WebSocket connection to the specified endpoint and query.
// Connect establishes a WebSocket connection to the specified endpoint and query.
// It returns the connection or an error if the connection fails.
func (c *Client) connect(endpoint string, queryValues *url.Values) (*websocket.Conn, error) {
func (c *Client) Connect(endpoint string, queryValues *url.Values) (*websocket.Conn, int, error) {
u := url.URL{
Scheme: c.scheme,
Host: c.host,
Path: endpoint,
RawQuery: queryValues.Encode(),
}

conn, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
conn, res, err := websocket.DefaultDialer.Dial(u.String(), nil)
if err != nil {
return nil, err
return nil, res.StatusCode, err
}

conn.SetPingHandler(func(payload string) error {
Expand All @@ -220,5 +220,5 @@ func (c *Client) connect(endpoint string, queryValues *url.Values) (*websocket.C
return nil
})
// TODO append to the connection pool
return conn, nil
return conn, res.StatusCode, nil
}
Loading