Jetstream package

setup/config/config.go

@@ -329,7 +329,7 @@ func (c *Dendrite) Verify(configErrs *ConfigErrors, isMonolith bool) {
 }
 
 func (c *Dendrite) Wiring() {
-	c.Global.Kafka.Matrix = &c.Global
+	c.Global.JetStream.Matrix = &c.Global
 	c.ClientAPI.Matrix = &c.Global
 	c.EDUServer.Matrix = &c.Global
 	c.FederationAPI.Matrix = &c.Global

setup/config/config_global.go

@@ -43,8 +43,8 @@ type Global struct {
 	// Defaults to an empty array.
 	TrustedIDServers []string `yaml:"trusted_third_party_id_servers"`
 
-	// Kafka/Naffka configuration
-	Kafka Kafka `yaml:"kafka"`
+	// JetStream configuration
+	JetStream JetStream `yaml:"jetstream"`
 
 	// Metrics configuration
 	Metrics Metrics `yaml:"metrics"`
@@ -63,7 +63,7 @@ func (c *Global) Defaults() {
 	c.KeyID = "ed25519:auto"
 	c.KeyValidityPeriod = time.Hour * 24 * 7
 
-	c.Kafka.Defaults()
+	c.JetStream.Defaults()
 	c.Metrics.Defaults()
 	c.DNSCache.Defaults()
 	c.Sentry.Defaults()
@@ -73,7 +73,7 @@ func (c *Global) Verify(configErrs *ConfigErrors, isMonolith bool) {
 	checkNotEmpty(configErrs, "global.server_name", string(c.ServerName))
 	checkNotEmpty(configErrs, "global.private_key", string(c.PrivateKeyPath))
 
-	c.Kafka.Verify(configErrs, isMonolith)
+	c.JetStream.Verify(configErrs, isMonolith)
 	c.Metrics.Verify(configErrs, isMonolith)
 	c.Sentry.Verify(configErrs, isMonolith)
 	c.DNSCache.Verify(configErrs, isMonolith)

setup/config/config_jetstream.go

@@ -0,0 +1,31 @@
+package config
+
+import "fmt"
+
+type JetStream struct {
+	Matrix *Global `yaml:"-"`
+
+	// A list of NATS addresses to connect to. If none are specified, an
+	// internal NATS server will be used when running in monolith mode only.
+	Addresses []string `yaml:"addresses"`
+	// The prefix to use for stream names for this homeserver - really only
+	// useful if running more than one Dendrite on the same NATS deployment.
+	TopicPrefix string `yaml:"topic_prefix"`
+}
+
+func (k *JetStream) TopicFor(name string) string {
+	return fmt.Sprintf("%s%s", k.TopicPrefix, name)
+}
+
+func (c *JetStream) Defaults() {
+	c.Addresses = []string{}
+	c.TopicPrefix = "Dendrite"
+}
+
+func (c *JetStream) Verify(configErrs *ConfigErrors, isMonolith bool) {
+	// If we are running in a polylith deployment then we need at least
+	// one NATS JetStream server to talk to.
+	if !isMonolith {
+		checkNotZero(configErrs, "global.jetstream.addresses", int64(len(c.Addresses)))
+	}
+}

setup/config/config_kafka.go

@@ -1,75 +0,0 @@
-package config
-
-import "fmt"
-
-// Defined Kafka topics.
-const (
-	TopicOutputTypingEvent       = "OutputTypingEvent"
-	TopicOutputSendToDeviceEvent = "OutputSendToDeviceEvent"
-	TopicOutputKeyChangeEvent    = "OutputKeyChangeEvent"
-	TopicOutputRoomEvent         = "OutputRoomEvent"
-	TopicOutputClientData        = "OutputClientData"
-	TopicOutputReceiptEvent      = "OutputReceiptEvent"
-)
-
-// KafkaTopics is a convenience slice to access all defined Kafka topics.
-var KafkaTopics = []string{
-	TopicOutputTypingEvent,
-	TopicOutputSendToDeviceEvent,
-	TopicOutputKeyChangeEvent,
-	TopicOutputRoomEvent,
-	TopicOutputClientData,
-	TopicOutputReceiptEvent,
-}
-
-type Kafka struct {
-	Matrix *Global `yaml:"-"`
-	
-	// A list of kafka/NATS addresses to connect to.
-	Addresses []string `yaml:"addresses"`
-	// The prefix to use for Kafka topic names for this homeserver - really only
-	// useful if running more than one Dendrite on the same Kafka deployment.
-	TopicPrefix string `yaml:"topic_prefix"`
-	// Whether to use naffka instead of kafka.
-	// Naffka can only be used when running dendrite as a single monolithic server.
-	// Kafka can be used both with a monolithic server and when running the
-	// components as separate servers.
-	UseNaffka bool `yaml:"use_naffka"`
-	// The Naffka database is used internally by the naffka library, if used.
-	Database DatabaseOptions `yaml:"naffka_database"`
-	// The max size a Kafka message passed between consumer/producer can have
-	// Equals roughly max.message.bytes / fetch.message.max.bytes in Kafka
-	MaxMessageBytes *int `yaml:"max_message_bytes"`
-	// Whether to use NATS instead of kafka/naffka
-	UseNATS bool `yaml:"use_nats"`
-}
-
-func (k *Kafka) TopicFor(name string) string {
-	return fmt.Sprintf("%s%s", k.TopicPrefix, name)
-}
-
-func (c *Kafka) Defaults() {
-	c.UseNaffka = true
-	c.Database.Defaults(10)
-	c.Addresses = []string{"localhost:2181"}
-	c.Database.ConnectionString = DataSource("file:naffka.db")
-	c.TopicPrefix = "Dendrite"
-
-	maxBytes := 1024 * 1024 * 8 // about 8MB
-	c.MaxMessageBytes = &maxBytes
-}
-
-func (c *Kafka) Verify(configErrs *ConfigErrors, isMonolith bool) {
-	if c.UseNaffka {
-		if !isMonolith {
-			configErrs.Add("naffka can only be used in a monolithic server")
-		}
-		checkNotEmpty(configErrs, "global.kafka.database.connection_string", string(c.Database.ConnectionString))
-	} else {
-		// If we aren't using naffka then we need to have at least one kafka/nats
-		// server to talk to.
-		checkNotZero(configErrs, "global.kafka.addresses", int64(len(c.Addresses)))
-	}
-	checkNotEmpty(configErrs, "global.kafka.topic_prefix", string(c.TopicPrefix))
-	checkPositive(configErrs, "global.kafka.max_message_bytes", int64(*c.MaxMessageBytes))
-}