add basic peer connect endpoint to debugapi

pkg/debugapi/debugapi.go

@@ -7,6 +7,7 @@ package debugapi
 import (
 	"net/http"
 
+	"github.com/ethersphere/bee/pkg/p2p"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -22,7 +23,9 @@ type server struct {
 	metricsRegistry *prometheus.Registry
 }
 
-type Options struct{}
+type Options struct {
+	P2P p2p.Service
+}
 
 func New(o Options) Service {
 	s := &server{

pkg/debugapi/peer.go

+// Copyright 2020 The Swarm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package debugapi
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"github.com/gorilla/mux"
+	"github.com/multiformats/go-multiaddr"
+)
+
+type peerConnectResponse struct {
+	Address string
+}
+
+func (s *server) peerConnectHandler(w http.ResponseWriter, r *http.Request) {
+	addr, err := multiaddr.NewMultiaddr("/" + mux.Vars(r)["multi-address"])
+	if err != nil {
+		panic(err)
+	}
+
+	address, err := s.P2P.Connect(r.Context(), addr)
+	if err != nil {
+		panic(err)
+	}
+
+	if err := json.NewEncoder(w).Encode(peerConnectResponse{
+		Address: address,
+	}); err != nil {
+		panic(err)
+	}
+}

pkg/debugapi/router.go

@@ -10,6 +10,7 @@ import (
 	"net/http/pprof"
 
 	"github.com/gorilla/handlers"
+	"github.com/gorilla/mux"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"resenje.org/web"
 )
@@ -22,7 +23,7 @@ func (s *server) setupRouting() {
 		promhttp.HandlerFor(s.metricsRegistry, promhttp.HandlerOpts{}),
 	))
 
-	internalRouter := http.NewServeMux()
+	internalRouter := mux.NewRouter()
 	internalBaseRouter.Handle("/", web.ChainHandlers(
 		handlers.CompressHandler,
 		web.NoCacheHeadersHandler,
@@ -30,9 +31,6 @@ func (s *server) setupRouting() {
 	))
 	internalRouter.Handle("/", http.NotFoundHandler())
 
-	internalRouter.HandleFunc("/health", s.statusHandler)
-	internalRouter.HandleFunc("/readiness", s.statusHandler)
-
 	internalRouter.Handle("/debug/pprof/", http.HandlerFunc(pprof.Index))
 	internalRouter.Handle("/debug/pprof/cmdline", http.HandlerFunc(pprof.Cmdline))
 	internalRouter.Handle("/debug/pprof/profile", http.HandlerFunc(pprof.Profile))
@@ -41,5 +39,10 @@ func (s *server) setupRouting() {
 
 	internalRouter.Handle("/debug/vars", expvar.Handler())
 
+	internalRouter.HandleFunc("/health", s.statusHandler)
+	internalRouter.HandleFunc("/readiness", s.statusHandler)
+
+	internalRouter.HandleFunc("/connect/{multi-address:.+}", s.peerConnectHandler)
+
 	s.Handler = internalBaseRouter
 }

pkg/node/node.go

@@ -103,7 +103,9 @@ func NewBee(o Options) (*Bee, error) {
 
 	if o.DebugAPIAddr != "" {
 		// Debug API server
-		debugAPIService := debugapi.New(debugapi.Options{})
+		debugAPIService := debugapi.New(debugapi.Options{
+			P2P: p2ps,
+		})
 		// register metrics from components
 		debugAPIService.MustRegisterMetrics(p2ps.Metrics()...)
 		debugAPIService.MustRegisterMetrics(pingPong.Metrics()...)