new wshrpc mechanism (#112)

lots of changes. new wshrpc implementation. unify websocket, web,
blockcontroller, domain sockets, and terminal inputs to all use the new
rpc system.

lots of moving files around to deal with circular dependencies

use new wshrpc as a client in wsh cmd

pkg/service/blockservice/blockservice.go

@@ -9,10 +9,8 @@ import (
 	"time"
 
 	"github.com/wavetermdev/thenextwave/pkg/blockcontroller"
-	"github.com/wavetermdev/thenextwave/pkg/cmdqueue"
 	"github.com/wavetermdev/thenextwave/pkg/filestore"
 	"github.com/wavetermdev/thenextwave/pkg/tsgen/tsgenmeta"
-	"github.com/wavetermdev/thenextwave/pkg/wshutil"
 	"github.com/wavetermdev/thenextwave/pkg/wstore"
 )
 
@@ -40,13 +38,6 @@ func (bs *BlockService) GetControllerStatus(ctx context.Context, blockId string)
 	return bc.GetRuntimeStatus(), nil
 }
 
-func (bs *BlockService) SendCommand(uiContext wstore.UIContext, blockId string, cmd wshutil.BlockCommand) error {
-	ctx, cancelFn := context.WithTimeout(context.Background(), DefaultTimeout)
-	defer cancelFn()
-	_, err := cmdqueue.RunCmd(ctx, cmd, wshutil.CmdContextType{BlockId: blockId, TabId: uiContext.ActiveTabId})
-	return err
-}
-
 func (bs *BlockService) SaveTerminalState(ctx context.Context, blockId string, state string, stateType string, ptyOffset int64) error {
 	_, err := wstore.DBMustGet[*wstore.Block](ctx, blockId)
 	if err != nil {

pkg/service/fileservice/fileservice.go

@@ -91,7 +91,11 @@ func (fs *FileService) ReadFile(path string) (*FullFile, error) {
 			innerFilesInfo = append(innerFilesInfo, *parentFileInfo)
 		}
 		for _, innerFileEntry := range innerFilesEntries {
-			innerFileInfoInt, _ := innerFileEntry.Info()
+			innerFileInfoInt, err := innerFileEntry.Info()
+			if err != nil {
+				log.Printf("unable to get file info for (innerFileInfo) %s: %v", innerFileEntry.Name(), err)
+				continue
+			}
 			mimeType := utilfn.DetectMimeType(filepath.Join(finfo.Path, innerFileInfoInt.Name()))
 			var fileSize int64
 			if mimeType == "directory" {

pkg/service/objectservice/objectservice.go

@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/wavetermdev/thenextwave/pkg/blockcontroller"
-	"github.com/wavetermdev/thenextwave/pkg/cmdqueue"
 	"github.com/wavetermdev/thenextwave/pkg/tsgen/tsgenmeta"
 	"github.com/wavetermdev/thenextwave/pkg/waveobj"
 	"github.com/wavetermdev/thenextwave/pkg/wstore"
@@ -137,7 +136,7 @@ func (svc *ObjectService) SetActiveTab(uiContext wstore.UIContext, tabId string)
 		return nil, fmt.Errorf("error getting tab: %w", err)
 	}
 	for _, blockId := range tab.BlockIds {
-		blockErr := blockcontroller.StartBlockController(ctx, tabId, blockId, cmdqueue.RunCmd)
+		blockErr := blockcontroller.StartBlockController(ctx, tabId, blockId)
 		if blockErr != nil {
 			// we don't want to fail the set active tab operation if a block controller fails to start
 			log.Printf("error starting block controller (blockid:%s): %v", blockId, blockErr)
@@ -191,7 +190,7 @@ func (svc *ObjectService) CreateBlock(uiContext wstore.UIContext, blockDef *wsto
 		return "", nil, fmt.Errorf("error creating block: %w", err)
 	}
 	if blockData.Controller != "" {
-		err = blockcontroller.StartBlockController(ctx, uiContext.ActiveTabId, blockData.OID, cmdqueue.RunCmd)
+		err = blockcontroller.StartBlockController(ctx, uiContext.ActiveTabId, blockData.OID)
 		if err != nil {
 			return "", nil, fmt.Errorf("error starting block controller: %w", err)
 		}

pkg/service/service.go

@@ -18,7 +18,6 @@ import (
 	"github.com/wavetermdev/thenextwave/pkg/util/utilfn"
 	"github.com/wavetermdev/thenextwave/pkg/waveobj"
 	"github.com/wavetermdev/thenextwave/pkg/web/webcmd"
-	"github.com/wavetermdev/thenextwave/pkg/wshutil"
 	"github.com/wavetermdev/thenextwave/pkg/wstore"
 )
 
@@ -39,8 +38,8 @@ var waveObjMapRType = reflect.TypeOf(map[string]waveobj.WaveObj{})
 var methodMetaRType = reflect.TypeOf(tsgenmeta.MethodMeta{})
 var waveObjUpdateRType = reflect.TypeOf(wstore.WaveObjUpdate{})
 var uiContextRType = reflect.TypeOf((*wstore.UIContext)(nil)).Elem()
-var blockCommandRType = reflect.TypeOf((*wshutil.BlockCommand)(nil)).Elem()
 var wsCommandRType = reflect.TypeOf((*webcmd.WSCommandType)(nil)).Elem()
+var orefRType = reflect.TypeOf((*waveobj.ORef)(nil)).Elem()
 
 type WebCallType struct {
 	Service   string            `json:"service"`
@@ -96,18 +95,7 @@ func convertComplex(argType reflect.Type, jsonArg any) (any, error) {
 }
 
 func isSpecialWaveArgType(argType reflect.Type) bool {
-	return argType == waveObjRType || argType == waveObjSliceRType || argType == waveObjMapRType || argType == blockCommandRType || argType == wsCommandRType
-}
-
-func convertBlockCommand(argType reflect.Type, jsonArg any) (any, error) {
-	if _, ok := jsonArg.(map[string]any); !ok {
-		return nil, fmt.Errorf("cannot convert %T to %s", jsonArg, argType)
-	}
-	cmd, err := wshutil.ParseCmdMap(jsonArg.(map[string]any))
-	if err != nil {
-		return nil, fmt.Errorf("error parsing command map: %w", err)
-	}
-	return cmd, nil
+	return argType == waveObjRType || argType == waveObjSliceRType || argType == waveObjMapRType || argType == wsCommandRType
 }
 
 func convertWSCommand(argType reflect.Type, jsonArg any) (any, error) {
@@ -123,8 +111,15 @@ func convertWSCommand(argType reflect.Type, jsonArg any) (any, error) {
 
 func convertSpecial(argType reflect.Type, jsonArg any) (any, error) {
 	jsonType := reflect.TypeOf(jsonArg)
-	if argType == blockCommandRType {
-		return convertBlockCommand(argType, jsonArg)
+	if argType == orefRType {
+		if jsonType.Kind() != reflect.String {
+			return nil, fmt.Errorf("cannot convert %T to %s", jsonArg, argType)
+		}
+		oref, err := waveobj.ParseORef(jsonArg.(string))
+		if err != nil {
+			return nil, fmt.Errorf("invalid oref string: %v", err)
+		}
+		return oref, nil
 	} else if argType == wsCommandRType {
 		return convertWSCommand(argType, jsonArg)
 	} else if argType == waveObjRType {