fix(controller): ResetRoom, feat: added Start handler

pull/1/head
Benyamin Azarkhazin 2023-07-31 23:40:39 +03:30
parent 5fadfbfb20
commit 8d2d26c14c
Signed by: benyamin
GPG Key ID: 3AE44F5623C70269
6 changed files with 43 additions and 7 deletions

View File

@ -4,10 +4,12 @@ import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"io"
"net/http" "net/http"
"sourcecode.social/greatape/goldgorilla/models" "sourcecode.social/greatape/goldgorilla/models"
"sourcecode.social/greatape/goldgorilla/models/dto" "sourcecode.social/greatape/goldgorilla/models/dto"
"sourcecode.social/greatape/goldgorilla/repositories" "sourcecode.social/greatape/goldgorilla/repositories"
"time"
) )
type RoomController struct { type RoomController struct {
@ -141,10 +143,16 @@ func (c *RoomController) ResetRoom(ctx *gin.Context) {
} }
roomId := "" roomId := ""
if rid, exists := reqModel["roomId"]; !exists { if rid, exists := reqModel["roomId"]; !exists {
roomId = rid
c.helper.ResponseUnprocessableEntity(ctx) c.helper.ResponseUnprocessableEntity(ctx)
return
} else {
if castedrid, stringItIs := rid.(string); stringItIs {
roomId = castedrid
} else {
c.helper.ResponseUnprocessableEntity(ctx)
return
}
} }
err := c.repo.ResetRoom(roomId) err := c.repo.ResetRoom(roomId)
if c.helper.HandleIfErr(ctx, err, nil) { if c.helper.HandleIfErr(ctx, err, nil) {
return return
@ -152,3 +160,17 @@ func (c *RoomController) ResetRoom(ctx *gin.Context) {
c.helper.Response(ctx, nil, http.StatusNoContent) c.helper.Response(ctx, nil, http.StatusNoContent)
} }
func (c *RoomController) Start(ctx *gin.Context) {
buffer, _ := json.Marshal(map[string]any{"roomId": c.conf.TargetRoom, "svcAddr": c.conf.ServiceAddress})
body := bytes.NewReader(buffer)
res, err := http.Post(c.conf.LogjamBaseUrl+"/join", "application/json", body)
if err != nil {
println(err.Error())
time.Sleep(4 * time.Second)
}
if res.StatusCode > 204 {
resbody, _ := io.ReadAll(res.Body)
println("get /join "+res.Status, string(resbody))
}
}

View File

@ -1 +1,7 @@
package controllers package controllers
import "github.com/gin-gonic/gin"
func HealthCheck(ctx *gin.Context) {
ctx.Status(204)
}

View File

@ -6,7 +6,7 @@ import (
) )
func main() { func main() {
svcAddr := flag.String("svc-addr", "", "service to register in logjam") svcAddr := flag.String("svc-addr", "", "service baseurl to register in logjam ( shoudln't end with / )")
src := flag.String("src", ":8080", "listenhost:listenPort") src := flag.String("src", ":8080", "listenhost:listenPort")
logjamBaseUrl := flag.String("logjam-base-url", "https://example.com", "logjam base url(shouldn't end with /)") logjamBaseUrl := flag.String("logjam-base-url", "https://example.com", "logjam base url(shouldn't end with /)")
targetRoom := flag.String("targetRoom", "testyroom", "target room") targetRoom := flag.String("targetRoom", "testyroom", "target room")

View File

@ -30,7 +30,7 @@ type Room struct {
Peers map[uint64]*Peer Peers map[uint64]*Peer
trackLock *sync.Mutex trackLock *sync.Mutex
Tracks map[string]*Track Tracks map[string]*Track
timer *time.Timer timer *time.Ticker
} }
type RoomRepository struct { type RoomRepository struct {
@ -412,18 +412,22 @@ func (r *RoomRepository) ClosePeer(roomId string, id uint64) error {
func (r *RoomRepository) ResetRoom(roomId string) error { func (r *RoomRepository) ResetRoom(roomId string) error {
r.Lock() r.Lock()
if !r.doesRoomExists(roomId) { if !r.doesRoomExists(roomId) {
return
}
r.Unlock() r.Unlock()
return nil
}
room := r.Rooms[roomId] room := r.Rooms[roomId]
r.Unlock()
room.Lock() room.Lock()
defer room.Unlock()
room.timer.Stop() room.timer.Stop()
for _, peer := range room.Peers { for _, peer := range room.Peers {
peer.Conn.Close() peer.Conn.Close()
} }
room.Unlock()
r.Lock() r.Lock()
delete(r.Rooms, roomId) delete(r.Rooms, roomId)
r.Unlock() r.Unlock()
return nil
} }

View File

@ -9,9 +9,12 @@ func registerRoomRoutes(rg *gin.RouterGroup, ctrl *controllers.RoomController) {
rg.POST("/peer", ctrl.CreatePeer) rg.POST("/peer", ctrl.CreatePeer)
rg.DELETE("/peer", ctrl.ClosePeer) rg.DELETE("/peer", ctrl.ClosePeer)
rg.POST("/ice", ctrl.AddICECandidate) rg.POST("/ice", ctrl.AddICECandidate)
rg.POST("/answer", ctrl.Answer) rg.POST("/answer", ctrl.Answer)
rg.POST("/offer", ctrl.Offer) rg.POST("/offer", ctrl.Offer)
rg.POST("/", ctrl.Start)
rg.DELETE("/", ctrl.ResetRoom) rg.DELETE("/", ctrl.ResetRoom)
} }

View File

@ -13,6 +13,7 @@ func (r *Router) RegisterRoutes(rCtrl *controllers.RoomController) error {
gin.SetMode(gin.ReleaseMode) gin.SetMode(gin.ReleaseMode)
r.router = gin.Default() r.router = gin.Default()
registerRoomRoutes(r.router.Group("/room"), rCtrl) registerRoomRoutes(r.router.Group("/room"), rCtrl)
r.router.GET("/healthcheck", controllers.HealthCheck)
return nil return nil
} }