Merge pull request #26 from isther/main

Features

Author: VictorFrWu

account.go

@@ -2,7 +2,6 @@ package bybit_connector
 
 import (
 	"context"
-	"encoding/json"
 	"github.com/wuhewuhe/bybit.go.api/handlers"
 	"net/http"
 )

asset.go

@@ -2,7 +2,6 @@ package bybit_connector
 
 import (
 	"context"
-	"encoding/json"
 	"net/http"
 )
 

broker.go

@@ -2,7 +2,6 @@ package bybit_connector
 
 import (
 	"context"
-	"encoding/json"
 	"github.com/wuhewuhe/bybit.go.api/handlers"
 	"net/http"
 )

bybit_api_client.go

@@ -6,17 +6,21 @@ import (
 	"crypto/hmac"
 	"crypto/sha256"
 	"encoding/hex"
-	"encoding/json"
 	"fmt"
-	"github.com/wuhewuhe/bybit.go.api/handlers"
 	"io"
 	"log"
 	"net/http"
 	"os"
 	"strconv"
 	"time"
+
+	"github.com/bitly/go-simplejson"
+	jsoniter "github.com/json-iterator/go"
+	"github.com/wuhewuhe/bybit.go.api/handlers"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 type ServerResponse struct {
 	RetCode    int         `json:"retCode"`
 	RetMsg     string      `json:"retMsg"`
@@ -77,6 +81,14 @@ func GetCurrentTime() int64 {
 	return timeStamp
 }
 
+func newJSON(data []byte) (j *simplejson.Json, err error) {
+	j, err = simplejson.NewJson(data)
+	if err != nil {
+		return nil, err
+	}
+	return j, nil
+}
+
 // NewBybitHttpClient NewClient Create client function for initialising new Bybit client
 func NewBybitHttpClient(apiKey string, APISecret string, options ...ClientOption) *Client {
 	c := &Client{
@@ -152,6 +164,9 @@ func (c *Client) parseRequest(r *request, opts ...RequestOption) (err error) {
 
 func (c *Client) callAPI(ctx context.Context, r *request, opts ...RequestOption) (data []byte, err error) {
 	err = c.parseRequest(r, opts...)
+	if err != nil {
+		return nil, err
+	}
 	req, err := http.NewRequest(r.method, r.fullURL, r.body)
 	if err != nil {
 		return []byte{}, err
@@ -196,36 +211,79 @@ func (c *Client) callAPI(ctx context.Context, r *request, opts ...RequestOption)
 	return data, nil
 }
 
-// NewMarketKlineService Market Endpoints
-func (c *Client) NewMarketKlineService(klineType, category, symbol, interval string) *Klines {
-	return &Klines{
-		c:         c,
-		category:  category,
-		symbol:    symbol,
-		interval:  interval,
-		klineType: klineType,
-	}
+func (c *Client) NewInstrumentsInfoService() *InstrumentsInfoService {
+	return &InstrumentsInfoService{c: c}
 }
 
-func (c *Client) NewMarketKLinesService(klineType string, params map[string]interface{}) *MarketClient {
-	return &MarketClient{
-		c:         c,
-		klineType: klineType,
-		params:    params,
-	}
+// NewMarketKlineService Market Kline Endpoints
+func (c *Client) NewMarketKlineService() *MarketKlinesService {
+	return &MarketKlinesService{c: c}
 }
 
-func (c *Client) NewMarketInfoServiceNoParams() *MarketClient {
-	return &MarketClient{
-		c: c,
-	}
+// NewMarketMarkPriceKlineService Market Mark Price Kline Endpoints
+func (c *Client) NewMarketMarkPriceKlineService() *MarketMarkPriceKlineService {
+	return &MarketMarkPriceKlineService{c: c}
 }
 
-func (c *Client) NewMarketInfoService(params map[string]interface{}) *MarketClient {
-	return &MarketClient{
-		c:      c,
-		params: params,
-	}
+// NewMarketIndexPriceKlineService Market Index Price Kline Endpoints
+func (c *Client) NewMarketIndexPriceKlineService() *MarketIndexPriceKlineService {
+	return &MarketIndexPriceKlineService{c: c}
+}
+
+// NewMarketPremiumIndexPriceKlineService Market Premium Index Price Kline Endpoints
+func (c *Client) NewMarketPremiumIndexPriceKlineService() *MarketPremiumIndexPriceKlineService {
+	return &MarketPremiumIndexPriceKlineService{c: c}
+}
+
+func (c *Client) NewOrderBookService() *MarketOrderBookService {
+	return &MarketOrderBookService{c: c}
+}
+
+func (c *Client) NewTickersService() *MarketTickersService {
+	return &MarketTickersService{c: c}
+}
+
+func (c *Client) NewFundingTatesService() *MarketFundingRatesService {
+	return &MarketFundingRatesService{c: c}
+}
+
+func (c *Client) NewGetPublicRecentTradesService() *GetPublicRecentTradesService {
+	return &GetPublicRecentTradesService{c: c}
+}
+
+// GetOpenInterestsServicdde
+func (c *Client) NewGetOpenInterestsService() *GetOpenInterestsService {
+	return &GetOpenInterestsService{c: c}
+}
+
+// GetHistoricalVolatilityService
+func (c *Client) NewGetHistoricalVolatilityService() *GetHistoricalVolatilityService {
+	return &GetHistoricalVolatilityService{c: c}
+}
+
+// GetInsuranceInfoService
+func (c *Client) NewGetInsuranceInfoService() *GetInsuranceInfoService {
+	return &GetInsuranceInfoService{c: c}
+}
+
+// GetRiskLimitService
+func (c *Client) NewGetRiskLimitService() *GetRiskLimitService {
+	return &GetRiskLimitService{c: c}
+}
+
+// GetDeliveryPriceService
+func (c *Client) NewGetDeliveryPriceService() *GetDeliveryPriceService {
+	return &GetDeliveryPriceService{c: c}
+}
+
+// GetMarketLSRatioService
+func (c *Client) NewGetMarketLSRatioService() *GetMarketLSRatioService {
+	return &GetMarketLSRatioService{c: c}
+}
+
+// GetServerTimeService
+func (c *Client) NewGetServerTimeService() *GetServerTimeService {
+	return &GetServerTimeService{c: c}
 }
 
 // NewPlaceOrderService Trade Endpoints

bybit_websocket.go

@@ -1,14 +1,15 @@
 package bybit_connector
 
 import (
+	"context"
 	"crypto/hmac"
 	"crypto/sha256"
 	"encoding/hex"
-	"encoding/json"
 	"fmt"
+	"time"
+
 	"github.com/google/uuid"
 	"github.com/gorilla/websocket"
-	"time"
 )
 
 type MessageHandler func(message string) error
@@ -43,6 +44,8 @@ type WebSocket struct {
 	maxAliveTime string
 	pingInterval int
 	onMessage    MessageHandler
+	ctx          context.Context
+	cancel       context.CancelFunc
 }
 
 type WebsocketOption func(*WebSocket)
@@ -111,6 +114,7 @@ func (b *WebSocket) Connect(args []string) error {
 
 	go b.handleIncomingMessages()
 
+	b.ctx, b.cancel = context.WithCancel(context.Background())
 	Ping(b)
 
 	return b.sendSubscription(args)
@@ -126,12 +130,16 @@ func Ping(b *WebSocket) {
 				if err := b.conn.WriteMessage(websocket.PingMessage, nil); err != nil {
 					fmt.Println("Failed to send ping:", err)
 				}
+			case <-b.ctx.Done():
+				fmt.Println("Exit ping")
+				return
 			}
 		}
 	}()
 }
 
 func (b *WebSocket) Disconnect() error {
+	b.cancel()
 	return b.conn.Close()
 }