Remove Fx from client implementation

client/client.go

@@ -0,0 +1,79 @@
+package client
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"strings"
+
+	"capnproto.org/go/capnp/v3/rpc"
+	"github.com/libp2p/go-libp2p/core/host"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
+	"github.com/lthibault/log"
+	ww "github.com/wetware/ww/pkg"
+)
+
+var ErrNoPeers = errors.New("no peers")
+
+type Config struct {
+	Logger   log.Logger
+	NS       string
+	Peers    []string // static bootstrap peers
+	Discover string   // bootstrap service multiadr
+}
+
+func (cfg Config) Dial(ctx context.Context, h host.Host) (*rpc.Conn, error) {
+	if cfg.Logger == nil {
+		cfg.Logger = log.New()
+	}
+	cfg.Logger = cfg.Logger.WithField("ns", cfg.NS)
+
+	peer, err := cfg.connect(ctx, h)
+	if err != nil {
+		return nil, fmt.Errorf("connect: %w", err)
+	}
+
+	s, err := h.NewStream(ctx, peer,
+		ww.Subprotocol(cfg.NS),
+		ww.Subprotocol(cfg.NS, "/packed"))
+	if err != nil {
+		return nil, fmt.Errorf("upgrade: %w", err)
+	}
+
+	return rpc.NewConn(transport(s), nil), nil
+}
+
+func (cfg Config) connect(ctx context.Context, h host.Host) (peer.ID, error) {
+	d, err := cfg.newBootstrapper(h)
+	if err != nil {
+		return "", fmt.Errorf("bootstrap: %w", err)
+	}
+	defer d.Close()
+
+	var peers <-chan peer.AddrInfo
+	if peers, err = d.FindPeers(ctx, cfg.NS); err != nil {
+		return "", fmt.Errorf("discover: %w", err)
+	}
+
+	for info := range peers {
+		if err = h.Connect(ctx, info); err == nil {
+			return info.ID, nil
+		}
+	}
+
+	// no peers?
+	if err == nil {
+		err = ErrNoPeers
+	}
+
+	return "", err
+}
+
+func transport(s network.Stream) rpc.Transport {
+	if strings.HasSuffix(string(s.Protocol()), "/packed") {
+		return rpc.NewPackedStreamTransport(s)
+	}
+
+	return rpc.NewStreamTransport(s)
+}

client/discovery.go

@@ -0,0 +1,39 @@
+package client
+
+import (
+	"io"
+
+	"github.com/libp2p/go-libp2p/core/discovery"
+	"github.com/libp2p/go-libp2p/core/host"
+	"github.com/wetware/casm/pkg/boot"
+	"github.com/wetware/casm/pkg/boot/socket"
+	bootutil "github.com/wetware/casm/pkg/boot/util"
+)
+
+func (cfg Config) newBootstrapper(h host.Host) (*bootService, error) {
+	var d discovery.Discoverer
+	var err error
+	if len(cfg.Peers) > 0 {
+		d, err = boot.NewStaticAddrStrings(cfg.Peers...)
+	} else {
+		d, err = bootutil.DialString(h, cfg.Discover,
+			socket.WithLogger(cfg.Logger),
+			socket.WithRateLimiter(socket.NewPacketLimiter(256, 16)))
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &bootService{Discoverer: d}, nil
+}
+
+type bootService struct{ discovery.Discoverer }
+
+func (d bootService) Close() (err error) {
+	if c, ok := d.Discoverer.(io.Closer); ok {
+		err = c.Close()
+	}
+
+	return
+}

cmd/ww/main.go

@@ -11,6 +11,8 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
+	"path"
+	"runtime"
 	"syscall"
 
 	"github.com/urfave/cli/v2"
@@ -20,6 +22,42 @@ import (
 	cmdstart "github.com/wetware/ww/internal/cmd/start"
 )
 
+var flags = []cli.Flag{
+	&cli.StringFlag{
+		Name:    "ns",
+		Usage:   "cluster namespace",
+		Value:   "ww",
+		EnvVars: []string{"WW_NS"},
+	},
+	&cli.StringSliceFlag{
+		Name:    "peer",
+		Aliases: []string{"p"},
+		Usage:   "bootstrap peer `ADDR`",
+		EnvVars: []string{"WW_PEERS"},
+	},
+	&cli.StringFlag{
+		Name:    "discover",
+		Aliases: []string{"d"},
+		Usage:   "use discovery service",
+		Value:   bootstrapAddr(),
+		EnvVars: []string{"WW_DISCOVER"},
+	},
+
+	// Category:  Logging
+	&cli.BoolFlag{
+		Name:     "debug",
+		Usage:    "enable debug logging",
+		EnvVars:  []string{"WW_DEBUG"},
+		Category: "LOGGING",
+	},
+	&cli.BoolFlag{
+		Name:     "json",
+		Usage:    "enable json logging",
+		EnvVars:  []string{"WW_JSON"},
+		Category: "LOGGING",
+	},
+}
+
 func main() {
 	ctx, cancel := signal.NotifyContext(
 		context.Background(),
@@ -36,6 +74,7 @@ func main() {
 		UsageText:            "ww [global options] command [command options] [arguments...]",
 		Copyright:            "2020 The Wetware Project",
 		EnableBashCompletion: true,
+		Flags:                flags,
 		Commands: []*cli.Command{
 			cmdrun.Command(),
 			cmdstart.Command(),
@@ -47,3 +86,15 @@ func main() {
 		os.Exit(1) // application error
 	}
 }
+func bootstrapAddr() string {
+	return path.Join("/ip4/228.8.8.8/udp/8822/multicast", loopback())
+}
+
+func loopback() string {
+	switch runtime.GOOS {
+	case "darwin":
+		return "lo0"
+	default:
+		return "lo"
+	}
+}