Federation sender API remodel (#988)

* Define an input API for the federationsender

* Wiring for rooomserver input API and federation sender input API

* Whoops, commit common too

* Merge input API into query API

* Rename FederationSenderQueryAPI to FederationSenderInternalAPI

* Fix dendritejs

* Rename Input to Perform

* Fix a couple of inputs -> performs

* Remove needless storage interface, add comments

roomserver/api/input.go

@@ -21,6 +21,7 @@ import (
 	"net/http"
 
 	commonHTTP "github.com/matrix-org/dendrite/common/http"
+	fsAPI "github.com/matrix-org/dendrite/federationsender/api"
 	"github.com/matrix-org/gomatrixserverlib"
 	opentracing "github.com/opentracing/opentracing-go"
 )
@@ -106,6 +107,9 @@ type InputRoomEventsResponse struct {
 
 // RoomserverInputAPI is used to write events to the room server.
 type RoomserverInputAPI interface {
+	// needed to avoid chicken and egg scenario when setting up the
+	// interdependencies between the roomserver and the FS input API
+	SetFederationSenderAPI(fsInputAPI fsAPI.FederationSenderInternalAPI)
 	InputRoomEvents(
 		ctx context.Context,
 		request *InputRoomEventsRequest,
@@ -122,12 +126,22 @@ func NewRoomserverInputAPIHTTP(roomserverURL string, httpClient *http.Client) (R
 	if httpClient == nil {
 		return nil, errors.New("NewRoomserverInputAPIHTTP: httpClient is <nil>")
 	}
-	return &httpRoomserverInputAPI{roomserverURL, httpClient}, nil
+	return &httpRoomserverInputAPI{roomserverURL, httpClient, nil}, nil
 }
 
 type httpRoomserverInputAPI struct {
 	roomserverURL string
 	httpClient    *http.Client
+	// The federation sender API allows us to send federation
+	// requests from the new perform input requests, still TODO.
+	fsInputAPI fsAPI.FederationSenderInternalAPI
+}
+
+// SetFederationSenderInputAPI passes in a federation sender input API reference
+// so that we can avoid the chicken-and-egg problem of both the roomserver input API
+// and the federation sender input API being interdependent.
+func (h *httpRoomserverInputAPI) SetFederationSenderAPI(fsInputAPI fsAPI.FederationSenderInternalAPI) {
+	h.fsInputAPI = fsInputAPI
 }
 
 // InputRoomEvents implements RoomserverInputAPI

roomserver/input/input.go

@@ -26,6 +26,8 @@ import (
 	"github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/dendrite/roomserver/storage"
 	"github.com/matrix-org/util"
+
+	fsAPI "github.com/matrix-org/dendrite/federationsender/api"
 )
 
 // RoomserverInputAPI implements api.RoomserverInputAPI
@@ -37,6 +39,16 @@ type RoomserverInputAPI struct {
 	OutputRoomEventTopic string
 	// Protects calls to processRoomEvent
 	mutex sync.Mutex
+	// The federation sender API allows us to send federation
+	// requests from the new perform input requests, still TODO.
+	fsAPI fsAPI.FederationSenderInternalAPI
+}
+
+// SetFederationSenderInputAPI passes in a federation sender input API reference
+// so that we can avoid the chicken-and-egg problem of both the roomserver input API
+// and the federation sender input API being interdependent.
+func (r *RoomserverInputAPI) SetFederationSenderAPI(fsAPI fsAPI.FederationSenderInternalAPI) {
+	r.fsAPI = fsAPI
 }
 
 // WriteOutputEvents implements OutputRoomEventWriter

roomserver/roomserver.go

@@ -21,6 +21,7 @@ import (
 	"github.com/matrix-org/gomatrixserverlib"
 
 	asQuery "github.com/matrix-org/dendrite/appservice/query"
+
 	"github.com/matrix-org/dendrite/common/basecomponent"
 	"github.com/matrix-org/dendrite/roomserver/alias"
 	"github.com/matrix-org/dendrite/roomserver/input"