fix: correctly encode data

Author: hacdias

core/commands/name/name.go

@@ -2,6 +2,7 @@ package name
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"io"
 	"strings"
@@ -15,6 +16,7 @@ import (
 	cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
 	"github.com/ipld/go-ipld-prime"
 	"github.com/ipld/go-ipld-prime/codec/dagcbor"
+	"github.com/ipld/go-ipld-prime/codec/dagjson"
 	ic "github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/peer"
 	mbase "github.com/multiformats/go-multibase"
@@ -156,11 +158,26 @@ var IpnsInspectCmd = &cmds.Command{
 		}
 
 		if len(entry.Data) != 0 {
+			// This is hacky. The variable node (datamodel.Node) doesn't directly marshal
+			// to JSON. Therefore, we need to first decode from DAG-CBOR, then encode in
+			// DAG-JSON and finally unmarshal it from JSON. Since DAG-JSON is a subset
+			// of JSON, that should work. Then, we can store the final value in the
+			// result.Entry.Data for further inspection.
 			node, err := ipld.Decode(entry.Data, dagcbor.Decode)
 			if err != nil {
 				return err
 			}
-			result.Entry.Data = node
+
+			var buf bytes.Buffer
+			err = dagjson.Encode(node, &buf)
+			if err != nil {
+				return err
+			}
+
+			err = json.Unmarshal(buf.Bytes(), &result.Entry.Data)
+			if err != nil {
+				return err
+			}
 		}
 
 		validity, err := ipns.GetEOL(&entry)
@@ -200,9 +217,9 @@ var IpnsInspectCmd = &cmds.Command{
 			}
 		}
 
-		return cmds.EmitOnce(res, &result)
+		return cmds.EmitOnce(res, result)
 	},
-	Type: &IpnsInspectResult{},
+	Type: IpnsInspectResult{},
 	Encoders: cmds.EncoderMap{
 		cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *IpnsInspectResult) error {
 			tw := tabwriter.NewWriter(w, 0, 0, 1, ' ', 0)
@@ -220,7 +237,12 @@ var IpnsInspectCmd = &cmds.Command{
 			fmt.Fprintf(tw, "PublicKey:\t%q\n", out.Entry.PublicKey)
 			fmt.Fprintf(tw, "Signature V1:\t%q\n", out.Entry.SignatureV1)
 			fmt.Fprintf(tw, "Signature V2:\t%q\n", out.Entry.SignatureV2)
-			fmt.Fprintf(tw, "Data:\t%q\n", out.Entry.Data)
+
+			data, err := json.Marshal(out.Entry.Data)
+			if err != nil {
+				return err
+			}
+			fmt.Fprintf(tw, "Data:\t%s\n", string(data))
 
 			if out.Validation == nil {
 				tw.Flush()