Brian Picciano
8c3e6a2845
In a world where the daemon can manage more than one network, the Daemon is really responsible only for knowing which networks are currently joined, creating/joining/leaving networks, and routing incoming RPC requests to the correct network handler as needed. The new network package, with its Network interface, inherits most of the logic that Daemon used to have, leaving Daemon only the parts needed for the functionality just described. There's a lot of cleanup done here in order to really nail down the separation of concerns between the two, especially around directory creation.
48 lines
1.3 KiB
Go
48 lines
1.3 KiB
Go
package daemon
|
|
|
|
import (
|
|
"context"
|
|
"isle/daemon/jsonrpc2"
|
|
"isle/daemon/network"
|
|
"isle/nebula"
|
|
"net/http"
|
|
)
|
|
|
|
// RPC defines the methods which the Daemon exposes over RPC (via the RPCHandler
|
|
// or HTTPHandler methods). Method documentation can be found on the Daemon
|
|
// type.
|
|
type RPC interface {
|
|
CreateNetwork(
|
|
ctx context.Context,
|
|
name string,
|
|
domain string,
|
|
ipNet nebula.IPNet,
|
|
hostName nebula.HostName,
|
|
) error
|
|
|
|
JoinNetwork(context.Context, network.JoiningBootstrap) error
|
|
|
|
// All network.RPC methods are automatically implemented by Daemon using the
|
|
// currently joined network. If no network is joined then any call to these
|
|
// methods will return ErrNoNetwork.
|
|
network.RPC
|
|
}
|
|
|
|
// RPCHandler returns a jsonrpc2.Handler which will use the Daemon to serve all
|
|
// methods defined on the RPC interface.
|
|
func (d *Daemon) RPCHandler() jsonrpc2.Handler {
|
|
rpc := RPC(d)
|
|
return jsonrpc2.Chain(
|
|
jsonrpc2.NewMLogMiddleware(d.logger.WithNamespace("rpc")),
|
|
jsonrpc2.ExposeServerSideErrorsMiddleware,
|
|
)(
|
|
jsonrpc2.NewDispatchHandler(&rpc),
|
|
)
|
|
}
|
|
|
|
// HTTPRPCHandler returns an http.Handler which will use the Daemon to serve all
|
|
// methods defined on the RPC interface via the JSONRPC2 protocol.
|
|
func (d *Daemon) HTTPRPCHandler() http.Handler {
|
|
return jsonrpc2.NewHTTPHandler(d.RPCHandler())
|
|
}
|