fix(client): adapt to regenerated stream bindings

Use the named MaliceRPC_SyncStreamClient interface and record the new artifact RPCs.

Author: h3zh1

client/command/context/context_command_test.go

@@ -9,10 +9,10 @@ import (
 
 	"github.com/chainreactors/IoM-go/consts"
 	"github.com/chainreactors/IoM-go/proto/client/clientpb"
+	"github.com/chainreactors/IoM-go/proto/services/clientrpc"
 	"github.com/chainreactors/malice-network/client/assets"
 	"github.com/chainreactors/malice-network/client/command/testsupport"
 	"github.com/chainreactors/malice-network/helper/utils/output"
-	"google.golang.org/grpc"
 )
 
 func TestContextCommandConformance(t *testing.T) {
@@ -42,7 +42,7 @@ func TestContextCommandConformance(t *testing.T) {
 			Argv:    []string{consts.CommandSync, "ctx-1"},
 			WantErr: "sync context failed",
 			Setup: func(t testing.TB, h *testsupport.Harness) {
-				h.Recorder.OnContextStream("SyncStream", func(ctx context.Context, request any) (grpc.ServerStreamingClient[clientpb.ContextChunk], error) {
+				h.Recorder.OnContextStream("SyncStream", func(ctx context.Context, request any) (clientrpc.MaliceRPC_SyncStreamClient, error) {
 					return nil, context.DeadlineExceeded
 				})
 			},
@@ -58,7 +58,7 @@ func TestContextCommandConformance(t *testing.T) {
 			Name: "sync streams file-backed context content",
 			Argv: []string{consts.CommandSync, "ctx-1"},
 			Setup: func(t testing.TB, h *testsupport.Harness) {
-				h.Recorder.OnContextStream("SyncStream", func(ctx context.Context, request any) (grpc.ServerStreamingClient[clientpb.ContextChunk], error) {
+				h.Recorder.OnContextStream("SyncStream", func(ctx context.Context, request any) (clientrpc.MaliceRPC_SyncStreamClient, error) {
 					header := &clientpb.Context{
 						Id:   "ctx-1",
 						Type: consts.ContextDownload,
@@ -119,7 +119,7 @@ func TestContextCommandConformance(t *testing.T) {
 			Argv:    []string{consts.CommandSync, "ctx-1"},
 			WantErr: "unexpected stream offset",
 			Setup: func(t testing.TB, h *testsupport.Harness) {
-				h.Recorder.OnContextStream("SyncStream", func(ctx context.Context, request any) (grpc.ServerStreamingClient[clientpb.ContextChunk], error) {
+				h.Recorder.OnContextStream("SyncStream", func(ctx context.Context, request any) (clientrpc.MaliceRPC_SyncStreamClient, error) {
 					header := downloadContext("ctx-1", "broken.bin", nil)
 					return contextChunkStream(
 						&clientpb.ContextChunk{Header: header, TotalSize: 4},
@@ -137,7 +137,7 @@ func TestContextCommandConformance(t *testing.T) {
 	})
 }
 
-func contextChunkStream(chunks ...*clientpb.ContextChunk) grpc.ServerStreamingClient[clientpb.ContextChunk] {
+func contextChunkStream(chunks ...*clientpb.ContextChunk) clientrpc.MaliceRPC_SyncStreamClient {
 	index := 0
 	return &testsupport.ContextChunkStream{RecvFunc: func() (*clientpb.ContextChunk, error) {
 		if index == len(chunks) {

client/command/context/sync.go

@@ -8,12 +8,12 @@ import (
 	"path/filepath"
 
 	"github.com/chainreactors/IoM-go/proto/client/clientpb"
+	"github.com/chainreactors/IoM-go/proto/services/clientrpc"
 	"github.com/chainreactors/malice-network/client/assets"
 	"github.com/chainreactors/malice-network/client/core"
 	"github.com/chainreactors/malice-network/helper/utils/fileutils"
 	"github.com/chainreactors/malice-network/helper/utils/output"
 	"github.com/spf13/cobra"
-	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
@@ -67,7 +67,7 @@ func syncContextUnary(con *core.Console, req *clientpb.Sync) error {
 	return nil
 }
 
-func receiveContextStream(con *core.Console, stream grpc.ServerStreamingClient[clientpb.ContextChunk]) error {
+func receiveContextStream(con *core.Console, stream clientrpc.MaliceRPC_SyncStreamClient) error {
 	first, err := stream.Recv()
 	if err != nil {
 		return err

client/command/testsupport/recorder.go

@@ -39,7 +39,7 @@ type RecorderRPC struct {
 	artifactsResponders       map[string]func(context.Context, any) (*clientpb.Artifacts, error)
 	buildConfigResponders     map[string]func(context.Context, any) (*clientpb.BuildConfig, error)
 	contextResponders         map[string]func(context.Context, any) (*clientpb.Context, error)
-	contextStreamResponders   map[string]func(context.Context, any) (grpc.ServerStreamingClient[clientpb.ContextChunk], error)
+	contextStreamResponders   map[string]func(context.Context, any) (clientrpc.MaliceRPC_SyncStreamClient, error)
 	taskContextResponders     map[string]func(context.Context, any) (*clientpb.TaskContext, error)
 	taskContextsResponders    map[string]func(context.Context, any) (*clientpb.TaskContexts, error)
 	tasksResponders           map[string]func(context.Context, any) (*clientpb.Tasks, error)
@@ -71,7 +71,7 @@ func NewRecorderRPC() *RecorderRPC {
 		artifactsResponders:       map[string]func(context.Context, any) (*clientpb.Artifacts, error){},
 		buildConfigResponders:     map[string]func(context.Context, any) (*clientpb.BuildConfig, error){},
 		contextResponders:         map[string]func(context.Context, any) (*clientpb.Context, error){},
-		contextStreamResponders:   map[string]func(context.Context, any) (grpc.ServerStreamingClient[clientpb.ContextChunk], error){},
+		contextStreamResponders:   map[string]func(context.Context, any) (clientrpc.MaliceRPC_SyncStreamClient, error){},
 		taskContextResponders:     map[string]func(context.Context, any) (*clientpb.TaskContext, error){},
 		taskContextsResponders:    map[string]func(context.Context, any) (*clientpb.TaskContexts, error){},
 		tasksResponders:           map[string]func(context.Context, any) (*clientpb.Tasks, error){},
@@ -150,7 +150,7 @@ func (r *RecorderRPC) OnContext(method string, fn func(context.Context, any) (*c
 	r.contextResponders[method] = fn
 }
 
-func (r *RecorderRPC) OnContextStream(method string, fn func(context.Context, any) (grpc.ServerStreamingClient[clientpb.ContextChunk], error)) {
+func (r *RecorderRPC) OnContextStream(method string, fn func(context.Context, any) (clientrpc.MaliceRPC_SyncStreamClient, error)) {
 	r.contextStreamResponders[method] = fn
 }
 
@@ -491,7 +491,7 @@ func (r *RecorderRPC) Sync(ctx context.Context, in *clientpb.Sync, opts ...grpc.
 	return &clientpb.Context{Id: in.GetContextId()}, nil
 }
 
-func (r *RecorderRPC) SyncStream(ctx context.Context, in *clientpb.Sync, opts ...grpc.CallOption) (grpc.ServerStreamingClient[clientpb.ContextChunk], error) {
+func (r *RecorderRPC) SyncStream(ctx context.Context, in *clientpb.Sync, opts ...grpc.CallOption) (clientrpc.MaliceRPC_SyncStreamClient, error) {
 	r.recordPrimary(ctx, "SyncStream", in)
 	if responder, ok := r.contextStreamResponders["SyncStream"]; ok {
 		return responder(ctx, in)
@@ -919,6 +919,10 @@ func (r *RecorderRPC) SyncBuild(ctx context.Context, in *clientpb.BuildConfig, o
 	return r.artifactResponse(ctx, "SyncBuild", in)
 }
 
+func (r *RecorderRPC) ReplayArtifact(ctx context.Context, in *clientpb.Artifact, opts ...grpc.CallOption) (*clientpb.Artifact, error) {
+	return r.artifactResponse(ctx, "ReplayArtifact", in)
+}
+
 func (r *RecorderRPC) ListArtifact(ctx context.Context, in *clientpb.Empty, opts ...grpc.CallOption) (*clientpb.Artifacts, error) {
 	r.recordPrimary(ctx, "ListArtifact", in)
 	if responder, ok := r.artifactsResponders["ListArtifact"]; ok {
@@ -946,6 +950,10 @@ func (r *RecorderRPC) DownloadArtifact(ctx context.Context, in *clientpb.Artifac
 	return r.artifactResponse(ctx, "DownloadArtifact", in)
 }
 
+func (r *RecorderRPC) GetArtifactProfile(ctx context.Context, in *clientpb.Artifact, opts ...grpc.CallOption) (*clientpb.Artifact, error) {
+	return r.artifactResponse(ctx, "GetArtifactProfile", in)
+}
+
 func (r *RecorderRPC) UpdateArtifact(ctx context.Context, in *clientpb.Artifact, opts ...grpc.CallOption) (*clientpb.Artifact, error) {
 	return r.artifactResponse(ctx, "UpdateArtifact", in)
 }