perf: update sdk and deps

Author: LeeEirc

cmd/common/storage_backend.go

@@ -1,150 +1,15 @@
 package common
 
 import (
-	"strings"
-
 	"github.com/jumpserver-dev/sdk-go/model"
 	"github.com/jumpserver-dev/sdk-go/service"
-	"github.com/jumpserver/wisp/pkg/storage"
+	"github.com/jumpserver-dev/sdk-go/storage"
 )
 
-type StorageType interface {
-	TypeName() string
-}
-
-type ReplayStorage interface {
-	Upload(gZipFile, target string) error
-	StorageType
-}
-
-type CommandStorage interface {
-	BulkSave(commands []*model.Command) error
-	StorageType
-}
-
-func NewCommandBackend(apiClient *service.JMService, cfg *model.CommandConfig) CommandStorage {
-	switch cfg.TypeName {
-	case "es", "elasticsearch":
-		var hosts = cfg.Hosts
-		var skipVerify bool
-		index := cfg.Index
-		docType := cfg.DocType
-		if cfg.Other != nil {
-			skipVerify = cfg.Other.IgnoreVerifyCerts
-		}
-		if index == "" {
-			index = "jumpserver"
-		}
-		if docType == "" {
-			docType = "_doc"
-		}
-		return storage.ESCommandStorage{
-			Hosts:              hosts,
-			Index:              index,
-			DocType:            docType,
-			InsecureSkipVerify: skipVerify,
-		}
-	case "null":
-		return storage.NewNullStorage()
-	default:
-		return storage.ServerStorage{StorageType: "server", JmsService: apiClient}
-	}
+func NewCommandBackend(apiClient *service.JMService, cfg *model.TerminalConfig) storage.CommandStorage {
+	return storage.NewCommandStorage(apiClient, cfg)
 }
 
-func NewReplayBackend(apiClient *service.JMService, cfg *model.ReplayConfig) ReplayStorage {
-
-	switch cfg.TypeName {
-	case "azure":
-		var (
-			accountName    string
-			accountKey     string
-			containerName  string
-			endpointSuffix string
-		)
-		endpointSuffix = cfg.EndpointSuffix
-		accountName = cfg.AccountName
-		accountKey = cfg.AccountKey
-		containerName = cfg.ContainerName
-
-		if endpointSuffix == "" {
-			endpointSuffix = "core.chinacloudapi.cn"
-		}
-		return storage.AzureReplayStorage{
-			AccountName:    accountName,
-			AccountKey:     accountKey,
-			ContainerName:  containerName,
-			EndpointSuffix: endpointSuffix,
-		}
-	case "oss":
-		var (
-			endpoint  string
-			bucket    string
-			accessKey string
-			secretKey string
-		)
-
-		endpoint = cfg.Endpoint
-		bucket = cfg.Bucket
-		accessKey = cfg.AccessKey
-		secretKey = cfg.SecretKey
-		return storage.OSSReplayStorage{
-			Endpoint:  endpoint,
-			Bucket:    bucket,
-			AccessKey: accessKey,
-			SecretKey: secretKey,
-		}
-	case "s3", "swift", "cos":
-		var (
-			region    string
-			endpoint  string
-			bucket    string
-			accessKey string
-			secretKey string
-		)
-
-		bucket = cfg.Bucket
-		endpoint = cfg.Endpoint
-		region = cfg.Region
-		accessKey = cfg.AccessKey
-		secretKey = cfg.SecretKey
-
-		if region == "" && endpoint != "" {
-			endpointArray := strings.Split(endpoint, ".")
-			if len(endpointArray) >= 2 {
-				region = endpointArray[1]
-			}
-		}
-		if bucket == "" {
-			bucket = "jumpserver"
-		}
-		return storage.S3ReplayStorage{
-			Bucket:    bucket,
-			Region:    region,
-			AccessKey: accessKey,
-			SecretKey: secretKey,
-			Endpoint:  endpoint,
-		}
-	case "obs":
-		var (
-			endpoint  string
-			bucket    string
-			accessKey string
-			secretKey string
-		)
-
-		endpoint = cfg.Endpoint
-		bucket = cfg.Bucket
-		accessKey = cfg.AccessKey
-		secretKey = cfg.SecretKey
-		return storage.OBSReplayStorage{
-			Endpoint:  endpoint,
-			Bucket:    bucket,
-			AccessKey: accessKey,
-			SecretKey: secretKey,
-		}
-	case "null":
-		return storage.NewNullStorage()
-	default:
-		return storage.ServerStorage{StorageType: "server", JmsService: apiClient}
-	}
+func NewReplayBackend(apiClient *service.JMService, cfg *model.ReplayConfig) storage.ReplayStorage {
+	return storage.NewReplayStorage(apiClient, *cfg)
 }

cmd/common/uploader_service.go

@@ -12,6 +12,7 @@ import (
 	modelCommon "github.com/jumpserver-dev/sdk-go/common"
 	"github.com/jumpserver-dev/sdk-go/model"
 	"github.com/jumpserver-dev/sdk-go/service"
+	"github.com/jumpserver-dev/sdk-go/storage"
 	"github.com/jumpserver/wisp/pkg/logger"
 )
 
@@ -71,12 +72,12 @@ func (u *UploaderService) updateBackendCfg(termCfg *model.TerminalConfig) {
 	u.terminalCfg.Store(termCfg)
 }
 
-func (u *UploaderService) getCommandBackend() CommandStorage {
-	cfg := u.commandCfg.Load().(model.CommandConfig)
+func (u *UploaderService) getCommandBackend() storage.CommandStorage {
+	cfg := u.terminalCfg.Load().(model.TerminalConfig)
 	return NewCommandBackend(u.apiClient, &cfg)
 }
 
-func (u *UploaderService) getReplayBackend() ReplayStorage {
+func (u *UploaderService) getReplayBackend() storage.ReplayStorage {
 	cfg := u.replayCfg.Load().(model.ReplayConfig)
 	return NewReplayBackend(u.apiClient, &cfg)
 }

go.mod

@@ -3,58 +3,61 @@ module github.com/jumpserver/wisp
 go 1.24.6
 
 require (
-	github.com/Azure/azure-storage-blob-go v0.15.0
-	github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
-	github.com/aws/aws-sdk-go v1.44.306
-	github.com/elastic/go-elasticsearch/v6 v6.8.5
-	github.com/elastic/go-elasticsearch/v8 v8.14.0
 	github.com/gorilla/websocket v1.5.3
-	github.com/huaweicloud/huaweicloud-sdk-go-obs v3.25.4+incompatible
-	github.com/jumpserver-dev/sdk-go v0.0.0-20251007162206-113f4e3fdde6
+	github.com/jumpserver-dev/sdk-go v0.0.0-20260130073417-a608248623a4
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.10.1
 	github.com/spf13/viper v1.21.0
 	golang.org/x/crypto v0.42.0
 	google.golang.org/grpc v1.65.0
 	google.golang.org/protobuf v1.34.2
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
-
 )
 
 require (
 	github.com/Azure/azure-pipeline-go v0.2.3 // indirect
+	github.com/Azure/azure-storage-blob-go v0.15.0 // indirect
 	github.com/LeeEirc/httpsig v1.2.1 // indirect
+	github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible // indirect
+	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
+	github.com/aws/aws-sdk-go v1.44.306 // indirect
 	github.com/dlclark/regexp2 v1.11.4 // indirect
 	github.com/elastic/elastic-transport-go/v8 v8.6.0 // indirect
+	github.com/elastic/go-elasticsearch/v6 v6.8.5 // indirect
+	github.com/elastic/go-elasticsearch/v8 v8.14.0 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
+	github.com/huaweicloud/huaweicloud-sdk-go-obs v3.25.4+incompatible // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/influxdata/influxdb-client-go/v2 v2.14.0 // indirect
+	github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+	github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect
 	github.com/mattn/go-ieproxy v0.0.1 // indirect
+	github.com/oapi-codegen/runtime v1.1.1 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
-	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/sagikazarmark/locafero v0.12.0 // indirect
 	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
-	github.com/shoenig/go-m1cpu v0.1.6 // indirect
+	github.com/shoenig/go-m1cpu v0.1.7 // indirect
 	github.com/spf13/afero v1.15.0 // indirect
 	github.com/spf13/cast v1.10.0 // indirect
 	github.com/spf13/pflag v1.0.10 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/tklauser/go-sysconf v0.3.12 // indirect
-	github.com/tklauser/numcpus v0.6.1 // indirect
+	github.com/tklauser/go-sysconf v0.3.16 // indirect
+	github.com/tklauser/numcpus v0.11.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/net v0.43.0 // indirect
-	golang.org/x/sys v0.36.0 // indirect
-	golang.org/x/text v0.29.0 // indirect
+	golang.org/x/sys v0.40.0 // indirect
+	golang.org/x/text v0.33.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
 	google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e // indirect
 )