Revert "fix(rpc.go): use JSONRPCRouter instead of JSONRPCServer after merging with refactory-jsonrpc"

Nevexo · Nevexo · commit 26b84074ae38 · 2025-02-11T14:52:36.000Z
This reverts commit 25c8160.
diff --git a/internal/plugin/rpc.go b/internal/plugin/rpc.go
@@ -96,7 +96,7 @@ func (s *PluginRpcServer) SocketPath() string {
 }
 
 func (s *PluginRpcServer) handleConnection(conn net.Conn) {
-	rpcserver := jsonrpc.NewJSONRPCRouter(conn, map[string]*jsonrpc.RPCHandler{})
+	rpcserver := jsonrpc.NewJSONRPCServer(conn, map[string]*jsonrpc.RPCHandler{})
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -129,7 +129,7 @@ func (s *PluginRpcServer) handleConnection(conn net.Conn) {
 	}
 }
 
-func (s *PluginRpcServer) handleRpcStatus(ctx context.Context, rpcserver *jsonrpc.JSONRPCRouter) {
+func (s *PluginRpcServer) handleRpcStatus(ctx context.Context, rpcserver *jsonrpc.JSONRPCServer) {
 	s.status = PluginRpcStatusUnknown
 
 	log.Printf("Plugin rpc server started. Getting supported methods...")

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ func (s *PluginRpcServer) SocketPath() string {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`func (s *PluginRpcServer) handleConnection(conn net.Conn) {`
`99`		`- rpcserver := jsonrpc.NewJSONRPCRouter(conn, map[string]*jsonrpc.RPCHandler{})`
	`99`	`+ rpcserver := jsonrpc.NewJSONRPCServer(conn, map[string]*jsonrpc.RPCHandler{})`
`100`	`100`
`101`	`101`	`ctx, cancel := context.WithCancel(context.Background())`
`102`	`102`	`defer cancel()`
`@@ -129,7 +129,7 @@ func (s *PluginRpcServer) handleConnection(conn net.Conn) {`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
`132`		`-func (s PluginRpcServer) handleRpcStatus(ctx context.Context, rpcserver jsonrpc.JSONRPCRouter) {`
	`132`	`+func (s PluginRpcServer) handleRpcStatus(ctx context.Context, rpcserver jsonrpc.JSONRPCServer) {`
`133`	`133`	`s.status = PluginRpcStatusUnknown`
`134`	`134`
`135`	`135`	`log.Printf("Plugin rpc server started. Getting supported methods...")`