ipfs: extract multiaddr container to its own pkg

Author: djdv

internal/filesystem/ipfs/mountpoint.go

@@ -11,6 +11,7 @@ import (
 	p9fs "github.com/djdv/go-filesystem-utils/internal/filesystem/9p"
 	coreiface "github.com/ipfs/boxo/coreiface"
 	"github.com/multiformats/go-multiaddr"
+	maddrc "github.com/djdv/go-filesystem-utils/internal/multiaddr"
 )
 
 type (
@@ -36,7 +37,7 @@ func (*IPFSGuest) GuestID() filesystem.ID { return IPFSID }
 func (ig *IPFSGuest) UnmarshalJSON(b []byte) error {
 	// multiformats/go-multiaddr issue #100
 	var maddrWorkaround struct {
-		APIMaddr multiaddrContainer `json:"apiMaddr,omitempty"`
+		APIMaddr maddrc.Multiaddr `json:"apiMaddr,omitempty"`
 	}
 	if err := json.Unmarshal(b, &maddrWorkaround); err != nil {
 		return err

internal/filesystem/ipfs/multiaddr.go

@@ -0,0 +1,63 @@
+package multiaddr
+
+import (
+	"encoding/json"
+
+	"github.com/multiformats/go-multiaddr"
+)
+
+// Multiaddr wraps the reference Multiaddr library
+// adding deserialization support.
+type Multiaddr struct{ multiaddr.Multiaddr }
+
+func (ma *Multiaddr) MarshalBinary() ([]byte, error) {
+	if maddr := ma.Multiaddr; maddr != nil {
+		return maddr.MarshalBinary()
+	}
+	return nil, nil
+}
+
+func (ma *Multiaddr) UnmarshalBinary(b []byte) error {
+	maddr, err := multiaddr.NewMultiaddrBytes(b)
+	if err != nil {
+		return err
+	}
+	ma.Multiaddr = maddr
+	return nil
+}
+
+func (ma *Multiaddr) MarshalText() ([]byte, error) {
+	if maddr := ma.Multiaddr; maddr != nil {
+		return maddr.MarshalText()
+	}
+	return []byte{}, nil
+}
+
+func (ma *Multiaddr) UnmarshalText(b []byte) error {
+	maddr, err := multiaddr.NewMultiaddr(string(b))
+	if err != nil {
+		return err
+	}
+	ma.Multiaddr = maddr
+	return nil
+}
+
+func (ma *Multiaddr) MarshalJSON() ([]byte, error) {
+	if maddr := ma.Multiaddr; maddr != nil {
+		return maddr.MarshalJSON()
+	}
+	return []byte("null"), nil
+}
+
+func (ma *Multiaddr) UnmarshalJSON(b []byte) error {
+	var maddrString string
+	if err := json.Unmarshal(b, &maddrString); err != nil {
+		return err
+	}
+	maddr, err := multiaddr.NewMultiaddr(maddrString)
+	if err != nil {
+		return err
+	}
+	ma.Multiaddr = maddr
+	return nil
+}