mirror of
https://github.com/go-gitea/gitea.git
synced 2026-07-28 17:25:17 +02:00
* Closes #36942 * Fixes #19265 Replaces the SSE-based push channel (`/user/events`) with a WebSocket endpoint (`/-/ws`). ### What changes - **New `/-/ws` endpoint** (authenticated). One WebSocket per origin, shared across tabs via a single `SharedWorker`. - **Pubsub broker** (`services/pubsub`) for fan-out by topic, behind a `Broker` interface. `MemoryBroker` is the default (single process); a Redis backend is available for multi-process setups, configured via `[websocket].PUBSUB_TYPE` / `PUBSUB_CONN_STR`. The internal Gitea queue was not usable here because it has FIFO/single-consumer semantics. - **Push-only event production.** Events are emitted by write-triggered notifiers — `NotificationCountChange`, `PublishStopwatchesForUser`, and the logout publisher — wired into the existing `notify.Notifier` interface. No server-side pollers. - **Typed pub/sub on the client.** `web_src/js/modules/worker.ts` is a singleton transport; features subscribe per event type via `onUserEvent('notification-count', cb)` instead of branching on `event.data.type`. - **Wire contract** (`UserEventType` union) is shared between the worker and consumers via `web_src/js/types.ts`, kept in sync with `services/websocket/events.go`. - **Client-side periodic polling fallback** kicks in only when the WebSocket cannot be established (e.g. proxy blocks WS, browser lacks module-SharedWorker support). ### What's removed - `modules/eventsource` (SSE manager, run loop, messenger). - `/user/events` route and `tests/integration/eventsource_test.go`. - All server-side polling for stopwatches and notification counts. ### Stopwatch multi-tab fix The navbar stopwatch icon was previously rendered conditionally on `{{if $activeStopwatch}}`, so tabs loaded before the timer started had no DOM element to update. The icon and popup are now always rendered (toggled with `tw-hidden`), and the start/stop/cancel handlers POST silently so all open tabs reflect the change in real time. ### Deployment note WebSocket needs the upgrade headers to pass through a reverse proxy, e.g. for nginx: ```nginx proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; ``` Without them the WebSocket cannot be established, and after 3 consecutive failed opens the shared worker signals `push-unavailable`: the notification count and stopwatch fall back to periodic polling on the existing `[ui.notification]` timeouts. Real-time push is lost, the features keep working. The reverse-proxy docs need the same note (see the `docs-update-needed` label). --------- Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: Epid <rexmrj@gmail.com>
118 lines
3.0 KiB
Go
118 lines
3.0 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package json
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/binary"
|
|
"encoding/json" //nolint:depguard // this package wraps it
|
|
"io"
|
|
)
|
|
|
|
// Encoder represents an encoder for json
|
|
type Encoder interface {
|
|
Encode(v any) error
|
|
}
|
|
|
|
// Decoder represents a decoder for json
|
|
type Decoder interface {
|
|
Decode(v any) error
|
|
}
|
|
|
|
// Interface represents an interface to handle json data
|
|
type Interface interface {
|
|
Marshal(v any) ([]byte, error)
|
|
MarshalWrite(w io.Writer, v any) error
|
|
Unmarshal(data []byte, v any) error
|
|
NewEncoder(writer io.Writer) Encoder
|
|
NewDecoder(reader io.Reader) Decoder
|
|
Indent(dst *bytes.Buffer, src []byte, prefix, indent string) error
|
|
}
|
|
|
|
var DefaultJSONHandler = getDefaultJSONHandler()
|
|
|
|
// Marshal converts object as bytes
|
|
func Marshal(v any) ([]byte, error) {
|
|
return DefaultJSONHandler.Marshal(v)
|
|
}
|
|
|
|
// MarshalWrite writes the JSON encoding of v to the given writer
|
|
func MarshalWrite(w io.Writer, v any) error {
|
|
return DefaultJSONHandler.MarshalWrite(w, v)
|
|
}
|
|
|
|
// Unmarshal decodes object from bytes
|
|
func Unmarshal(data []byte, v any) error {
|
|
return DefaultJSONHandler.Unmarshal(data, v)
|
|
}
|
|
|
|
// NewEncoder creates an encoder to write objects to writer
|
|
func NewEncoder(writer io.Writer) Encoder {
|
|
return DefaultJSONHandler.NewEncoder(writer)
|
|
}
|
|
|
|
// NewDecoder creates a decoder to read objects from reader
|
|
func NewDecoder(reader io.Reader) Decoder {
|
|
return DefaultJSONHandler.NewDecoder(reader)
|
|
}
|
|
|
|
// Indent appends to dst an indented form of the JSON-encoded src.
|
|
func Indent(dst *bytes.Buffer, src []byte, prefix, indent string) error {
|
|
return DefaultJSONHandler.Indent(dst, src, prefix, indent)
|
|
}
|
|
|
|
// MarshalIndent copied from encoding/json
|
|
func MarshalIndent(v any, prefix, indent string) ([]byte, error) {
|
|
b, err := Marshal(v)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var buf bytes.Buffer
|
|
err = Indent(&buf, b, prefix, indent)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return buf.Bytes(), nil
|
|
}
|
|
|
|
// Valid proxy to json.Valid
|
|
func Valid(data []byte) bool {
|
|
return json.Valid(data)
|
|
}
|
|
|
|
// UnmarshalHandleDoubleEncode - due to a bug in xorm (see https://gitea.com/xorm/xorm/pulls/1957) - it's
|
|
// possible that a Blob may be double encoded or gain an unwanted prefix of 0xff 0xfe.
|
|
func UnmarshalHandleDoubleEncode(bs []byte, v any) error {
|
|
if len(bs) == 0 {
|
|
// json.Unmarshal will report errors if input is empty (nil or zero-length)
|
|
// It seems that XORM ignores the nil but still passes zero-length string into this function
|
|
// To be consistent, we should treat all empty inputs as success
|
|
return nil
|
|
}
|
|
err := json.Unmarshal(bs, v)
|
|
if err != nil {
|
|
ok := true
|
|
rs := []byte{}
|
|
temp := make([]byte, 2)
|
|
for _, rn := range string(bs) {
|
|
if rn > 0xffff {
|
|
ok = false
|
|
break
|
|
}
|
|
binary.LittleEndian.PutUint16(temp, uint16(rn))
|
|
rs = append(rs, temp...)
|
|
}
|
|
if ok {
|
|
if len(rs) > 1 && rs[0] == 0xff && rs[1] == 0xfe {
|
|
rs = rs[2:]
|
|
}
|
|
err = json.Unmarshal(rs, v)
|
|
}
|
|
}
|
|
if err != nil && len(bs) > 2 && bs[0] == 0xff && bs[1] == 0xfe {
|
|
err = json.Unmarshal(bs[2:], v)
|
|
}
|
|
return err
|
|
}
|