part of stateWatcher code is moved to stateInit

Author: nexcode

client_stateinit.go

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2025 RPCPlatform Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package rpcplatform
+
+import (
+	"context"
+	"strings"
+	"time"
+
+	etcd "go.etcd.io/etcd/client/v3"
+)
+
+func (c *Client) stateInit() (map[string]string, int64, error) {
+	ctx, cancel := context.WithTimeout(context.Background(), 4*time.Second)
+	resp, err := c.etcd.Get(ctx, c.target, etcd.WithPrefix())
+	cancel()
+
+	if err != nil {
+		return nil, 0, err
+	}
+
+	serverInfo := make(map[string]string, len(resp.Kvs))
+	for _, kv := range resp.Kvs {
+		trimKey := strings.TrimPrefix(string(kv.Key), c.target)
+		serverInfo[trimKey] = string(kv.Value)
+	}
+
+	c.updateState(true, serverInfo)
+	return serverInfo, resp.Header.Revision, nil
+}

client_statewatcher.go

@@ -20,33 +20,20 @@ import (
 	"context"
 	"strings"
 	"sync"
-	"time"
 
 	etcd "go.etcd.io/etcd/client/v3"
 )
 
-func (c *Client) stateWatcher() error {
-	ctx, cancel := context.WithTimeout(context.Background(), 4*time.Second)
-	resp, err := c.etcd.Get(ctx, c.target, etcd.WithPrefix())
-	cancel()
-
-	if err != nil {
-		return err
-	}
-
-	serverInfo := make(map[string]string, len(resp.Kvs))
-	for _, kv := range resp.Kvs {
-		trimKey := strings.TrimPrefix(string(kv.Key), c.target)
-		serverInfo[trimKey] = string(kv.Value)
-	}
-
-	c.updateState(true, serverInfo)
-
+func (c *Client) stateWatcher(serverInfo map[string]string, revision int64) error {
 	watchChan := c.etcd.Watch(context.Background(), c.target,
-		etcd.WithPrefix(), etcd.WithRev(resp.Header.Revision+1),
+		etcd.WithPrefix(), etcd.WithRev(revision+1),
 	)
 
-	var wg sync.WaitGroup
+	var (
+		cancel = func() {}
+		ctx    context.Context
+		wg     sync.WaitGroup
+	)
 
 	go func() {
 		for data := range watchChan {

rpcplatform_newclient.go

@@ -44,19 +44,23 @@ func (p *RPCPlatform) NewClient(target string, attributes *ClientAttributes) (*C
 		return nil, err
 	}
 
-	client, err := grpc.NewClient(target, options...)
-	if err != nil {
-		return nil, err
-	}
-
 	c := &Client{
 		target:   p.config.EtcdPrefix + gears.FixPath(target) + "/",
 		etcd:     p.config.EtcdClient,
 		resolver: resolver,
-		client:   client,
 	}
 
-	if err = c.stateWatcher(); err != nil {
+	serverInfo, revision, err := c.stateInit()
+	if err != nil {
+		return nil, err
+	}
+
+	c.client, err = grpc.NewClient(target, options...)
+	if err != nil {
+		return nil, err
+	}
+
+	if err = c.stateWatcher(serverInfo, revision); err != nil {
 		return nil, err
 	}