Merge pull request #2598 from traPtitech/feat/qall-v2-with-roomstate

feat: livekitでのqallの実装の取り込み

Author: kaitoyama

cmd/config.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"cloud.google.com/go/profiler"
+	"github.com/leandro-lugaresi/hub"
 	"github.com/spf13/viper"
 	"go.uber.org/zap"
 	"google.golang.org/api/option"
@@ -23,6 +24,7 @@ import (
 	"github.com/traPtitech/traQ/service/imaging"
 	"github.com/traPtitech/traQ/service/message"
 	"github.com/traPtitech/traQ/service/oidc"
+	"github.com/traPtitech/traQ/service/qall"
 	"github.com/traPtitech/traQ/service/rbac"
 	"github.com/traPtitech/traQ/service/search"
 	"github.com/traPtitech/traQ/service/variable"
@@ -209,6 +211,16 @@ type Config struct {
 		SecretKey string `mapstructure:"secretKey" yaml:"secretKey"`
 	} `mapstructure:"skyway" yaml:"skyway"`
 
+	// LiveKit LiveKit設定
+	LiveKit struct {
+		// Host ホスト名
+		Host string `mapstructure:"host" yaml:"host"`
+		// APIKey APIキー
+		APIKey string `mapstructure:"apiKey" yaml:"apiKey"`
+		// APISecret APIシークレット
+		APISecret string `mapstructure:"apiSecret" yaml:"apiSecret"`
+	} `mapstructure:"livekit" yaml:"livekit"`
+
 	// JWT JsonWebToken設定
 	JWT struct {
 		// Keys 鍵設定
@@ -326,6 +338,9 @@ func init() {
 	viper.SetDefault("externalAuth.slack.allowSignUp", false)
 	viper.SetDefault("externalAuth.slack.allowedTeamId", "")
 	viper.SetDefault("skyway.secretKey", "")
+	viper.SetDefault("livekit.host", "")
+	viper.SetDefault("livekit.apiKey", "")
+	viper.SetDefault("livekit.apiSecret", "")
 	viper.SetDefault("jwt.keys.private", "")
 }
 
@@ -549,6 +564,17 @@ func provideRouterConfig(c *Config) *router.Config {
 		AccessTokenExp:   c.OAuth2.AccessTokenExpire,
 		IsRefreshEnabled: c.OAuth2.IsRefreshEnabled,
 		SkyWaySecretKey:  c.SkyWay.SecretKey,
+		LiveKitHost:      c.LiveKit.Host,
+		LiveKitAPIKey:    c.LiveKit.APIKey,
+		LiveKitAPISecret: c.LiveKit.APISecret,
 		ExternalAuth:     provideRouterExternalAuthConfig(c),
 	}
 }
+
+func provideQallRoomStateManager(c *Config, h *hub.Hub) qall.RoomStateManager {
+	return qall.NewRoomStateManager(c.LiveKit.Host, c.LiveKit.APIKey, c.LiveKit.APISecret, h)
+}
+
+func provideQallSoundboard(repo repository.Repository, fs storage.FileStorage, logger *zap.Logger, h *hub.Hub) (qall.Soundboard, error) {
+	return qall.NewSoundboardManager(repo, fs, logger, h)
+}

cmd/serve_wire.go

@@ -57,6 +57,8 @@ func newServer(hub *hub.Hub, db *gorm.DB, repo repository.Repository, fs storage
 		provideOIDCService,
 		provideRouterConfig,
 		provideESEngineConfig,
+		provideQallRoomStateManager,
+		provideQallSoundboard,
 		wire.Struct(new(service.Services), "*"),
 		wire.Struct(new(Server), "*"),
 		wire.Bind(new(repository.ChannelRepository), new(repository.Repository)),

cmd/wire_gen.go

@@ -24,7 +24,7 @@ Here are some tips for configuring traQ:
 - If you want a private instance, set `allowSignUp` to `false`.
     - You can use `externalAuth.github.allowedOrganizations` to only allow signup of your GitHub organization members.
     - Otherwise, an admin or external app has to manually set accounts up via `POST /api/v3/users`.
-- For the maximum user experience, try to configure Elasticsearch, FCM, and Skyway to enable message search, notification, and Qall features, respectively.
+- For the maximum user experience, try to configure Elasticsearch, FCM, and livekit to enable message search, notification, and Qall features, respectively.
 
 The following are example configurations.
 
@@ -153,12 +153,22 @@ oauth2:
   # Access token expiration time in seconds. Default: 31536000 (1 year)
   accessTokenExp: 31536000 # 1 year
 
-# Skyway settings.
+# (deprecated) Skyway settings.
 # You must set this to enable the call ('Qall') feature.
 skyway:
   # Skyway secret key.
   secretKey: secretKey
 
+# LiveKit settings.
+# You must set these to enable the call ('Qall') feature.
+livekit:
+  # LiveKit host url
+  livekitHost: livekitHost
+  # LiveKit api key
+  livekitAPIKey: livekitAPIKey
+  # LiveKit api secret
+  livekitAPISecret: livekitAPISecret
+
 # (optional) JWT settings.
 # Used to issue QR codes to authenticate user.
 jwt:
@@ -203,7 +213,7 @@ externalAuth:
 
 </details>
 
-Minimal configuration (with ES, no FCM, and no Skyway)
+Minimal configuration (with ES, no FCM, and no Livekit)
 
 ```yaml
 origin: https://example.com
@@ -251,10 +261,16 @@ traQ uses `config.js` for configuring the frontend application.
       projectId: 'projectId',
       messagingSenderId: 'messagingSenderId'
     },
-    // (optional) Skyway settings.
+    // (deprecated) Skyway settings.
     skyway: {
       apiKey: 'apiKey'
     },
+    // (optional) Livekit settings.
+    livekit: {
+      livekitHost: 'livekitHost',
+      livekitApiKey: 'livekitApiKey',
+      livekitAPISecret: 'livekitAPISecret'
+    },
     // (optional) Enable search feature.
     enableSearch: true,
     // (optional) Application links.