feat(cli): add updates to data transfer

Add an API to get data transfer updates and add modify the CLI to be an ongoing monitoring plan
2020-08-18 17:36:29 -07:00
parent ef7f7375e7
commit 66ac7c195c
7 changed files with 168 additions and 81 deletions
@@ -7,6 +7,7 @@ import (
 	"io"
 	"os"

+	datatransfer "github.com/filecoin-project/go-data-transfer"
 	"github.com/filecoin-project/specs-actors/actors/abi/big"
 	"golang.org/x/xerrors"

@@ -470,11 +471,15 @@ func (a *API) clientRetrieve(ctx context.Context, order api.RetrievalOrder, ref
 	unsubscribe := a.Retrieval.SubscribeToEvents(func(event rm.ClientEvent, state rm.ClientDealState) {
 		if state.PayloadCID.Equals(order.Root) {

-			events <- marketevents.RetrievalEvent{
+			select {
+			case <-ctx.Done():
+				return
+			case events <- marketevents.RetrievalEvent{
 				Event:         event,
 				Status:        state.Status,
 				BytesReceived: state.TotalReceived,
 				FundsSpent:    state.FundsSpent,
+			}:
 			}

 			switch state.Status {
@@ -767,29 +772,59 @@ func (a *API) ClientListDataTransfers(ctx context.Context) ([]api.DataTransferCh
 	}

 	apiChannels := make([]api.DataTransferChannel, 0, len(inProgressChannels))
-	for channelID, channelState := range inProgressChannels {
-		channel := api.DataTransferChannel{
-			TransferID:  channelState.TransferID(),
-			Status:      channelState.Status(),
-			BaseCID:     channelState.BaseCID(),
-			IsInitiator: channelID.Initiator == a.Host.ID(),
-			IsSender:    channelState.Sender() == a.Host.ID(),
-			Message:     channelState.Message(),
-		}
-		voucherJSON, err := json.Marshal(channelState.Voucher())
-		if err != nil {
-			return nil, err
-		}
-		channel.VoucherJSON = string(voucherJSON)
-		if channel.IsSender {
-			channel.Transferred = channelState.Sent()
-			channel.OtherPeer = channelState.Recipient()
-		} else {
-			channel.Transferred = channelState.Received()
-			channel.OtherPeer = channelState.Sender()
-		}
-		apiChannels = append(apiChannels, channel)
+	for _, channelState := range inProgressChannels {
+		apiChannels = append(apiChannels, toAPIChannel(a.Host.ID(), channelState))
 	}

 	return apiChannels, nil
 }
+
+func (a *API) ClientDataTransferUpdates(ctx context.Context) (<-chan api.DataTransferChannel, error) {
+	channels := make(chan api.DataTransferChannel)
+
+	unsub := a.DataTransfer.SubscribeToEvents(func(evt datatransfer.Event, channelState datatransfer.ChannelState) {
+		channel := toAPIChannel(a.Host.ID(), channelState)
+		select {
+		case <-ctx.Done():
+		case channels <- channel:
+		}
+	})
+
+	go func() {
+		defer unsub()
+		<-ctx.Done()
+	}()
+
+	return channels, nil
+}
+
+func toAPIChannel(hostID peer.ID, channelState datatransfer.ChannelState) api.DataTransferChannel {
+	channel := api.DataTransferChannel{
+		TransferID: channelState.TransferID(),
+		Status:     channelState.Status(),
+		BaseCID:    channelState.BaseCID(),
+		IsSender:   channelState.Sender() == hostID,
+		Message:    channelState.Message(),
+	}
+	stringer, ok := channelState.Voucher().(fmt.Stringer)
+	if ok {
+		channel.Voucher = stringer.String()
+	} else {
+		voucherJSON, err := json.Marshal(channelState.Voucher())
+		if err != nil {
+			channel.Voucher = fmt.Errorf("Voucher Serialization: %w", err).Error()
+		} else {
+			channel.Voucher = string(voucherJSON)
+		}
+	}
+	if channel.IsSender {
+		channel.IsInitiator = !channelState.IsPull()
+		channel.Transferred = channelState.Sent()
+		channel.OtherPeer = channelState.Recipient()
+	} else {
+		channel.IsInitiator = channelState.IsPull()
+		channel.Transferred = channelState.Received()
+		channel.OtherPeer = channelState.Sender()
+	}
+	return channel
+}