mirror of
https://github.com/navidrome/navidrome.git
synced 2026-01-03 06:15:22 +00:00
* refactor: implement OnSchedulerCallback method in wasmSchedulerCallback Added the OnSchedulerCallback method to the wasmSchedulerCallback struct, enabling it to handle scheduler callback events. This method constructs a SchedulerCallbackRequest and invokes the corresponding plugin method, facilitating better integration with the scheduling system. The changes improve the plugin's ability to respond to scheduled events, enhancing overall functionality. Signed-off-by: Deluan <deluan@navidrome.org> * fix(plugins): update executeCallback method to use callMethod Modified the executeCallback method to accept an additional parameter, methodName, which specifies the callback method to be executed. This change ensures that the correct method is called for each WebSocket event, improving the accuracy of callback execution for plugins. Signed-off-by: Deluan <deluan@navidrome.org> * fix(plugins): capture OnInit metrics Signed-off-by: Deluan <deluan@navidrome.org> * fix(plugins): improve logging for metrics in callMethod Updated the logging statement in the callMethod function to include the elapsed time as a separate key in the log output. This change enhances the clarity of the logged metrics, making it easier to analyze the performance of plugin requests and troubleshoot any issues that may arise. Signed-off-by: Deluan <deluan@navidrome.org> * fix(plugins): enhance logging for schedule callback execution Signed-off-by: Deluan <deluan@navidrome.org> * refactor(server): streamline scrobbler stopping logic Refactored the logic for stopping scrobbler instances when they are removed. The new implementation introduces a `stoppableScrobbler` interface to simplify the type assertion process, allowing for a more concise and readable code structure. This change ensures that any scrobbler implementing the `Stop` method is properly stopped before removal, improving the overall reliability of the plugin management system. Signed-off-by: Deluan <deluan@navidrome.org> * fix(plugins): improve plugin lifecycle management and error handling Enhanced the plugin lifecycle management by implementing error handling in the OnInit method. The changes include the addition of specific error conditions that can be returned during plugin initialization, allowing for better management of plugin states. Additionally, the unregisterPlugin method was updated to ensure proper cleanup of plugins that fail to initialize, improving overall stability and reliability of the plugin system. Signed-off-by: Deluan <deluan@navidrome.org> * refactor(plugins): remove unused LoadAllPlugins and related methods Eliminated the LoadAllPlugins, LoadAllMediaAgents, and LoadAllScrobblers methods from the manager implementation as they were not utilized in the codebase. This cleanup reduces complexity and improves maintainability by removing redundant code, allowing for a more streamlined plugin management process. Signed-off-by: Deluan <deluan@navidrome.org> * fix(plugins): update logging configuration for plugins Configured logging for multiple plugins to remove timestamps and source file/line information, while adding specific prefixes for better identification. Signed-off-by: Deluan <deluan@navidrome.org> * fix(plugins): clear initialization state when unregistering a plugin Added functionality to clear the initialization state of a plugin in the lifecycle manager when it is unregistered. This change ensures that the lifecycle state is accurately maintained, preventing potential issues with plugins that may be re-registered after being unregistered. The new method `clearInitialized` was implemented to handle this state management. Signed-off-by: Deluan <deluan@navidrome.org> * test: add unit tests for convertError function, rename to checkErr Added comprehensive unit tests for the convertError function to ensure correct behavior across various scenarios, including handling nil responses, typed nils, and responses implementing errorResponse. These tests validate that the function returns the expected results without panicking and correctly wraps original errors when necessary. Signed-off-by: Deluan <deluan@navidrome.org> * fix(plugins): update plugin base implementation and method calls Refactored the plugin base implementation by renaming `wasmBasePlugin` to `baseCapability` across multiple files. Updated method calls in the `wasmMediaAgent`, `wasmSchedulerCallback`, and `wasmScrobblerPlugin` to align with the new base structure. These changes improve code clarity and maintainability by standardizing the plugin architecture, ensuring consistent usage of the base capabilities across different plugin types. Signed-off-by: Deluan <deluan@navidrome.org> * fix(discord): handle failed connections and improve heartbeat checks Added a new method to clean up failed connections, which cancels the heartbeat schedule, closes the WebSocket connection, and removes cache entries. Enhanced the heartbeat check to log failures and trigger the cleanup process on the first failure. These changes ensure better management of user connections and improve the overall reliability of the RPC system. Signed-off-by: Deluan <deluan@navidrome.org> --------- Signed-off-by: Deluan <deluan@navidrome.org>
189 lines
4.6 KiB
Go
189 lines
4.6 KiB
Go
package plugins
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
|
|
. "github.com/onsi/ginkgo/v2"
|
|
. "github.com/onsi/gomega"
|
|
)
|
|
|
|
type nilInstance struct{}
|
|
|
|
var _ = Describe("baseCapability", func() {
|
|
var ctx = context.Background()
|
|
|
|
It("should load instance using loadFunc", func() {
|
|
called := false
|
|
plugin := &baseCapability[*nilInstance, any]{
|
|
wasmPath: "",
|
|
id: "test",
|
|
capability: "test",
|
|
loadFunc: func(ctx context.Context, _ any, path string) (*nilInstance, error) {
|
|
called = true
|
|
return &nilInstance{}, nil
|
|
},
|
|
}
|
|
inst, done, err := plugin.getInstance(ctx, "test")
|
|
defer done()
|
|
Expect(err).To(BeNil())
|
|
Expect(inst).ToNot(BeNil())
|
|
Expect(called).To(BeTrue())
|
|
})
|
|
})
|
|
|
|
var _ = Describe("checkErr", func() {
|
|
Context("when resp is nil", func() {
|
|
It("should return the original error unchanged", func() {
|
|
var resp *testErrorResponse
|
|
originalErr := errors.New("original error")
|
|
|
|
result, err := checkErr(resp, originalErr)
|
|
|
|
Expect(result).To(BeNil())
|
|
Expect(err).To(Equal(originalErr))
|
|
})
|
|
|
|
It("should return nil error when both resp and err are nil", func() {
|
|
var resp *testErrorResponse
|
|
|
|
result, err := checkErr(resp, nil)
|
|
|
|
Expect(result).To(BeNil())
|
|
Expect(err).To(BeNil())
|
|
})
|
|
})
|
|
|
|
Context("when resp is a typed nil that implements errorResponse", func() {
|
|
It("should not panic and return original error", func() {
|
|
var resp *testErrorResponse // typed nil
|
|
originalErr := errors.New("original error")
|
|
|
|
// This should not panic
|
|
result, err := checkErr(resp, originalErr)
|
|
|
|
Expect(result).To(BeNil())
|
|
Expect(err).To(Equal(originalErr))
|
|
})
|
|
|
|
It("should handle typed nil with nil error gracefully", func() {
|
|
var resp *testErrorResponse // typed nil
|
|
|
|
// This should not panic
|
|
result, err := checkErr(resp, nil)
|
|
|
|
Expect(result).To(BeNil())
|
|
Expect(err).To(BeNil())
|
|
})
|
|
})
|
|
|
|
Context("when resp implements errorResponse with non-empty error", func() {
|
|
It("should create new error when original error is nil", func() {
|
|
resp := &testErrorResponse{errorMsg: "plugin error"}
|
|
|
|
result, err := checkErr(resp, nil)
|
|
|
|
Expect(result).To(Equal(resp))
|
|
Expect(err).To(MatchError("plugin error"))
|
|
})
|
|
|
|
It("should wrap original error when both exist", func() {
|
|
resp := &testErrorResponse{errorMsg: "plugin error"}
|
|
originalErr := errors.New("original error")
|
|
|
|
result, err := checkErr(resp, originalErr)
|
|
|
|
Expect(result).To(Equal(resp))
|
|
Expect(err).To(MatchError("plugin error: original error"))
|
|
})
|
|
})
|
|
|
|
Context("when resp implements errorResponse with empty error", func() {
|
|
It("should return original error unchanged", func() {
|
|
resp := &testErrorResponse{errorMsg: ""}
|
|
originalErr := errors.New("original error")
|
|
|
|
result, err := checkErr(resp, originalErr)
|
|
|
|
Expect(result).To(Equal(resp))
|
|
Expect(err).To(Equal(originalErr))
|
|
})
|
|
|
|
It("should return nil error when both are empty/nil", func() {
|
|
resp := &testErrorResponse{errorMsg: ""}
|
|
|
|
result, err := checkErr(resp, nil)
|
|
|
|
Expect(result).To(Equal(resp))
|
|
Expect(err).To(BeNil())
|
|
})
|
|
})
|
|
|
|
Context("when resp does not implement errorResponse", func() {
|
|
It("should return original error unchanged", func() {
|
|
resp := &testNonErrorResponse{data: "some data"}
|
|
originalErr := errors.New("original error")
|
|
|
|
result, err := checkErr(resp, originalErr)
|
|
|
|
Expect(result).To(Equal(resp))
|
|
Expect(err).To(Equal(originalErr))
|
|
})
|
|
|
|
It("should return nil error when original error is nil", func() {
|
|
resp := &testNonErrorResponse{data: "some data"}
|
|
|
|
result, err := checkErr(resp, nil)
|
|
|
|
Expect(result).To(Equal(resp))
|
|
Expect(err).To(BeNil())
|
|
})
|
|
})
|
|
|
|
Context("when resp is a value type (not pointer)", func() {
|
|
It("should handle value types that implement errorResponse", func() {
|
|
resp := testValueErrorResponse{errorMsg: "value error"}
|
|
originalErr := errors.New("original error")
|
|
|
|
result, err := checkErr(resp, originalErr)
|
|
|
|
Expect(result).To(Equal(resp))
|
|
Expect(err).To(MatchError("value error: original error"))
|
|
})
|
|
|
|
It("should handle value types with empty error", func() {
|
|
resp := testValueErrorResponse{errorMsg: ""}
|
|
originalErr := errors.New("original error")
|
|
|
|
result, err := checkErr(resp, originalErr)
|
|
|
|
Expect(result).To(Equal(resp))
|
|
Expect(err).To(Equal(originalErr))
|
|
})
|
|
})
|
|
})
|
|
|
|
// Test helper types
|
|
type testErrorResponse struct {
|
|
errorMsg string
|
|
}
|
|
|
|
func (t *testErrorResponse) GetError() string {
|
|
if t == nil {
|
|
return "" // This is what would typically happen with a typed nil
|
|
}
|
|
return t.errorMsg
|
|
}
|
|
|
|
type testNonErrorResponse struct {
|
|
data string
|
|
}
|
|
|
|
type testValueErrorResponse struct {
|
|
errorMsg string
|
|
}
|
|
|
|
func (t testValueErrorResponse) GetError() string {
|
|
return t.errorMsg
|
|
}
|