move fetch, push to http package.

Author: nasdf

go.mod

@@ -3,6 +3,7 @@ module github.com/multiverse-vcs/go-multiverse
 go 1.16
 
 require (
+	github.com/alecthomas/chroma v0.8.2
 	github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
 	github.com/ipfs/go-bitswap v0.3.2
 	github.com/ipfs/go-blockservice v0.1.4
@@ -17,8 +18,10 @@ require (
 	github.com/ipfs/go-ipld-cbor v0.0.3
 	github.com/ipfs/go-ipld-format v0.2.0
 	github.com/ipfs/go-merkledag v0.3.2
+	github.com/ipfs/go-path v0.0.9
 	github.com/ipfs/go-unixfs v0.2.4
 	github.com/ipld/go-car v0.1.0
+	github.com/julienschmidt/httprouter v1.3.0
 	github.com/kr/text v0.2.0 // indirect
 	github.com/libp2p/go-libp2p v0.12.0
 	github.com/libp2p/go-libp2p-connmgr v0.2.4

go.sum

@@ -6,7 +6,6 @@ import (
 	"path/filepath"
 
 	cid "github.com/ipfs/go-cid"
-	"github.com/multiverse-vcs/go-multiverse/pkg/remote"
 )
 
 const (
@@ -24,8 +23,8 @@ type Config struct {
 	Branches map[string]cid.Cid `json:"branches"`
 	// Index is the CID of the current commit.
 	Index cid.Cid `json:"index"`
-	// Remote is the path to the repository.
-	Remote remote.Path `json:"remote"`
+	// Remote is the repository remote server.
+	Remote string `json:"remote"`
 	// Tags is a map of names to commit CIDs.
 	Tags map[string]cid.Cid `json:"tags"`
 

pkg/command/config.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/signal"
 
+	"github.com/multiverse-vcs/go-multiverse/pkg/http"
 	"github.com/multiverse-vcs/go-multiverse/pkg/remote"
 	"github.com/multiverse-vcs/go-multiverse/pkg/rpc"
 	"github.com/nasdf/ulimit"
@@ -40,6 +41,7 @@ func NewDaemonCommand() *cli.Command {
 				return err
 			}
 
+			go http.ListenAndServe(server)
 			go rpc.ListenAndServe(server)
 
 			fmt.Printf(Banner)

pkg/command/daemon.go

@@ -1,11 +1,14 @@
 package command
 
 import (
+	"bytes"
+	"errors"
 	"os"
 
-	"github.com/multiverse-vcs/go-multiverse/pkg/remote"
-	"github.com/multiverse-vcs/go-multiverse/pkg/rpc"
-	"github.com/multiverse-vcs/go-multiverse/pkg/rpc/repo"
+	cid "github.com/ipfs/go-cid"
+	ipld "github.com/ipfs/go-ipld-format"
+	car "github.com/ipld/go-car"
+	"github.com/multiverse-vcs/go-multiverse/pkg/http"
 	"github.com/urfave/cli/v2"
 )
 
@@ -14,6 +17,13 @@ func NewPushCommand() *cli.Command {
 	return &cli.Command{
 		Name:  "push",
 		Usage: "Update a remote repository",
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:    "branch",
+				Aliases: []string{"b"},
+				Usage:   "Branch to push",
+			},
+		},
 		Action: func(c *cli.Context) error {
 			cwd, err := os.Getwd()
 			if err != nil {
@@ -25,38 +35,37 @@ func NewPushCommand() *cli.Command {
 				return err
 			}
 
-			client, err := rpc.NewClient()
-			if err != nil {
-				return rpc.ErrDialRPC
+			branch := c.String("branch")
+			if branch == "" {
+				branch = ctx.Config.Branch
 			}
 
-			fetchArgs := repo.FetchArgs{
-				Remote: ctx.Config.Remote,
+			head := ctx.Config.Branches[branch]
+			if !head.Defined() {
+				return errors.New("nothing to push")
 			}
 
-			var fetchReply repo.FetchReply
-			if err := client.Call("Repo.Fetch", &fetchArgs, &fetchReply); err != nil {
+			client := http.NewClient()
+			repo, err := client.Fetch(ctx.Config.Remote)
+			if err != nil {
 				return err
 			}
 
-			branch := ctx.Config.Branch
-			heads := fetchReply.Repository.Heads()
-			old := fetchReply.Repository.Branches[branch]
-			new := ctx.Config.Branches[branch]
+			refs := repo.Heads()
+			walk := func(node ipld.Node) ([]*ipld.Link, error) {
+				if refs.Has(node.Cid()) {
+					return nil, nil
+				}
 
-			pack, err := remote.BuildPack(c.Context, ctx.DAG, heads, old, new)
-			if err != nil {
-				return err
+				return node.Links(), nil
 			}
 
-			pushArgs := repo.PushArgs{
-				Branch: branch,
-				Pack:   pack,
-				Remote: ctx.Config.Remote,
+			var data bytes.Buffer
+			if err := car.WriteCarWithWalker(c.Context, ctx.DAG, []cid.Cid{head}, &data, walk); err != nil {
+				return err
 			}
 
-			var pushReply repo.PushReply
-			return client.Call("Repo.Push", &pushArgs, &pushReply)
+			return client.Push(ctx.Config.Remote, branch, data.Bytes())
 		},
 	}
 }

pkg/command/push.go

@@ -3,7 +3,6 @@ package command
 import (
 	"os"
 
-	"github.com/multiverse-vcs/go-multiverse/pkg/remote"
 	"github.com/urfave/cli/v2"
 )
 
@@ -23,12 +22,7 @@ func NewRemoteCommand() *cli.Command {
 				return err
 			}
 
-			path := remote.Path(c.Args().Get(0))
-			if err = path.Verify(); err != nil {
-				return err
-			}
-
-			repo.Config.Remote = path
+			repo.Config.Remote = c.Args().Get(0)
 			return repo.Config.Write()
 		},
 	}

pkg/command/remote.go

@@ -1,8 +1,6 @@
 package repo
 
 import (
-	"fmt"
-
 	"github.com/multiverse-vcs/go-multiverse/pkg/rpc"
 	"github.com/multiverse-vcs/go-multiverse/pkg/rpc/repo"
 	"github.com/urfave/cli/v2"
@@ -32,7 +30,6 @@ func NewCreateCommand() *cli.Command {
 				return err
 			}
 
-			fmt.Println(reply.Remote)
 			return nil
 		},
 	}

pkg/command/repo/create.go

@@ -0,0 +1,62 @@
+package http
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+
+	"github.com/multiverse-vcs/go-multiverse/pkg/object"
+)
+
+// Client is an HTTP client.
+type Client struct {
+	*http.Client
+}
+
+// NewClient returns a new client.
+func NewClient() *Client {
+	return &Client{
+		&http.Client{},
+	}
+}
+
+// Fetch returns the repository at the given remote.
+func (c *Client) Fetch(remote string) (*object.Repository, error) {
+	url := fmt.Sprintf("http://%s/%s", BindAddr, remote)
+
+	res, err := c.Get(url)
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusOK {
+		return nil, errors.New("fetch request failed")
+	}
+
+	var repo object.Repository
+	if err := json.NewDecoder(res.Body).Decode(&repo); err != nil {
+		return nil, err
+	}
+
+	return &repo, nil
+}
+
+// Push updates the given branch at the remote with data.
+func (c *Client) Push(remote string, branch string, data []byte) error {
+	url := fmt.Sprintf("http://%s/%s/%s", BindAddr, remote, branch)
+
+	res, err := c.Post(url, "application/octet-stream", bytes.NewReader(data))
+	if err != nil {
+		return err
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusCreated {
+		return errors.New("push request failed")
+	}
+
+	return nil
+}

pkg/http/client.go

@@ -0,0 +1,51 @@
+package http
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+
+	"github.com/julienschmidt/httprouter"
+	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/multiverse-vcs/go-multiverse/pkg/object"
+)
+
+// Fetch returns the repository at the given path.
+func (s *Service) Fetch(w http.ResponseWriter, req *http.Request) error {
+	ctx := req.Context()
+
+	params := httprouter.ParamsFromContext(ctx)
+	pname := params.ByName("peer")
+	rname := params.ByName("repo")
+
+	peerID, err := peer.Decode(pname)
+	if err != nil {
+		return err
+	}
+
+	authorID, err := s.Namesys.Resolve(ctx, peerID)
+	if err != nil {
+		return err
+	}
+
+	author, err := object.GetAuthor(ctx, s.Peer.DAG, authorID)
+	if err != nil {
+		return err
+	}
+
+	repoID, ok := author.Repositories[rname]
+	if !ok {
+		return errors.New("repository does not exist")
+	}
+
+	repo, err := object.GetRepository(ctx, s.Peer.DAG, repoID)
+	if err != nil {
+		return err
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(repo)
+
+	return nil
+}