mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
J3vbandClaude Fable 5
5c91d2492b
Port the last three V1 message types to typed V2 handlers, then remove the V1 registry and fallback path so handleMessage has a single dispatch generation (audit A-2026-07-09 / backlog item 11). Server-internal only — the envelope wire format is unchanged, no client/protocol edits. - chat_command: ChatCommandCmd + constructor (empty/args guards) and a V2 handler returning an ephemeral Reply plus a channel-routed PluginBroadcastEvent gated by MessageService.CanPost; PluginDeps reads the registry live (wired post-construction) - voice_join/voice_leave: V2 handlers gate parse/rate-limit and hand off to the still-hub-internal handleVoiceJoin/handleVoiceLeave routines via new Result.JoinVoice / Result.LeaveVoice appliers (those routines are also called un-throttled on disconnect and channel switch) - delete HandlerRegistry.handlers/Register/Dispatch/RegisteredTypes/ IsRegisteredV1/hasV2, the MessageHandler type, and the V1-shadowing guard; NewHub registers only V2 - tests: per-handler V2 tests + a parity guard asserting every command constructor has a V2 handler and vice versa (locks the migration shut) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
76 lines
2.4 KiB
Go
76 lines
2.4 KiB
Go
package ws
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"log/slog"
|
|
"runtime"
|
|
)
|
|
|
|
// handlerV2Entry pairs a V2 handler with its domain-specific dependency struct.
|
|
type handlerV2Entry struct {
|
|
handler HandlerV2
|
|
deps any // concrete deps struct for this handler's domain
|
|
}
|
|
|
|
// HandlerRegistry maps message type strings to their typed V2 handlers.
|
|
// It is not safe for concurrent use after initialization; all RegisterV2
|
|
// calls must happen before any DispatchV2 calls.
|
|
type HandlerRegistry struct {
|
|
handlersV2 map[string]handlerV2Entry
|
|
}
|
|
|
|
// NewHandlerRegistry creates an empty handler registry.
|
|
func NewHandlerRegistry() *HandlerRegistry {
|
|
return &HandlerRegistry{
|
|
handlersV2: make(map[string]handlerV2Entry),
|
|
}
|
|
}
|
|
|
|
// RegisterV2 registers a V2 handler for the given command type.
|
|
// PANICS if cmdType is already registered (duplicate guard).
|
|
func (r *HandlerRegistry) RegisterV2(cmdType string, handler HandlerV2, deps any) {
|
|
if _, exists := r.handlersV2[cmdType]; exists {
|
|
panic(fmt.Sprintf("RegisterV2: cmdType %q already registered", cmdType))
|
|
}
|
|
r.handlersV2[cmdType] = handlerV2Entry{handler: handler, deps: deps}
|
|
}
|
|
|
|
// DispatchV2 looks up a V2 handler and calls it.
|
|
// Returns (result, true) if found, (Result{}, false) if not.
|
|
// Recovers from panics (e.g. bad type assertions on cmd or deps) to prevent
|
|
// a single malformed message from crashing the entire server.
|
|
func (r *HandlerRegistry) DispatchV2(ctx context.Context, cmd Command, info ClientInfo) (result Result, ok bool) {
|
|
entry, found := r.handlersV2[cmd.Type()]
|
|
if !found {
|
|
return Result{}, false
|
|
}
|
|
defer func() {
|
|
if rec := recover(); rec != nil {
|
|
buf := make([]byte, 4096)
|
|
n := runtime.Stack(buf, false)
|
|
// TODO: stack trace may contain sensitive function arguments
|
|
// (e.g. encrypted keys). Consider scrubbing or limiting frames.
|
|
slog.Error("DispatchV2 panic recovered",
|
|
"type", cmd.Type(),
|
|
"user_id", info.UserID,
|
|
"panic", rec,
|
|
"stack", string(buf[:n]),
|
|
)
|
|
result = Result{Error: ClientError{Code: ErrCodeInternal, Message: "internal error"}}
|
|
ok = true
|
|
}
|
|
}()
|
|
return entry.handler(ctx, cmd, info, entry.deps), true
|
|
}
|
|
|
|
// RegisteredV2Types returns all V2-registered message types (unordered).
|
|
// Intended for testing and diagnostics.
|
|
func (r *HandlerRegistry) RegisteredV2Types() []string {
|
|
types := make([]string, 0, len(r.handlersV2))
|
|
for t := range r.handlersV2 {
|
|
types = append(types, t)
|
|
}
|
|
return types
|
|
}
|