Wire AS API into roomserver again

cmd/dendrite-client-api-server/main.go

@@ -38,6 +38,7 @@ func main() {
 	asQuery := base.CreateHTTPAppServiceAPIs()
 	rsAPI := base.CreateHTTPRoomserverAPIs()
 	fsAPI := base.CreateHTTPFederationSenderAPIs()
+	rsAPI.SetFederationSenderAPI(fsAPI)
 	eduInputAPI := eduserver.SetupEDUServerComponent(base, cache.New())
 
 	clientapi.SetupClientAPIComponent(

cmd/dendrite-demo-libp2p/main.go

@@ -160,6 +160,7 @@ func main() {
 	fsAPI := federationsender.SetupFederationSenderComponent(
 		&base.Base, federation, rsAPI, &keyRing,
 	)
+	rsAPI.SetFederationSenderAPI(fsAPI)
 
 	clientapi.SetupClientAPIComponent(
 		&base.Base, deviceDB, accountDB,

cmd/dendrite-federation-api-server/main.go

@@ -37,6 +37,7 @@ func main() {
 
 	rsAPI := base.CreateHTTPRoomserverAPIs()
 	asAPI := base.CreateHTTPAppServiceAPIs()
+	rsAPI.SetFederationSenderAPI(fsAPI)
 	eduInputAPI := eduserver.SetupEDUServerComponent(base, cache.New())
 	eduProducer := producers.NewEDUServerProducer(eduInputAPI)
 

cmd/dendrite-federation-sender-server/main.go

@@ -28,12 +28,11 @@ func main() {
 	federation := base.CreateFederationClient()
 	keyDB := base.CreateKeyDB()
 	keyRing := keydb.CreateKeyRing(federation.Client, keyDB, cfg.Matrix.KeyPerspectives)
-
 	rsAPI := base.CreateHTTPRoomserverAPIs()
-
+	fsAPI := federationsender.SetupFederationSenderComponent(
-	federationsender.SetupFederationSenderComponent(
 		base, federation, rsAPI, &keyRing,
 	)
+	rsAPI.SetFederationSenderAPI(fsAPI)
 
 	base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationSender), string(base.Cfg.Listen.FederationSender))
 

cmd/dendrite-public-rooms-api-server/main.go

@@ -28,7 +28,10 @@ func main() {
 
 	deviceDB := base.CreateDeviceDB()
 
+	fsAPI := base.CreateHTTPFederationSenderAPIs()
 	rsAPI := base.CreateHTTPRoomserverAPIs()
+	rsAPI.SetFederationSenderAPI(fsAPI)
+
 	publicRoomsDB, err := storage.NewPublicRoomsServerDatabase(string(base.Cfg.Database.PublicRoomsAPI))
 	if err != nil {
 		logrus.WithError(err).Panicf("failed to connect to public rooms db")

cmd/dendrite-room-server/main.go

@@ -30,8 +30,9 @@ func main() {
 	federation := base.CreateFederationClient()
 	keyRing := keydb.CreateKeyRing(federation.Client, keyDB, cfg.Matrix.KeyPerspectives)
 
+	asAPI := base.CreateHTTPAppServiceAPIs()
 	fsAPI := base.CreateHTTPFederationSenderAPIs()
-	rsAPI := roomserver.SetupRoomServerComponent(base, keyRing, federation, nil) // TODO: AS API here
+	rsAPI := roomserver.SetupRoomServerComponent(base, keyRing, federation, asAPI) // TODO: AS API here
 	rsAPI.SetFederationSenderAPI(fsAPI)
 
 	base.SetupAndServeHTTP(string(base.Cfg.Bind.RoomServer), string(base.Cfg.Listen.RoomServer))

cmd/dendrite-sync-api-server/main.go

@@ -28,7 +28,9 @@ func main() {
 	accountDB := base.CreateAccountsDB()
 	federation := base.CreateFederationClient()
 
+	fsAPI := base.CreateHTTPFederationSenderAPIs()
 	rsAPI := base.CreateHTTPRoomserverAPIs()
+	rsAPI.SetFederationSenderAPI(fsAPI)
 
 	syncapi.SetupSyncAPIComponent(base, deviceDB, accountDB, rsAPI, federation, cfg)
 

roomserver/api/api.go

@@ -9,8 +9,9 @@ import (
 // RoomserverInputAPI is used to write events to the room server.
 type RoomserverInternalAPI interface {
 	// needed to avoid chicken and egg scenario when setting up the
-	// interdependencies between the roomserver and the FS input API
+	// interdependencies between the roomserver and other input APIs
-	SetFederationSenderAPI(fsInputAPI fsAPI.FederationSenderInternalAPI)
+	SetFederationSenderAPI(fsAPI fsAPI.FederationSenderInternalAPI)
+
 	InputRoomEvents(
 		ctx context.Context,
 		request *InputRoomEventsRequest,

roomserver/api/http.go

@@ -5,15 +5,13 @@ import (
 	"net/http"
 
 	"github.com/matrix-org/dendrite/common/caching"
-	fsAPI "github.com/matrix-org/dendrite/federationsender/api"
+	fsInputAPI "github.com/matrix-org/dendrite/federationsender/api"
 )
 
 type httpRoomserverInternalAPI struct {
-	roomserverURL string
+	roomserverURL  string
-	httpClient    *http.Client
+	httpClient     *http.Client
-	// The federation sender API allows us to send federation
+	fsAPI          fsInputAPI.FederationSenderInternalAPI
-	// requests from the new perform input requests, still TODO.
-	fsInputAPI     fsAPI.FederationSenderInternalAPI
 	immutableCache caching.ImmutableCache
 }
 
@@ -29,9 +27,8 @@ func NewRoomserverInternalAPIHTTP(
 		return nil, errors.New("NewRoomserverInternalAPIHTTP: httpClient is <nil>")
 	}
 	return &httpRoomserverInternalAPI{
-		roomserverURL: roomserverURL,
+		roomserverURL:  roomserverURL,
-		httpClient:    httpClient,
+		httpClient:     httpClient,
-		//fsInputAPI:     fsInputAPI,
 		immutableCache: immutableCache,
 	}, nil
 }
@@ -39,6 +36,6 @@ func NewRoomserverInternalAPIHTTP(
 // 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 *httpRoomserverInternalAPI) SetFederationSenderAPI(fsInputAPI fsAPI.FederationSenderInternalAPI) {
+func (h *httpRoomserverInternalAPI) SetFederationSenderAPI(fsAPI fsInputAPI.FederationSenderInternalAPI) {
-	h.fsInputAPI = fsInputAPI
+	h.fsAPI = fsAPI
 }