working tsunami app in wave

Author: sawka

electron.vite.config.ts

@@ -78,7 +78,7 @@ export default defineConfig({
         server: {
             open: false,
             watch: {
-                ignored: ["dist/**", "**/*.go", "**/go.mod", "**/go.sum", "**/*.md", "**/*.json"],
+                ignored: ["dist/**", "**/*.go", "**/go.mod", "**/go.sum", "**/*.md", "**/*.json", "emain/**"],
             },
         },
         css: {

emain/emain-util.ts

@@ -107,6 +107,10 @@ export function shFrameNavHandler(event: Electron.Event<Electron.WebContentsWill
         // allowed
         return;
     }
+    if (event.frame.name != null && event.frame.name.startsWith("tsunami")) {
+        // allowed
+        return;
+    }
     event.preventDefault();
     console.log("frame navigation canceled");
 }

frontend/app/view/tsunami/tsunami.tsx

@@ -134,7 +134,7 @@ const TsunamiView = memo(({ model }: TsunamiViewProps) => {
 
     if (shouldShowIframe) {
         const iframeUrl = `http://localhost:${shellProcFullStatus.tsunamiport}/?clientid=wave:${model.blockId}`;
-        return <iframe src={iframeUrl} className="w-full h-full border-0" title="Tsunami Application" />;
+        return <iframe src={iframeUrl} className="w-full h-full border-0" title="Tsunami Application" name={`tsunami:${model.blockId}`} />;
     }
 
     const status = shellProcFullStatus?.shellprocstatus ?? "init";

pkg/blockcontroller/tsunamicontroller.go

@@ -14,6 +14,7 @@ import (
 	"runtime"
 	"strings"
 	"sync"
+	"syscall"
 
 	"github.com/wavetermdev/waveterm/pkg/utilds"
 	"github.com/wavetermdev/waveterm/pkg/wavebase"
@@ -300,7 +301,7 @@ func (c *TsunamiController) SendInput(input *BlockInputUnion) error {
 }
 
 func runTsunamiAppBinary(ctx context.Context, appBinPath string) (*TsunamiAppProc, error) {
-	cmd := exec.CommandContext(ctx, appBinPath, "--close-on-stdin")
+	cmd := exec.Command(appBinPath, "--close-on-stdin")
 
 	stdoutPipe, err := cmd.StdoutPipe()
 	if err != nil {
@@ -338,6 +339,22 @@ func runTsunamiAppBinary(ctx context.Context, appBinPath string) (*TsunamiAppPro
 	// Start goroutine to handle cmd.Wait()
 	go func() {
 		tsunamiProc.WaitRtn = cmd.Wait()
+		log.Printf("WAIT RETURN: %v\n", tsunamiProc.WaitRtn)
+		if err := tsunamiProc.WaitRtn; err != nil {
+			if ee, ok := err.(*exec.ExitError); ok {
+				if ws, ok := ee.ProcessState.Sys().(syscall.WaitStatus); ok {
+					if ws.Signaled() {
+						sig := ws.Signal()
+						log.Printf("tsunami proc killed by signal: %s (%d)", sig, int(sig))
+					} else {
+						log.Printf("tsunami proc exited with code %d", ee.ExitCode())
+					}
+				}
+			} else {
+				log.Printf("tsunami proc error: %v", err)
+			}
+		}
+
 		close(waitCh)
 	}()
 
@@ -354,6 +371,7 @@ func runTsunamiAppBinary(ctx context.Context, appBinPath string) (*TsunamiAppPro
 				errChan <- fmt.Errorf("stderr buffer error: %w", err)
 				return
 			}
+			log.Printf("[stderr-readline] %s\n", line)
 
 			port := build.ParseTsunamiPort(line)
 			if port > 0 {

tsunami/build/build.go

@@ -39,6 +39,10 @@ type BuildOpts struct {
 	MoveFileBack   bool
 }
 
+func (b BuildOpts) AppName() string {
+	return filepath.Base(b.AppPath)
+}
+
 type BuildEnv struct {
 	GoVersion   string
 	TempDir     string