temp oid in client (can use with wavefile)

cmd/server/main-server.go

@@ -58,6 +58,7 @@ func doShutdown(reason string) {
 		shutdownActivityUpdate()
 		sendTelemetryWrapper()
 		// TODO deal with flush in progress
+		clearTempFiles()
 		filestore.WFS.FlushCache(ctx)
 		watcher := wconfig.GetWatcher()
 		if watcher != nil {
@@ -193,6 +194,17 @@ func grabAndRemoveEnvVars() error {
 	return nil
 }
 
+func clearTempFiles() error {
+	ctx, cancelFn := context.WithTimeout(context.Background(), 2*time.Second)
+	defer cancelFn()
+	client, err := wstore.DBGetSingleton[*waveobj.Client](ctx)
+	if err != nil {
+		return fmt.Errorf("error getting client: %v", err)
+	}
+	filestore.WFS.DeleteZone(ctx, client.TempOID)
+	return nil
+}
+
 func main() {
 	log.SetFlags(log.LstdFlags | log.Lmicroseconds)
 	log.SetPrefix("[wavesrv] ")
@@ -268,6 +280,11 @@ func main() {
 		log.Printf("error ensuring initial data: %v\n", err)
 		return
 	}
+	err = clearTempFiles()
+	if err != nil {
+		log.Printf("error clearing temp files: %v\n", err)
+		return
+	}
 	if firstRun {
 		migrateErr := wstore.TryMigrateOldHistory()
 		if migrateErr != nil {

cmd/wsh/cmd/wshcmd-file-util.go

@@ -184,7 +184,7 @@ func streamFileList(zoneId string, path string, recursive bool, filesOnly bool)
 			}
 
 			if len(files) == 0 {
-				if !foundAny {
+				if !foundAny && prefix != "" {
 					resultChan <- fileListResult{err: fmt.Errorf("%s: No such file or directory", path)}
 				}
 				return

cmd/wsh/cmd/wshcmd-file.go

@@ -104,7 +104,7 @@ var fileListCmd = &cobra.Command{
 	Use:     "ls [wavefile://zone[/path]]",
 	Short:   "list wave files",
 	Example: "  wsh file ls wavefile://block/\n  wsh file ls wavefile://client/configs/",
-	RunE:    fileListRun,
+	RunE:    activityWrap("file", fileListRun),
 	PreRunE: preRunSetupRpcClient,
 }
 
@@ -113,7 +113,7 @@ var fileCatCmd = &cobra.Command{
 	Short:   "display contents of a wave file",
 	Example: "  wsh file cat wavefile://block/config.txt\n  wsh file cat wavefile://client/settings.json",
 	Args:    cobra.ExactArgs(1),
-	RunE:    fileCatRun,
+	RunE:    activityWrap("file", fileCatRun),
 	PreRunE: preRunSetupRpcClient,
 }
 
@@ -122,7 +122,7 @@ var fileInfoCmd = &cobra.Command{
 	Short:   "show wave file information",
 	Example: "  wsh file info wavefile://block/config.txt",
 	Args:    cobra.ExactArgs(1),
-	RunE:    fileInfoRun,
+	RunE:    activityWrap("file", fileInfoRun),
 	PreRunE: preRunSetupRpcClient,
 }
 
@@ -131,7 +131,7 @@ var fileRmCmd = &cobra.Command{
 	Short:   "remove a wave file",
 	Example: "  wsh file rm wavefile://block/config.txt",
 	Args:    cobra.ExactArgs(1),
-	RunE:    fileRmRun,
+	RunE:    activityWrap("file", fileRmRun),
 	PreRunE: preRunSetupRpcClient,
 }
 
@@ -140,7 +140,7 @@ var fileWriteCmd = &cobra.Command{
 	Short:   "write stdin into a wave file (up to 10MB)",
 	Example: "  echo 'hello' | wsh file write wavefile://block/greeting.txt",
 	Args:    cobra.ExactArgs(1),
-	RunE:    fileWriteRun,
+	RunE:    activityWrap("file", fileWriteRun),
 	PreRunE: preRunSetupRpcClient,
 }
 
@@ -150,7 +150,7 @@ var fileAppendCmd = &cobra.Command{
 	Long:    "append stdin to a wave file, buffering input and respecting 10MB total file size limit",
 	Example: "  tail -f log.txt | wsh file append wavefile://block/app.log",
 	Args:    cobra.ExactArgs(1),
-	RunE:    fileAppendRun,
+	RunE:    activityWrap("file", fileAppendRun),
 	PreRunE: preRunSetupRpcClient,
 }
 
@@ -161,7 +161,7 @@ var fileCpCmd = &cobra.Command{
 Exactly one of source or destination must be a wavefile:// URL.`,
 	Example: "  wsh file cp wavefile://block/config.txt ./local-config.txt\n  wsh file cp ./local-config.txt wavefile://block/config.txt",
 	Args:    cobra.ExactArgs(2),
-	RunE:    fileCpRun,
+	RunE:    activityWrap("file", fileCpRun),
 	PreRunE: preRunSetupRpcClient,
 }
 

cmd/wsh/cmd/wshcmd-root.go

@@ -57,6 +57,17 @@ func preRunSetupRpcClient(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
+type RunEFnType = func(*cobra.Command, []string) error
+
+func activityWrap(activityStr string, origRunE RunEFnType) RunEFnType {
+	return func(cmd *cobra.Command, args []string) (rtnErr error) {
+		defer func() {
+			sendActivity(activityStr, rtnErr == nil)
+		}()
+		return origRunE(cmd, args)
+	}
+}
+
 func resolveBlockArg() (*waveobj.ORef, error) {
 	oref := blockArg
 	if oref == "" {

frontend/types/gotypes.d.ts

@@ -25,6 +25,7 @@ declare global {
         numsshconn?: number;
         numwslconn?: number;
         nummagnify?: number;
+        numpanics?: number;
         startup?: number;
         shutdown?: number;
         settabtheme?: number;
@@ -83,6 +84,7 @@ declare global {
         tosagreed?: number;
         hasoldhistory?: boolean;
         nexttabid?: number;
+        tempoid?: string;
     };
 
     // windowservice.CloseTabRtnType

pkg/waveobj/wtype.go

@@ -28,6 +28,7 @@ const (
 	OType_Tab         = "tab"
 	OType_LayoutState = "layout"
 	OType_Block       = "block"
+	OType_Temp        = "temp"
 )
 
 var ValidOTypes = map[string]bool{
@@ -37,6 +38,7 @@ var ValidOTypes = map[string]bool{
 	OType_Tab:         true,
 	OType_LayoutState: true,
 	OType_Block:       true,
+	OType_Temp:        true,
 }
 
 type WaveObjUpdate struct {
@@ -128,6 +130,7 @@ type Client struct {
 	TosAgreed     int64       `json:"tosagreed,omitempty"`
 	HasOldHistory bool        `json:"hasoldhistory,omitempty"`
 	NextTabId     int         `json:"nexttabid,omitempty"`
+	TempOID       string      `json:"tempoid,omitempty"`
 }
 
 func (*Client) GetOType() string {

pkg/wcore/wcore.go

@@ -215,6 +215,13 @@ func EnsureInitialData() (*waveobj.Window, bool, error) {
 			return nil, false, fmt.Errorf("error updating client: %w", err)
 		}
 	}
+	if client.TempOID == "" {
+		client.TempOID = uuid.NewString()
+		err = wstore.DBUpdate(ctx, client)
+		if err != nil {
+			return nil, false, fmt.Errorf("error updating client: %w", err)
+		}
+	}
 	log.Printf("clientid: %s\n", client.OID)
 	if len(client.WindowIds) == 1 {
 		checkAndFixWindow(ctx, client.WindowIds[0])

pkg/wshrpc/wshserver/resolvers.go

@@ -24,6 +24,7 @@ const (
 	SimpleId_Workspace = "workspace"
 	SimpleId_Client    = "client"
 	SimpleId_Global    = "global"
+	SimpleId_Temp      = "temp"
 )
 
 var (
@@ -41,7 +42,8 @@ func parseSimpleId(simpleId string) (discriminator string, value string, err err
 
 	// Handle special keywords
 	if simpleId == SimpleId_This || simpleId == SimpleId_Block || simpleId == SimpleId_Tab ||
-		simpleId == SimpleId_Ws || simpleId == SimpleId_Workspace || simpleId == SimpleId_Client || simpleId == SimpleId_Global {
+		simpleId == SimpleId_Ws || simpleId == SimpleId_Workspace ||
+		simpleId == SimpleId_Client || simpleId == SimpleId_Global || simpleId == SimpleId_Temp {
 		return "this", simpleId, nil
 	}
 
@@ -110,6 +112,13 @@ func resolveThis(ctx context.Context, data wshrpc.CommandResolveIdsData, value s
 		}
 		return &waveobj.ORef{OType: waveobj.OType_Client, OID: client.OID}, nil
 	}
+	if value == SimpleId_Temp {
+		client, err := wstore.DBGetSingleton[*waveobj.Client](ctx)
+		if err != nil {
+			return nil, fmt.Errorf("error getting client: %v", err)
+		}
+		return &waveobj.ORef{OType: "temp", OID: client.TempOID}, nil
+	}
 	return nil, fmt.Errorf("invalid value for 'this' resolver: %s", value)
 }