Merge pull request #84 from binance/rc-common-v1.1.0

Author: alplabin

.github/workflows/release.yaml

@@ -172,8 +172,8 @@ jobs:
             PATCH=${VERSION_PARTS[2]}
 
             # Increment patch version
-            NEW_PATCH=$((PATCH + 1))
-            NEW_VERSION="v${MAJOR}.${MINOR}.${NEW_PATCH}"
+            NEW_MINOR=$((MINOR + 1))
+            NEW_VERSION="v${MAJOR}.${NEW_MINOR}.${PATCH}"
           fi
 
           # Set the full tag name

common/CHANGELOG.md

@@ -1,8 +1,13 @@
 ### Changelog
 
+## 1.1.0 - 2026-01-13
+
+- Updated `WebsocketStreams` `Subscribe` method to support `int32` format for `id` parameter
+- Support Derivatives Trading Options different WS Streams URL paths.
+
 ## 1.0.1 - 2025-12-17
 
-- Fix `common` tags issue
+- Fixed `common` tags issue
 
 ## 1.0.0 - 2025-12-16
 

common/common/constants.go

@@ -69,7 +69,7 @@ const DerivativesTradingUsdsFuturesWebsocketStreamsTestnetUrl = "wss://stream.bi
 
 // Derivatives Trading Options API URLs
 const DerivativesTradingOptionsRestApiProdUrl = "https://eapi.binance.com"
-const DerivativesTradingOptionsWebsocketStreamsProdUrl = "wss://nbstream.binance.com/eoptions/stream"
+const DerivativesTradingOptionsWebsocketStreamsProdUrl = "wss://fstream.binance.com"
 
 // Derivatives Trading Portfolio Margin API URLs
 const DerivativesTradingPortfolioMarginRestApiProdUrl = "https://papi.binance.com"

common/common/utils.go

@@ -22,6 +22,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	randpkg "math/rand/v2"
 	"net"
 	"net/http"
 	"net/url"
@@ -1003,6 +1004,13 @@ var GenerateUUID = func() string {
 	return uuid.New().String()
 }
 
+// GenerateIntUUID is a function that generates a new random int32 UUID.
+//
+// @return An int32 representing the generated UUID.
+var GenerateIntUUID = func() int32 {
+	return randpkg.Int32()
+}
+
 // Pretty converts a value to its pretty-printed JSON string representation.
 //
 // @param v The value to be pretty-printed.

common/common/websocket.go

@@ -1130,7 +1130,7 @@ func (w *WebsocketStreams) Connect(userAgent string) error {
 // @param streams A slice of stream names to subscribe to.
 // @param id A slice of IDs corresponding to each stream. If empty, new UUIDs will be generated.
 // @return An error if any subscription fails, otherwise nil.
-func (w *WebsocketStreams) Subscribe(streams []string, id []string) error {
+func (w *WebsocketStreams) Subscribe(streams []string, id []any, strictInt bool) error {
 	if len(streams) == 0 {
 		return errors.New("no streams to subscribe")
 	}
@@ -1145,7 +1145,13 @@ func (w *WebsocketStreams) Subscribe(streams []string, id []string) error {
 			return err
 		}
 
-		streamID := GenerateUUID()
+		var streamID interface{}
+		if strictInt {
+			streamID = GenerateIntUUID()
+		} else {
+			streamID = GenerateUUID()
+		}
+
 		if len(id) > num {
 			streamID = id[num]
 		}
@@ -1337,9 +1343,9 @@ func (w *WebsocketStreams) CloseWebSocketStreamConnection() error {
 // @param stream The name of the stream to handle.
 // @param id An optional slice of IDs associated with the stream.
 // @return A pointer to the created StreamHandler or an error if subscription fails.
-func CreateStreamHandler[T any](wrapper *StreamHandlerWrapper, stream string, id []string) (*StreamHandler[T], error) {
+func CreateStreamHandler[T any](wrapper *StreamHandlerWrapper, stream string, id []any, strictInt bool) (*StreamHandler[T], error) {
 	if wrapper.WebsocketStreams != nil {
-		if err := wrapper.WebsocketStreams.Subscribe([]string{stream}, id); err != nil {
+		if err := wrapper.WebsocketStreams.Subscribe([]string{stream}, id, strictInt); err != nil {
 			return nil, err
 		}
 	} else if wrapper.WebsocketAPI != nil {

common/tests/unit/utils_test.go

@@ -15,6 +15,7 @@ import (
 	"strings"
 	"testing"
 	"time"
+	"unicode/utf8"
 
 	"github.com/binance/binance-connector-go/common/common"
 )
@@ -31,10 +32,10 @@ func (m mockMappedNullable) ToMap() (map[string]interface{}, error) {
 
 func TestParameterAddToHeaderOrQuery_BasicTypes(t *testing.T) {
 	tests := []struct {
-		name           string
-		obj            interface{}
+		name		   string
+		obj			interface{}
 		expectedValue  string
-		expectedKey    string
+		expectedKey	string
 		collectionType string
 	}{
 		{"int", 42, "42", "intKey", ""},
@@ -588,7 +589,7 @@ func TestPrepareRequest_WithJSONBody(t *testing.T) {
 	cfg := &common.ConfigurationRestAPI{}
 	body := struct {
 		Key1 string `json:"key1"`
-		Key2 int    `json:"key2"`
+		Key2 int	`json:"key2"`
 	}{
 		Key1: "value1",
 		Key2: 123,
@@ -640,3 +641,58 @@ func TestPrepareRequest_WithQueryAndBody(t *testing.T) {
 		t.Errorf("Expected Content-Type header to be set")
 	}
 }
+
+func TestGenerateUUID(t *testing.T) {
+	t.Run("returns non-empty string", func(t *testing.T) {
+		uuid := common.GenerateUUID()
+		if len(uuid) == 0 {
+			t.Error("GenerateUUID() returned empty string")
+		}
+	})
+
+	t.Run("returns valid UTF-8 string", func(t *testing.T) {
+		uuid := common.GenerateUUID()
+		if !utf8.ValidString(uuid) {
+			t.Error("GenerateUUID() returned invalid UTF-8 string")
+		}
+	})
+
+	t.Run("returns string of expected length", func(t *testing.T) {
+		uuid := common.GenerateUUID()
+
+		if len(uuid) != 36 {
+			t.Errorf("GenerateUUID() returned string of length %d, expected 36", len(uuid))
+		}
+	})
+
+	t.Run("returns different values on subsequent calls", func(t *testing.T) {
+		first := common.GenerateUUID()
+		second := common.GenerateUUID()
+		if first == second {
+			t.Error("GenerateUUID() returned same value on subsequent calls")
+		}
+	})
+}
+
+func TestGenerateIntUUID(t *testing.T) {
+	t.Run("returns a value", func(t *testing.T) {
+		uuid := common.GenerateIntUUID()
+		_ = uuid
+	})
+
+	t.Run("returns different values on subsequent calls", func(t *testing.T) {
+		first := common.GenerateIntUUID()
+		second := common.GenerateIntUUID()
+		if first == second {
+			t.Error("GenerateIntUUID() returned same value on subsequent calls")
+		}
+	})
+
+	t.Run("returns value within int32 range", func(t *testing.T) {
+		uuid := common.GenerateIntUUID()
+
+		if uuid < -2147483648 || uuid > 2147483647 {
+			t.Errorf("GenerateIntUUID() returned value %d outside int32 range", uuid)
+		}
+	})
+}