refactor: refactored all handlers into a callback map#144
Merged
Conversation
WalkthroughAdds a registry-based JSON-RPC dispatch for non-streaming methods and an Execute entry point for embedded clients; refactors server dispatch to use the registry while preserving special streaming and extended-timeout handling for screencapture and device_boot. Changes
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing touches
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Fix all issues with AI agents
In `@server/server.go`:
- Around line 169-181: When req.Method is empty, don't set a generic err and let
the later decoding error path run; instead immediately call sendJSONRPCError
with ErrCodeInvalidRequest (-32600) and a clear message (e.g. "Invalid Request"
and data like "method is required or empty"), then return. Update the req.Method
== "" branch to use sendJSONRPCError(w, req.ID, ErrCodeInvalidRequest, "Invalid
Request", "Method is required or empty") and remove the assignment that causes
the misleading "Error decoding JSON-RPC request"/ErrCodeServerError handling;
keep the existing registry lookup (GetMethodRegistry, handler) unchanged.
🧹 Nitpick comments (2)
server/dispatch.go (1)
13-35: Consider caching the registry map.
GetMethodRegistry()allocates a new map on every call. If this function is invoked per-request, the repeated allocations add unnecessary GC pressure. Consider initializing the map once at package level or usingsync.Once.♻️ Suggested refactor using package-level initialization
+var methodRegistry = map[string]HandlerFunc{ + "devices": handleDevicesList, + "screenshot": handleScreenshot, + "io_tap": handleIoTap, + "io_longpress": handleIoLongPress, + "io_text": handleIoText, + "io_button": handleIoButton, + "io_swipe": handleIoSwipe, + "io_gesture": handleIoGesture, + "url": handleURL, + "device_info": handleDeviceInfo, + "io_orientation_get": handleIoOrientationGet, + "io_orientation_set": handleIoOrientationSet, + "device_boot": handleDeviceBoot, + "device_shutdown": handleDeviceShutdown, + "device_reboot": handleDeviceReboot, + "dump_ui": handleDumpUI, + "apps_launch": handleAppsLaunch, + "apps_terminate": handleAppsTerminate, + "apps_list": handleAppsList, +} + // GetMethodRegistry returns a map of method names to handler functions // This is used by both the HTTP server and embedded clients func GetMethodRegistry() map[string]HandlerFunc { - return map[string]HandlerFunc{ - "devices": handleDevicesList, - ... - } + return methodRegistry }server/server.go (1)
183-186: Misleading log message.The log message "Error decoding JSON-RPC request" is inaccurate at this point—decoding has already succeeded. This error comes from handler execution.
💡 Suggested fix
if err != nil { - log.Printf("Error decoding JSON-RPC request: %v", err) + log.Printf("Error executing method '%s': %v", req.Method, err) sendJSONRPCError(w, req.ID, ErrCodeServerError, "Server error", err.Error()) return }
Comment on lines
+169
to
+181
| // Use registry for all methods | ||
| if req.Method == "" { | ||
| err = fmt.Errorf("'method' is required") | ||
| } else { | ||
| registry := GetMethodRegistry() | ||
| handler, exists := registry[req.Method] | ||
| if exists { | ||
| result, err = handler(req.Params) | ||
| } else { | ||
| sendJSONRPCError(w, req.ID, ErrCodeMethodNotFound, "Method not found", fmt.Sprintf("Method '%s' not found", req.Method)) | ||
| return | ||
| } | ||
| } |
There was a problem hiding this comment.
Empty method error uses incorrect error code and misleading log message.
When req.Method is empty, the error flows to line 184-185 which logs "Error decoding JSON-RPC request" (misleading since decoding succeeded) and returns ErrCodeServerError. Per JSON-RPC spec, a missing/empty method should return ErrCodeInvalidRequest (-32600).
🔧 Suggested fix
// Use registry for all methods
if req.Method == "" {
- err = fmt.Errorf("'method' is required")
+ sendJSONRPCError(w, req.ID, ErrCodeInvalidRequest, "Invalid Request", "'method' is required")
+ return
} else {
registry := GetMethodRegistry()
handler, exists := registry[req.Method]📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| // Use registry for all methods | |
| if req.Method == "" { | |
| err = fmt.Errorf("'method' is required") | |
| } else { | |
| registry := GetMethodRegistry() | |
| handler, exists := registry[req.Method] | |
| if exists { | |
| result, err = handler(req.Params) | |
| } else { | |
| sendJSONRPCError(w, req.ID, ErrCodeMethodNotFound, "Method not found", fmt.Sprintf("Method '%s' not found", req.Method)) | |
| return | |
| } | |
| } | |
| // Use registry for all methods | |
| if req.Method == "" { | |
| sendJSONRPCError(w, req.ID, ErrCodeInvalidRequest, "Invalid Request", "'method' is required") | |
| return | |
| } else { | |
| registry := GetMethodRegistry() | |
| handler, exists := registry[req.Method] | |
| if exists { | |
| result, err = handler(req.Params) | |
| } else { | |
| sendJSONRPCError(w, req.ID, ErrCodeMethodNotFound, "Method not found", fmt.Sprintf("Method '%s' not found", req.Method)) | |
| return | |
| } | |
| } |
🤖 Prompt for AI Agents
In `@server/server.go` around lines 169 - 181, When req.Method is empty, don't set
a generic err and let the later decoding error path run; instead immediately
call sendJSONRPCError with ErrCodeInvalidRequest (-32600) and a clear message
(e.g. "Invalid Request" and data like "method is required or empty"), then
return. Update the req.Method == "" branch to use sendJSONRPCError(w, req.ID,
ErrCodeInvalidRequest, "Invalid Request", "Method is required or empty") and
remove the assignment that causes the misleading "Error decoding JSON-RPC
request"/ErrCodeServerError handling; keep the existing registry lookup
(GetMethodRegistry, handler) unchanged.
This was referenced Jan 17, 2026
Closed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary by CodeRabbit
New Features
Refactor
Bug Fixes / Improvements
✏️ Tip: You can customize this high-level summary in your review settings.