Merge pull request #14 from wpaulino/looprpc-rest

looprpc+cmd/loopd: add client REST definitions and REST proxy

Author: Roasbeef

cmd/loop/loopout.go

@@ -14,11 +14,11 @@ var loopOutCommand = cli.Command{
 	ArgsUsage: "amt [addr]",
 	Description: `
 	Attempts loop out the target amount into either the backing lnd's
-	wallet, or a targeted address. 
-	
-	The amount is to be specified in satoshis. 
+	wallet, or a targeted address.
 
-	Optionally a BASE58/bech32 encoded bitcoin destination address may be 
+	The amount is to be specified in satoshis.
+
+	Optionally a BASE58/bech32 encoded bitcoin destination address may be
 	specified. If not specified, a new wallet address will be generated.`,
 	Flags: []cli.Flag{
 		cli.Uint64Flag{
@@ -55,12 +55,10 @@ func loopOut(ctx *cli.Context) error {
 	}
 	defer cleanup()
 
-	quote, err := client.GetLoopOutQuote(
-		context.Background(),
-		&looprpc.QuoteRequest{
-			Amt: int64(amt),
-		},
-	)
+	quoteReq := &looprpc.QuoteRequest{
+		Amt: int64(amt),
+	}
+	quote, err := client.LoopOutQuote(context.Background(), quoteReq)
 	if err != nil {
 		return err
 	}

cmd/loop/terms.go

@@ -13,7 +13,7 @@ import (
 
 var termsCommand = cli.Command{
 	Name:   "terms",
-	Usage:  "show current server swap terms",
+	Usage:  "Display the current swap terms imposed by the server.",
 	Action: terms,
 }
 
@@ -24,9 +24,8 @@ func terms(ctx *cli.Context) error {
 	}
 	defer cleanup()
 
-	terms, err := client.GetLoopOutTerms(
-		context.Background(), &looprpc.TermsRequest{},
-	)
+	req := &looprpc.TermsRequest{}
+	terms, err := client.LoopOutTerms(context.Background(), req)
 	if err != nil {
 		return err
 	}

cmd/loopd/config.go

@@ -12,7 +12,8 @@ type config struct {
 	Insecure   bool   `long:"insecure" description:"disable tls"`
 	Network    string `long:"network" description:"network to run on" choice:"regtest" choice:"testnet" choice:"mainnet" choice:"simnet"`
 	SwapServer string `long:"swapserver" description:"swap server address host:port"`
-	Listen     string `long:"listen" description:"address to listen on for rpc lcients"`
+	RPCListen  string `long:"rpclisten" description:"Address to listen on for gRPC clients"`
+	RESTListen string `long:"restlisten" description:"Address to listen on for REST clients"`
 
 	Lnd *lndConfig `group:"lnd" namespace:"lnd"`
 
@@ -22,7 +23,8 @@ type config struct {
 var defaultConfig = config{
 	Network:    "mainnet",
 	SwapServer: "swap.lightning.today:11009",
-	Listen:     "localhost:11010",
+	RPCListen:  "localhost:11010",
+	RESTListen: "localhost:8081",
 	Insecure:   false,
 	Lnd: &lndConfig{
 		Host: "localhost:10009",

cmd/loopd/daemon.go

@@ -4,12 +4,14 @@ import (
 	"context"
 	"fmt"
 	"net"
+	"net/http"
 	"os"
 	"os/signal"
 	"runtime/pprof"
 	"sync"
 	"time"
 
+	proxy "github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/lightninglabs/loop"
 	"github.com/lightninglabs/loop/looprpc"
 	"google.golang.org/grpc"
@@ -59,15 +61,38 @@ func daemon(config *config) error {
 	grpcServer := grpc.NewServer(serverOpts...)
 	looprpc.RegisterSwapClientServer(grpcServer, &server)
 
-	// Next, Start the gRPC server listening for HTTP/2 connections.
-	logger.Infof("Starting RPC listener")
-	lis, err := net.Listen("tcp", config.Listen)
+	// Next, start the gRPC server listening for HTTP/2 connections.
+	logger.Infof("Starting gRPC listener")
+	grpcListener, err := net.Listen("tcp", config.RPCListen)
 	if err != nil {
 		return fmt.Errorf("RPC server unable to listen on %s",
-			config.Listen)
+			config.RPCListen)
 
 	}
-	defer lis.Close()
+	defer grpcListener.Close()
+
+	// We'll also create and start an accompanying proxy to serve clients
+	// through REST.
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	mux := proxy.NewServeMux()
+	proxyOpts := []grpc.DialOption{grpc.WithInsecure()}
+	err = looprpc.RegisterSwapClientHandlerFromEndpoint(
+		ctx, mux, config.RPCListen, proxyOpts,
+	)
+	if err != nil {
+		return err
+	}
+
+	logger.Infof("Starting REST proxy listener")
+	restListener, err := net.Listen("tcp", config.RESTListen)
+	if err != nil {
+		return fmt.Errorf("REST proxy unable to listen on %s",
+			config.RESTListen)
+	}
+	defer restListener.Close()
+	proxy := &http.Server{Handler: mux}
+	go proxy.Serve(restListener)
 
 	statusChan := make(chan loop.SwapInfo)
 
@@ -124,9 +149,10 @@ func daemon(config *config) error {
 	go func() {
 		defer wg.Done()
 
-		logger.Infof("RPC server listening on %s", lis.Addr())
+		logger.Infof("RPC server listening on %s", grpcListener.Addr())
+		logger.Infof("REST proxy listening on %s", restListener.Addr())
 
-		err = grpcServer.Serve(lis)
+		err = grpcServer.Serve(grpcListener)
 		if err != nil {
 			logger.Error(err)
 		}

cmd/loopd/swapclient_server.go

@@ -208,8 +208,8 @@ func (s *swapClientServer) Monitor(in *looprpc.MonitorRequest,
 	}
 }
 
-// GetTerms returns the terms that the server enforces for swaps.
-func (s *swapClientServer) GetLoopOutTerms(ctx context.Context,
+// LoopOutTerms returns the terms that the server enforces for loop out swaps.
+func (s *swapClientServer) LoopOutTerms(ctx context.Context,
 	req *looprpc.TermsRequest) (*looprpc.TermsResponse, error) {
 
 	logger.Infof("Terms request received")
@@ -230,8 +230,9 @@ func (s *swapClientServer) GetLoopOutTerms(ctx context.Context,
 	}, nil
 }
 
-// GetQuote returns a quote for a swap with the provided parameters.
-func (s *swapClientServer) GetLoopOutQuote(ctx context.Context,
+// LoopOutQuote returns a quote for a loop out swap with the provided
+// parameters.
+func (s *swapClientServer) LoopOutQuote(ctx context.Context,
 	req *looprpc.QuoteRequest) (*looprpc.QuoteResponse, error) {
 
 	quote, err := s.impl.LoopOutQuote(ctx, &loop.LoopOutQuoteRequest{

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/coreos/bbolt v0.0.0-20180223184059-7ee3ded59d4835e10f3e7d0f7603c42aa5e83820
 	github.com/fortytw2/leaktest v1.3.0
 	github.com/golang/protobuf v1.2.0
+	github.com/grpc-ecosystem/grpc-gateway v0.0.0-20170724004829-f2862b476edc
 	github.com/jessevdk/go-flags v0.0.0-20170926144705-f88afde2fa19
 	github.com/lightningnetwork/lnd v0.0.0
 	github.com/urfave/cli v1.20.0