Merge branch 'OpenIMSDK:main' into main

pkg/discoveryregistry/zookeeper/discover.go

@@ -40,7 +40,17 @@ func (s *ZkClient) watch() {
 		event := <-s.eventChan
 		switch event.Type {
 		case zk.EventSession:
+			if event.State == zk.StateHasSession && s.isRegistered {
+				s.logger.Printf("zk session event stateHasSession: %+v, client prepare to create new temp node", event)
+				node, err := s.CreateTempNode(s.rpcRegisterName, s.rpcRegisterAddr)
+				if err != nil {
+					s.logger.Printf("zk session event stateHasSession: %+v, create temp node error: %v", event, err)
+				} else {
+					s.node = node
+				}
+			} else {
 				s.logger.Printf("zk session event: %+v", event)
+			}
 		case zk.EventNodeChildrenChanged:
 			s.logger.Printf("zk event: %s", event.Path)
 			l := strings.Split(event.Path, "/")

pkg/discoveryregistry/zookeeper/register.go

@@ -30,6 +30,14 @@ func (s *ZkClient) CreateRpcRootNodes(serviceNames []string) error {
 	return nil
 }
 
+func (s *ZkClient) CreateTempNode(rpcRegisterName, addr string) (node string, err error) {
+	return s.conn.CreateProtectedEphemeralSequential(
+		s.getPath(rpcRegisterName)+"/"+addr+"_",
+		[]byte(addr),
+		zk.WorldACL(zk.PermAll),
+	)
+}
+
 func (s *ZkClient) Register(rpcRegisterName, host string, port int, opts ...grpc.DialOption) error {
 	if err := s.ensureName(rpcRegisterName); err != nil {
 		return err
@@ -39,15 +47,14 @@ func (s *ZkClient) Register(rpcRegisterName, host string, port int, opts ...grpc
 	if err != nil {
 		return err
 	}
-	node, err := s.conn.CreateProtectedEphemeralSequential(
+	node, err := s.CreateTempNode(rpcRegisterName, addr)
-		s.getPath(rpcRegisterName)+"/"+addr+"_",
-		[]byte(addr),
-		zk.WorldACL(zk.PermAll),
-	)
 	if err != nil {
 		return err
 	}
+	s.rpcRegisterName = rpcRegisterName
+	s.rpcRegisterAddr = addr
 	s.node = node
+	s.isRegistered = true
 	return nil
 }
 
@@ -60,6 +67,9 @@ func (s *ZkClient) UnRegister() error {
 	}
 	time.Sleep(time.Second)
 	s.node = ""
+	s.rpcRegisterName = ""
+	s.rpcRegisterAddr = ""
+	s.isRegistered = false
 	s.localConns = make(map[string][]grpc.ClientConnInterface)
 	s.resolvers = make(map[string]*Resolver)
 	return nil

pkg/discoveryregistry/zookeeper/resolver.go

@@ -73,7 +73,11 @@ func (s *ZkClient) Build(
 	opts resolver.BuildOptions,
 ) (resolver.Resolver, error) {
 	s.logger.Printf("build resolver: %+v, cc: %+v", target, cc.UpdateState)
-	// log.ZDebug(context.Background(), "build resolver start", "target", target, "cc", cc.UpdateState)
+	serviceName := strings.TrimLeft(target.URL.Path, "/")
+	if oldResolver, ok := s.resolvers[serviceName]; ok {
+		s.logger.Printf("rpc resolver exist: %+v, cc: %+v, key: %s", target, cc.UpdateState, serviceName)
+		return oldResolver, nil
+	}
 	r := &Resolver{}
 	r.target = target
 	r.cc = cc
@@ -81,11 +85,8 @@ func (s *ZkClient) Build(
 	r.ResolveNowZK(resolver.ResolveNowOptions{})
 	s.lock.Lock()
 	defer s.lock.Unlock()
-	serviceName := strings.TrimLeft(target.URL.Path, "/")
 	s.resolvers[serviceName] = r
 	s.logger.Printf("build resolver finished: %+v, cc: %+v, key: %s", target, cc.UpdateState, serviceName)
-	// log.ZDebug(context.Background(), "build resolver finished", "target", target, "cc", cc.UpdateState,
-	// "serviceName", serviceName)
 	return r, nil
 }
 

pkg/discoveryregistry/zookeeper/zk.go

@@ -40,6 +40,9 @@ type ZkClient struct {
 	userName  string
 	password  string
 
+	rpcRegisterName string
+	rpcRegisterAddr string
+	isRegistered    bool
 	scheme          string
 
 	timeout   int
@@ -136,6 +139,7 @@ func NewClient(zkServers []string, zkRoot string, options ...ZkOption) (*ZkClien
 	resolver.Register(client)
 	go client.refresh()
 	go client.watch()
+	time.Sleep(time.Millisecond * 50)
 	return client, nil
 }
 

pkg/proto/auth/auth.go

@@ -14,13 +14,16 @@
 
 package auth
 
-import "github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
+import (
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
+)
 
 func (x *UserTokenReq) Check() error {
 	if x.UserID == "" {
 		return errs.ErrArgs.Wrap("userID is empty")
 	}
-	if x.PlatformID > 9 || x.PlatformID < 1 {
+	if x.PlatformID > constant.AdminPlatformID || x.PlatformID < constant.IOSPlatformID {
 		return errs.ErrArgs.Wrap("platform is invalidate")
 	}
 	return nil
@@ -30,7 +33,7 @@ func (x *ForceLogoutReq) Check() error {
 	if x.UserID == "" {
 		return errs.ErrArgs.Wrap("userID is empty")
 	}
-	if x.PlatformID > 9 || x.PlatformID < 1 {
+	if x.PlatformID > constant.AdminPlatformID || x.PlatformID < constant.IOSPlatformID {
 		return errs.ErrArgs.Wrap("platformID is invalidate")
 	}
 	return nil

pkg/proto/auth/auth.pb.go

@@ -22,14 +22,13 @@ package auth
 
 import (
 	context "context"
-	reflect "reflect"
-	sync "sync"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (

pkg/proto/conversation/conversation.pb.go

@@ -22,16 +22,14 @@ package conversation
 
 import (
 	context "context"
-	reflect "reflect"
+	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
-	sync "sync"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-
+	reflect "reflect"
-	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
+	sync "sync"
 )
 
 const (

pkg/proto/errinfo/errinfo.pb.go

@@ -21,11 +21,10 @@
 package errinfo
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (

pkg/proto/friend/friend.go

@@ -152,9 +152,6 @@ func (x *SetFriendRemarkReq) Check() error {
 	if x.FriendUserID == "" {
 		return errs.ErrArgs.Wrap("fromUserID is empty")
 	}
-	if x.Remark == "" {
-		return errs.ErrArgs.Wrap("remark is empty")
-	}
 	return nil
 }
 

pkg/proto/friend/friend.pb.go

@@ -22,16 +22,14 @@ package friend
 
 import (
 	context "context"
-	reflect "reflect"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
-	sync "sync"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-
+	reflect "reflect"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	sync "sync"
 )
 
 const (

pkg/proto/group/group.pb.go

@@ -22,17 +22,15 @@ package group
 
 import (
 	context "context"
-	reflect "reflect"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
-	sync "sync"
+	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-
+	reflect "reflect"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	sync "sync"
-	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
 )
 
 const (

pkg/proto/msg/msg.pb.go

@@ -22,16 +22,14 @@ package msg
 
 import (
 	context "context"
-	reflect "reflect"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
-	sync "sync"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-
+	reflect "reflect"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	sync "sync"
 )
 
 const (

pkg/proto/msggateway/msggateway.pb.go

@@ -22,16 +22,14 @@ package msggateway
 
 import (
 	context "context"
-	reflect "reflect"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
-	sync "sync"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-
+	reflect "reflect"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	sync "sync"
 )
 
 const (

pkg/proto/push/push.pb.go

@@ -22,16 +22,14 @@ package push
 
 import (
 	context "context"
-	reflect "reflect"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
-	sync "sync"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-
+	reflect "reflect"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	sync "sync"
 )
 
 const (

pkg/proto/sdkws/sdkws.pb.go

@@ -21,13 +21,11 @@
 package sdkws
 
 import (
-	reflect "reflect"
+	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
-	sync "sync"
-
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-
+	reflect "reflect"
-	wrapperspb "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb"
+	sync "sync"
 )
 
 const (

pkg/proto/statistics/statistics.pb.go

@@ -21,10 +21,9 @@
 package statistics
 
 import (
-	reflect "reflect"
-
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
 )
 
 const (

pkg/proto/third/third.pb.go

@@ -22,14 +22,13 @@ package third
 
 import (
 	context "context"
-	reflect "reflect"
-	sync "sync"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (

pkg/proto/user/user.go

@@ -137,9 +137,6 @@ func (x *GetPaginationUsersReq) Check() error {
 }
 
 func (x *UserRegisterReq) Check() error {
-	if x.Secret == "" {
-		return errs.ErrArgs.Wrap("Secret is empty")
-	}
 	if x.Users == nil {
 		return errs.ErrArgs.Wrap("Users is empty")
 	}

pkg/proto/user/user.pb.go

@@ -22,17 +22,15 @@ package user
 
 import (
 	context "context"
-	reflect "reflect"
+	conversation "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
-	sync "sync"
+	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-
+	reflect "reflect"
-	conversation "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
+	sync "sync"
-	sdkws "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
 )
 
 const (

pkg/proto/wrapperspb/wrapperspb.pb.go

@@ -21,11 +21,10 @@
 package wrapperspb
 
 import (
-	reflect "reflect"
-	sync "sync"
-
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (

scripts/build.cmd

@@ -0,0 +1,11 @@
+go build -o api.exe ../cmd/openim-api/main.go
+go build -o auth.exe ../cmd/openim-rpc/openim-rpc-auth/main.go
+go build -o conversation.exe ../cmd/openim-rpc/openim-rpc-conversation/main.go
+go build -o friend.exe ../cmd/openim-rpc/openim-rpc-friend/main.go
+go build -o group.exe ../cmd/openim-rpc/openim-rpc-group/main.go
+go build -o msg.exe ../cmd/openim-rpc/openim-rpc-msg/main.go
+go build -o third.exe ../cmd/openim-rpc/openim-rpc-third/main.go
+go build -o user.exe ../cmd/openim-rpc/openim-rpc-user/main.go
+go build -o push.exe ../cmd/openim-push/main.go
+go build -o msgtransfer.exe ../cmd/openim-msgtransfer/main.go
+go build -o msggateway.exe ../cmd/openim-msggateway/main.go