From d01dff5774c3c9fdde1d20c67f664b207d001689 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sat, 5 Nov 2022 23:16:20 +0100 Subject: [PATCH] WIP --- pkg/register/plugin_client.go | 10 +++++----- pkg/register/plugin_server.go | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkg/register/plugin_client.go b/pkg/register/plugin_client.go index 9cead62..194fbaf 100644 --- a/pkg/register/plugin_client.go +++ b/pkg/register/plugin_client.go @@ -21,11 +21,11 @@ func (pc *PluginClient) Do(ctx context.Context, commandName string, args map[str CommandName: commandName, Args: args, } - doReq, err := json.Marshal(req) - if err != nil { - return err - } - err = pc.client.Call("Plugin.Do", doReq, new(any)) + //doReq, err := json.Marshal(req) + //if err != nil { + // return err + //} + err := pc.client.Call("Plugin.Do", req, new(any)) if err != nil { return err } diff --git a/pkg/register/plugin_server.go b/pkg/register/plugin_server.go index 3c86d5c..01d9fdc 100644 --- a/pkg/register/plugin_server.go +++ b/pkg/register/plugin_server.go @@ -3,27 +3,27 @@ package register import ( "context" "encoding/json" - "errors" ) type PluginServer struct { Impl Plugin } -func (ps *PluginServer) Do(args any, resp *string) error { - rawReq, ok := args.(string) - if !ok { - return errors.New("args is not a string") - } +func (ps *PluginServer) Do(args *DoRequest, resp *string) error { + //rawReq, ok := args.(string) + //if !ok { + // return errors.New("args is not a string") + //} - var doReq DoRequest - if err := json.Unmarshal([]byte(rawReq), &doReq); err != nil { - return err - } - - if err := ps.Impl.Do(context.Background(), doReq.CommandName, doReq.Args); err != nil { + //var doReq DoRequest + //if err := json.Unmarshal([]byte(rawReq), &doReq); err != nil { + // return err + //} + + if err := ps.Impl.Do(context.Background(), args.CommandName, args.Args); err != nil { return err } + *resp = "" return nil }