mirror of
https://github.com/d0zingcat/gocryptotrader.git
synced 2026-06-06 15:10:59 +00:00
websocket/gateio: Add request functions for websocket multi-connection [SPOT] (#1598)
* 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 * stream match update * update tests * linter: fix * glorious: nits + handle context cancellations * 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. * glorious: whooops * gk: nits * Leak issue and edge case * Websocket: Add SendMessageReturnResponses * whooooooopsie * gk: nitssssss * Update exchanges/stream/stream_match.go Co-authored-by: Gareth Kirwan <gbjkirwan@gmail.com> * Update exchanges/stream/stream_match_test.go Co-authored-by: Gareth Kirwan <gbjkirwan@gmail.com> * linter: appease the linter gods * gk: nits * gk: drain brain * started * more changes before merge match pr * gateio: still building out * gateio: finish spot * fix up tests in gateio * Add tests for stream package * rm unused field * glorious: nits * rn files, specifically set function names to asset and offload routing to websocket type. * linter: fix * glorious: nits * add counter and update gateio * fix collision issue * 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 * upgrade to upstream merge * 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 * dont need to make consecutive Unix() calls * websocket: fix potential panic on error and no responses and adding waitForResponses * rm json parser and handle in json package instead * linter: fix * linter: fix again * * change field name OutboundRequestSignature to WrapperDefinedConnectionSignature for agnostic inbound and outbound connections. * change method name GetOutboundConnection to GetConnection for agnostic inbound and outbound connections. * drop outbound field map for improved performance just using a range and field check (less complex as well) * change field name connections to connectionToWrapper for better clarity * spells and magic and wands * glorious: nits * comparable check for signature * mv err var * glorious: nits and stuff * attempt to fix race * glorious: nits * gk: nits; engine log cleanup * gk: nits; OCD * gk: nits; move function change file names * gk: nits; 🚀 * gk: nits; convert variadic function and message inspection to interface and include a specific function for that handling so as to not need nil on every call * gk: nits; continued * gk: engine nits; rm loaded exchange * gk: nits; drop WebsocketLoginResponse * stream: Add match method EnsureMatchWithData * gk: nits; rn Inspect to IsFinal * gk: nits; rn to MessageFilter * linter: fix * gateio: update rate limit definitions (cherry-pick) * Add test and missing * Shared REST rate limit definitions with Websocket service, set lookup item to nil for systems that do not require rate limiting; add glorious nit * integrate rate limits for websocket trading spot * bitstamp: fix issue * glorious: nits * ch name and commentary * fix bug add test * rm a thing * fix test * Update engine/engine.go Co-authored-by: Adrian Gallagher <adrian.gallagher@thrasher.io> * thrasher: nits * Update exchanges/stream/stream_match_test.go Co-authored-by: Adrian Gallagher <adrian.gallagher@thrasher.io> * Update exchanges/stream/stream_match_test.go Co-authored-by: Adrian Gallagher <adrian.gallagher@thrasher.io> * GK: nits rn websocket functions * explicit function names for single to multi outbound orders * linter: fix --------- Co-authored-by: shazbert <ryan.oharareid@thrasher.io> Co-authored-by: Gareth Kirwan <gbjkirwan@gmail.com> Co-authored-by: Scott <gloriousCode@users.noreply.github.com> Co-authored-by: Adrian Gallagher <adrian.gallagher@thrasher.io>
This commit is contained in:
@@ -223,13 +223,16 @@ func TestConnectionMessageErrors(t *testing.T) {
|
||||
assert.ErrorIs(t, err, errNoPendingConnections, "Connect should error correctly")
|
||||
|
||||
ws.useMultiConnectionManagement = true
|
||||
ws.SetCanUseAuthenticatedEndpoints(true)
|
||||
|
||||
mock := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { mockws.WsMockUpgrader(t, w, r, mockws.EchoHandler) }))
|
||||
defer mock.Close()
|
||||
ws.connectionManager = []ConnectionWrapper{{Setup: &ConnectionSetup{URL: "ws" + mock.URL[len("http"):] + "/ws"}}}
|
||||
ws.connectionManager = []*ConnectionWrapper{{Setup: &ConnectionSetup{URL: "ws" + mock.URL[len("http"):] + "/ws"}}}
|
||||
err = ws.Connect()
|
||||
require.ErrorIs(t, err, errWebsocketSubscriptionsGeneratorUnset)
|
||||
|
||||
ws.connectionManager[0].Setup.Authenticate = func(context.Context, Connection) error { return errDastardlyReason }
|
||||
|
||||
ws.connectionManager[0].Setup.GenerateSubscriptions = func() (subscription.List, error) {
|
||||
return nil, errDastardlyReason
|
||||
}
|
||||
@@ -371,7 +374,7 @@ func TestWebsocket(t *testing.T) {
|
||||
|
||||
ws.useMultiConnectionManagement = true
|
||||
|
||||
ws.connectionManager = []ConnectionWrapper{{Setup: &ConnectionSetup{URL: "ws://demos.kaazing.com/echo"}, Connection: &WebsocketConnection{}}}
|
||||
ws.connectionManager = []*ConnectionWrapper{{Setup: &ConnectionSetup{URL: "ws://demos.kaazing.com/echo"}, Connection: &WebsocketConnection{}}}
|
||||
err = ws.SetProxyAddress("https://192.168.0.1:1337")
|
||||
require.NoError(t, err)
|
||||
}
|
||||
@@ -464,7 +467,7 @@ func TestSubscribeUnsubscribe(t *testing.T) {
|
||||
|
||||
amazingConn := multi.getConnectionFromSetup(amazingCandidate)
|
||||
multi.connections = map[Connection]*ConnectionWrapper{
|
||||
amazingConn: &multi.connectionManager[0],
|
||||
amazingConn: multi.connectionManager[0],
|
||||
}
|
||||
|
||||
subs, err = amazingCandidate.GenerateSubscriptions()
|
||||
@@ -761,8 +764,43 @@ func TestSendMessageReturnResponse(t *testing.T) {
|
||||
wc.ResponseMaxLimit = 1
|
||||
_, err = wc.SendMessageReturnResponse(context.Background(), request.Unset, "123", req)
|
||||
assert.ErrorIs(t, err, ErrSignatureTimeout, "SendMessageReturnResponse should error when request ID not found")
|
||||
|
||||
_, err = wc.SendMessageReturnResponsesWithInspector(context.Background(), request.Unset, "123", req, 1, inspection{})
|
||||
assert.ErrorIs(t, err, ErrSignatureTimeout, "SendMessageReturnResponse should error when request ID not found")
|
||||
}
|
||||
|
||||
func TestWaitForResponses(t *testing.T) {
|
||||
t.Parallel()
|
||||
dummy := &WebsocketConnection{
|
||||
ResponseMaxLimit: time.Nanosecond,
|
||||
Match: NewMatch(),
|
||||
}
|
||||
_, err := dummy.waitForResponses(context.Background(), "silly", nil, 1, inspection{})
|
||||
require.ErrorIs(t, err, ErrSignatureTimeout)
|
||||
|
||||
dummy.ResponseMaxLimit = time.Second
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
cancel()
|
||||
_, err = dummy.waitForResponses(ctx, "silly", nil, 1, inspection{})
|
||||
require.ErrorIs(t, err, context.Canceled)
|
||||
|
||||
// test break early and hit verbose path
|
||||
ch := make(chan []byte, 1)
|
||||
ch <- []byte("hello")
|
||||
ctx = request.WithVerbose(context.Background())
|
||||
|
||||
got, err := dummy.waitForResponses(ctx, "silly", ch, 2, inspection{breakEarly: true})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, got, 1)
|
||||
assert.Equal(t, "hello", string(got[0]))
|
||||
}
|
||||
|
||||
type inspection struct {
|
||||
breakEarly bool
|
||||
}
|
||||
|
||||
func (i inspection) IsFinal([]byte) bool { return i.breakEarly }
|
||||
|
||||
type reporter struct {
|
||||
name string
|
||||
msg []byte
|
||||
@@ -1229,6 +1267,11 @@ func TestSetupNewConnection(t *testing.T) {
|
||||
require.ErrorIs(t, err, errWebsocketDataHandlerUnset)
|
||||
|
||||
connSetup.Handler = func(context.Context, []byte) error { return nil }
|
||||
connSetup.MessageFilter = []string{"slices are super naughty and not comparable"}
|
||||
err = multi.SetupNewConnection(connSetup)
|
||||
require.ErrorIs(t, err, errMessageFilterNotComparable)
|
||||
|
||||
connSetup.MessageFilter = "comparable string signature"
|
||||
err = multi.SetupNewConnection(connSetup)
|
||||
require.NoError(t, err)
|
||||
|
||||
@@ -1484,3 +1527,42 @@ func TestMonitorTraffic(t *testing.T) {
|
||||
ws.TrafficAlert <- struct{}{}
|
||||
require.False(t, innerShell())
|
||||
}
|
||||
|
||||
func TestGetConnection(t *testing.T) {
|
||||
t.Parallel()
|
||||
var ws *Websocket
|
||||
_, err := ws.GetConnection(nil)
|
||||
require.ErrorIs(t, err, common.ErrNilPointer)
|
||||
|
||||
ws = &Websocket{}
|
||||
|
||||
_, err = ws.GetConnection(nil)
|
||||
require.ErrorIs(t, err, errMessageFilterNotSet)
|
||||
|
||||
_, err = ws.GetConnection("testURL")
|
||||
require.ErrorIs(t, err, errCannotObtainOutboundConnection)
|
||||
|
||||
ws.useMultiConnectionManagement = true
|
||||
|
||||
_, err = ws.GetConnection("testURL")
|
||||
require.ErrorIs(t, err, ErrNotConnected)
|
||||
|
||||
ws.setState(connectedState)
|
||||
|
||||
_, err = ws.GetConnection("testURL")
|
||||
require.ErrorIs(t, err, ErrRequestRouteNotFound)
|
||||
|
||||
ws.connectionManager = []*ConnectionWrapper{{
|
||||
Setup: &ConnectionSetup{MessageFilter: "testURL", URL: "testURL"},
|
||||
}}
|
||||
|
||||
_, err = ws.GetConnection("testURL")
|
||||
require.ErrorIs(t, err, ErrNotConnected)
|
||||
|
||||
expected := &WebsocketConnection{}
|
||||
ws.connectionManager[0].Connection = expected
|
||||
|
||||
conn, err := ws.GetConnection("testURL")
|
||||
require.NoError(t, err)
|
||||
assert.Same(t, expected, conn)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user