Merge pull request #141 from libsv/fix/more-host-pc

Fix: Query subscription peer channel on notification, not own.

peerchannels.go

@@ -77,5 +77,7 @@ type PeerChannelAPITokenStoreArgs struct {
 // PeerChannelMessageArgs for quering a peer channel message.
 type PeerChannelMessageArgs struct {
  ChannelID string
+ Host string
+ Path string
  Token string
 }

peerchannels_notify.go

@@ -28,6 +28,8 @@ type PeerChannelsMessageHandler interface {
 
 // PeerChannelSubscription for subscribing to channel notifications.
 type PeerChannelSubscription struct {
+ Host string
+ Path string
  ChannelID string
  Token string
  ChannelType PeerChannelHandlerType

service/pay.go

@@ -151,7 +151,7 @@ func (p *pay) Pay(ctx context.Context, req payd.PayRequest) (*dpp.PaymentACK, er
  Path: ack.PeerChannel.Path,
  Type: payd.PeerChannelHandlerTypeProof,
  }); err != nil {
- log.Err(err)
+ log.Error().Err(err)
  }
  if err := p.storeTx.Commit(ctx); err != nil {
  return nil, errors.Wrap(err, "failed to commit tx")

service/peerchannels.go

@@ -96,8 +96,8 @@ func (p *peerChannelsSvc) PeerChannelsMessage(ctx context.Context, args *payd.Pe
  spvchannels.WithToken(args.Token),
  spvchannels.WithChannelID(args.ChannelID),
  spvchannels.WithVersion("v1"),
- spvchannels.WithBaseURL(p.cfg.Host),
- spvchannels.WithPath(p.cfg.Path),
+ spvchannels.WithBaseURL(args.Host),
+ spvchannels.WithPath(args.Path),
  spvchannels.WithNoTLS(),
  )
  msgs, err := c.Messages(ctx, spvchannels.MessagesRequest{

service/peerchannels_notify.go

@@ -47,6 +47,8 @@ func (p *peerChannelsNotifySvc) Subscribe(ctx context.Context, channel *payd.Pee
  channel.CreatedAt = time.Now()
  }
 
+ log.Debug().Msgf("subscribing to channel %s with token %s at %s%s", channel.ID, channel.Token, channel.Host, channel.Path)
+
  u := url.URL{
  Scheme: "ws",
  Host: channel.Host,
@@ -76,6 +78,8 @@ func (p *peerChannelsNotifySvc) Subscribe(ctx context.Context, channel *payd.Pee
  }()
 
  sub := payd.PeerChannelSubscription{
+ Host: channel.Host,
+ Path: channel.Path,
  ChannelID: channel.ID,
  ChannelType: channel.Type,
  Token: channel.Token,
@@ -107,6 +111,7 @@ func (p *peerChannelsNotifySvc) listen(ctx context.Context, sub *payd.PeerChanne
  log.Error().Err(errors.WithStack(err))
  }
 
+ log.Debug().Msgf("message received on channel %s", sub.ChannelID)
  in <- true
  }()
 
@@ -124,13 +129,17 @@ func (p *peerChannelsNotifySvc) listen(ctx context.Context, sub *payd.PeerChanne
 func (p *peerChannelsNotifySvc) handleNotification(ctx context.Context, sub *payd.PeerChannelSubscription, cancel context.CancelFunc) error {
  msgs, err := p.pcSvc.PeerChannelsMessage(ctx, &payd.PeerChannelMessageArgs{
  ChannelID: sub.ChannelID,
+ Host: sub.Host,
+ Path: sub.Path,
  Token: sub.Token,
  })
  if err != nil {
  log.Error().Err(errors.WithStack(err))
  return err
  }
 
+ log.Debug().Msgf("channel %s fetched messages: %#v", sub.ChannelID, msgs)
+
  hdlr := p.handlers[sub.ChannelType]
  finished, err := hdlr.HandlePeerChannelsMessage(ctx, msgs)
  if err != nil {

service/proofs.go

@@ -67,7 +67,7 @@ func (p *proofs) HandlePeerChannelsMessage(ctx context.Context, msgs spvchannels
  }
 
  if mm["callbackReason"].(string) != "merkleProof" {
- log.Info().Msg("skipping msg")
+ log.Debug().Msgf("skipping msg %#v", msg)
  continue
  }