perf: 提升后端高并发承载能力
This commit is contained in:
@@ -1,6 +1,9 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"net/http"
|
||||||
|
"time"
|
||||||
|
|
||||||
"hightube/internal/api"
|
"hightube/internal/api"
|
||||||
"hightube/internal/chat"
|
"hightube/internal/chat"
|
||||||
"hightube/internal/db"
|
"hightube/internal/db"
|
||||||
@@ -23,9 +26,16 @@ func main() {
|
|||||||
// Start the API server in a goroutine so it doesn't block the RTMP server
|
// Start the API server in a goroutine so it doesn't block the RTMP server
|
||||||
go func() {
|
go func() {
|
||||||
r := api.SetupRouter(srv)
|
r := api.SetupRouter(srv)
|
||||||
|
httpServer := &http.Server{
|
||||||
|
Addr: ":8080",
|
||||||
|
Handler: r,
|
||||||
|
ReadHeaderTimeout: 5 * time.Second,
|
||||||
|
IdleTimeout: 60 * time.Second,
|
||||||
|
MaxHeaderBytes: 1 << 20,
|
||||||
|
}
|
||||||
monitor.Infof("API server listening on :8080")
|
monitor.Infof("API server listening on :8080")
|
||||||
monitor.Infof("Web console listening on :8080/admin")
|
monitor.Infof("Web console listening on :8080/admin")
|
||||||
if err := r.Run(":8080"); err != nil {
|
if err := httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
|
||||||
monitor.Errorf("Failed to start API server: %v", err)
|
monitor.Errorf("Failed to start API server: %v", err)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|||||||
@@ -29,8 +29,8 @@ func AdminLogin(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
var user model.User
|
user, err := db.LoadUserByUsername(strings.TrimSpace(req.Username))
|
||||||
if err := db.DB.Where("username = ?", strings.TrimSpace(req.Username)).First(&user).Error; err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid username or password"})
|
c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid username or password"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -191,7 +191,7 @@ func UpdateUserRole(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := db.DB.Model(&model.User{}).Where("id = ?", userID).Update("role", role).Error; err != nil {
|
if err := db.UpdateUserRole(userID, role); err != nil {
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to update role"})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to update role"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -218,7 +218,7 @@ func UpdateUserEnabled(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := db.DB.Model(&model.User{}).Where("id = ?", userID).Update("enabled", req.Enabled).Error; err != nil {
|
if err := db.UpdateUserEnabled(userID, req.Enabled); err != nil {
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to update enabled status"})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to update enabled status"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -251,7 +251,7 @@ func ResetUserPassword(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := db.DB.Model(&model.User{}).Where("id = ?", userID).Update("password", hash).Error; err != nil {
|
if err := db.UpdateUserPassword(userID, hash); err != nil {
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to reset password"})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to reset password"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -274,11 +274,7 @@ func DeleteUser(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := db.DB.Where("user_id = ?", userID).Delete(&model.Room{}).Error; err != nil {
|
if err := db.DeleteUserCascade(userID); err != nil {
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to delete rooms"})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err := db.DB.Delete(&model.User{}, userID).Error; err != nil {
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to delete user"})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to delete user"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
package api
|
package api
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
|
||||||
"hightube/internal/db"
|
"hightube/internal/db"
|
||||||
"hightube/internal/model"
|
"hightube/internal/model"
|
||||||
@@ -41,10 +43,12 @@ func Register(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check if user exists
|
// Check if user exists
|
||||||
var existingUser model.User
|
if _, err := db.LoadUserByUsername(req.Username); err == nil {
|
||||||
if err := db.DB.Where("username = ?", req.Username).First(&existingUser).Error; err == nil {
|
|
||||||
c.JSON(http.StatusConflict, gin.H{"error": "Username already exists"})
|
c.JSON(http.StatusConflict, gin.H{"error": "Username already exists"})
|
||||||
return
|
return
|
||||||
|
} else if !errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to validate username"})
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Hash password
|
// Hash password
|
||||||
@@ -61,20 +65,13 @@ func Register(c *gin.Context) {
|
|||||||
Role: "user",
|
Role: "user",
|
||||||
Enabled: true,
|
Enabled: true,
|
||||||
}
|
}
|
||||||
if err := db.DB.Create(&user).Error; err != nil {
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create user"})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create a default live room for the new user
|
|
||||||
room := model.Room{
|
room := model.Room{
|
||||||
UserID: user.ID,
|
|
||||||
Title: user.Username + "'s Live Room",
|
Title: user.Username + "'s Live Room",
|
||||||
StreamKey: utils.GenerateStreamKey(),
|
StreamKey: utils.GenerateStreamKey(),
|
||||||
IsActive: false,
|
IsActive: false,
|
||||||
}
|
}
|
||||||
if err := db.DB.Create(&room).Error; err != nil {
|
if err := db.CreateUserAndRoom(&user, &room); err != nil {
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create room for user"})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create user"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -87,9 +84,10 @@ func Login(c *gin.Context) {
|
|||||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
req.Username = strings.TrimSpace(req.Username)
|
||||||
|
|
||||||
var user model.User
|
user, err := db.LoadUserByUsername(req.Username)
|
||||||
if err := db.DB.Where("username = ?", req.Username).First(&user).Error; err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid username or password"})
|
c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid username or password"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -127,8 +125,8 @@ func ChangePassword(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
var user model.User
|
user, err := db.LoadUserByID(userID.(uint))
|
||||||
if err := db.DB.First(&user, userID).Error; err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusNotFound, gin.H{"error": "User not found"})
|
c.JSON(http.StatusNotFound, gin.H{"error": "User not found"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -147,7 +145,7 @@ func ChangePassword(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Update user
|
// Update user
|
||||||
if err := db.DB.Model(&user).Update("password", hashedPassword).Error; err != nil {
|
if err := db.UpdateUserPassword(user.ID, hashedPassword); err != nil {
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to update password"})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to update password"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var upgrader = websocket.Upgrader{
|
var upgrader = websocket.Upgrader{
|
||||||
|
ReadBufferSize: 1024,
|
||||||
|
WriteBufferSize: 1024,
|
||||||
CheckOrigin: func(r *http.Request) bool {
|
CheckOrigin: func(r *http.Request) bool {
|
||||||
return true // Allow all connections
|
return true // Allow all connections
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -89,8 +89,8 @@ func authenticateRequest(c *gin.Context) (*model.User, error) {
|
|||||||
return nil, errInvalidToken
|
return nil, errInvalidToken
|
||||||
}
|
}
|
||||||
|
|
||||||
var user model.User
|
user, err := db.LoadUserByID(uint(userID))
|
||||||
if err := db.DB.First(&user, uint(userID)).Error; err != nil {
|
if err != nil {
|
||||||
return nil, errUserNotFound
|
return nil, errUserNotFound
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,15 +6,14 @@ import (
|
|||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
|
||||||
"hightube/internal/db"
|
"hightube/internal/db"
|
||||||
"hightube/internal/model"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// GetMyRoom returns the room details for the currently authenticated user
|
// GetMyRoom returns the room details for the currently authenticated user
|
||||||
func GetMyRoom(c *gin.Context) {
|
func GetMyRoom(c *gin.Context) {
|
||||||
userID, _ := c.Get("user_id")
|
userID, _ := c.Get("user_id")
|
||||||
|
|
||||||
var room model.Room
|
room, err := db.LoadRoomByUserID(userID.(uint))
|
||||||
if err := db.DB.Where("user_id = ?", userID).First(&room).Error; err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusNotFound, gin.H{"error": "Room not found"})
|
c.JSON(http.StatusNotFound, gin.H{"error": "Room not found"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -29,9 +28,8 @@ func GetMyRoom(c *gin.Context) {
|
|||||||
|
|
||||||
// GetActiveRooms returns a list of all currently active live rooms
|
// GetActiveRooms returns a list of all currently active live rooms
|
||||||
func GetActiveRooms(c *gin.Context) {
|
func GetActiveRooms(c *gin.Context) {
|
||||||
var rooms []model.Room
|
rooms, err := db.ListActiveRooms()
|
||||||
// Fetch rooms where is_active is true
|
if err != nil {
|
||||||
if err := db.DB.Where("is_active = ?", true).Find(&rooms).Error; err != nil {
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to fetch active rooms"})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to fetch active rooms"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,8 @@ func SetupRouter(streamServer *stream.RTMPServer) *gin.Engine {
|
|||||||
// 设置为发布模式,消除 "[WARNING] Running in debug mode" 警告
|
// 设置为发布模式,消除 "[WARNING] Running in debug mode" 警告
|
||||||
gin.SetMode(gin.ReleaseMode)
|
gin.SetMode(gin.ReleaseMode)
|
||||||
|
|
||||||
r := gin.Default()
|
r := gin.New()
|
||||||
|
r.Use(gin.Recovery())
|
||||||
BindAdminDependencies(streamServer)
|
BindAdminDependencies(streamServer)
|
||||||
|
|
||||||
// Use CORS middleware to allow web access
|
// Use CORS middleware to allow web access
|
||||||
|
|||||||
@@ -9,10 +9,12 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
writeWait = 10 * time.Second
|
writeWait = 10 * time.Second
|
||||||
pongWait = 60 * time.Second
|
pongWait = 60 * time.Second
|
||||||
pingPeriod = (pongWait * 9) / 10
|
pingPeriod = (pongWait * 9) / 10
|
||||||
maxMessageSize = 512
|
maxMessageSize = 512
|
||||||
|
roomQueueBufferSize = 2048
|
||||||
|
historyLimit = 100
|
||||||
)
|
)
|
||||||
|
|
||||||
type Message struct {
|
type Message struct {
|
||||||
@@ -32,12 +34,23 @@ type Client struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type Hub struct {
|
type Hub struct {
|
||||||
rooms map[string]map[*Client]bool
|
mutex sync.RWMutex
|
||||||
roomsHistory map[string][]Message
|
rooms map[string]*roomHub
|
||||||
broadcast chan Message
|
}
|
||||||
|
|
||||||
|
type roomHub struct {
|
||||||
|
roomID string
|
||||||
|
manager *Hub
|
||||||
register chan *Client
|
register chan *Client
|
||||||
unregister chan *Client
|
unregister chan *Client
|
||||||
mutex sync.RWMutex
|
broadcast chan Message
|
||||||
|
clearHistory chan struct{}
|
||||||
|
stop chan struct{}
|
||||||
|
stopOnce sync.Once
|
||||||
|
|
||||||
|
mutex sync.RWMutex
|
||||||
|
clients map[*Client]struct{}
|
||||||
|
history []Message
|
||||||
}
|
}
|
||||||
|
|
||||||
type StatsSnapshot struct {
|
type StatsSnapshot struct {
|
||||||
@@ -48,118 +61,179 @@ type StatsSnapshot struct {
|
|||||||
|
|
||||||
func NewHub() *Hub {
|
func NewHub() *Hub {
|
||||||
return &Hub{
|
return &Hub{
|
||||||
broadcast: make(chan Message),
|
rooms: make(map[string]*roomHub),
|
||||||
register: make(chan *Client),
|
|
||||||
unregister: make(chan *Client),
|
|
||||||
rooms: make(map[string]map[*Client]bool),
|
|
||||||
roomsHistory: make(map[string][]Message),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Hub) Run() {
|
func (h *Hub) getRoom(roomID string) *roomHub {
|
||||||
|
h.mutex.RLock()
|
||||||
|
room := h.rooms[roomID]
|
||||||
|
h.mutex.RUnlock()
|
||||||
|
return room
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Hub) getOrCreateRoom(roomID string) *roomHub {
|
||||||
|
if room := h.getRoom(roomID); room != nil {
|
||||||
|
return room
|
||||||
|
}
|
||||||
|
|
||||||
|
h.mutex.Lock()
|
||||||
|
defer h.mutex.Unlock()
|
||||||
|
|
||||||
|
if room := h.rooms[roomID]; room != nil {
|
||||||
|
return room
|
||||||
|
}
|
||||||
|
|
||||||
|
room := &roomHub{
|
||||||
|
roomID: roomID,
|
||||||
|
manager: h,
|
||||||
|
register: make(chan *Client, roomQueueBufferSize),
|
||||||
|
unregister: make(chan *Client, roomQueueBufferSize),
|
||||||
|
broadcast: make(chan Message, roomQueueBufferSize),
|
||||||
|
clearHistory: make(chan struct{}, 1),
|
||||||
|
stop: make(chan struct{}),
|
||||||
|
clients: make(map[*Client]struct{}),
|
||||||
|
}
|
||||||
|
h.rooms[roomID] = room
|
||||||
|
go room.run()
|
||||||
|
return room
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Hub) deleteRoomIfIdle(room *roomHub) {
|
||||||
|
room.mutex.RLock()
|
||||||
|
idle := len(room.clients) == 0 && len(room.history) == 0
|
||||||
|
room.mutex.RUnlock()
|
||||||
|
if !idle {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
h.mutex.Lock()
|
||||||
|
if current := h.rooms[room.roomID]; current == room {
|
||||||
|
delete(h.rooms, room.roomID)
|
||||||
|
room.stopOnce.Do(func() {
|
||||||
|
close(room.stop)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
h.mutex.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *roomHub) run() {
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case client := <-h.register:
|
case client := <-r.register:
|
||||||
h.mutex.Lock()
|
r.handleRegister(client)
|
||||||
if h.rooms[client.RoomID] == nil {
|
case client := <-r.unregister:
|
||||||
h.rooms[client.RoomID] = make(map[*Client]bool)
|
r.handleUnregister(client)
|
||||||
}
|
case message := <-r.broadcast:
|
||||||
h.rooms[client.RoomID][client] = true
|
r.handleBroadcast(message)
|
||||||
|
case <-r.clearHistory:
|
||||||
// Copy existing history to send outside the lock
|
r.handleClearHistory()
|
||||||
var historyCopy []Message
|
case <-r.stop:
|
||||||
if history, ok := h.roomsHistory[client.RoomID]; ok {
|
return
|
||||||
historyCopy = make([]Message, len(history))
|
|
||||||
copy(historyCopy, history)
|
|
||||||
}
|
|
||||||
h.mutex.Unlock()
|
|
||||||
|
|
||||||
// Send history outside the lock
|
|
||||||
for _, msg := range historyCopy {
|
|
||||||
msg.IsHistory = true
|
|
||||||
msgBytes, err := json.Marshal(msg)
|
|
||||||
if err == nil {
|
|
||||||
select {
|
|
||||||
case client.Send <- msgBytes:
|
|
||||||
default:
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
case client := <-h.unregister:
|
|
||||||
h.mutex.Lock()
|
|
||||||
if rooms, ok := h.rooms[client.RoomID]; ok {
|
|
||||||
if _, ok := rooms[client]; ok {
|
|
||||||
delete(rooms, client)
|
|
||||||
close(client.Send)
|
|
||||||
// We no longer delete the room from h.rooms here if we want history to persist
|
|
||||||
// even if everyone leaves (as long as it's active in DB).
|
|
||||||
// But we should clean up if the room is empty and we want to save memory.
|
|
||||||
// However, the history is what matters.
|
|
||||||
if len(rooms) == 0 {
|
|
||||||
delete(h.rooms, client.RoomID)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
h.mutex.Unlock()
|
|
||||||
|
|
||||||
case message := <-h.broadcast:
|
|
||||||
// Marshal message outside the lock to optimize performance
|
|
||||||
msgBytes, err := json.Marshal(message)
|
|
||||||
if err != nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
h.mutex.Lock()
|
|
||||||
// Only store "chat" and "danmaku" messages in history
|
|
||||||
if message.Type == "chat" || message.Type == "danmaku" {
|
|
||||||
h.roomsHistory[message.RoomID] = append(h.roomsHistory[message.RoomID], message)
|
|
||||||
// Limit history size to avoid memory leak (e.g., last 100 messages)
|
|
||||||
if len(h.roomsHistory[message.RoomID]) > 100 {
|
|
||||||
h.roomsHistory[message.RoomID] = h.roomsHistory[message.RoomID][1:]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
clients := h.rooms[message.RoomID]
|
|
||||||
if clients != nil {
|
|
||||||
for client := range clients {
|
|
||||||
select {
|
|
||||||
case client.Send <- msgBytes:
|
|
||||||
default:
|
|
||||||
close(client.Send)
|
|
||||||
delete(clients, client)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
h.mutex.Unlock()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ClearRoomHistory removes history for a room, should be called when stream ends
|
func (r *roomHub) handleRegister(client *Client) {
|
||||||
|
r.mutex.RLock()
|
||||||
|
historyCopy := make([]Message, len(r.history))
|
||||||
|
copy(historyCopy, r.history)
|
||||||
|
r.mutex.RUnlock()
|
||||||
|
|
||||||
|
for _, msg := range historyCopy {
|
||||||
|
msg.IsHistory = true
|
||||||
|
msgBytes, err := json.Marshal(msg)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
case client.Send <- msgBytes:
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
r.mutex.Lock()
|
||||||
|
r.clients[client] = struct{}{}
|
||||||
|
r.mutex.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *roomHub) handleUnregister(client *Client) {
|
||||||
|
r.mutex.Lock()
|
||||||
|
if _, ok := r.clients[client]; ok {
|
||||||
|
delete(r.clients, client)
|
||||||
|
close(client.Send)
|
||||||
|
}
|
||||||
|
r.mutex.Unlock()
|
||||||
|
|
||||||
|
r.manager.deleteRoomIfIdle(r)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *roomHub) handleBroadcast(message Message) {
|
||||||
|
msgBytes, err := json.Marshal(message)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
r.mutex.Lock()
|
||||||
|
if message.Type == "chat" || message.Type == "danmaku" {
|
||||||
|
r.history = append(r.history, message)
|
||||||
|
if len(r.history) > historyLimit {
|
||||||
|
r.history = r.history[1:]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for client := range r.clients {
|
||||||
|
select {
|
||||||
|
case client.Send <- msgBytes:
|
||||||
|
default:
|
||||||
|
close(client.Send)
|
||||||
|
delete(r.clients, client)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
r.mutex.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *roomHub) handleClearHistory() {
|
||||||
|
r.mutex.Lock()
|
||||||
|
r.history = nil
|
||||||
|
r.mutex.Unlock()
|
||||||
|
r.manager.deleteRoomIfIdle(r)
|
||||||
|
}
|
||||||
|
|
||||||
func (h *Hub) ClearRoomHistory(roomID string) {
|
func (h *Hub) ClearRoomHistory(roomID string) {
|
||||||
h.mutex.Lock()
|
if room := h.getRoom(roomID); room != nil {
|
||||||
defer h.mutex.Unlock()
|
select {
|
||||||
delete(h.roomsHistory, roomID)
|
case room.clearHistory <- struct{}{}:
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Hub) RegisterClient(c *Client) {
|
func (h *Hub) RegisterClient(c *Client) {
|
||||||
h.register <- c
|
h.getOrCreateRoom(c.RoomID).register <- c
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Hub) UnregisterClient(c *Client) {
|
||||||
|
if room := h.getRoom(c.RoomID); room != nil {
|
||||||
|
room.unregister <- c
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// BroadcastToRoom sends a message to the broadcast channel
|
|
||||||
func (h *Hub) BroadcastToRoom(msg Message) {
|
func (h *Hub) BroadcastToRoom(msg Message) {
|
||||||
h.broadcast <- msg
|
h.getOrCreateRoom(msg.RoomID).broadcast <- msg
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Client) ReadPump() {
|
func (c *Client) ReadPump() {
|
||||||
defer func() {
|
defer func() {
|
||||||
c.Hub.unregister <- c
|
c.Hub.UnregisterClient(c)
|
||||||
c.Conn.Close()
|
c.Conn.Close()
|
||||||
}()
|
}()
|
||||||
c.Conn.SetReadLimit(maxMessageSize)
|
c.Conn.SetReadLimit(maxMessageSize)
|
||||||
c.Conn.SetReadDeadline(time.Now().Add(pongWait))
|
c.Conn.SetReadDeadline(time.Now().Add(pongWait))
|
||||||
c.Conn.SetPongHandler(func(string) error { c.Conn.SetReadDeadline(time.Now().Add(pongWait)); return nil })
|
c.Conn.SetPongHandler(func(string) error {
|
||||||
|
c.Conn.SetReadDeadline(time.Now().Add(pongWait))
|
||||||
|
return nil
|
||||||
|
})
|
||||||
for {
|
for {
|
||||||
_, message, err := c.Conn.ReadMessage()
|
_, message, err := c.Conn.ReadMessage()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -169,7 +243,7 @@ func (c *Client) ReadPump() {
|
|||||||
if err := json.Unmarshal(message, &msg); err == nil {
|
if err := json.Unmarshal(message, &msg); err == nil {
|
||||||
msg.RoomID = c.RoomID
|
msg.RoomID = c.RoomID
|
||||||
msg.Username = c.Username
|
msg.Username = c.Username
|
||||||
c.Hub.broadcast <- msg
|
c.Hub.BroadcastToRoom(msg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -192,7 +266,10 @@ func (c *Client) WritePump() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
w.Write(message)
|
if _, err := w.Write(message); err != nil {
|
||||||
|
_ = w.Close()
|
||||||
|
return
|
||||||
|
}
|
||||||
if err := w.Close(); err != nil {
|
if err := w.Close(); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -209,23 +286,29 @@ var MainHub *Hub
|
|||||||
|
|
||||||
func InitChat() {
|
func InitChat() {
|
||||||
MainHub = NewHub()
|
MainHub = NewHub()
|
||||||
go MainHub.Run()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Hub) GetStatsSnapshot() StatsSnapshot {
|
func (h *Hub) GetStatsSnapshot() StatsSnapshot {
|
||||||
h.mutex.RLock()
|
h.mutex.RLock()
|
||||||
defer h.mutex.RUnlock()
|
rooms := make([]*roomHub, 0, len(h.rooms))
|
||||||
|
|
||||||
roomClients := make(map[string]int, len(h.rooms))
|
roomClients := make(map[string]int, len(h.rooms))
|
||||||
|
for roomID, room := range h.rooms {
|
||||||
|
rooms = append(rooms, room)
|
||||||
|
roomClients[roomID] = 0
|
||||||
|
}
|
||||||
|
h.mutex.RUnlock()
|
||||||
|
|
||||||
totalClients := 0
|
totalClients := 0
|
||||||
for roomID, clients := range h.rooms {
|
for _, room := range rooms {
|
||||||
count := len(clients)
|
room.mutex.RLock()
|
||||||
roomClients[roomID] = count
|
count := len(room.clients)
|
||||||
|
room.mutex.RUnlock()
|
||||||
|
roomClients[room.roomID] = count
|
||||||
totalClients += count
|
totalClients += count
|
||||||
}
|
}
|
||||||
|
|
||||||
return StatsSnapshot{
|
return StatsSnapshot{
|
||||||
RoomCount: len(h.rooms),
|
RoomCount: len(rooms),
|
||||||
TotalConnectedClient: totalClients,
|
TotalConnectedClient: totalClients,
|
||||||
RoomClients: roomClients,
|
RoomClients: roomClients,
|
||||||
}
|
}
|
||||||
|
|||||||
332
backend/internal/db/cache.go
Normal file
332
backend/internal/db/cache.go
Normal file
@@ -0,0 +1,332 @@
|
|||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"gorm.io/gorm"
|
||||||
|
|
||||||
|
"hightube/internal/model"
|
||||||
|
)
|
||||||
|
|
||||||
|
type userCache struct {
|
||||||
|
mutex sync.RWMutex
|
||||||
|
byID map[uint]model.User
|
||||||
|
byUsername map[string]uint
|
||||||
|
}
|
||||||
|
|
||||||
|
type roomCache struct {
|
||||||
|
mutex sync.RWMutex
|
||||||
|
byID map[uint]model.Room
|
||||||
|
byUserID map[uint]uint
|
||||||
|
byStreamKey map[string]uint
|
||||||
|
activeRoomIDs map[uint]struct{}
|
||||||
|
activeRoomsLoaded bool
|
||||||
|
}
|
||||||
|
|
||||||
|
var users = &userCache{
|
||||||
|
byID: make(map[uint]model.User),
|
||||||
|
byUsername: make(map[string]uint),
|
||||||
|
}
|
||||||
|
|
||||||
|
var rooms = &roomCache{
|
||||||
|
byID: make(map[uint]model.Room),
|
||||||
|
byUserID: make(map[uint]uint),
|
||||||
|
byStreamKey: make(map[string]uint),
|
||||||
|
activeRoomIDs: make(map[uint]struct{}),
|
||||||
|
}
|
||||||
|
|
||||||
|
func cacheUser(user model.User) {
|
||||||
|
usernameKey := strings.ToLower(strings.TrimSpace(user.Username))
|
||||||
|
|
||||||
|
users.mutex.Lock()
|
||||||
|
users.byID[user.ID] = user
|
||||||
|
if usernameKey != "" {
|
||||||
|
users.byUsername[usernameKey] = user.ID
|
||||||
|
}
|
||||||
|
users.mutex.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func removeUserFromCache(user model.User) {
|
||||||
|
usernameKey := strings.ToLower(strings.TrimSpace(user.Username))
|
||||||
|
|
||||||
|
users.mutex.Lock()
|
||||||
|
delete(users.byID, user.ID)
|
||||||
|
if usernameKey != "" {
|
||||||
|
delete(users.byUsername, usernameKey)
|
||||||
|
}
|
||||||
|
users.mutex.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func cacheRoom(room model.Room) {
|
||||||
|
rooms.mutex.Lock()
|
||||||
|
rooms.byID[room.ID] = room
|
||||||
|
rooms.byUserID[room.UserID] = room.ID
|
||||||
|
if room.StreamKey != "" {
|
||||||
|
rooms.byStreamKey[room.StreamKey] = room.ID
|
||||||
|
}
|
||||||
|
if room.IsActive {
|
||||||
|
rooms.activeRoomIDs[room.ID] = struct{}{}
|
||||||
|
} else {
|
||||||
|
delete(rooms.activeRoomIDs, room.ID)
|
||||||
|
}
|
||||||
|
rooms.mutex.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func removeRoomFromCache(room model.Room) {
|
||||||
|
rooms.mutex.Lock()
|
||||||
|
delete(rooms.byID, room.ID)
|
||||||
|
delete(rooms.byUserID, room.UserID)
|
||||||
|
if room.StreamKey != "" {
|
||||||
|
delete(rooms.byStreamKey, room.StreamKey)
|
||||||
|
}
|
||||||
|
delete(rooms.activeRoomIDs, room.ID)
|
||||||
|
rooms.mutex.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func LoadUserByID(id uint) (model.User, error) {
|
||||||
|
users.mutex.RLock()
|
||||||
|
if user, ok := users.byID[id]; ok {
|
||||||
|
users.mutex.RUnlock()
|
||||||
|
return user, nil
|
||||||
|
}
|
||||||
|
users.mutex.RUnlock()
|
||||||
|
|
||||||
|
var user model.User
|
||||||
|
if err := DB.First(&user, id).Error; err != nil {
|
||||||
|
return model.User{}, err
|
||||||
|
}
|
||||||
|
cacheUser(user)
|
||||||
|
return user, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func LoadUserByUsername(username string) (model.User, error) {
|
||||||
|
key := strings.ToLower(strings.TrimSpace(username))
|
||||||
|
if key == "" {
|
||||||
|
return model.User{}, gorm.ErrRecordNotFound
|
||||||
|
}
|
||||||
|
|
||||||
|
users.mutex.RLock()
|
||||||
|
if id, ok := users.byUsername[key]; ok {
|
||||||
|
if user, found := users.byID[id]; found {
|
||||||
|
users.mutex.RUnlock()
|
||||||
|
return user, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
users.mutex.RUnlock()
|
||||||
|
|
||||||
|
var user model.User
|
||||||
|
if err := DB.Where("username = ?", strings.TrimSpace(username)).First(&user).Error; err != nil {
|
||||||
|
return model.User{}, err
|
||||||
|
}
|
||||||
|
cacheUser(user)
|
||||||
|
return user, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func LoadRoomByUserID(userID uint) (model.Room, error) {
|
||||||
|
rooms.mutex.RLock()
|
||||||
|
if roomID, ok := rooms.byUserID[userID]; ok {
|
||||||
|
if room, found := rooms.byID[roomID]; found {
|
||||||
|
rooms.mutex.RUnlock()
|
||||||
|
return room, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rooms.mutex.RUnlock()
|
||||||
|
|
||||||
|
var room model.Room
|
||||||
|
if err := DB.Where("user_id = ?", userID).First(&room).Error; err != nil {
|
||||||
|
return model.Room{}, err
|
||||||
|
}
|
||||||
|
cacheRoom(room)
|
||||||
|
return room, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func LoadRoomByStreamKey(streamKey string) (model.Room, error) {
|
||||||
|
rooms.mutex.RLock()
|
||||||
|
if roomID, ok := rooms.byStreamKey[streamKey]; ok {
|
||||||
|
if room, found := rooms.byID[roomID]; found {
|
||||||
|
rooms.mutex.RUnlock()
|
||||||
|
return room, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rooms.mutex.RUnlock()
|
||||||
|
|
||||||
|
var room model.Room
|
||||||
|
if err := DB.Where("stream_key = ?", streamKey).First(&room).Error; err != nil {
|
||||||
|
return model.Room{}, err
|
||||||
|
}
|
||||||
|
cacheRoom(room)
|
||||||
|
return room, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func ListActiveRooms() ([]model.Room, error) {
|
||||||
|
rooms.mutex.RLock()
|
||||||
|
loaded := rooms.activeRoomsLoaded
|
||||||
|
if loaded {
|
||||||
|
result := make([]model.Room, 0, len(rooms.activeRoomIDs))
|
||||||
|
for roomID := range rooms.activeRoomIDs {
|
||||||
|
if room, ok := rooms.byID[roomID]; ok {
|
||||||
|
result = append(result, room)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
complete := len(result) == len(rooms.activeRoomIDs)
|
||||||
|
rooms.mutex.RUnlock()
|
||||||
|
if complete {
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
rooms.mutex.RUnlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
var result []model.Room
|
||||||
|
if err := DB.Where("is_active = ?", true).Find(&result).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
rooms.mutex.Lock()
|
||||||
|
for _, room := range result {
|
||||||
|
rooms.byID[room.ID] = room
|
||||||
|
rooms.byUserID[room.UserID] = room.ID
|
||||||
|
if room.StreamKey != "" {
|
||||||
|
rooms.byStreamKey[room.StreamKey] = room.ID
|
||||||
|
}
|
||||||
|
rooms.activeRoomIDs[room.ID] = struct{}{}
|
||||||
|
}
|
||||||
|
rooms.activeRoomsLoaded = true
|
||||||
|
rooms.mutex.Unlock()
|
||||||
|
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func CreateUserAndRoom(user *model.User, room *model.Room) error {
|
||||||
|
if user == nil || room == nil {
|
||||||
|
return errors.New("user and room are required")
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := DB.Transaction(func(tx *gorm.DB) error {
|
||||||
|
if err := tx.Create(user).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
room.UserID = user.ID
|
||||||
|
if err := tx.Create(room).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
cacheUser(*user)
|
||||||
|
cacheRoom(*room)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func UpdateUserRole(userID uint, role string) error {
|
||||||
|
if err := DB.Model(&model.User{}).Where("id = ?", userID).Update("role", role).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
user, err := LoadUserByID(userID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
user.Role = role
|
||||||
|
cacheUser(user)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func UpdateUserEnabled(userID uint, enabled bool) error {
|
||||||
|
if err := DB.Model(&model.User{}).Where("id = ?", userID).Update("enabled", enabled).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
user, err := LoadUserByID(userID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
user.Enabled = enabled
|
||||||
|
cacheUser(user)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func UpdateUserPassword(userID uint, hash string) error {
|
||||||
|
if err := DB.Model(&model.User{}).Where("id = ?", userID).Update("password", hash).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
user, err := LoadUserByID(userID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
user.Password = hash
|
||||||
|
cacheUser(user)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func SetRoomActive(roomID uint, active bool) error {
|
||||||
|
if err := DB.Model(&model.Room{}).Where("id = ?", roomID).Update("is_active", active).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
rooms.mutex.Lock()
|
||||||
|
room, ok := rooms.byID[roomID]
|
||||||
|
if ok {
|
||||||
|
room.IsActive = active
|
||||||
|
rooms.byID[roomID] = room
|
||||||
|
if active {
|
||||||
|
rooms.activeRoomIDs[roomID] = struct{}{}
|
||||||
|
} else {
|
||||||
|
delete(rooms.activeRoomIDs, roomID)
|
||||||
|
}
|
||||||
|
rooms.activeRoomsLoaded = true
|
||||||
|
rooms.mutex.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
rooms.mutex.Unlock()
|
||||||
|
|
||||||
|
if !active {
|
||||||
|
rooms.mutex.Lock()
|
||||||
|
delete(rooms.activeRoomIDs, roomID)
|
||||||
|
rooms.activeRoomsLoaded = true
|
||||||
|
rooms.mutex.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var roomFromDB model.Room
|
||||||
|
if err := DB.First(&roomFromDB, roomID).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
roomFromDB.IsActive = active
|
||||||
|
cacheRoom(roomFromDB)
|
||||||
|
|
||||||
|
rooms.mutex.Lock()
|
||||||
|
rooms.activeRoomsLoaded = true
|
||||||
|
rooms.mutex.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func DeleteUserCascade(userID uint) error {
|
||||||
|
user, userErr := LoadUserByID(userID)
|
||||||
|
room, roomErr := LoadRoomByUserID(userID)
|
||||||
|
|
||||||
|
if err := DB.Transaction(func(tx *gorm.DB) error {
|
||||||
|
if err := tx.Where("user_id = ?", userID).Delete(&model.Room{}).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := tx.Delete(&model.User{}, userID).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if roomErr == nil {
|
||||||
|
removeRoomFromCache(room)
|
||||||
|
}
|
||||||
|
if userErr == nil {
|
||||||
|
removeUserFromCache(user)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ package db
|
|||||||
import (
|
import (
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
|
"runtime"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"gorm.io/driver/sqlite"
|
"gorm.io/driver/sqlite"
|
||||||
@@ -37,15 +38,32 @@ func InitDB() {
|
|||||||
log.Fatalf("Failed to connect database: %v", err)
|
log.Fatalf("Failed to connect database: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Configure connection pool settings
|
|
||||||
sqlDB, err := DB.DB()
|
sqlDB, err := DB.DB()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("Failed to get database instance: %v", err)
|
log.Fatalf("Failed to get database instance: %v", err)
|
||||||
}
|
}
|
||||||
sqlDB.SetMaxOpenConns(10)
|
maxOpen := runtime.NumCPU()*2 + 1
|
||||||
sqlDB.SetMaxIdleConns(5)
|
if maxOpen < 4 {
|
||||||
|
maxOpen = 4
|
||||||
|
}
|
||||||
|
if maxOpen > 32 {
|
||||||
|
maxOpen = 32
|
||||||
|
}
|
||||||
|
sqlDB.SetMaxOpenConns(maxOpen)
|
||||||
|
sqlDB.SetMaxIdleConns(maxOpen)
|
||||||
|
sqlDB.SetConnMaxIdleTime(10 * time.Minute)
|
||||||
sqlDB.SetConnMaxLifetime(time.Hour)
|
sqlDB.SetConnMaxLifetime(time.Hour)
|
||||||
|
|
||||||
|
for _, pragma := range []string{
|
||||||
|
"PRAGMA synchronous=NORMAL",
|
||||||
|
"PRAGMA temp_store=MEMORY",
|
||||||
|
"PRAGMA foreign_keys=ON",
|
||||||
|
} {
|
||||||
|
if execErr := DB.Exec(pragma).Error; execErr != nil {
|
||||||
|
log.Fatalf("Failed to apply %s: %v", pragma, execErr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Auto-migrate the schema
|
// Auto-migrate the schema
|
||||||
err = DB.AutoMigrate(&model.User{}, &model.Room{})
|
err = DB.AutoMigrate(&model.User{}, &model.Room{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -57,7 +75,7 @@ func InitDB() {
|
|||||||
|
|
||||||
ensureAdminUser()
|
ensureAdminUser()
|
||||||
|
|
||||||
monitor.Infof("Database initialized successfully with WAL mode and connection pooling")
|
monitor.Infof("Database initialized successfully with WAL mode and tuned SQLite pragmas")
|
||||||
}
|
}
|
||||||
|
|
||||||
func ensureAdminUser() {
|
func ensureAdminUser() {
|
||||||
@@ -77,14 +95,17 @@ func ensureAdminUser() {
|
|||||||
updates := map[string]interface{}{}
|
updates := map[string]interface{}{}
|
||||||
if user.Role != "admin" {
|
if user.Role != "admin" {
|
||||||
updates["role"] = "admin"
|
updates["role"] = "admin"
|
||||||
|
user.Role = "admin"
|
||||||
}
|
}
|
||||||
if !user.Enabled {
|
if !user.Enabled {
|
||||||
updates["enabled"] = true
|
updates["enabled"] = true
|
||||||
|
user.Enabled = true
|
||||||
}
|
}
|
||||||
if len(updates) > 0 {
|
if len(updates) > 0 {
|
||||||
DB.Model(&user).Updates(updates)
|
DB.Model(&user).Updates(updates)
|
||||||
monitor.Warnf("Admin account normalized for username=%s", adminUsername)
|
monitor.Warnf("Admin account normalized for username=%s", adminUsername)
|
||||||
}
|
}
|
||||||
|
cacheUser(user)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -115,5 +136,10 @@ func ensureAdminUser() {
|
|||||||
monitor.Warnf("Failed to create default admin room: %v", roomErr)
|
monitor.Warnf("Failed to create default admin room: %v", roomErr)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cacheUser(newAdmin)
|
||||||
|
if room.ID != 0 {
|
||||||
|
cacheRoom(room)
|
||||||
|
}
|
||||||
|
|
||||||
monitor.Warnf("Default admin created for username=%s; change the password after first login", adminUsername)
|
monitor.Warnf("Default admin created for username=%s; change the password after first login", adminUsername)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,5 +10,5 @@ type Room struct {
|
|||||||
UserID uint `gorm:"uniqueIndex;not null"`
|
UserID uint `gorm:"uniqueIndex;not null"`
|
||||||
Title string `gorm:"default:'My Live Room'"`
|
Title string `gorm:"default:'My Live Room'"`
|
||||||
StreamKey string `gorm:"uniqueIndex;not null"` // Secret key for OBS streaming
|
StreamKey string `gorm:"uniqueIndex;not null"` // Secret key for OBS streaming
|
||||||
IsActive bool `gorm:"default:false"` // Whether the stream is currently active
|
IsActive bool `gorm:"index;default:false"` // Whether the stream is currently active
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ import (
|
|||||||
|
|
||||||
"hightube/internal/chat"
|
"hightube/internal/chat"
|
||||||
"hightube/internal/db"
|
"hightube/internal/db"
|
||||||
"hightube/internal/model"
|
|
||||||
"hightube/internal/monitor"
|
"hightube/internal/monitor"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -147,7 +146,9 @@ func NewRTMPServer() *RTMPServer {
|
|||||||
if isSource {
|
if isSource {
|
||||||
roomIDUint := parseRoomID(roomID)
|
roomIDUint := parseRoomID(roomID)
|
||||||
if roomIDUint != 0 {
|
if roomIDUint != 0 {
|
||||||
db.DB.Model(&model.Room{}).Where("id = ?", roomIDUint).Updates(map[string]interface{}{"is_active": true})
|
if err := db.SetRoomActive(roomIDUint, true); err != nil {
|
||||||
|
monitor.Warnf("Failed to mark room active room_id=%s: %v", roomID, err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
s.startVariantTranscoders(roomID)
|
s.startVariantTranscoders(roomID)
|
||||||
s.startThumbnailCapture(roomID)
|
s.startThumbnailCapture(roomID)
|
||||||
@@ -165,7 +166,9 @@ func NewRTMPServer() *RTMPServer {
|
|||||||
s.stopThumbnailCapture(roomID)
|
s.stopThumbnailCapture(roomID)
|
||||||
roomIDUint := parseRoomID(roomID)
|
roomIDUint := parseRoomID(roomID)
|
||||||
if roomIDUint != 0 {
|
if roomIDUint != 0 {
|
||||||
db.DB.Model(&model.Room{}).Where("id = ?", roomIDUint).Updates(map[string]interface{}{"is_active": false})
|
if err := db.SetRoomActive(roomIDUint, false); err != nil {
|
||||||
|
monitor.Warnf("Failed to mark room inactive room_id=%s: %v", roomID, err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
chat.MainHub.ClearRoomHistory(roomID)
|
chat.MainHub.ClearRoomHistory(roomID)
|
||||||
monitor.Infof("Publishing ended for room_id=%s", roomID)
|
monitor.Infof("Publishing ended for room_id=%s", roomID)
|
||||||
@@ -317,8 +320,8 @@ func (s *RTMPServer) HandleThumbnail(c *gin.Context) {
|
|||||||
|
|
||||||
func (s *RTMPServer) resolvePublishPath(parts []string) (roomID string, channelPath string, isSource bool, ok bool) {
|
func (s *RTMPServer) resolvePublishPath(parts []string) (roomID string, channelPath string, isSource bool, ok bool) {
|
||||||
if parts[1] == "live" && len(parts) == 3 {
|
if parts[1] == "live" && len(parts) == 3 {
|
||||||
var room model.Room
|
room, err := db.LoadRoomByStreamKey(parts[2])
|
||||||
if err := db.DB.Where("stream_key = ?", parts[2]).First(&room).Error; err != nil {
|
if err != nil {
|
||||||
return "", "", false, false
|
return "", "", false, false
|
||||||
}
|
}
|
||||||
roomID = fmt.Sprintf("%d", room.ID)
|
roomID = fmt.Sprintf("%d", room.ID)
|
||||||
|
|||||||
Reference in New Issue
Block a user