Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-05-17 21:00:38 +02:00
Code Issues Activity

fix(websocket): use gitea modules/json, write raw bytes directly

Browse Source
This commit is contained in:
Epid 2026-03-24 00:07:56 +03:00
parent 69324f3e13
commit f26aa2f520
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
routers/web/websocket/websocket.go
View File

@ -4,7 +4,6 @@
package websocket package websocket
import ( import (
"encoding/json"
"fmt" "fmt"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
@ -12,7 +11,6 @@ import (
"code.gitea.io/gitea/services/pubsub" "code.gitea.io/gitea/services/pubsub"
gitea_ws "github.com/coder/websocket" gitea_ws "github.com/coder/websocket"
"github.com/coder/websocket/wsjson"
) )
// Serve handles WebSocket upgrade and event delivery for the signed-in user. // Serve handles WebSocket upgrade and event delivery for the signed-in user.
@ -29,7 +27,7 @@ func Serve(ctx *context.Context) {
log.Error("websocket: accept failed: %v", err) log.Error("websocket: accept failed: %v", err)
return return
} }
defer conn.CloseNow() //nolint:errcheck defer conn.CloseNow() //nolint:errcheck // CloseNow is best-effort; error is intentionally ignored
topic := fmt.Sprintf("user-%d", ctx.Doer.ID) topic := fmt.Sprintf("user-%d", ctx.Doer.ID)
ch, cancel := pubsub.DefaultBroker.Subscribe(topic) ch, cancel := pubsub.DefaultBroker.Subscribe(topic)
@ -44,7 +42,7 @@ func Serve(ctx *context.Context) {
if !ok { if !ok {
return return
} }
if err := wsjson.Write(wsCtx, conn, json.RawMessage(msg)); err != nil { if err := conn.Write(wsCtx, gitea_ws.MessageText, msg); err != nil {
log.Trace("websocket: write failed: %v", err) log.Trace("websocket: write failed: %v", err)
return return
} }