Merge upstream 'v1.8.31'

Author: haidongxx

README.md

@@ -30,7 +30,7 @@ you can use other programming languages besides Go to access rpcx services.
 
 - **rpcx-gateway**: You can write clients in any programming languages to call rpcx services via [rpcx-gateway](https://github.com/rpcxio/rpcx-gateway)
 - **http invoke**: you can use the same http requests to access rpcx gateway
-- **Java Services/Clients**: You can use [rpcx-java](https://github.com/smallnest/rpcx-java) to implement/access rpcx servies via raw protocol.
+- **Java Services/Clients**: You can use [rpcx-java](https://github.com/smallnest/rpcx-java) to implement/access rpcx services via raw protocol.
 - **rust rpcx**: You can write rpcx services in rust by [rpcx-rs](https://github.com/smallnest/rpcx-rs)
 
 > If you can write Go methods, you can also write rpc services. It is so easy to write rpc applications with rpcx.
@@ -67,8 +67,8 @@ go get -v -tags "quic kcp" github.com/smallnest/rpcx/...
 rpcx is a RPC framework like [Alibaba Dubbo](http://dubbo.io/) and [Weibo Motan](https://github.com/weibocom/motan).
 
 **rpcx** is created for targets:
-1. **Simple**: easy to learn, easy to develop, easy to intergate and easy to deploy
-2. **Performance**: high perforamnce (>= grpc-go)
+1. **Simple**: easy to learn, easy to develop, easy to integrate and easy to deploy
+2. **Performance**: high performance (>= grpc-go)
 3. **Cross-platform**: support _raw slice of bytes_, _JSON_, _Protobuf_ and _MessagePack_. Theoretically it can be used with java, php, python, c/c++, node.js, c# and other platforms
 4. **Service discovery and service governance**: support zookeeper, etcd and consul.
 

client/client.go

@@ -213,6 +213,10 @@ type Call struct {
 }
 
 func (call *Call) done() {
+	if call.Done == nil { // Oneshot
+		return
+	}
+
 	select {
 	case call.Done <- call:
 		// ok

client/xclient.go

@@ -235,8 +235,18 @@ func filterByStateAndGroup(group string, servers map[string]string) {
 			if state := values.Get("state"); state == "inactive" {
 				delete(servers, k)
 			}
-			if group != "" && group != values.Get("group") {
-				delete(servers, k)
+			groups := values["group"] // Directly access the map to get all values associated with "group" as a slice
+			if group != "" {
+				found := false
+				for _, g := range groups {
+					if group == g {
+						found = true
+						break // A matching group is found, stop the search
+					}
+				}
+				if !found {
+					delete(servers, k) // If no matching group is found, delete the corresponding server from the map
+				}
 			}
 		}
 	}
@@ -245,6 +255,13 @@ func filterByStateAndGroup(group string, servers map[string]string) {
 // selects a client from candidates base on c.selectMode
 func (c *xClient) selectClient(ctx context.Context, servicePath, serviceMethod string, args interface{}) (string, RPCClient, error) {
 	c.mu.Lock()
+
+	if c.option.Sticky && c.stickyRPCClient != nil {
+		if c.stickyRPCClient.IsClosing() || c.stickyRPCClient.IsShutdown() {
+			c.stickyRPCClient = nil
+		}
+	}
+
 	if c.option.Sticky && c.stickyRPCClient != nil {
 		c.mu.Unlock()
 		return c.stickyK, c.stickyRPCClient, nil
@@ -264,13 +281,29 @@ func (c *xClient) selectClient(ctx context.Context, servicePath, serviceMethod s
 	client, err := c.getCachedClient(k, servicePath, serviceMethod, args)
 
 	if c.option.Sticky && client != nil {
+		c.mu.Lock()
+		safeCloseClient(c.stickyRPCClient)
+
 		c.stickyK = k
 		c.stickyRPCClient = client
+		c.mu.Unlock()
 	}
 
 	return k, client, err
 }
 
+func safeCloseClient(client RPCClient) {
+	if client == nil {
+		return
+	}
+
+	defer func() {
+		_ = recover()
+	}()
+
+	client.Close()
+}
+
 func (c *xClient) getCachedClient(k string, servicePath, serviceMethod string, args interface{}) (RPCClient, error) {
 	// TODO: improve the lock
 	var client RPCClient

client/xclient_test.go

@@ -93,7 +93,7 @@ func TestXClient_IT(t *testing.T) {
 }
 
 func TestXClient_filterByStateAndGroup(t *testing.T) {
-	servers := map[string]string{"a": "", "b": "state=inactive&ops=10", "c": "ops=20", "d": "group=test&ops=20"}
+	servers := map[string]string{"a": "", "b": "state=inactive&ops=10", "c": "ops=20", "d": "group=test1&group=test&ops=20"}
 	filterByStateAndGroup("test", servers)
 	if _, ok := servers["b"]; ok {
 		t.Error("has not remove inactive node")
@@ -107,6 +107,12 @@ func TestXClient_filterByStateAndGroup(t *testing.T) {
 	if _, ok := servers["d"]; !ok {
 		t.Error("node must be removed")
 	}
+
+	filterByStateAndGroup("test1", servers)
+
+	if _, ok := servers["d"]; !ok {
+		t.Error("node must be removed")
+	}
 }
 
 func TestUncoverError(t *testing.T) {

codec/codec.go

@@ -6,12 +6,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	pb "google.golang.org/protobuf/proto"
 	"reflect"
 
+	pb "google.golang.org/protobuf/proto"
+
 	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/gogo/protobuf/proto"
-	jsoniter "github.com/json-iterator/go"
 	"github.com/tinylib/msgp/msgp"
 	"github.com/vmihailenco/msgpack/v5"
 )
@@ -142,20 +142,3 @@ func (c ThriftCodec) Decode(data []byte, i interface{}) error {
 	d.Transport.Close()
 	return d.Read(context.Background(), i.(thrift.TStruct), data)
 }
-
-type JSONIterCodec struct{}
-
-func (c JSONIterCodec) Encode(i interface{}) ([]byte, error) {
-	var buf bytes.Buffer
-	enc := jsoniter.NewEncoder(&buf)
-	enc.SetEscapeHTML(false)
-	err := enc.Encode(i)
-	return buf.Bytes(), err
-}
-
-// Decode decodes an object from slice of bytes.
-func (c JSONIterCodec) Decode(data []byte, i interface{}) error {
-	d := jsoniter.NewDecoder(bytes.NewBuffer(data))
-	d.UseNumber()
-	return d.Decode(i)
-}

go.mod

@@ -1,15 +1,17 @@
 module github.com/smallnest/rpcx
 
-go 1.20
+go 1.21
+
+toolchain go1.22.1
 
 require (
 	github.com/ChimeraCoder/gojson v1.1.0
 	github.com/akutz/memconn v0.1.0
 	github.com/alitto/pond v1.8.3
-	github.com/apache/thrift v0.18.1
+	github.com/apache/thrift v0.20.0
 	github.com/edwingeng/doublejump v1.0.1
-	github.com/fatih/color v1.14.1
-	github.com/go-echarts/go-echarts/v2 v2.3.2
+	github.com/fatih/color v1.16.0
+	github.com/go-echarts/go-echarts/v2 v2.3.3
 	github.com/go-ping/ping v1.1.0
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/go-redis/redis_rate/v9 v9.1.2
@@ -19,71 +21,70 @@ require (
 	github.com/golang/snappy v0.0.4
 	github.com/grandcat/zeroconf v1.0.0
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/hashicorp/golang-lru v0.5.4
+	github.com/hashicorp/golang-lru v1.0.2
 	github.com/jamiealquiza/tachymeter v2.0.0+incompatible
-	github.com/json-iterator/go v1.1.12
 	github.com/juju/ratelimit v1.0.2
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/kavu/go_reuseport v1.5.0
 	github.com/kr/pretty v0.2.0
-	github.com/quic-go/quic-go v0.37.7
+	github.com/quic-go/quic-go v0.43.1
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
 	github.com/rpcxio/libkv v0.5.1
-	github.com/rs/cors v1.8.3
+	github.com/rs/cors v1.11.0
 	github.com/rubyist/circuitbreaker v2.2.1+incompatible
-	github.com/smallnest/quick v0.1.0
-	github.com/smallnest/statsview v0.0.0-20231119085602-10700f9abec4
+	github.com/smallnest/quick v0.2.0
+	github.com/smallnest/statsview v1.0.1
 	github.com/soheilhy/cmux v0.1.5
-	github.com/stretchr/testify v1.7.2
-	github.com/tinylib/msgp v1.1.8
+	github.com/stretchr/testify v1.8.4
+	github.com/tinylib/msgp v1.1.9
 	github.com/valyala/fastrand v1.1.0
 	github.com/vmihailenco/msgpack/v5 v5.3.5
 	github.com/xtaci/kcp-go v5.4.20+incompatible
-	golang.org/x/net v0.17.0
-	golang.org/x/sync v0.2.0
-	google.golang.org/protobuf v1.33.0
+	golang.org/x/net v0.25.0
+	golang.org/x/sync v0.7.0
+	google.golang.org/protobuf v1.34.1
 )
 
 require (
+	github.com/StackExchange/wmi v1.2.1 // indirect
 	github.com/cenk/backoff v2.2.1+incompatible // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-jump v0.0.0-20211018200510-ba001c3ffce0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
-	github.com/golang/mock v1.6.0 // indirect
-	github.com/google/pprof v0.0.0-20230228050547-1710fef4ab10 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
+	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
+	github.com/google/pprof v0.0.0-20240430035430-e4905b036c4e // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
-	github.com/klauspost/reedsolomon v1.11.7 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/klauspost/reedsolomon v1.12.1 // indirect
 	github.com/kr/text v0.1.0 // indirect
-	github.com/libp2p/go-sockaddr v0.1.1 // indirect
+	github.com/libp2p/go-sockaddr v0.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
-	github.com/miekg/dns v1.1.51 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/miekg/dns v1.1.59 // indirect
+	github.com/onsi/ginkgo/v2 v2.17.2 // indirect
 	github.com/peterbourgon/g2s v0.0.0-20140925154142-ec76db4c1ac1 // indirect
 	github.com/philhofer/fwd v1.1.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/quic-go/qtls-go1-20 v0.3.1 // indirect
+	github.com/shirou/gopsutil/v3 v3.20.10 // indirect
 	github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect
 	github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect
 	github.com/tjfoc/gmsm v1.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/exp v0.0.0-20230307190834-24139beb5833 // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.9.1 // indirect
+	go.uber.org/mock v0.4.0 // indirect
+	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/tools v0.21.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )