feat: Add Manual Registration, Invokable Discovery, and Refactor DI #2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Implements several enhancements to the MCP server: - Adds manual registration methods to the `Server` class (`withTool`, `withResource`, `withPrompt`, `withResourceTemplate`), allowing programmatic definition of MCP elements alongside attribute discovery. Supports array `[Class::class, 'method']` and invokable class string handlers. - Enables the `Discoverer` to find `#[Mcp*]` attributes placed directly on invokable classes (classes with a public `__invoke` method). Attributes (`McpTool`, `McpResource`, etc.) updated accordingly. - Refactors dependency injection within the `Server`. Core components like `Processor`, `Discoverer`, `Registry`, and `TransportState` now resolve dependencies (Logger, Cache, Config) Just-In-Time from the PSR-11 container. - Clarifies behavior: `withLogger/Cache/Config` methods primarily affect the default `BasicContainer`. When a custom container is used via `withContainer`, these services MUST be registered directly in the custom container. - Adds configuration options to control discovery paths (`withBasePath`, `withScanDirectories`, `withExcludeDirectories`). - Updates `README.md` extensively to document these new features and the updated DI behavior. - Adds comprehensive tests for manual registration and invokable class discovery, and updates existing tests to reflect the DI refactoring. BREAKING CHANGE: The dependency injection mechanism within the `Server` has been refactored. Components now resolve PSR-3/11/16 dependencies JIT from the container. Users providing a custom container via `withContainer()` MUST ensure `LoggerInterface`, `CacheInterface`, and `ConfigurationRepositoryInterface` are registered. The behavior of `withLogger()`, `withCache()`, and `withConfig()` is altered when a custom container is present; configuration should happen directly within the custom container itself. TransportHandler constructors now primarily accept the `Server` instance.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR introduces several significant enhancements and refactors, aimed at increasing flexibility and improving robustness.
Key Changes:
withTool,withResource,withPrompt,withResourceTemplate) to theServerclass, allowing programmatic definition of MCP elements alongside attribute discovery. Supports[Class::class, 'method']array handlers and invokable class string handlers.Discovererto find#[Mcp*]attributes placed directly on invokable class definitions (classes with a public__invokemethod), using the__invokemethod as the handler.Processor,Registry,TransportState,Discoverer, etc.) now resolve essential dependencies (LoggerInterface,CacheInterface,ConfigurationRepositoryInterface) Just-In-Time from the configured PSR-11 container.withLogger/Cache/Configreplace defaults. When using a custom container viawithContainer(), providing these core interfaces (LoggerInterface,CacheInterface,ConfigurationRepositoryInterface) within the custom container is mandatory, and thewith*methods on theServerinstance do not override the container's configuration for these services during runtime.withBasePath(),withScanDirectories(), andwithExcludeDirectories()methods on theServerfor more precise configuration of directory scanning.HttpTransportHandler,StdioTransportHandler) to primarily accept theServerinstance, simplifying instantiation.README.mdsignificantly to cover all changes. Added new unit tests for manual registration and invokable discovery, and updated existing tests for DI refactoring.Breaking Changes:
withContainer()MUST ensureLoggerInterface,CacheInterface, andConfigurationRepositoryInterfaceare registered within their container. The behavior ofwithLogger/Cache/Configis altered when a custom container is present; configuration should happen directly in the container.Serverinstance. Integrations (especially for HTTP transports) will need to update handler instantiation.