d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-06-05 07:26:47 +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

20
exchanges/deribit/deribit_websocket.go
View File

@@ -10,7 +10,7 @@ import (
"text/template"
"time"
"github.com/gorilla/websocket"
gws "github.com/gorilla/websocket"
"github.com/thrasher-corp/gocryptotrader/common"
"github.com/thrasher-corp/gocryptotrader/common/crypto"
"github.com/thrasher-corp/gocryptotrader/currency"
@@ -21,10 +21,10 @@ import (
"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"
)
@@ -124,9 +124,9 @@ var (
// WsConnect starts a new connection with the websocket API
func (d *Deribit) WsConnect() error {
if !d.Websocket.IsEnabled() || !d.IsEnabled() {
return stream.ErrWebsocketNotEnabled
return websocket.ErrWebsocketNotEnabled
}
var dialer websocket.Dialer
var dialer gws.Dialer
err := d.Websocket.Conn.Dial(&dialer, http.Header{})
if err != nil {
return err
@@ -299,8 +299,8 @@ func (d *Deribit) wsHandleData(respRaw []byte) error {
case "trades":
return d.processTrades(respRaw, channels)
default:
d.Websocket.DataHandler <- stream.UnhandledMessageWarning{
Message: d.Name + stream.UnhandledMessage + string(respRaw),
d.Websocket.DataHandler <- websocket.UnhandledMessageWarning{
Message: d.Name + websocket.UnhandledMessage + string(respRaw),
}
return nil
}
@@ -312,8 +312,8 @@ func (d *Deribit) wsHandleData(respRaw []byte) error {
return nil
}
default:
d.Websocket.DataHandler <- stream.UnhandledMessageWarning{
Message: d.Name + stream.UnhandledMessage + string(respRaw),
d.Websocket.DataHandler <- websocket.UnhandledMessageWarning{
Message: d.Name + websocket.UnhandledMessage + string(respRaw),
}
return nil
}
@@ -626,7 +626,7 @@ func (d *Deribit) processCandleChart(respRaw []byte, channels []string) error {
if err != nil {
return err
}
d.Websocket.DataHandler <- stream.KlineData{
d.Websocket.DataHandler <- websocket.KlineData{
Timestamp: time.UnixMilli(candleData.Tick),
Pair: cp,
AssetType: a,
@@ -839,7 +839,7 @@ func (d *Deribit) handleSubscription(method string, subs subscription.List) erro
subAck[c] = true
}
if len(subAck) != len(subs) {
err = stream.ErrSubscriptionFailure
err = websocket.ErrSubscriptionFailure
}
for _, s := range subs {
if _, ok := subAck[s.QualifiedChannel]; ok {

10
exchanges/deribit/deribit_wrapper.go
View File

@@ -25,10 +25,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"
)
@@ -150,7 +150,7 @@ func (d *Deribit) SetDefaults() {
if err != nil {
log.Errorln(log.ExchangeSys, err)
}
d.Websocket = stream.NewWebsocket()
d.Websocket = websocket.NewManager()
d.WebsocketResponseMaxLimit = exchange.DefaultWebsocketResponseMaxLimit
d.WebsocketResponseCheckTimeout = exchange.DefaultWebsocketResponseCheckTimeout
d.WebsocketOrderbookBufferLimit = exchange.DefaultWebsocketOrderbookBufferLimit
@@ -170,7 +170,7 @@ func (d *Deribit) Setup(exch *config.Exchange) error {
if err != nil {
return err
}
err = d.Websocket.Setup(&stream.WebsocketSetup{
err = d.Websocket.Setup(&websocket.ManagerSetup{
ExchangeConfig: exch,
DefaultURL: deribitWebsocketAddress,
RunningURL: deribitWebsocketAddress,
@@ -188,7 +188,7 @@ func (d *Deribit) Setup(exch *config.Exchange) error {
return err
}
return d.Websocket.SetupNewConnection(&stream.ConnectionSetup{
return d.Websocket.SetupNewConnection(&websocket.ConnectionSetup{
URL: d.Websocket.GetWebsocketURL(),
ResponseCheckTimeout: exch.WebsocketResponseCheckTimeout,
ResponseMaxLimit: exch.WebsocketResponseMaxLimit,

2
exchanges/deribit/deribit_ws_endpoints.go
View File

@@ -2319,7 +2319,7 @@ func (d *Deribit) WSMovePositions(ccy currency.Code, sourceSubAccountUID, target
return resp, d.SendWSRequest(nonMatchingEPL, movePositions, input, &resp, true)
}
// WsSimulateBlockTrade checks if a block trade can be executed through the websocket stream.
// WsSimulateBlockTrade checks if a block trade can be executed through the websocket
func (d *Deribit) WsSimulateBlockTrade(role string, trades []BlockTradeParam) (bool, error) {
if role != roleMaker && role != roleTaker {
return false, errInvalidTradeRole