Merge pull request #7 from atiklabs/master

Fixes, ReplaceStopOrder, FullUrl, Deprecated endpoints

examples/rest/main.go

@@ -9,10 +9,10 @@ func main() {
 	//baseURL := "https://api.bybit.com/"	// 主网络
 	baseURL := "https://api-testnet.bybit.com/" // 测试网络
 	b := rest.New(nil,
-		baseURL, "YIxOY2RhFkylPudq96", "Bg9G2oFOb3aaIMguD3FOvOJJVBycaoXqXNcI")
+		baseURL, "YIxOY2RhFkylPudq96", "Bg9G2oFOb3aaIMguD3FOvOJJVBycaoXqXNcI", true)
 
 	// 获取持仓
-	positions, err := b.GetPositions()
+	_, positions, err := b.GetPositions()
 	if err != nil {
 		log.Printf("%v", err)
 		return
@@ -27,9 +27,7 @@ func main() {
 	qty := 30
 	price := 7000.0
 	timeInForce := "GoodTillCancel"
-	reduceOnly := false
-	order, err := b.CreateOrder(side,
-		orderType, price, qty, timeInForce, reduceOnly, symbol)
+	_, order, err := b.CreateOrder(side, orderType, price, qty, timeInForce, 0, 0, false, false, "", symbol)
 	if err != nil {
 		log.Println(err)
 		return

go.mod

@@ -5,6 +5,7 @@ go 1.13
 require (
 	github.com/chuckpreslar/emission v0.0.0-20170206194824-a7ddd980baf9
 	github.com/gorilla/websocket v1.4.2
+	github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7
 	github.com/json-iterator/go v1.1.9
 	github.com/recws-org/recws v1.2.1
 	github.com/stretchr/testify v1.5.1

go.sum

@@ -23,12 +23,8 @@ github.com/recws-org/recws v1.2.1 h1:bYocRkAsS71hlQ9AMCVS+hYXHEgEyQsAbYKXf394gZ8
 github.com/recws-org/recws v1.2.1/go.mod h1:SxTgwQU/jqYSzEgUh4ifDxq/7enApS150f8nZ5Sczk8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 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/tidwall/gjson v1.3.5 h1:2oW9FBNu8qt9jy5URgrzsVx/T/KSn3qn/smJQ0crlDQ=
-github.com/tidwall/gjson v1.3.5/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
 github.com/tidwall/gjson v1.6.0 h1:9VEQWz6LLMUsUl6PueE49ir4Ka6CzLymOAZDxpFsTDc=
 github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
 github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=

recws/keepalive.go

@@ -0,0 +1,25 @@
+package recws
+
+import (
+	"sync"
+	"time"
+)
+
+type keepAliveResponse struct {
+	lastResponse time.Time
+	sync.RWMutex
+}
+
+func (k *keepAliveResponse) setLastResponse() {
+	k.Lock()
+	defer k.Unlock()
+
+	k.lastResponse = time.Now()
+}
+
+func (k *keepAliveResponse) getLastResponse() time.Time {
+	k.RLock()
+	defer k.RUnlock()
+
+	return k.lastResponse
+}