Update

Author: f0cii

futures_ws.go

@@ -28,6 +28,7 @@ type FuturesWS struct {
 	accessKey  string
 	secretKey  string
 	passphrase string
+	debugMode  bool
 
 	ctx    context.Context
 	cancel context.CancelFunc
@@ -235,6 +236,11 @@ func (ws *FuturesWS) run() {
 
 func (ws *FuturesWS) handleMsg(messageType int, msg []byte) {
 	ret := gjson.ParseBytes(msg)
+
+	if ws.debugMode {
+		log.Printf("%v", string(msg))
+	}
+
 	// 登录成功
 	// {"event":"login","success":true}
 
@@ -403,12 +409,13 @@ func (ws *FuturesWS) handleMsg(messageType int, msg []byte) {
 // NewFuturesWS 创建合约WS
 // wsURL:
 // wss://real.okex.com:8443/ws/v3
-func NewFuturesWS(wsURL string, accessKey string, secretKey string, passphrase string) *FuturesWS {
+func NewFuturesWS(wsURL string, accessKey string, secretKey string, passphrase string, debugMode bool) *FuturesWS {
 	ws := &FuturesWS{
 		wsURL:         wsURL,
 		accessKey:     accessKey,
 		secretKey:     secretKey,
 		passphrase:    passphrase,
+		debugMode:     debugMode,
 		subscriptions: make(map[string]interface{}),
 		dobMap:        make(map[string]*DepthOrderBook),
 	}

futures_ws_test.go

@@ -20,13 +20,12 @@ func newFuturesWSForTest() *FuturesWS {
 	wsURL := "wss://real.okex.com:8443/ws/v3"
 
 	ws := NewFuturesWS(wsURL,
-		accessKey, secretKey, passphrase)
+		accessKey, secretKey, passphrase, true)
 	err = ws.SetProxy("socks5://127.0.0.1:1080")
-	ws.SetProxy("socks5://127.0.0.1:1080")
 	//ws.SetProxy("http://127.0.0.1:1080")
-	//if err != nil {
-	//	log.Fatal(err)
-	//}
+	if err != nil {
+		log.Fatal(err)
+	}
 	return ws
 }
 
@@ -59,3 +58,14 @@ func TestFuturesWS_Depth20(t *testing.T) {
 
 	select {}
 }
+
+func TestFuturesWS_SubscribeOrder(t *testing.T) {
+	ws := newFuturesWSForTest()
+	ws.SetOrderCallback(func(orders []WSOrder) {
+		log.Printf("%#v", orders)
+	})
+	ws.SubscribeOrder("order_1", "BTC-USD-200626")
+	ws.Start()
+
+	select {}
+}

go.sum

@@ -118,6 +118,7 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=

swap_ws.go

@@ -28,6 +28,7 @@ type SwapWS struct {
 	accessKey  string
 	secretKey  string
 	passphrase string
+	debugMode  bool
 
 	ctx    context.Context
 	cancel context.CancelFunc
@@ -384,12 +385,13 @@ func (ws *SwapWS) handleMsg(messageType int, msg []byte) {
 // NewSwapWS 创建永续合约WS
 // wsURL:
 // wss://real.okex.com:8443/ws/v3
-func NewSwapWS(wsURL string, accessKey string, secretKey string, passphrase string) *SwapWS {
+func NewSwapWS(wsURL string, accessKey string, secretKey string, passphrase string, debugMode bool) *SwapWS {
 	ws := &SwapWS{
 		wsURL:         wsURL,
 		accessKey:     accessKey,
 		secretKey:     secretKey,
 		passphrase:    passphrase,
+		debugMode:     debugMode,
 		subscriptions: make(map[string]interface{}),
 		dobMap:        make(map[string]*DepthOrderBook),
 	}

swap_ws_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 )
 
-func newSwapWSForTest() *FuturesWS {
+func newSwapWSForTest() *SwapWS {
 	viper.SetConfigName("test_config")
 	viper.AddConfigPath("./conf")
 	err := viper.ReadInConfig()
@@ -18,7 +18,7 @@ func newSwapWSForTest() *FuturesWS {
 	secretKey := viper.GetString("secret_key")
 	passphrase := viper.GetString("passphrase")
 	wsURL := "wss://real.okex.com:8443/ws/v3"
-	ws := NewFuturesWS(wsURL, accessKey, secretKey, passphrase)
+	ws := NewSwapWS(wsURL, accessKey, secretKey, passphrase, true)
 	err = ws.SetProxy("socks5://127.0.0.1:1080")
 	////ws.SetProxy("http://127.0.0.1:1080")
 	if err != nil {