arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

refactor(plugins): simplify websocket callback invocation by creating a generic helper function

Browse Source 
Signed-off-by: Deluan <deluan@navidrome.org>
This commit is contained in:
Deluan
2026-02-02 08:59:40 +01:00
parent ebbc31f1ab
commit 7b709899a1
1 changed files with 17 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/host_websocket.go
+17 -70
View File
@@ -324,105 +324,52 @@ func (s *webSocketServiceImpl) readLoop(ctx context.Context, connectionID string
} }
} }
func (s *webSocketServiceImpl) invokeOnTextMessage(ctx context.Context, connectionID, message string) { // invokeWebSocketCallback is a generic helper that handles the common callback invocation pattern.
func invokeWebSocketCallback[I any](ctx context.Context, s *webSocketServiceImpl, funcName string, input I, callbackName string, connectionID string) {
instance := s.getPluginInstance() instance := s.getPluginInstance()
if instance == nil { if instance == nil {
return return
} }
input := capabilities.OnTextMessageRequest{
ConnectionID: connectionID,
Message: message,
}
// Create a timeout context for this callback invocation
callbackCtx, cancel := context.WithTimeout(ctx, webSocketCallbackTimeout) callbackCtx, cancel := context.WithTimeout(ctx, webSocketCallbackTimeout)
defer cancel() defer cancel()
start := time.Now() start := time.Now()
err := callPluginFunctionNoOutput(callbackCtx, instance, FuncWebSocketOnTextMessage, input) err := callPluginFunctionNoOutput(callbackCtx, instance, funcName, input)
if err != nil { if err != nil {
// Don't log error if function simply doesn't exist (optional callback)
if !errors.Is(errFunctionNotFound, err) { if !errors.Is(errFunctionNotFound, err) {
log.Error(ctx, "WebSocket text message callback failed", "plugin", s.pluginName, "connectionID", connectionID, "duration", time.Since(start), err) log.Error(ctx, "WebSocket "+callbackName+" callback failed", "plugin", s.pluginName, "connectionID", connectionID, "duration", time.Since(start), err)
} }
} }
} }
func (s *webSocketServiceImpl) invokeOnTextMessage(ctx context.Context, connectionID, message string) {
invokeWebSocketCallback(ctx, s, FuncWebSocketOnTextMessage, capabilities.OnTextMessageRequest{
ConnectionID: connectionID,
Message: message,
}, "text message", connectionID)
}
func (s *webSocketServiceImpl) invokeOnBinaryMessage(ctx context.Context, connectionID string, data []byte) { func (s *webSocketServiceImpl) invokeOnBinaryMessage(ctx context.Context, connectionID string, data []byte) {
instance := s.getPluginInstance() invokeWebSocketCallback(ctx, s, FuncWebSocketOnBinaryMessage, capabilities.OnBinaryMessageRequest{
if instance == nil {
return
}
input := capabilities.OnBinaryMessageRequest{
ConnectionID: connectionID, ConnectionID: connectionID,
Data: base64.StdEncoding.EncodeToString(data), Data: base64.StdEncoding.EncodeToString(data),
} }, "binary message", connectionID)
// Create a timeout context for this callback invocation
callbackCtx, cancel := context.WithTimeout(ctx, webSocketCallbackTimeout)
defer cancel()
start := time.Now()
err := callPluginFunctionNoOutput(callbackCtx, instance, FuncWebSocketOnBinaryMessage, input)
if err != nil {
// Don't log error if function simply doesn't exist (optional callback)
if !errors.Is(errFunctionNotFound, err) {
log.Error(ctx, "WebSocket binary message callback failed", "plugin", s.pluginName, "connectionID", connectionID, "duration", time.Since(start), err)
}
}
} }
func (s *webSocketServiceImpl) invokeOnError(ctx context.Context, connectionID, errorMsg string) { func (s *webSocketServiceImpl) invokeOnError(ctx context.Context, connectionID, errorMsg string) {
instance := s.getPluginInstance() invokeWebSocketCallback(ctx, s, FuncWebSocketOnError, capabilities.OnErrorRequest{
if instance == nil {
return
}
input := capabilities.OnErrorRequest{
ConnectionID: connectionID, ConnectionID: connectionID,
Error: errorMsg, Error: errorMsg,
} }, "error", connectionID)
// Create a timeout context for this callback invocation
callbackCtx, cancel := context.WithTimeout(ctx, webSocketCallbackTimeout)
defer cancel()
start := time.Now()
err := callPluginFunctionNoOutput(callbackCtx, instance, FuncWebSocketOnError, input)
if err != nil {
// Don't log error if function simply doesn't exist (optional callback)
if !errors.Is(errFunctionNotFound, err) {
log.Error(ctx, "WebSocket error callback failed", "plugin", s.pluginName, "connectionID", connectionID, "duration", time.Since(start), err)
}
}
} }
func (s *webSocketServiceImpl) invokeOnClose(ctx context.Context, connectionID string, code int32, reason string) { func (s *webSocketServiceImpl) invokeOnClose(ctx context.Context, connectionID string, code int32, reason string) {
instance := s.getPluginInstance() invokeWebSocketCallback(ctx, s, FuncWebSocketOnClose, capabilities.OnCloseRequest{
if instance == nil {
return
}
input := capabilities.OnCloseRequest{
ConnectionID: connectionID, ConnectionID: connectionID,
Code: code, Code: code,
Reason: reason, Reason: reason,
} }, "close", connectionID)
// Create a timeout context for this callback invocation
callbackCtx, cancel := context.WithTimeout(ctx, webSocketCallbackTimeout)
defer cancel()
start := time.Now()
err := callPluginFunctionNoOutput(callbackCtx, instance, FuncWebSocketOnClose, input)
if err != nil {
// Don't log error if function simply doesn't exist (optional callback)
if !errors.Is(errFunctionNotFound, err) {
log.Error(ctx, "WebSocket close callback failed", "plugin", s.pluginName, "connectionID", connectionID, "duration", time.Since(start), err)
}
}
} }
func (s *webSocketServiceImpl) getPluginInstance() *plugin { func (s *webSocketServiceImpl) getPluginInstance() *plugin {