fix http client

Author: zyxkad

cluster/cluster.go

@@ -23,7 +23,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"net/http"
 	"regexp"
 	"runtime"
 	"strings"
@@ -61,8 +60,7 @@ type Cluster struct {
 	status       atomic.Int32
 	socketStatus atomic.Int32
 	socket       *socket.Socket
-	client       *http.Client
-	cachedCli    *http.Client
+	client       *HTTPClient
 
 	authTokenMux    sync.RWMutex
 	authToken       *ClusterToken
@@ -73,6 +71,7 @@ func NewCluster(
 	name string, opts config.ClusterOptions, gcfg config.ClusterGeneralConfig,
 	storageManager *storage.Manager,
 	statManager *StatManager,
+	client *HTTPClient,
 ) (cr *Cluster) {
 	storages := make([]int, len(opts.Storages))
 	for i, name := range opts.Storages {
@@ -85,6 +84,7 @@ func NewCluster(
 		storageManager: storageManager,
 		storages:       storages,
 		statManager:    statManager,
+		client:         client,
 	}
 	return
 }

cluster/requests.go

@@ -209,7 +209,7 @@ func (cr *Cluster) GetConfig(ctx context.Context) (cfg *OpenbmclapiAgentConfig,
 	if err != nil {
 		return
 	}
-	res, err := cr.cachedCli.Do(req)
+	res, err := cr.client.DoUseCache(req)
 	if err != nil {
 		return
 	}

cluster/storage.go

@@ -101,7 +101,7 @@ func (cr *Cluster) GetFileList(ctx context.Context, fileMap map[string]*StorageF
 	if err != nil {
 		return err
 	}
-	res, err := cr.cachedCli.Do(req)
+	res, err := cr.client.DoUseCache(req)
 	if err != nil {
 		return err
 	}

config.go

@@ -56,7 +56,7 @@ func migrateConfig(data []byte, cfg *config.Config) {
 	if v, ok := oldConfig["keepalive-timeout"].(int); ok {
 		cfg.Advanced.KeepaliveTimeout = v
 	}
-	if oldConfig["clusters"].(map[string]any) == nil {
+	if oldConfig["clusters"] == nil {
 		id, ok1 := oldConfig["cluster-id"].(string)
 		secret, ok2 := oldConfig["cluster-secret"].(string)
 		publicHost, ok3 := oldConfig["public-host"].(string)

runner.go

@@ -225,7 +225,7 @@ func (r *Runner) InitClusters(ctx context.Context) {
 	r.clusters = make(map[string]*cluster.Cluster)
 	gcfg := r.GetClusterGeneralConfig()
 	for name, opts := range r.Config.Clusters {
-		cr := cluster.NewCluster(name, opts, gcfg, r.storageManager, r.statManager)
+		cr := cluster.NewCluster(name, opts, gcfg, r.storageManager, r.statManager, r.client)
 		if err := cr.Init(ctx); err != nil {
 			log.TrErrorf("error.init.failed", err)
 		} else {