remove old style wshrpc calls from wshcmd files...

Author: sawka

cmd/wsh/cmd/wshcmd-connserver.go

@@ -191,14 +191,10 @@ func serverRunRouter(jwtToken string) error {
 
 func checkForUpdate() error {
 	remoteInfo := wshutil.GetInfo()
-	needsRestartRaw, err := RpcClient.SendRpcRequest(wshrpc.Command_ConnUpdateWsh, remoteInfo, &wshrpc.RpcOpts{Timeout: 60000})
+	needsRestart, err := wshclient.ConnUpdateWshCommand(RpcClient, remoteInfo, &wshrpc.RpcOpts{Timeout: 60000})
 	if err != nil {
 		return fmt.Errorf("could not update: %w", err)
 	}
-	needsRestart, ok := needsRestartRaw.(bool)
-	if !ok {
-		return fmt.Errorf("wrong return type from update")
-	}
 	if needsRestart {
 		// run the restart command here
 		// how to get the correct path?

cmd/wsh/cmd/wshcmd-deleteblock.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/wavetermdev/waveterm/pkg/wshrpc"
+	"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
 )
 
 var deleteBlockCmd = &cobra.Command{
@@ -35,7 +36,7 @@ func deleteBlockRun(cmd *cobra.Command, args []string) (rtnErr error) {
 	deleteBlockData := &wshrpc.CommandDeleteBlockData{
 		BlockId: fullORef.OID,
 	}
-	_, err = RpcClient.SendRpcRequest(wshrpc.Command_DeleteBlock, deleteBlockData, &wshrpc.RpcOpts{Timeout: 2000})
+	err = wshclient.DeleteBlockCommand(RpcClient, *deleteBlockData, &wshrpc.RpcOpts{Timeout: 2000})
 	if err != nil {
 		return fmt.Errorf("delete block failed: %v", err)
 	}

cmd/wsh/cmd/wshcmd-editconfig.go

@@ -9,6 +9,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/wavetermdev/waveterm/pkg/waveobj"
 	"github.com/wavetermdev/waveterm/pkg/wshrpc"
+	"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
 )
 
 var editConfigMagnified bool
@@ -48,7 +49,7 @@ func editConfigRun(cmd *cobra.Command, args []string) (rtnErr error) {
 		Focused:   true,
 	}
 
-	_, err := RpcClient.SendRpcRequest(wshrpc.Command_CreateBlock, wshCmd, &wshrpc.RpcOpts{Timeout: 2000})
+	_, err := wshclient.CreateBlockCommand(RpcClient, *wshCmd, &wshrpc.RpcOpts{Timeout: 2000})
 	if err != nil {
 		return fmt.Errorf("opening config file: %w", err)
 	}

cmd/wsh/cmd/wshcmd-notify.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/wavetermdev/waveterm/pkg/wshrpc"
+	"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
 	"github.com/wavetermdev/waveterm/pkg/wshutil"
 )
 
@@ -38,7 +39,7 @@ func notifyRun(cmd *cobra.Command, args []string) (rtnErr error) {
 		Body:   message,
 		Silent: notifySilent,
 	}
-	_, err := RpcClient.SendRpcRequest(wshrpc.Command_Notify, notificationOptions, &wshrpc.RpcOpts{Timeout: 2000, Route: wshutil.ElectronRoute})
+	err := wshclient.NotifyCommand(RpcClient, *notificationOptions, &wshrpc.RpcOpts{Timeout: 2000, Route: wshutil.ElectronRoute})
 	if err != nil {
 		return fmt.Errorf("sending notification: %w", err)
 	}

cmd/wsh/cmd/wshcmd-secret.go

@@ -187,7 +187,7 @@ func secretUiRun(cmd *cobra.Command, args []string) (rtnErr error) {
 		Focused:   true,
 	}
 
-	_, err := RpcClient.SendRpcRequest(wshrpc.Command_CreateBlock, wshCmd, &wshrpc.RpcOpts{Timeout: 2000})
+	_, err := wshclient.CreateBlockCommand(RpcClient, *wshCmd, &wshrpc.RpcOpts{Timeout: 2000})
 	if err != nil {
 		return fmt.Errorf("opening secrets UI: %w", err)
 	}

cmd/wsh/cmd/wshcmd-setmeta.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/wavetermdev/waveterm/pkg/wshrpc"
+	"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
 )
 
 var setMetaCmd = &cobra.Command{
@@ -192,7 +193,7 @@ func setMetaRun(cmd *cobra.Command, args []string) (rtnErr error) {
 		ORef: *fullORef,
 		Meta: fullMeta,
 	}
-	_, err = RpcClient.SendRpcRequest(wshrpc.Command_SetMeta, setMetaWshCmd, &wshrpc.RpcOpts{Timeout: 2000})
+	err = wshclient.SetMetaCommand(RpcClient, *setMetaWshCmd, &wshrpc.RpcOpts{Timeout: 2000})
 	if err != nil {
 		return fmt.Errorf("setting metadata: %v", err)
 	}

cmd/wsh/cmd/wshcmd-view.go

@@ -13,6 +13,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/wavetermdev/waveterm/pkg/waveobj"
 	"github.com/wavetermdev/waveterm/pkg/wshrpc"
+	"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
 )
 
 var viewMagnified bool
@@ -99,7 +100,7 @@ func viewRun(cmd *cobra.Command, args []string) (rtnErr error) {
 			wshCmd.BlockDef.Meta[waveobj.MetaKey_Connection] = conn
 		}
 	}
-	_, err := RpcClient.SendRpcRequest(wshrpc.Command_CreateBlock, wshCmd, &wshrpc.RpcOpts{Timeout: 2000})
+	_, err := wshclient.CreateBlockCommand(RpcClient, *wshCmd, &wshrpc.RpcOpts{Timeout: 2000})
 	if err != nil {
 		return fmt.Errorf("running view command: %w", err)
 	}

package-lock.json

@@ -58,6 +58,7 @@ const (
 	Command_RouteAnnounce     = "routeannounce"     // special (for routing)
 	Command_RouteUnannounce   = "routeunannounce"   // special (for routing)
 	Command_Message           = "message"
+
 	Command_GetMeta           = "getmeta"
 	Command_SetMeta           = "setmeta"
 	Command_SetView           = "setview"