d0zingcat/gocryptotrader
1
0
Fork 0
mirror of https://github.com/d0zingcat/gocryptotrader.git synced 2026-05-29 23:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

websocket/gateio: Support multi connection management and integrate with GateIO (#1580)

Browse Source 
* gateio: Add multi asset websocket support WIP.

* meow

* Add tests and shenanigans

* integrate flushing and for enabling/disabling pairs from rpc shenanigans

* some changes

* linter: fixes strikes again.

* Change name ConnectionAssociation -> ConnectionCandidate for better clarity on purpose. Change connections map to point to candidate to track subscriptions for future dynamic connections holder and drop struct ConnectionDetails.

* Add subscription tests (state functional)

* glorious:nits + proxy handling

* Spelling

* linter: fixerino

* instead of nil, dont do nil.

* clean up nils

* cya nils

* don't need to set URL or check if its running

* stop ping handler routine leak

* * Fix bug where reader routine on error that is not a disconnection error but websocket frame error or anything really makes the reader routine return and then connection never cycles and the buffer gets filled.
* Handle reconnection via an errors.Is check which is simpler and in that scope allow for quick disconnect reconnect without waiting for connection cycle.
* Dial now uses code from DialContext but just calls context.Background()
* Don't allow reader to return on parse binary response error. Just output error and return a non nil response

* Allow rollback on connect on any error across all connections

* fix shadow jutsu

* glorious/gk: nitters - adds in ws mock server

* linter: fix

* fix deadlock on connection as the previous channel had no reader and would hang connection reader for eternity.

* gk: nits

* Leak issue and edge case

* gk: nits

* gk: drain brain

* glorious: nits

* Update exchanges/stream/websocket.go

Co-authored-by: Scott <gloriousCode@users.noreply.github.com>

* glorious: nits

* add tests

* linter: fix

* After merge

* Add error connection info

* Fix edge case where it does not reconnect made by an already closed connection

* stream coverage

* glorious: nits

* glorious: nits removed asset error handling in stream package

* linter: fix

* rm block

* Add basic readme

* fix asset enabled flush cycle for multi connection

* spella: fix

* linter: fix

* Add glorious suggestions, fix some race thing

* reinstate name before any routine gets spawned

* stop on error in mock tests

* glorious: nits

* glorious: nits found in CI build

* Add test for drain, bumped wait times as there seems to be something happening on macos CI builds, used context.WithTimeout because its instant.

* mutex across shutdown and connect for protection

* lint: fix

* test time withoffset, reinstate stop

* fix whoops

* const trafficCheckInterval; rm testmain

* y

* fix lint

* bump time check window

* stream: fix intermittant test failures while testing routines and remove code that is not needed.

* spells

* cant do what I did

* protect race due to routine.

* update testURL

* use mock websocket connection instead of test URL's

* linter: fix

* remove url because its throwing errors on CI builds

* connections drop all the time, don't need to worry about not being able to echo back ws data as it can be easily reviewed _test file side.

* remove another superfluous url thats not really set up for this

* spawn overwatch routine when there is no errors, inline checker instead of waiting for a time period, add sleep inline with echo handler as this is really quick and wanted to ensure that latency is handing correctly

* linter: fixerino uperino

* glorious: panix

* linter: things

* whoops

* defer lock and use functions that don't require locking in SetProxyAddress

* lint: fix

* thrasher: nits

---------

Co-authored-by: shazbert <ryan.oharareid@thrasher.io>
Co-authored-by: Scott <gloriousCode@users.noreply.github.com>
This commit is contained in:
Ryan O'Hara-Reid
2024-10-10 15:09:52 +11:00
committed by GitHub
parent c2dfb37efd
commit ac731ce283
58 changed files with 1996 additions and 1475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
exchanges/kraken/kraken_test.go
View File

@@ -29,6 +29,7 @@ import (
"github.com/thrasher-corp/gocryptotrader/exchanges/ticker"
testexch "github.com/thrasher-corp/gocryptotrader/internal/testing/exchange"
testsubs "github.com/thrasher-corp/gocryptotrader/internal/testing/subscriptions"
mockws "github.com/thrasher-corp/gocryptotrader/internal/testing/websocket"
"github.com/thrasher-corp/gocryptotrader/portfolio/withdraw"
)
@@ -1029,7 +1030,7 @@ func TestWsResubscribe(t *testing.T) {
err = subs[0].SetState(subscription.UnsubscribingState)
require.NoError(t, err)
err = k.Websocket.ResubscribeToChannel(subs[0])
err = k.Websocket.ResubscribeToChannel(k.Websocket.Conn, subs[0])
require.NoError(t, err, "Resubscribe must not error")
require.Equal(t, subscription.SubscribedState, subs[0].State(), "subscription must be subscribed again")
}
@@ -1209,7 +1210,7 @@ func TestWsHandleData(t *testing.T) {
k := new(Kraken) //nolint:govet // Intentional shadow to avoid future copy/paste mistakes
require.NoError(t, testexch.Setup(k), "Setup Instance must not error")
for _, l := range []int{10, 100} {
err := k.Websocket.AddSuccessfulSubscriptions(&subscription.Subscription{
err := k.Websocket.AddSuccessfulSubscriptions(k.Websocket.Conn, &subscription.Subscription{
Channel: subscription.OrderbookChannel,
Pairs: currency.Pairs{spotTestPair},
Asset: asset.Spot,
@@ -1439,7 +1440,7 @@ func TestWsOrderbookMax10Depth(t *testing.T) {
currency.NewPairWithDelimiter("GST", "EUR", "/"),
}
for _, p := range pairs {
err := k.Websocket.AddSuccessfulSubscriptions(&subscription.Subscription{
err := k.Websocket.AddSuccessfulSubscriptions(k.Websocket.Conn, &subscription.Subscription{
Channel: subscription.OrderbookChannel,
Pairs: currency.Pairs{p},
Asset: asset.Spot,
@@ -1569,7 +1570,7 @@ func TestGetOpenInterest(t *testing.T) {
}
// curryWsMockUpgrader handles Kraken specific http auth token responses prior to handling off to standard Websocket upgrader
func curryWsMockUpgrader(tb testing.TB, h testexch.WsMockFunc) http.HandlerFunc {
func curryWsMockUpgrader(tb testing.TB, h mockws.WsMockFunc) http.HandlerFunc {
tb.Helper()
return func(w http.ResponseWriter, r *http.Request) {
if strings.Contains(r.URL.Path, "GetWebSocketsToken") {
@@ -1577,7 +1578,7 @@ func curryWsMockUpgrader(tb testing.TB, h testexch.WsMockFunc) http.HandlerFunc
assert.NoError(tb, err, "Write should not error")
return
}
testexch.WsMockUpgrader(tb, w, r, h)
mockws.WsMockUpgrader(tb, w, r, h)
}
}

8
exchanges/kraken/kraken_websocket.go
View File

@@ -628,7 +628,7 @@ func (k *Kraken) wsProcessOrderBook(c string, response []any, pair currency.Pair
if errors.Is(err, errInvalidChecksum) {
log.Debugf(log.Global, "%s Resubscribing to invalid %s orderbook", k.Name, pair)
go func() {
if e2 := k.Websocket.ResubscribeToChannel(s); e2 != nil && !errors.Is(e2, subscription.ErrInStateAlready) {
if e2 := k.Websocket.ResubscribeToChannel(k.Websocket.Conn, s); e2 != nil && !errors.Is(e2, subscription.ErrInStateAlready) {
log.Errorf(log.ExchangeSys, "%s resubscription failure for %v: %v", k.Name, pair, e2)
}
}()
@@ -981,7 +981,7 @@ func (k *Kraken) Subscribe(in subscription.List) error {
subs := subscription.List{}
for _, s := range in {
if s.State() != subscription.ResubscribingState {
if err := k.Websocket.AddSubscriptions(s); err != nil {
if err := k.Websocket.AddSubscriptions(k.Websocket.Conn, s); err != nil {
errs = common.AppendError(errs, fmt.Errorf("%w; Channel: %s Pairs: %s", err, s.Channel, s.Pairs.Join()))
continue
}
@@ -999,7 +999,7 @@ func (k *Kraken) Subscribe(in subscription.List) error {
for _, s := range subs {
if s.State() != subscription.SubscribedState {
_ = s.SetState(subscription.InactiveState)
if err := k.Websocket.RemoveSubscriptions(s); err != nil {
if err := k.Websocket.RemoveSubscriptions(k.Websocket.Conn, s); err != nil {
errs = common.AppendError(errs, fmt.Errorf("error removing failed subscription: %w; Channel: %s Pairs: %s", err, s.Channel, s.Pairs.Join()))
}
}
@@ -1215,7 +1215,7 @@ func (k *Kraken) wsProcessSubStatus(resp []byte) {
if status == krakenWsSubscribed {
err = s.SetState(subscription.SubscribedState)
} else if s.State() != subscription.ResubscribingState { // Do not remove a resubscribing sub which just unsubbed
err = k.Websocket.RemoveSubscriptions(s)
err = k.Websocket.RemoveSubscriptions(k.Websocket.Conn, s)
if e2 := s.SetState(subscription.UnsubscribedState); e2 != nil {
err = common.AppendError(err, e2)
}

4
exchanges/kraken/kraken_wrapper.go
View File

@@ -228,7 +228,7 @@ func (k *Kraken) Setup(exch *config.Exchange) error {
return err
}
err = k.Websocket.SetupNewConnection(stream.ConnectionSetup{
err = k.Websocket.SetupNewConnection(&stream.ConnectionSetup{
RateLimit: request.NewWeightedRateLimitByDuration(50 * time.Millisecond),
ResponseCheckTimeout: exch.WebsocketResponseCheckTimeout,
ResponseMaxLimit: exch.WebsocketResponseMaxLimit,
@@ -241,7 +241,7 @@ func (k *Kraken) Setup(exch *config.Exchange) error {
if err != nil {
return err
}
return k.Websocket.SetupNewConnection(stream.ConnectionSetup{
return k.Websocket.SetupNewConnection(&stream.ConnectionSetup{
RateLimit: request.NewWeightedRateLimitByDuration(50 * time.Millisecond),
ResponseCheckTimeout: exch.WebsocketResponseCheckTimeout,
ResponseMaxLimit: exch.WebsocketResponseMaxLimit,