mirror of
https://github.com/ipfs/kubo.git
synced 2026-03-09 10:18:04 +08:00
Merge pull request #5671 from overbool/refactor/commands/dht
commands/dht: use new cmds lib
This commit is contained in:
Steven Allen
GitHub
commit
a98a7155e5
@ -1,26 +1,25 @@
|
||||
package commands
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"time"
|
||||
|
||||
cmds "github.com/ipfs/go-ipfs/commands"
|
||||
e "github.com/ipfs/go-ipfs/core/commands/e"
|
||||
dag "gx/ipfs/QmSei8kFMfqdJq7Q68d2LMnHbTWKKg2daA29ezUYFAUNgc/go-merkledag"
|
||||
path "gx/ipfs/QmT3rzed1ppXefourpmoZ7tyVQfsGPQZ1pHDngLmCvXxd3/go-path"
|
||||
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
|
||||
|
||||
cid "gx/ipfs/QmPSQnBKM9g7BaUcZCvswUJVscQ1ipjmwxN5PXCjkp9EQ7/go-cid"
|
||||
ipld "gx/ipfs/QmR7TcHkR9nxkUorfi8XMTAMLUK7GiP64TWWBzY3aacc1o/go-ipld-format"
|
||||
cmds "gx/ipfs/QmSXUokcP4TJpFfqozT69AVAYRtzXVMUjzQVkYX41R9Svs/go-ipfs-cmds"
|
||||
dag "gx/ipfs/QmSei8kFMfqdJq7Q68d2LMnHbTWKKg2daA29ezUYFAUNgc/go-merkledag"
|
||||
path "gx/ipfs/QmT3rzed1ppXefourpmoZ7tyVQfsGPQZ1pHDngLmCvXxd3/go-path"
|
||||
peer "gx/ipfs/QmTRhk7cgjUf2gfQ3p2M9KPECNZEW9XUrmHcFCgog4cPgB/go-libp2p-peer"
|
||||
pstore "gx/ipfs/QmTTJcDL3gsnGDALjh2fDGg1onGRUdVgNL2hU2WEZcVrMX/go-libp2p-peerstore"
|
||||
b58 "gx/ipfs/QmWFAMPqsEyUX7gDUsRVmMWz59FxSpJ1b2v6bJ1yYzo7jY/go-base58-fast/base58"
|
||||
routing "gx/ipfs/QmcQ81jSyWCp1jpkQ8CMbtpXT3jK7Wg6ZtYmoyWFgBoF9c/go-libp2p-routing"
|
||||
notif "gx/ipfs/QmcQ81jSyWCp1jpkQ8CMbtpXT3jK7Wg6ZtYmoyWFgBoF9c/go-libp2p-routing/notifications"
|
||||
"gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
|
||||
cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
|
||||
)
|
||||
|
||||
var ErrNotDHT = errors.New("routing service is not a DHT")
|
||||
@ -60,32 +59,28 @@ var queryDhtCmd = &cmds.Command{
|
||||
Options: []cmdkit.Option{
|
||||
cmdkit.BoolOption("verbose", dhtVerboseOptionName, "Print extra information."),
|
||||
},
|
||||
Run: func(req cmds.Request, res cmds.Response) {
|
||||
n, err := req.InvocContext().GetNode()
|
||||
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
|
||||
nd, err := cmdenv.GetNode(env)
|
||||
if err != nil {
|
||||
res.SetError(err, cmdkit.ErrNormal)
|
||||
return
|
||||
return err
|
||||
}
|
||||
|
||||
if n.DHT == nil {
|
||||
res.SetError(ErrNotDHT, cmdkit.ErrNormal)
|
||||
return
|
||||
if nd.DHT == nil {
|
||||
return ErrNotDHT
|
||||
}
|
||||
|
||||
id, err := peer.IDB58Decode(req.Arguments()[0])
|
||||
id, err := peer.IDB58Decode(req.Arguments[0])
|
||||
if err != nil {
|
||||
res.SetError(cmds.ClientError("invalid peer ID"), cmdkit.ErrClient)
|
||||
return
|
||||
return cmds.ClientError("invalid peer ID")
|
||||
}
|
||||
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
ctx, cancel := context.WithCancel(req.Context)
|
||||
ctx, events := notif.RegisterForQueryEvents(ctx)
|
||||
|
||||
closestPeers, err := n.DHT.GetClosestPeers(ctx, string(id))
|
||||
closestPeers, err := nd.DHT.GetClosestPeers(ctx, string(id))
|
||||
if err != nil {
|
||||
cancel()
|
||||
res.SetError(err, cmdkit.ErrNormal)
|
||||
return
|
||||
return err
|
||||
}
|
||||
|
||||
go func() {
|
||||
@ -98,22 +93,16 @@ var queryDhtCmd = &cmds.Command{
|
||||
}
|
||||
}()
|
||||
|
||||
outChan := make(chan interface{})
|
||||
res.SetOutput((<-chan interface{})(outChan))
|
||||
|
||||
go func() {
|
||||
defer close(outChan)
|
||||
for e := range events {
|
||||
select {
|
||||
case outChan <- e:
|
||||
case <-req.Context().Done():
|
||||
return
|
||||
}
|
||||
for e := range events {
|
||||
if err := res.Emit(e); err != nil {
|
||||
return err
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
return nil
|
||||
},
|
||||
Marshalers: cmds.MarshalerMap{
|
||||
cmds.Text: func() cmds.Marshaler {
|
||||
Encoders: cmds.EncoderMap{
|
||||
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *notif.QueryEvent) error {
|
||||
pfm := pfuncMap{
|
||||
notif.PeerResponse: func(obj *notif.QueryEvent, out io.Writer, verbose bool) {
|
||||
for _, p := range obj.Responses {
|
||||
@ -121,25 +110,10 @@ var queryDhtCmd = &cmds.Command{
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
return func(res cmds.Response) (io.Reader, error) {
|
||||
v, err := unwrapOutput(res.Output())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
obj, ok := v.(*notif.QueryEvent)
|
||||
if !ok {
|
||||
return nil, e.TypeErr(obj, v)
|
||||
}
|
||||
|
||||
verbose, _, _ := res.Request().Option(dhtVerboseOptionName).Bool()
|
||||
|
||||
buf := new(bytes.Buffer)
|
||||
printEvent(obj, buf, verbose, pfm)
|
||||
return buf, nil
|
||||
}
|
||||
}(),
|
||||
verbose, _ := req.Options[dhtVerboseOptionName].(bool)
|
||||
printEvent(out, w, verbose, pfm)
|
||||
return nil
|
||||
}),
|
||||
},
|
||||
Type: notif.QueryEvent{},
|
||||
}
|
||||
@ -161,52 +135,34 @@ var findProvidersDhtCmd = &cmds.Command{
|
||||
cmdkit.BoolOption("verbose", dhtVerboseOptionName, "Print extra information."),
|
||||
cmdkit.IntOption(numProvidersOptionName, "n", "The number of providers to find.").WithDefault(20),
|
||||
},
|
||||
Run: func(req cmds.Request, res cmds.Response) {
|
||||
n, err := req.InvocContext().GetNode()
|
||||
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
|
||||
n, err := cmdenv.GetNode(env)
|
||||
if err != nil {
|
||||
res.SetError(err, cmdkit.ErrNormal)
|
||||
return
|
||||
return err
|
||||
}
|
||||
|
||||
if n.Routing == nil {
|
||||
res.SetError(ErrNotOnline, cmdkit.ErrNormal)
|
||||
return
|
||||
return ErrNotOnline
|
||||
}
|
||||
|
||||
numProviders, _, err := res.Request().Option(numProvidersOptionName).Int()
|
||||
numProviders, _ := req.Options[numProvidersOptionName].(int)
|
||||
if err != nil {
|
||||
res.SetError(err, cmdkit.ErrNormal)
|
||||
return
|
||||
return err
|
||||
}
|
||||
if numProviders < 1 {
|
||||
res.SetError(fmt.Errorf("number of providers must be greater than 0"), cmdkit.ErrNormal)
|
||||
return
|
||||
return fmt.Errorf("number of providers must be greater than 0")
|
||||
}
|
||||
|
||||
c, err := cid.Parse(req.Arguments()[0])
|
||||
c, err := cid.Parse(req.Arguments[0])
|
||||
|
||||
if err != nil {
|
||||
res.SetError(err, cmdkit.ErrNormal)
|
||||
return
|
||||
return err
|
||||
}
|
||||
|
||||
outChan := make(chan interface{})
|
||||
res.SetOutput((<-chan interface{})(outChan))
|
||||
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
ctx, cancel := context.WithCancel(req.Context)
|
||||
ctx, events := notif.RegisterForQueryEvents(ctx)
|
||||
|
||||
pchan := n.Routing.FindProvidersAsync(ctx, c, numProviders)
|
||||
go func() {
|
||||
defer close(outChan)
|
||||
for e := range events {
|
||||
select {
|
||||
case outChan <- e:
|
||||
case <-req.Context().Done():
|
||||
return
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
go func() {
|
||||
defer cancel()
|
||||
@ -218,9 +174,16 @@ var findProvidersDhtCmd = &cmds.Command{
|
||||
})
|
||||
}
|
||||
}()
|
||||
for e := range events {
|
||||
if err := res.Emit(e); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
},
|
||||
Marshalers: cmds.MarshalerMap{
|
||||
cmds.Text: func() func(cmds.Response) (io.Reader, error) {
|
||||
Encoders: cmds.EncoderMap{
|
||||
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *notif.QueryEvent) error {
|
||||
pfm := pfuncMap{
|
||||
notif.FinalPeer: func(obj *notif.QueryEvent, out io.Writer, verbose bool) {
|
||||
if verbose {
|
||||
@ -241,23 +204,11 @@ var findProvidersDhtCmd = &cmds.Command{
|
||||
},
|
||||
}
|
||||
|
||||
return func(res cmds.Response) (io.Reader, error) {
|
||||
verbose, _, _ := res.Request().Option(dhtVerboseOptionName).Bool()
|
||||
v, err := unwrapOutput(res.Output())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
verbose, _ := req.Options[dhtVerboseOptionName].(bool)
|
||||
printEvent(out, w, verbose, pfm)
|
||||
|
||||
obj, ok := v.(*notif.QueryEvent)
|
||||
if !ok {
|
||||
return nil, e.TypeErr(obj, v)
|
||||
}
|
||||
|
||||
buf := new(bytes.Buffer)
|
||||
printEvent(obj, buf, verbose, pfm)
|
||||
return buf, nil
|
||||
}
|
||||
}(),
|
||||
return nil
|
||||
}),
|
||||
},
|
||||
Type: notif.QueryEvent{},
|
||||
}
|
||||
@ -278,71 +229,51 @@ var provideRefDhtCmd = &cmds.Command{
|
||||
cmdkit.BoolOption("verbose", dhtVerboseOptionName, "Print extra information."),
|
||||
cmdkit.BoolOption(recursiveOptionName, "r", "Recursively provide entire graph."),
|
||||
},
|
||||
Run: func(req cmds.Request, res cmds.Response) {
|
||||
n, err := req.InvocContext().GetNode()
|
||||
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
|
||||
nd, err := cmdenv.GetNode(env)
|
||||
if err != nil {
|
||||
res.SetError(err, cmdkit.ErrNormal)
|
||||
return
|
||||
return err
|
||||
}
|
||||
|
||||
if n.Routing == nil {
|
||||
res.SetError(ErrNotOnline, cmdkit.ErrNormal)
|
||||
return
|
||||
if nd.Routing == nil {
|
||||
return ErrNotOnline
|
||||
}
|
||||
|
||||
if len(n.PeerHost.Network().Conns()) == 0 {
|
||||
res.SetError(errors.New("cannot provide, no connected peers"), cmdkit.ErrNormal)
|
||||
return
|
||||
if len(nd.PeerHost.Network().Conns()) == 0 {
|
||||
return errors.New("cannot provide, no connected peers")
|
||||
}
|
||||
|
||||
rec, _, _ := req.Option(recursiveOptionName).Bool()
|
||||
rec, _ := req.Options[recursiveOptionName].(bool)
|
||||
|
||||
var cids []cid.Cid
|
||||
for _, arg := range req.Arguments() {
|
||||
for _, arg := range req.Arguments {
|
||||
c, err := cid.Decode(arg)
|
||||
if err != nil {
|
||||
res.SetError(err, cmdkit.ErrNormal)
|
||||
return
|
||||
return err
|
||||
}
|
||||
|
||||
has, err := n.Blockstore.Has(c)
|
||||
has, err := nd.Blockstore.Has(c)
|
||||
if err != nil {
|
||||
res.SetError(err, cmdkit.ErrNormal)
|
||||
return
|
||||
return err
|
||||
}
|
||||
|
||||
if !has {
|
||||
res.SetError(fmt.Errorf("block %s not found locally, cannot provide", c), cmdkit.ErrNormal)
|
||||
return
|
||||
return fmt.Errorf("block %s not found locally, cannot provide", c)
|
||||
}
|
||||
|
||||
cids = append(cids, c)
|
||||
}
|
||||
|
||||
outChan := make(chan interface{})
|
||||
res.SetOutput((<-chan interface{})(outChan))
|
||||
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
ctx, cancel := context.WithCancel(req.Context)
|
||||
ctx, events := notif.RegisterForQueryEvents(ctx)
|
||||
|
||||
go func() {
|
||||
defer close(outChan)
|
||||
for e := range events {
|
||||
select {
|
||||
case outChan <- e:
|
||||
case <-req.Context().Done():
|
||||
return
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
go func() {
|
||||
defer cancel()
|
||||
var err error
|
||||
if rec {
|
||||
err = provideKeysRec(ctx, n.Routing, n.DAG, cids)
|
||||
err = provideKeysRec(ctx, nd.Routing, nd.DAG, cids)
|
||||
} else {
|
||||
err = provideKeys(ctx, n.Routing, cids)
|
||||
err = provideKeys(ctx, nd.Routing, cids)
|
||||
}
|
||||
if err != nil {
|
||||
notif.PublishQueryEvent(ctx, ¬if.QueryEvent{
|
||||
@ -351,9 +282,17 @@ var provideRefDhtCmd = &cmds.Command{
|
||||
})
|
||||
}
|
||||
}()
|
||||
|
||||
for e := range events {
|
||||
if err := res.Emit(e); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
},
|
||||
Marshalers: cmds.MarshalerMap{
|
||||
cmds.Text: func() func(res cmds.Response) (io.Reader, error) {
|
||||
Encoders: cmds.EncoderMap{
|
||||
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *notif.QueryEvent) error {
|
||||
pfm := pfuncMap{
|
||||
notif.FinalPeer: func(obj *notif.QueryEvent, out io.Writer, verbose bool) {
|
||||
if verbose {
|
||||
@ -362,22 +301,11 @@ var provideRefDhtCmd = &cmds.Command{
|
||||
},
|
||||
}
|
||||
|
||||
return func(res cmds.Response) (io.Reader, error) {
|
||||
verbose, _, _ := res.Request().Option(dhtVerboseOptionName).Bool()
|
||||
v, err := unwrapOutput(res.Output())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
obj, ok := v.(*notif.QueryEvent)
|
||||
if !ok {
|
||||
return nil, e.TypeErr(obj, v)
|
||||
}
|
||||
verbose, _ := req.Options[dhtVerboseOptionName].(bool)
|
||||
printEvent(out, w, verbose, pfm)
|
||||
|
||||
buf := new(bytes.Buffer)
|
||||
printEvent(obj, buf, verbose, pfm)
|
||||
return buf, nil
|
||||
}
|
||||
}(),
|
||||
return nil
|
||||
}),
|
||||
},
|
||||
Type: notif.QueryEvent{},
|
||||
}
|
||||
@ -430,44 +358,27 @@ var findPeerDhtCmd = &cmds.Command{
|
||||
Options: []cmdkit.Option{
|
||||
cmdkit.BoolOption("verbose", dhtVerboseOptionName, "Print extra information."),
|
||||
},
|
||||
Run: func(req cmds.Request, res cmds.Response) {
|
||||
n, err := req.InvocContext().GetNode()
|
||||
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
|
||||
nd, err := cmdenv.GetNode(env)
|
||||
if err != nil {
|
||||
res.SetError(err, cmdkit.ErrNormal)
|
||||
return
|
||||
return err
|
||||
}
|
||||
|
||||
if n.Routing == nil {
|
||||
res.SetError(ErrNotOnline, cmdkit.ErrNormal)
|
||||
return
|
||||
if nd.Routing == nil {
|
||||
return ErrNotOnline
|
||||
}
|
||||
|
||||
pid, err := peer.IDB58Decode(req.Arguments()[0])
|
||||
pid, err := peer.IDB58Decode(req.Arguments[0])
|
||||
if err != nil {
|
||||
res.SetError(err, cmdkit.ErrNormal)
|
||||
return
|
||||
return err
|
||||
}
|
||||
|
||||
outChan := make(chan interface{})
|
||||
res.SetOutput((<-chan interface{})(outChan))
|
||||
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
ctx, cancel := context.WithCancel(req.Context)
|
||||
ctx, events := notif.RegisterForQueryEvents(ctx)
|
||||
|
||||
go func() {
|
||||
defer close(outChan)
|
||||
for v := range events {
|
||||
select {
|
||||
case outChan <- v:
|
||||
case <-req.Context().Done():
|
||||
}
|
||||
|
||||
}
|
||||
}()
|
||||
|
||||
go func() {
|
||||
defer cancel()
|
||||
pi, err := n.Routing.FindPeer(ctx, pid)
|
||||
pi, err := nd.Routing.FindPeer(ctx, pid)
|
||||
if err != nil {
|
||||
notif.PublishQueryEvent(ctx, ¬if.QueryEvent{
|
||||
Type: notif.QueryError,
|
||||
@ -481,9 +392,17 @@ var findPeerDhtCmd = &cmds.Command{
|
||||
Responses: []*pstore.PeerInfo{&pi},
|
||||
})
|
||||
}()
|
||||
|
||||
for e := range events {
|
||||
if err := res.Emit(e); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
},
|
||||
Marshalers: cmds.MarshalerMap{
|
||||
cmds.Text: func() func(cmds.Response) (io.Reader, error) {
|
||||
Encoders: cmds.EncoderMap{
|
||||
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *notif.QueryEvent) error {
|
||||
pfm := pfuncMap{
|
||||
notif.FinalPeer: func(obj *notif.QueryEvent, out io.Writer, verbose bool) {
|
||||
pi := obj.Responses[0]
|
||||
@ -493,24 +412,10 @@ var findPeerDhtCmd = &cmds.Command{
|
||||
},
|
||||
}
|
||||
|
||||
return func(res cmds.Response) (io.Reader, error) {
|
||||
verbose, _, _ := res.Request().Option(dhtVerboseOptionName).Bool()
|
||||
v, err := unwrapOutput(res.Output())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
obj, ok := v.(*notif.QueryEvent)
|
||||
if !ok {
|
||||
return nil, e.TypeErr(obj, v)
|
||||
}
|
||||
|
||||
buf := new(bytes.Buffer)
|
||||
printEvent(obj, buf, verbose, pfm)
|
||||
|
||||
return buf, nil
|
||||
}
|
||||
}(),
|
||||
verbose, _ := req.Options[dhtVerboseOptionName].(bool)
|
||||
printEvent(out, w, verbose, pfm)
|
||||
return nil
|
||||
}),
|
||||
},
|
||||
Type: notif.QueryEvent{},
|
||||
}
|
||||
@ -535,43 +440,27 @@ Different key types can specify other 'best' rules.
|
||||
Options: []cmdkit.Option{
|
||||
cmdkit.BoolOption("verbose", dhtVerboseOptionName, "Print extra information."),
|
||||
},
|
||||
Run: func(req cmds.Request, res cmds.Response) {
|
||||
n, err := req.InvocContext().GetNode()
|
||||
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
|
||||
nd, err := cmdenv.GetNode(env)
|
||||
if err != nil {
|
||||
res.SetError(err, cmdkit.ErrNormal)
|
||||
return
|
||||
return err
|
||||
}
|
||||
|
||||
if n.Routing == nil {
|
||||
res.SetError(ErrNotOnline, cmdkit.ErrNormal)
|
||||
return
|
||||
if nd.Routing == nil {
|
||||
return ErrNotOnline
|
||||
}
|
||||
|
||||
dhtkey, err := escapeDhtKey(req.Arguments()[0])
|
||||
dhtkey, err := escapeDhtKey(req.Arguments[0])
|
||||
if err != nil {
|
||||
res.SetError(err, cmdkit.ErrNormal)
|
||||
return
|
||||
return err
|
||||
}
|
||||
|
||||
outChan := make(chan interface{})
|
||||
res.SetOutput((<-chan interface{})(outChan))
|
||||
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
ctx, cancel := context.WithCancel(req.Context)
|
||||
ctx, events := notif.RegisterForQueryEvents(ctx)
|
||||
|
||||
go func() {
|
||||
defer close(outChan)
|
||||
for e := range events {
|
||||
select {
|
||||
case outChan <- e:
|
||||
case <-req.Context().Done():
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
go func() {
|
||||
defer cancel()
|
||||
val, err := n.Routing.GetValue(ctx, dhtkey)
|
||||
val, err := nd.Routing.GetValue(ctx, dhtkey)
|
||||
if err != nil {
|
||||
notif.PublishQueryEvent(ctx, ¬if.QueryEvent{
|
||||
Type: notif.QueryError,
|
||||
@ -584,9 +473,17 @@ Different key types can specify other 'best' rules.
|
||||
})
|
||||
}
|
||||
}()
|
||||
|
||||
for e := range events {
|
||||
if err := res.Emit(e); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
},
|
||||
Marshalers: cmds.MarshalerMap{
|
||||
cmds.Text: func() func(cmds.Response) (io.Reader, error) {
|
||||
Encoders: cmds.EncoderMap{
|
||||
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *notif.QueryEvent) error {
|
||||
pfm := pfuncMap{
|
||||
notif.Value: func(obj *notif.QueryEvent, out io.Writer, verbose bool) {
|
||||
if verbose {
|
||||
@ -597,25 +494,11 @@ Different key types can specify other 'best' rules.
|
||||
},
|
||||
}
|
||||
|
||||
return func(res cmds.Response) (io.Reader, error) {
|
||||
verbose, _, _ := res.Request().Option(dhtVerboseOptionName).Bool()
|
||||
v, err := unwrapOutput(res.Output())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
verbose, _ := req.Options[dhtVerboseOptionName].(bool)
|
||||
printEvent(out, w, verbose, pfm)
|
||||
|
||||
obj, ok := v.(*notif.QueryEvent)
|
||||
if !ok {
|
||||
return nil, e.TypeErr(obj, v)
|
||||
}
|
||||
|
||||
buf := new(bytes.Buffer)
|
||||
|
||||
printEvent(obj, buf, verbose, pfm)
|
||||
|
||||
return buf, nil
|
||||
}
|
||||
}(),
|
||||
return nil
|
||||
}),
|
||||
},
|
||||
Type: notif.QueryEvent{},
|
||||
}
|
||||
@ -649,46 +532,29 @@ NOTE: A value may not exceed 2048 bytes.
|
||||
Options: []cmdkit.Option{
|
||||
cmdkit.BoolOption("verbose", dhtVerboseOptionName, "Print extra information."),
|
||||
},
|
||||
Run: func(req cmds.Request, res cmds.Response) {
|
||||
n, err := req.InvocContext().GetNode()
|
||||
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
|
||||
nd, err := cmdenv.GetNode(env)
|
||||
if err != nil {
|
||||
res.SetError(err, cmdkit.ErrNormal)
|
||||
return
|
||||
return err
|
||||
}
|
||||
|
||||
if n.Routing == nil {
|
||||
res.SetError(ErrNotOnline, cmdkit.ErrNormal)
|
||||
return
|
||||
if nd.Routing == nil {
|
||||
return ErrNotOnline
|
||||
}
|
||||
|
||||
key, err := escapeDhtKey(req.Arguments()[0])
|
||||
key, err := escapeDhtKey(req.Arguments[0])
|
||||
if err != nil {
|
||||
res.SetError(err, cmdkit.ErrNormal)
|
||||
return
|
||||
return err
|
||||
}
|
||||
|
||||
outChan := make(chan interface{})
|
||||
res.SetOutput((<-chan interface{})(outChan))
|
||||
data := req.Arguments[1]
|
||||
|
||||
data := req.Arguments()[1]
|
||||
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
ctx, cancel := context.WithCancel(req.Context)
|
||||
ctx, events := notif.RegisterForQueryEvents(ctx)
|
||||
|
||||
go func() {
|
||||
defer close(outChan)
|
||||
for e := range events {
|
||||
select {
|
||||
case outChan <- e:
|
||||
case <-req.Context().Done():
|
||||
return
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
go func() {
|
||||
defer cancel()
|
||||
err := n.Routing.PutValue(ctx, key, []byte(data))
|
||||
err := nd.Routing.PutValue(ctx, key, []byte(data))
|
||||
if err != nil {
|
||||
notif.PublishQueryEvent(ctx, ¬if.QueryEvent{
|
||||
Type: notif.QueryError,
|
||||
@ -696,9 +562,17 @@ NOTE: A value may not exceed 2048 bytes.
|
||||
})
|
||||
}
|
||||
}()
|
||||
|
||||
for e := range events {
|
||||
if err := res.Emit(e); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
},
|
||||
Marshalers: cmds.MarshalerMap{
|
||||
cmds.Text: func() func(cmds.Response) (io.Reader, error) {
|
||||
Encoders: cmds.EncoderMap{
|
||||
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *notif.QueryEvent) error {
|
||||
pfm := pfuncMap{
|
||||
notif.FinalPeer: func(obj *notif.QueryEvent, out io.Writer, verbose bool) {
|
||||
if verbose {
|
||||
@ -710,23 +584,12 @@ NOTE: A value may not exceed 2048 bytes.
|
||||
},
|
||||
}
|
||||
|
||||
return func(res cmds.Response) (io.Reader, error) {
|
||||
verbose, _, _ := res.Request().Option(dhtVerboseOptionName).Bool()
|
||||
v, err := unwrapOutput(res.Output())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
obj, ok := v.(*notif.QueryEvent)
|
||||
if !ok {
|
||||
return nil, e.TypeErr(obj, v)
|
||||
}
|
||||
verbose, _ := req.Options[dhtVerboseOptionName].(bool)
|
||||
|
||||
buf := new(bytes.Buffer)
|
||||
printEvent(obj, buf, verbose, pfm)
|
||||
printEvent(out, w, verbose, pfm)
|
||||
|
||||
return buf, nil
|
||||
}
|
||||
}(),
|
||||
return nil
|
||||
}),
|
||||
},
|
||||
Type: notif.QueryEvent{},
|
||||
}
|
||||
|
||||
@ -125,7 +125,7 @@ var rootSubcommands = map[string]*cmds.Command{
|
||||
"bootstrap": lgc.NewCommand(BootstrapCmd),
|
||||
"config": lgc.NewCommand(ConfigCmd),
|
||||
"dag": dag.DagCmd,
|
||||
"dht": lgc.NewCommand(DhtCmd),
|
||||
"dht": DhtCmd,
|
||||
"diag": lgc.NewCommand(DiagCmd),
|
||||
"dns": DNSCmd,
|
||||
"id": IDCmd,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user