streamrpc 0.3 + config from daemon/config

daemon/connecter/connecter.go

@@ -4,17 +4,44 @@ import (
 	"fmt"
 	"github.com/problame/go-streamrpc"
 	"github.com/zrepl/zrepl/config"
+	"github.com/zrepl/zrepl/daemon/streamrpcconfig"
 )
 
-func FromConfig(g *config.Global, in config.ConnectEnum) (streamrpc.Connecter, error) {
+func FromConfig(g *config.Global, in config.ConnectEnum) (*ClientFactory, error) {
+	var (
+		connecter            streamrpc.Connecter
+		errConnecter, errRPC error
+		connConf             *streamrpc.ConnConfig
+	)
 	switch v := in.Ret.(type) {
 	case *config.SSHStdinserverConnect:
-		return SSHStdinserverConnecterFromConfig(v)
+		connecter, errConnecter = SSHStdinserverConnecterFromConfig(v)
+		connConf, errRPC = streamrpcconfig.FromDaemonConfig(g, v.RPC)
 	case *config.TCPConnect:
-		return TCPConnecterFromConfig(v)
+		connecter, errConnecter = TCPConnecterFromConfig(v)
+		connConf, errRPC = streamrpcconfig.FromDaemonConfig(g, v.RPC)
 	case *config.TLSConnect:
-		return TLSConnecterFromConfig(v)
+		connecter, errConnecter = TLSConnecterFromConfig(v)
+		connConf, errRPC = streamrpcconfig.FromDaemonConfig(g, v.RPC)
 	default:
 		panic(fmt.Sprintf("implementation error: unknown connecter type %T", v))
 	}
+
+	if errConnecter != nil {
+		return nil, errConnecter
+	}
+	if errRPC != nil {
+		return nil, errRPC
+	}
+
+	return &ClientFactory{connecter: connecter, config: &streamrpc.ClientConfig{connConf}}, nil
+}
+
+type ClientFactory struct {
+	connecter streamrpc.Connecter
+	config    *streamrpc.ClientConfig
+}
+
+func (f ClientFactory) NewClient() (*streamrpc.Client, error) {
+	return streamrpc.NewClient(f.connecter, f.config)
 }