Skip to content

work towards fixing dht commands #6277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 14, 2019
Merged

work towards fixing dht commands #6277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76dc6f5
commands(dht): make it possible to return errors from printEvent
Stebalien Apr 30, 2019
9027eaa
commands(dht): base64 encode value in get
Stebalien Apr 30, 2019
cc2ab14
commands(dht): load arguments from request body
Stebalien Apr 30, 2019
a8fa9dd
test: dht put/get round trips
Stebalien May 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 46 additions & 30 deletions core/commands/dht.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package commands

import (
"context"
"encoding/base64"
"errors"
"fmt"
"io"
Expand Down Expand Up @@ -104,15 +105,15 @@ var queryDhtCmd = &cmds.Command{
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) {
notif.PeerResponse: func(obj *notif.QueryEvent, out io.Writer, verbose bool) error {
for _, p := range obj.Responses {
fmt.Fprintf(out, "%s\n", p.ID.Pretty())
}
return nil
},
}
verbose, _ := req.Options[dhtVerboseOptionName].(bool)
printEvent(out, w, verbose, pfm)
return nil
return printEvent(out, w, verbose, pfm)
}),
},
Type: notif.QueryEvent{},
Expand Down Expand Up @@ -182,12 +183,13 @@ var findProvidersDhtCmd = &cmds.Command{
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) {
notif.FinalPeer: func(obj *notif.QueryEvent, out io.Writer, verbose bool) error {
if verbose {
fmt.Fprintf(out, "* closest peer %s\n", obj.ID)
}
return nil
},
notif.Provider: func(obj *notif.QueryEvent, out io.Writer, verbose bool) {
notif.Provider: func(obj *notif.QueryEvent, out io.Writer, verbose bool) error {
prov := obj.Responses[0]
if verbose {
fmt.Fprintf(out, "provider: ")
Expand All @@ -198,13 +200,12 @@ var findProvidersDhtCmd = &cmds.Command{
fmt.Fprintf(out, "\t%s\n", a)
}
}
return nil
},
}

verbose, _ := req.Options[dhtVerboseOptionName].(bool)
printEvent(out, w, verbose, pfm)

return nil
return printEvent(out, w, verbose, pfm)
}),
},
Type: notif.QueryEvent{},
Expand Down Expand Up @@ -240,6 +241,13 @@ var provideRefDhtCmd = &cmds.Command{
return errors.New("cannot provide, no connected peers")
}

// Needed to parse stdin args.
// TODO: Lazy Load
err = req.ParseBodyArgs()
if err != nil {
return err
}

rec, _ := req.Options[recursiveOptionName].(bool)

var cids []cid.Cid
Expand Down Expand Up @@ -291,17 +299,16 @@ var provideRefDhtCmd = &cmds.Command{
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) {
notif.FinalPeer: func(obj *notif.QueryEvent, out io.Writer, verbose bool) error {
if verbose {
fmt.Fprintf(out, "sending provider record to peer %s\n", obj.ID)
}
return nil
},
}

verbose, _ := req.Options[dhtVerboseOptionName].(bool)
printEvent(out, w, verbose, pfm)

return nil
return printEvent(out, w, verbose, pfm)
}),
},
Type: notif.QueryEvent{},
Expand Down Expand Up @@ -403,17 +410,17 @@ var findPeerDhtCmd = &cmds.Command{
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) {
notif.FinalPeer: func(obj *notif.QueryEvent, out io.Writer, verbose bool) error {
pi := obj.Responses[0]
for _, a := range pi.Addrs {
fmt.Fprintf(out, "%s\n", a)
}
return nil
},
}

verbose, _ := req.Options[dhtVerboseOptionName].(bool)
printEvent(out, w, verbose, pfm)
return nil
return printEvent(out, w, verbose, pfm)
}),
},
Type: notif.QueryEvent{},
Expand Down Expand Up @@ -470,7 +477,7 @@ Different key types can specify other 'best' rules.
} else {
notif.PublishQueryEvent(ctx, &notif.QueryEvent{
Type: notif.Value,
Extra: string(val),
Extra: base64.StdEncoding.EncodeToString(val),
})
}
}()
Expand All @@ -486,19 +493,22 @@ Different key types can specify other 'best' rules.
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) {
notif.Value: func(obj *notif.QueryEvent, out io.Writer, verbose bool) error {
if verbose {
fmt.Fprintf(out, "got value: '%s'\n", obj.Extra)
} else {
fmt.Fprintln(out, obj.Extra)
res, err := base64.StdEncoding.DecodeString(obj.Extra)
if err != nil {
return err
}
out.Write(res)
}
return nil
},
}

verbose, _ := req.Options[dhtVerboseOptionName].(bool)
printEvent(out, w, verbose, pfm)

return nil
return printEvent(out, w, verbose, pfm)
}),
},
Type: notif.QueryEvent{},
Expand Down Expand Up @@ -539,6 +549,12 @@ NOTE: A value may not exceed 2048 bytes.
return err
}

// Needed to parse stdin args.
err = req.ParseBodyArgs()
if err != nil {
return err
}

if !nd.IsOnline {
return ErrNotOnline
}
Expand Down Expand Up @@ -576,38 +592,37 @@ NOTE: A value may not exceed 2048 bytes.
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) {
notif.FinalPeer: func(obj *notif.QueryEvent, out io.Writer, verbose bool) error {
if verbose {
fmt.Fprintf(out, "* closest peer %s\n", obj.ID)
}
return nil
},
notif.Value: func(obj *notif.QueryEvent, out io.Writer, verbose bool) {
notif.Value: func(obj *notif.QueryEvent, out io.Writer, verbose bool) error {
fmt.Fprintf(out, "%s\n", obj.ID.Pretty())
return nil
},
}

verbose, _ := req.Options[dhtVerboseOptionName].(bool)

printEvent(out, w, verbose, pfm)

return nil
return printEvent(out, w, verbose, pfm)
}),
},
Type: notif.QueryEvent{},
}

type printFunc func(obj *notif.QueryEvent, out io.Writer, verbose bool)
type printFunc func(obj *notif.QueryEvent, out io.Writer, verbose bool) error
type pfuncMap map[notif.QueryEventType]printFunc

func printEvent(obj *notif.QueryEvent, out io.Writer, verbose bool, override pfuncMap) {
func printEvent(obj *notif.QueryEvent, out io.Writer, verbose bool, override pfuncMap) error {
if verbose {
fmt.Fprintf(out, "%s: ", time.Now().Format("15:04:05.000"))
}

if override != nil {
if pf, ok := override[obj.Type]; ok {
pf(obj, out, verbose)
return
return pf(obj, out, verbose)
}
}

Expand Down Expand Up @@ -648,6 +663,7 @@ func printEvent(obj *notif.QueryEvent, out io.Writer, verbose bool, override pfu
fmt.Fprintf(out, "unrecognized event type: %d\n", obj.Type)
}
}
return nil
}

func escapeDhtKey(s string) (string, error) {
Expand Down
6 changes: 6 additions & 0 deletions test/sharness/t0170-dht.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ test_dht() {
[ -s putted ] ||
test_fsh cat putted
'

test_expect_success 'put round trips' '
echo -n "$TEST_DHT_VALUE" >expected &&
ipfsi 0 dht get "$TEST_DHT_PATH" >actual &&
test_cmp actual expected
'

# ipfs dht get <key>
test_expect_success 'get with good keys' '
Expand Down