d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-06-05 15:10:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Websocket: Restructure files and types (#1859)

Browse Source 
* Websocket: Rename stream package

* Websocket: Rename Websocket to Manager

* Websocket: Replace explicit errs with common.NilGuard

* Websocket: Move websocket_types.go to types.go

* Websocket: Minor field comment and alignment in types

* Webosocket: Rename WebsocketConnection to Connection

* Alphapoint: Make gorilla ws import explicit

Just to avoid confusion with our own packages.

* Websocket: Move stream_match to match

* Websocket: Move websocket_connection to connection

* Websocket: Move websocket.go to manager.go

* Websocket: Break out all subscription methods into subscriptions.go

* Websocket: Move connection type into its file

* Websocket: Remove PositionUpdated

Type is not used anywhere

* Kraken: Use local constant for pong

Was the only use of websocket.Pong and doesn't really feel right to
represent kraken's api resp in one of our packages

* Websocket: Move connection sub-types to connection package

* Websocket: Move manager types into manager

* Websocket: Move ConnectionWrapper into manager

* Websocket: Move websocket_test to manager_test

* Websocket: Privatise connectionWrapper

* Websocket: Remaining types into types.go

These really belong somewhere else mostly, but this will do for now

* Websocket: Tidy up connection method vars

* Gofumpt: Moving package imports around

* Websocket: Rename errDuplicateConnectionSetup

* Websocket: Fix duplicate import of gws

* Websocket: Fix gofumpt -extra

* Websocket: Standardise import of gws across other pkgs

* Kraken: Remove unused sub conf consts

These were replaced by the generic Levels and Depth fields on all subs

* Websocket: Privitise ConnectioWrapper fields

* Websocket: inline single use var WebsocketNotAuthenticatedUsingRest

* Websocket: Move documentation to template

* Bithumb: Assertify TestWsHandleData
This commit is contained in:
Gareth Kirwan
2025-04-10 08:25:02 +02:00
committed by GitHub
parent 676b2e0367
commit b4e45e9a1b
119 changed files with 3169 additions and 3056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
exchanges/binanceus/binanceus.go
View File

@@ -1852,7 +1852,7 @@ func (bi *Binanceus) SendAuthHTTPRequest(ctx context.Context, ePath exchange.URL
// GetWsAuthStreamKey this method 'Creates User Data Stream' will retrieve a key to use for authorised WS streaming
// Same as that of Binance
// Start a new user data stream. The stream will close after 60 minutes unless a keepalive is sent.
// Start a new user data websocket. The stream will close after 60 minutes unless a keepalive is sent.
// If the account has an active listenKey,
// that listenKey will be returned and its validity will be extended for 60 minutes.
func (bi *Binanceus) GetWsAuthStreamKey(ctx context.Context) (string, error) {
@@ -1928,7 +1928,7 @@ func (bi *Binanceus) MaintainWsAuthStreamKey(ctx context.Context) error {
}, request.AuthenticatedRequest)
}
// CloseUserDataStream Close out a user data stream.
// CloseUserDataStream Close out a user data websocket.
func (bi *Binanceus) CloseUserDataStream(ctx context.Context) error {
endpointPath, err := bi.API.Endpoints.GetURL(exchange.RestSpotSupplementary)
if err != nil {

18
exchanges/binanceus/binanceus_websocket.go
View File

@@ -9,17 +9,17 @@ import (
"strings"
"time"
"github.com/gorilla/websocket"
gws "github.com/gorilla/websocket"
"github.com/thrasher-corp/gocryptotrader/currency"
"github.com/thrasher-corp/gocryptotrader/encoding/json"
"github.com/thrasher-corp/gocryptotrader/exchanges/asset"
"github.com/thrasher-corp/gocryptotrader/exchanges/order"
"github.com/thrasher-corp/gocryptotrader/exchanges/orderbook"
"github.com/thrasher-corp/gocryptotrader/exchanges/request"
"github.com/thrasher-corp/gocryptotrader/exchanges/stream"
"github.com/thrasher-corp/gocryptotrader/exchanges/subscription"
"github.com/thrasher-corp/gocryptotrader/exchanges/ticker"
"github.com/thrasher-corp/gocryptotrader/exchanges/trade"
"github.com/thrasher-corp/gocryptotrader/internal/exchange/websocket"
"github.com/thrasher-corp/gocryptotrader/log"
)
@@ -46,9 +46,9 @@ var (
// WsConnect initiates a websocket connection
func (bi *Binanceus) WsConnect() error {
if !bi.Websocket.IsEnabled() || !bi.IsEnabled() {
return stream.ErrWebsocketNotEnabled
return websocket.ErrWebsocketNotEnabled
}
var dialer websocket.Dialer
var dialer gws.Dialer
dialer.HandshakeTimeout = bi.Config.HTTPTimeout
dialer.Proxy = http.ProxyFromEnvironment
var err error
@@ -82,9 +82,9 @@ func (bi *Binanceus) WsConnect() error {
go bi.KeepAuthKeyAlive()
}
bi.Websocket.Conn.SetupPingHandler(request.Unset, stream.PingHandler{
bi.Websocket.Conn.SetupPingHandler(request.Unset, websocket.PingHandler{
UseGorillaHandler: true,
MessageType: websocket.PongMessage,
MessageType: gws.PongMessage,
Delay: pingDelay,
})
@@ -400,7 +400,7 @@ func (bi *Binanceus) wsHandleData(respRaw []byte) error {
return err
}
bi.Websocket.DataHandler <- stream.KlineData{
bi.Websocket.DataHandler <- websocket.KlineData{
Timestamp: kline.EventTime,
Pair: pair,
AssetType: asset.Spot,
@@ -465,8 +465,8 @@ func (bi *Binanceus) wsHandleData(respRaw []byte) error {
bi.Websocket.DataHandler <- agg
return nil
default:
bi.Websocket.DataHandler <- stream.UnhandledMessageWarning{
Message: bi.Name + stream.UnhandledMessage + string(respRaw),
bi.Websocket.DataHandler <- websocket.UnhandledMessageWarning{
Message: bi.Name + websocket.UnhandledMessage + string(respRaw),
}
}
}

10
exchanges/binanceus/binanceus_wrapper.go
View File

@@ -22,10 +22,10 @@ import (
"github.com/thrasher-corp/gocryptotrader/exchanges/orderbook"
"github.com/thrasher-corp/gocryptotrader/exchanges/protocol"
"github.com/thrasher-corp/gocryptotrader/exchanges/request"
"github.com/thrasher-corp/gocryptotrader/exchanges/stream"
"github.com/thrasher-corp/gocryptotrader/exchanges/stream/buffer"
"github.com/thrasher-corp/gocryptotrader/exchanges/ticker"
"github.com/thrasher-corp/gocryptotrader/exchanges/trade"
"github.com/thrasher-corp/gocryptotrader/internal/exchange/websocket"
"github.com/thrasher-corp/gocryptotrader/internal/exchange/websocket/buffer"
"github.com/thrasher-corp/gocryptotrader/log"
"github.com/thrasher-corp/gocryptotrader/portfolio/withdraw"
)
@@ -141,7 +141,7 @@ func (bi *Binanceus) SetDefaults() {
"%s setting default endpoints error %v",
bi.Name, err)
}
bi.Websocket = stream.NewWebsocket()
bi.Websocket = websocket.NewManager()
bi.WebsocketResponseMaxLimit = exchange.DefaultWebsocketResponseMaxLimit
bi.WebsocketResponseCheckTimeout = exchange.DefaultWebsocketResponseCheckTimeout
bi.WebsocketOrderbookBufferLimit = exchange.DefaultWebsocketOrderbookBufferLimit
@@ -167,7 +167,7 @@ func (bi *Binanceus) Setup(exch *config.Exchange) error {
return err
}
err = bi.Websocket.Setup(&stream.WebsocketSetup{
err = bi.Websocket.Setup(&websocket.ManagerSetup{
ExchangeConfig: exch,
DefaultURL: binanceusDefaultWebsocketURL,
RunningURL: ePoint,
@@ -186,7 +186,7 @@ func (bi *Binanceus) Setup(exch *config.Exchange) error {
return err
}
return bi.Websocket.SetupNewConnection(&stream.ConnectionSetup{
return bi.Websocket.SetupNewConnection(&websocket.ConnectionSetup{
ResponseCheckTimeout: exch.WebsocketResponseCheckTimeout,
ResponseMaxLimit: exch.WebsocketResponseMaxLimit,
RateLimit: request.NewWeightedRateLimitByDuration(300 * time.Millisecond),