fix issue when tab does not exist in workspace (#2580)

this fixes a rare case where a workspace tries to load a tab that
doesn't exist. this allows the UI to load even despite that condition.
in addition it fixes the "delete tab" path so, even if the tab doesn't
exist, it will get cleaned up correctly out of the workspace.

Author: sawka

frontend/wave.ts

@@ -181,20 +181,23 @@ async function initWave(initOpts: WaveInitOpts) {
     subscribeToConnEvents();
 
     // ensures client/window/workspace are loaded into the cache before rendering
-    const [client, waveWindow, initialTab] = await Promise.all([
-        WOS.loadAndPinWaveObject<Client>(WOS.makeORef("client", initOpts.clientId)),
-        WOS.loadAndPinWaveObject<WaveWindow>(WOS.makeORef("window", initOpts.windowId)),
-        WOS.loadAndPinWaveObject<Tab>(WOS.makeORef("tab", initOpts.tabId)),
-    ]);
-    const [ws, layoutState] = await Promise.all([
-        WOS.loadAndPinWaveObject<Workspace>(WOS.makeORef("workspace", waveWindow.workspaceid)),
-        WOS.reloadWaveObject<LayoutState>(WOS.makeORef("layout", initialTab.layoutstate)),
-    ]);
-    loadAllWorkspaceTabs(ws);
-    WOS.wpsSubscribeToObject(WOS.makeORef("workspace", waveWindow.workspaceid));
-
-    document.title = `Wave Terminal - ${initialTab.name}`; // TODO update with tab name change
-
+    try {
+        const [client, waveWindow, initialTab] = await Promise.all([
+            WOS.loadAndPinWaveObject<Client>(WOS.makeORef("client", initOpts.clientId)),
+            WOS.loadAndPinWaveObject<WaveWindow>(WOS.makeORef("window", initOpts.windowId)),
+            WOS.loadAndPinWaveObject<Tab>(WOS.makeORef("tab", initOpts.tabId)),
+        ]);
+        const [ws, layoutState] = await Promise.all([
+            WOS.loadAndPinWaveObject<Workspace>(WOS.makeORef("workspace", waveWindow.workspaceid)),
+            WOS.reloadWaveObject<LayoutState>(WOS.makeORef("layout", initialTab.layoutstate)),
+        ]);
+        loadAllWorkspaceTabs(ws);
+        WOS.wpsSubscribeToObject(WOS.makeORef("workspace", waveWindow.workspaceid));
+        document.title = `Wave Terminal - ${initialTab.name}`; // TODO update with tab name change
+    } catch (e) {
+        console.error("Failed initialization error", e);
+        getApi().sendLog("Error in initialization (wave.ts, loading required objects) " + e.message + "\n" + e.stack);
+    }
     registerGlobalKeys();
     registerElectronReinjectKeyHandler();
     registerControlShiftStateUpdateHandler();

go.mod

@@ -33,7 +33,7 @@ require (
 	github.com/spf13/cobra v1.10.1
 	github.com/ubuntu/gowsl v0.0.0-20240906163211-049fd49bd93b
 	github.com/wavetermdev/htmltoken v0.2.0
-	github.com/wavetermdev/waveterm/tsunami v0.0.0-00010101000000-000000000000
+	github.com/wavetermdev/waveterm/tsunami v0.12.3
 	golang.org/x/crypto v0.45.0
 	golang.org/x/mod v0.30.0
 	golang.org/x/sync v0.18.0
@@ -80,6 +80,7 @@ require (
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/outrigdev/goid v0.3.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect

go.sum

@@ -144,6 +144,8 @@ github.com/mattn/go-sqlite3 v1.14.32 h1:JD12Ag3oLy1zQA+BNn74xRgaBbdhbNIDYvQUEuuE
 github.com/mattn/go-sqlite3 v1.14.32/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/outrigdev/goid v0.3.0 h1:t/otQD3EXc45cLtQVPUnNgEyRaTQA4cPeu3qVcrsIws=
+github.com/outrigdev/goid v0.3.0/go.mod h1:hEH7f27ypN/GHWt/7gvkRoFYR0LZizfUBIAbak4neVE=
 github.com/photostorm/pty v1.1.19-0.20230903182454-31354506054b h1:cLGKfKb1uk0hxI0Q8L83UAJPpeJ+gSpn3cCU/tjd3eg=
 github.com/photostorm/pty v1.1.19-0.20230903182454-31354506054b/go.mod h1:KO+FcPtyLAiRC0hJwreJVvfwc7vnNz77UxBTIGHdPVk=
 github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=

pkg/service/workspaceservice/workspaceservice.go

@@ -259,15 +259,14 @@ func (svc *WorkspaceService) CloseTab_Meta() tsgenmeta.MethodMeta {
 // returns the new active tabid
 func (svc *WorkspaceService) CloseTab(ctx context.Context, workspaceId string, tabId string, fromElectron bool) (*CloseTabRtnType, waveobj.UpdatesRtnType, error) {
 	ctx = waveobj.ContextWithUpdates(ctx)
-	tab, err := wstore.DBMustGet[*waveobj.Tab](ctx, tabId)
-	if err != nil {
-		return nil, nil, fmt.Errorf("error getting tab: %w", err)
+	tab, err := wstore.DBGet[*waveobj.Tab](ctx, tabId)
+	if err == nil && tab != nil {
+		go func() {
+			for _, blockId := range tab.BlockIds {
+				blockcontroller.StopBlockController(blockId)
+			}
+		}()
 	}
-	go func() {
-		for _, blockId := range tab.BlockIds {
-			blockcontroller.StopBlockController(blockId)
-		}
-	}()
 	newActiveTabId, err := wcore.DeleteTab(ctx, workspaceId, tabId, true)
 	if err != nil {
 		return nil, nil, fmt.Errorf("error closing tab: %w", err)

pkg/wcore/block.go

@@ -150,7 +150,7 @@ func createBlockObj(ctx context.Context, tabId string, blockDef *waveobj.BlockDe
 // recursive: if true, will recursively close parent tab, window, workspace, if they are empty.
 // Returns new active tab id, error.
 func DeleteBlock(ctx context.Context, blockId string, recursive bool) error {
-	block, err := wstore.DBMustGet[*waveobj.Block](ctx, blockId)
+	block, err := wstore.DBGet[*waveobj.Block](ctx, blockId)
 	if err != nil {
 		return fmt.Errorf("error getting block: %w", err)
 	}
@@ -223,11 +223,11 @@ func deleteBlockObj(ctx context.Context, blockId string) (int, error) {
 			}
 		}
 		wstore.DBDelete(tx.Context(), waveobj.OType_Block, blockId)
-		
+
 		// Clean up block runtime info
 		blockORef := waveobj.MakeORef(waveobj.OType_Block, blockId)
 		wstore.DeleteRTInfo(blockORef)
-		
+
 		return parentBlockCount, nil
 	})
 }

pkg/wcore/workspace.go

@@ -290,13 +290,12 @@ func DeleteTab(ctx context.Context, workspaceId string, tabId string, recursive
 
 	// close blocks (sends events + stops block controllers)
 	tab, _ := wstore.DBGet[*waveobj.Tab](ctx, tabId)
-	if tab == nil {
-		return "", fmt.Errorf("tab not found: %q", tabId)
-	}
-	for _, blockId := range tab.BlockIds {
-		err := DeleteBlock(ctx, blockId, false)
-		if err != nil {
-			return "", fmt.Errorf("error deleting block %s: %w", blockId, err)
+	if tab != nil {
+		for _, blockId := range tab.BlockIds {
+			err := DeleteBlock(ctx, blockId, false)
+			if err != nil {
+				return "", fmt.Errorf("error deleting block %s: %w", blockId, err)
+			}
 		}
 	}
 
@@ -319,7 +318,9 @@ func DeleteTab(ctx context.Context, workspaceId string, tabId string, recursive
 
 	wstore.DBUpdate(ctx, ws)
 	wstore.DBDelete(ctx, waveobj.OType_Tab, tabId)
-	wstore.DBDelete(ctx, waveobj.OType_LayoutState, tab.LayoutState)
+	if tab != nil {
+		wstore.DBDelete(ctx, waveobj.OType_LayoutState, tab.LayoutState)
+	}
 
 	// if no tabs remaining, close window
 	if recursive && newActiveTabId == "" {