aiden
/
synctv
mirror of https://github.com/synctv-org/synctv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Feat: full error message

Browse Source
pull/134/head
zijiren233 11 months ago
parent b27847b014
commit d19d21a1f4
3 changed files with 89 additions and 39 deletions
Show Stats Download Patch File Download Diff File

85
server/handlers/movie.go
Unescape Escape View File

@ -210,7 +210,12 @@ func PushMovie(ctx *gin.Context) {
if err != nil {
log.Errorf("push movie error: %v", err)
if errors.Is(err, dbModel.ErrNoPermission) {
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorResp(err))
ctx.AbortWithStatusJSON(
http.StatusForbidden,
model.NewApiErrorResp(
fmt.Errorf("push movie error: %w", err),
),
)
return
}
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorResp(err))
@ -242,7 +247,12 @@ func PushMovies(ctx *gin.Context) {
if err != nil {
log.Errorf("push movies error: %v", err)
if errors.Is(err, dbModel.ErrNoPermission) {
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorResp(err))
ctx.AbortWithStatusJSON(
http.StatusForbidden,
model.NewApiErrorResp(
fmt.Errorf("push movies error: %w", err),
),
)
return
}
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorResp(err))
@ -257,7 +267,7 @@ func NewPublishKey(ctx *gin.Context) {
if !conf.Conf.Server.Rtmp.Enable {
log.Errorf("rtmp is not enabled")
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorStringResp("rtmp is not enabled"))
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("rtmp is not enabled"))
return
}
@ -279,7 +289,12 @@ func NewPublishKey(ctx *gin.Context) {
if movie.Movie.CreatorID != user.ID {
log.Errorf("new publish key error: %v", dbModel.ErrNoPermission)
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorResp(dbModel.ErrNoPermission))
ctx.AbortWithStatusJSON(
http.StatusForbidden,
model.NewApiErrorResp(
fmt.Errorf("new publish key error: %w", dbModel.ErrNoPermission),
),
)
return
}
@ -326,7 +341,12 @@ func EditMovie(ctx *gin.Context) {
if err := user.UpdateMovie(room, req.Id, (*dbModel.BaseMovie)(&req.PushMovieReq)); err != nil {
log.Errorf("edit movie error: %v", err)
if errors.Is(err, dbModel.ErrNoPermission) {
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorResp(err))
ctx.AbortWithStatusJSON(
http.StatusForbidden,
model.NewApiErrorResp(
fmt.Errorf("edit movie error: %w", err),
),
)
return
}
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorResp(err))
@ -352,7 +372,12 @@ func DelMovie(ctx *gin.Context) {
if err != nil {
log.Errorf("del movie error: %v", err)
if errors.Is(err, dbModel.ErrNoPermission) {
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorResp(err))
ctx.AbortWithStatusJSON(
http.StatusForbidden,
model.NewApiErrorResp(
fmt.Errorf("del movie error: %w", err),
),
)
return
}
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorResp(err))
@ -368,7 +393,12 @@ func ClearMovies(ctx *gin.Context) {
if err := user.ClearMovies(room); err != nil {
if errors.Is(err, dbModel.ErrNoPermission) {
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorResp(err))
ctx.AbortWithStatusJSON(
http.StatusForbidden,
model.NewApiErrorResp(
fmt.Errorf("clear movies error: %w", err),
),
)
return
}
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorResp(err))
@ -412,7 +442,12 @@ func ChangeCurrentMovie(ctx *gin.Context) {
if err != nil {
log.Errorf("change current movie error: %v", err)
if errors.Is(err, dbModel.ErrNoPermission) {
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorResp(err))
ctx.AbortWithStatusJSON(
http.StatusForbidden,
model.NewApiErrorResp(
fmt.Errorf("change current movie error: %w", err),
),
)
return
}
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorResp(err))
@ -427,7 +462,7 @@ func ProxyMovie(ctx *gin.Context) {
if !settings.MovieProxy.Get() {
log.Errorf("movie proxy is not enabled")
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorStringResp("movie proxy is not enabled"))
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("movie proxy is not enabled"))
return
}
roomId := ctx.Param("roomId")
@ -572,12 +607,12 @@ func JoinLive(ctx *gin.Context) {
return
}
if m.Movie.Base.RtmpSource && !conf.Conf.Server.Rtmp.Enable {
log.Errorf("join live error: %v", "rtmp is not enabled")
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorStringResp("rtmp is not enabled"))
log.Error("join live error: rtmp is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("rtmp is not enabled"))
return
} else if m.Movie.Base.Live && !settings.LiveProxy.Get() {
log.Errorf("join live error: %v", "live proxy is not enabled")
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorStringResp("live proxy is not enabled"))
log.Error("join live error: live proxy is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("live proxy is not enabled"))
return
}
channel, err := m.Channel()
@ -636,12 +671,12 @@ func JoinFlvLive(ctx *gin.Context) {
return
}
if m.Movie.Base.RtmpSource && !conf.Conf.Server.Rtmp.Enable {
log.Errorf("join flv live error: %v", "rtmp is not enabled")
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorStringResp("rtmp is not enabled"))
log.Error("join flv live error: rtmp is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("rtmp is not enabled"))
return
} else if m.Movie.Base.Live && !settings.LiveProxy.Get() {
log.Errorf("join flv live error: %v", "live proxy is not enabled")
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorStringResp("live proxy is not enabled"))
log.Error("join flv live error: live proxy is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("live proxy is not enabled"))
return
}
channel, err := m.Channel()
@ -675,12 +710,12 @@ func JoinHlsLive(ctx *gin.Context) {
return
}
if m.Movie.Base.RtmpSource && !conf.Conf.Server.Rtmp.Enable {
log.Errorf("join hls live error: %v", "rtmp is not enabled")
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorStringResp("rtmp is not enabled"))
log.Error("join hls live error: rtmp is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("rtmp is not enabled"))
return
} else if m.Movie.Base.Live && !settings.LiveProxy.Get() {
log.Errorf("join hls live error: %v", "live proxy is not enabled")
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorStringResp("live proxy is not enabled"))
log.Error("join hls live error: live proxy is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("live proxy is not enabled"))
return
}
channel, err := m.Channel()
@ -725,12 +760,12 @@ func ServeHlsLive(ctx *gin.Context) {
return
}
if m.Movie.Base.RtmpSource && !conf.Conf.Server.Rtmp.Enable {
log.Errorf("serve hls live error: %v", "rtmp is not enabled")
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorStringResp("rtmp is not enabled"))
log.Error("serve hls live error: rtmp is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("rtmp is not enabled"))
return
} else if m.Movie.Base.Live && !settings.LiveProxy.Get() {
log.Errorf("serve hls live error: %v", "live proxy is not enabled")
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorStringResp("live proxy is not enabled"))
log.Error("serve hls live error: live proxy is not enabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("live proxy is not enabled"))
return
}
channel, err := m.Channel()

26
server/handlers/room.go
Unescape Escape View File

@ -3,6 +3,7 @@ package handlers
import (
"context"
"errors"
"fmt"
"net/http"
"slices"
"time"
@ -55,8 +56,8 @@ func CreateRoom(ctx *gin.Context) {
log := ctx.MustGet("log").(*logrus.Entry)
if settings.DisableCreateRoom.Get() && !user.IsAdmin() {
log.Warn("create room is disabled")
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorStringResp("create room is disabled"))
log.Error("create room is disabled")
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("create room is disabled"))
return
}
@ -319,7 +320,12 @@ func DeleteRoom(ctx *gin.Context) {
if err := user.DeleteRoom(room); err != nil {
log.Errorf("delete room failed: %v", err)
if errors.Is(err, dbModel.ErrNoPermission) {
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorResp(err))
ctx.AbortWithStatusJSON(
http.StatusForbidden,
model.NewApiErrorResp(
fmt.Errorf("delete room failed: %w", err),
),
)
return
}
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorResp(err))
@ -344,7 +350,12 @@ func SetRoomPassword(ctx *gin.Context) {
if err := user.SetRoomPassword(room, req.Password); err != nil {
log.Errorf("set room password failed: %v", err)
if errors.Is(err, dbModel.ErrNoPermission) {
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorResp(err))
ctx.AbortWithStatusJSON(
http.StatusForbidden,
model.NewApiErrorResp(
fmt.Errorf("set room password failed: %w", err),
),
)
return
}
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorResp(err))
@ -386,7 +397,12 @@ func SetRoomSetting(ctx *gin.Context) {
if err := user.UpdateRoomSettings(room, req); err != nil {
log.Errorf("set room setting failed: %v", err)
if errors.Is(err, dbModel.ErrNoPermission) {
ctx.AbortWithStatusJSON(http.StatusForbidden, model.NewApiErrorResp(err))
ctx.AbortWithStatusJSON(
http.StatusForbidden,
model.NewApiErrorResp(
fmt.Errorf("set room setting failed: %w", err),
),
)
return
}
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorResp(err))

17
server/handlers/websocket.go
Unescape Escape View File

@ -2,6 +2,7 @@ package handlers
import (
"errors"
"fmt"
"io"
"net/http"
"time"
@ -169,10 +170,10 @@ func handleElementMsg(cli *op.Client, msg *pb.ElementMessage) error {
if err != nil && errors.Is(err, dbModel.ErrNoPermission) {
return cli.Send(&pb.ElementMessage{
Type: pb.ElementMessageType_ERROR,
Error: err.Error(),
Error: fmt.Sprintf("send chat message error: %v", err),
})
}
return err
return nil
case pb.ElementMessageType_PLAY,
pb.ElementMessageType_PAUSE,
pb.ElementMessageType_CHANGE_RATE:
@ -180,7 +181,7 @@ func handleElementMsg(cli *op.Client, msg *pb.ElementMessage) error {
if err != nil {
return cli.Send(&pb.ElementMessage{
Type: pb.ElementMessageType_ERROR,
Error: err.Error(),
Error: fmt.Sprintf("set status error: %v", err),
})
}
return cli.Broadcast(&pb.ElementMessage{
@ -202,7 +203,7 @@ func handleElementMsg(cli *op.Client, msg *pb.ElementMessage) error {
if err != nil {
return cli.Send(&pb.ElementMessage{
Type: pb.ElementMessageType_ERROR,
Error: err.Error(),
Error: fmt.Sprintf("set seek rate error: %v", err),
})
}
return cli.Broadcast(&pb.ElementMessage{
@ -240,17 +241,15 @@ func handleElementMsg(cli *op.Client, msg *pb.ElementMessage) error {
if msg.CheckReq.ExpireId != 0 && current.MovieID != "" {
currentMovie, err := cli.Room().GetMovieByID(current.MovieID)
if err != nil {
_ = cli.Send(&pb.ElementMessage{
return cli.Send(&pb.ElementMessage{
Type: pb.ElementMessageType_ERROR,
Error: err.Error(),
Error: fmt.Sprintf("get movie by id error: %v", err),
})
break
}
if currentMovie.CheckExpired(msg.CheckReq.ExpireId) {
_ = cli.Send(&pb.ElementMessage{
return cli.Send(&pb.ElementMessage{
Type: pb.ElementMessageType_CURRENT_CHANGED,
})
break
}
}
status := current.Status

Write Preview
Loading…
Cancel
Save