Merge branch 'main' into evan/grid

This continues the work to unblock multiple window support. `emain.ts`
now contains no more references to a "main" window, instead all event
handlers will dispatch to either the window that triggered the event,
the currently focused window, or the first window to be spun up.

.github/workflows/regression.yml

@@ -22,7 +22,7 @@ jobs:
             - uses: dashcamio/testdriver@main
               id: testdriver
               with:
-                  version: v2.10.2
+                    version: v2.12.5
                   prerun: |
                       rm ~/Desktop/WITH-LOVE-FROM-AMERICA.txt
                       cd ~/actions-runner/_work/testdriver/testdriver/

src/app/appconst.ts

@@ -21,9 +21,9 @@ export const NoStrPos = -1;
 export const RemotePtyRows = 8;
 export const RemotePtyTotalRows = 25;
 export const RemotePtyCols = 80;
-export const ProdServerEndpoint = "https://127.0.0.1:1619";
+export const ProdServerEndpoint = "http://127.0.0.1:1619";
 export const ProdServerWsEndpoint = "ws://127.0.0.1:1623";
-export const DevServerEndpoint = "https://127.0.0.1:8090";
+export const DevServerEndpoint = "http://127.0.0.1:8090";
 export const DevServerWsEndpoint = "ws://127.0.0.1:8091";
 export const DefaultTermFontSize = 13;
 export const DefaultTermFontFamily = "Hack";

src/app2/app.tsx

@@ -0,0 +1,160 @@
+// Copyright 2023, Command Line Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import * as React from "react";
+import * as mobxReact from "mobx-react";
+import * as mobx from "mobx";
+import { clsx } from "clsx";
+
+import { If } from "tsx-control-statements/components";
+import { GlobalModel } from "@/models";
+import { isBlank } from "@/util/util";
+import { WorkspaceView } from "@/app/workspace/workspaceview";
+import { PluginsView } from "@/app/pluginsview/pluginsview";
+import { BookmarksView } from "@/app/bookmarks/bookmarks";
+import { HistoryView } from "@/app/history/history";
+import { ConnectionsView } from "@/app/connections/connections";
+import { ClientSettingsView } from "@/app/clientsettings/clientsettings";
+import { MainSideBar } from "@/app/sidebar/main";
+import { RightSideBar } from "@/app/sidebar/right";
+import { DisconnectedModal, ClientStopModal } from "@/modals";
+import { ModalsProvider } from "@/modals/provider";
+import { Button, TermStyleList } from "@/elements";
+import { ErrorBoundary } from "@/common/error/errorboundary";
+
+import "@/app/app.less";
+
+export const App2: React.FC = mobxReact.observer(() => {
+    const [dcWait, setDcWait] = React.useState(false);
+    const mainContentRef = React.useRef<HTMLDivElement>(null);
+    const [termThemesLoaded, setTermThemesLoaded] = React.useState(false);
+
+    const handleContextMenu = (e: React.MouseEvent<HTMLElement>) => {
+        let isInNonTermInput = false;
+        const activeElem = document.activeElement;
+        if (activeElem != null && activeElem.nodeName == "TEXTAREA") {
+            if (!activeElem.classList.contains("xterm-helper-textarea")) {
+                isInNonTermInput = true;
+            }
+        }
+        if (activeElem != null && activeElem.nodeName == "INPUT" && activeElem.getAttribute("type") == "text") {
+            isInNonTermInput = true;
+        }
+        const opts: ContextMenuOpts = {};
+        if (isInNonTermInput) {
+            opts.showCut = true;
+        }
+        const sel = window.getSelection();
+        if (!isBlank(sel?.toString()) || isInNonTermInput) {
+            GlobalModel.contextEditMenu(e, opts);
+        }
+    };
+
+    const openMainSidebar = mobx.action(() => {
+        const mainSidebarModel = GlobalModel.mainSidebarModel;
+        const width = mainSidebarModel.getWidth(true);
+        mainSidebarModel.saveState(width, false);
+    });
+
+    const openRightSidebar = mobx.action(() => {
+        const rightSidebarModel = GlobalModel.rightSidebarModel;
+        const width = rightSidebarModel.getWidth(true);
+        rightSidebarModel.saveState(width, false);
+    });
+
+    const remotesModel = GlobalModel.remotesModel;
+    const disconnected = !GlobalModel.ws.open.get() || !GlobalModel.waveSrvRunning.get();
+    const hasClientStop = GlobalModel.getHasClientStop();
+    const platform = GlobalModel.getPlatform();
+    const clientData = GlobalModel.clientData.get();
+
+    // Previously, this is done in sidebar.tsx but it causes flicker when clientData is null cos screen-view shifts around.
+    // Doing it here fixes the flicker cos app is not rendered until clientData is populated.
+    // wait for termThemes as well (this actually means that the "connect" packet has been received)
+    if (clientData == null || GlobalModel.termThemes.get() == null) {
+        return null;
+    }
+
+    if (disconnected || hasClientStop) {
+        if (!dcWait) {
+            setTimeout(() => setDcWait(true), 1500);
+        }
+        return (
+            <div id="main" className={"platform-" + platform} onContextMenu={handleContextMenu}>
+                <div ref={mainContentRef} className="main-content">
+                    <MainSideBar parentRef={mainContentRef} />
+                    <div className="session-view" />
+                </div>
+                <If condition={dcWait}>
+                    <If condition={disconnected}>
+                        <DisconnectedModal />
+                    </If>
+                    <If condition={!disconnected && hasClientStop}>
+                        <ClientStopModal />
+                    </If>
+                </If>
+            </div>
+        );
+    }
+
+    if (dcWait) {
+        setTimeout(() => setDcWait(false), 0);
+    }
+
+    // used to force a full reload of the application
+    const renderVersion = GlobalModel.renderVersion.get();
+    const mainSidebarCollapsed = GlobalModel.mainSidebarModel.getCollapsed();
+    const rightSidebarCollapsed = GlobalModel.rightSidebarModel.getCollapsed();
+    const activeMainView = GlobalModel.activeMainView.get();
+    const lightDarkClass = GlobalModel.isDarkTheme.get() ? "is-dark" : "is-light";
+    const mainClassName = clsx(
+        "platform-" + platform,
+        {
+            "mainsidebar-collapsed": mainSidebarCollapsed,
+            "rightsidebar-collapsed": rightSidebarCollapsed,
+        },
+        lightDarkClass
+    );
+    return (
+        <>
+            <TermStyleList onRendered={() => setTermThemesLoaded(true)} />
+            <div
+                key={`version- + ${renderVersion}`}
+                id="main"
+                className={mainClassName}
+                onContextMenu={handleContextMenu}
+            >
+                <If condition={termThemesLoaded}>
+                    <If condition={mainSidebarCollapsed}>
+                        <div key="logo-button" className="logo-button-container">
+                            <div className="logo-button-spacer" />
+                            <div className="logo-button" onClick={openMainSidebar}>
+                                <img src="public/logos/wave-logo.png" alt="logo" />
+                            </div>
+                        </div>
+                    </If>
+                    <If condition={GlobalModel.isDev && rightSidebarCollapsed && activeMainView == "session"}>
+                        <div className="right-sidebar-triggers">
+                            <Button className="secondary ghost right-sidebar-trigger" onClick={openRightSidebar}>
+                                <i className="fa-sharp fa-solid fa-sidebar-flip"></i>
+                            </Button>
+                        </div>
+                    </If>
+                    <div ref={mainContentRef} className="main-content">
+                        <MainSideBar parentRef={mainContentRef} />
+                        <ErrorBoundary>
+                            <PluginsView />
+                            <WorkspaceView />
+                            <HistoryView />
+                            <BookmarksView />
+                            <ConnectionsView model={remotesModel} />
+                            <ClientSettingsView model={remotesModel} />
+                        </ErrorBoundary>
+                        <RightSideBar parentRef={mainContentRef} />
+                    </div>
+                    <ModalsProvider />
+                </If>
+            </div>
+        </>
+    );
+});

src/electron/emain.ts

@@ -16,13 +16,12 @@ import { handleJsonFetchResponse, fireAndForget } from "@/util/util";
 import { v4 as uuidv4 } from "uuid";
 import { adaptFromElectronKeyEvent, setKeyUtilPlatform } from "@/util/keyutil";
 import { platform } from "os";
-import * as https from "https";
 
 const WaveAppPathVarName = "WAVETERM_APP_PATH";
 const WaveDevVarName = "WAVETERM_DEV";
 const AuthKeyFile = "waveterm.authkey";
-const DevServerEndpoint = "https://127.0.0.1:8090";
-const ProdServerEndpoint = "https://127.0.0.1:1619";
+const DevServerEndpoint = "http://127.0.0.1:8090";
+const ProdServerEndpoint = "http://127.0.0.1:1619";
 
 const isDev = process.env[WaveDevVarName] != null;
 const waveHome = getWaveHomeDir();
@@ -35,13 +34,6 @@ let wasActive = true;
 let wasInFg = true;
 let currentGlobalShortcut: string | null = null;
 let initialClientData: ClientDataType = null;
-let windows: Windows = {};
-
-const httpsAgentIgnoreCert = new https.Agent({
-    rejectUnauthorized: false,
-});
-
-interface Windows extends Record<string, Electron.BrowserWindow> {}
 
 checkPromptMigrate();
 ensureDir(waveHome);
@@ -330,10 +322,7 @@ function shFrameNavHandler(event: Electron.Event<Electron.WebContentsWillFrameNa
     console.log("frame navigation canceled");
 }
 
-function createWindow(id: string, clientData: ClientDataType | null): Electron.BrowserWindow {
-    if (windows[id]) {
-        console.error(`createWindow called for existing window ${id}`);
-    }
+function createWindow(clientData: ClientDataType | null): Electron.BrowserWindow {
     const bounds = calcBounds(clientData);
     setKeyUtilPlatform(platform());
     const win = new electron.BrowserWindow({
@@ -381,18 +370,9 @@ function createWindow(id: string, clientData: ClientDataType | null): Electron.B
         wasInFg = true;
         wasActive = true;
     });
-    win.on("close", () => {
-        delete windows[id];
-    });
     win.webContents.on("zoom-changed", (e) => {
         win.webContents.send("zoom-changed");
     });
-    windows[id] = win;
-    return win;
-}
-
-function createMainWindow(clientData: ClientDataType | null) {
-    const win = createWindow("main", clientData);
     win.webContents.setWindowOpenHandler(({ url, frameName }) => {
         if (url.startsWith("https://docs.waveterm.dev/")) {
             console.log("openExternal docs", url);
@@ -413,6 +393,7 @@ function createMainWindow(clientData: ClientDataType | null) {
         console.log("window-open denied", url);
         return { action: "deny" };
     });
+    return win;
 }
 
 function mainResizeHandler(_: any, win: Electron.BrowserWindow) {
@@ -423,7 +404,7 @@ function mainResizeHandler(_: any, win: Electron.BrowserWindow) {
     const winSize = { width: bounds.width, height: bounds.height, top: bounds.y, left: bounds.x };
     const url = new URL(getBaseHostPort() + "/api/set-winsize");
     const fetchHeaders = getFetchHeaders();
-    fetch(url, { method: "post", body: JSON.stringify(winSize), headers: fetchHeaders, agent: httpsAgentIgnoreCert })
+    fetch(url, { method: "post", body: JSON.stringify(winSize), headers: fetchHeaders })
         .then((resp) => handleJsonFetchResponse(url, resp))
         .catch((err) => {
             console.log("error setting winsize", err);
@@ -434,7 +415,7 @@ function mainPowerHandler(status: string) {
     const url = new URL(getBaseHostPort() + "/api/power-monitor");
     const fetchHeaders = getFetchHeaders();
     const body = { status: status };
-    fetch(url, { method: "post", body: JSON.stringify(body), headers: fetchHeaders, agent: httpsAgentIgnoreCert })
+    fetch(url, { method: "post", body: JSON.stringify(body), headers: fetchHeaders })
         .then((resp) => handleJsonFetchResponse(url, resp))
         .catch((err) => {
             console.log("error setting power monitor state", err);
@@ -484,14 +465,6 @@ function calcBounds(clientData: ClientDataType): Electron.Rectangle {
 app.on("window-all-closed", () => {
     if (unamePlatform !== "darwin") app.quit();
 });
-app.on("certificate-error", (event, webContents, url, error, certificate, callback) => {
-    if (url.startsWith(getBaseHostPort())) {
-        event.preventDefault();
-        callback(true);
-    } else {
-        callback(false);
-    }
-});
 
 electron.ipcMain.on("toggle-developer-tools", (event) => {
     const window = getWindowForEvent(event);
@@ -547,6 +520,10 @@ electron.ipcMain.on("get-id", (event) => {
     event.returnValue = instanceId + ":" + event.processId;
 });
 
+electron.ipcMain.on("get-window-id", (event) => {
+    event.returnValue = event.sender.id;
+});
+
 electron.ipcMain.on("get-platform", (event) => {
     event.returnValue = unamePlatform;
 });
@@ -667,7 +644,7 @@ async function getClientDataPoll(loopNum: number): Promise<ClientDataType | null
 async function getClientData(willRetry: boolean, retryNum: number): Promise<ClientDataType | null> {
     const url = new URL(getBaseHostPort() + "/api/get-client-data");
     const fetchHeaders = getFetchHeaders();
-    return fetch(url, { headers: fetchHeaders, agent: httpsAgentIgnoreCert })
+    return fetch(url, { headers: fetchHeaders })
         .then((resp) => handleJsonFetchResponse(url, resp))
         .then((data) => {
             if (data == null) {
@@ -686,13 +663,13 @@ async function getClientData(willRetry: boolean, retryNum: number): Promise<Clie
 }
 
 function sendWSSC() {
-    if (windows["main"] != null) {
+    electron.BrowserWindow.getAllWindows().forEach((win) => {
         if (waveSrvProc == null) {
-            windows["main"].webContents.send("wavesrv-status-change", false);
-            return;
+            win.webContents.send("wavesrv-status-change", false);
+        } else {
+            win.webContents.send("wavesrv-status-change", true, waveSrvProc.pid);
         }
-        windows["main"].webContents.send("wavesrv-status-change", true, waveSrvProc.pid);
-    }
+    });
 }
 
 function runWaveSrv() {
@@ -760,7 +737,7 @@ electron.ipcMain.on("context-editmenu", (_, { x, y }, opts) => {
     menu.popup({ x, y });
 });
 
-async function createMainWindowWrap() {
+async function createWindowWrap() {
     let clientData: ClientDataType | null = null;
     try {
         clientData = await getClientDataPoll(1);
@@ -768,9 +745,9 @@ async function createMainWindowWrap() {
     } catch (e) {
         console.log("error getting wavesrv clientdata", e.toString());
     }
-    createMainWindow(clientData);
+    const win = createWindow(clientData);
     if (clientData?.winsize.fullscreen) {
-        windows["main"].setFullScreen(true);
+        win.setFullScreen(true);
     }
     configureAutoUpdaterStartup(clientData);
 }
@@ -783,18 +760,13 @@ function logActiveState() {
     const activeState = { fg: wasInFg, active: wasActive, open: true };
     const url = new URL(getBaseHostPort() + "/api/log-active-state");
     const fetchHeaders = getFetchHeaders();
-    fetch(url, {
-        method: "post",
-        body: JSON.stringify(activeState),
-        headers: fetchHeaders,
-        agent: httpsAgentIgnoreCert,
-    })
+    fetch(url, { method: "post", body: JSON.stringify(activeState), headers: fetchHeaders })
         .then((resp) => handleJsonFetchResponse(url, resp))
         .catch((err) => {
             console.log("error logging active state", err);
         });
     // for next iteration
-    wasInFg = windows["main"]?.isFocused();
+    wasInFg = electron.BrowserWindow.getFocusedWindow()?.isFocused() ?? false;
     wasActive = false;
 }
 
@@ -820,9 +792,13 @@ function reregisterGlobalShortcut(shortcut: string) {
         currentGlobalShortcut = null;
         return;
     }
-    const ok = electron.globalShortcut.register(shortcut, () => {
+    const ok = electron.globalShortcut.register(shortcut, async () => {
         console.log("global shortcut triggered, showing window");
-        windows["main"]?.show();
+        if (electron.BrowserWindow.getAllWindows().length == 0) {
+            await createWindowWrap();
+        }
+        const winToShow = electron.BrowserWindow.getFocusedWindow() ?? electron.BrowserWindow.getAllWindows()[0];
+        winToShow?.show();
     });
     console.log("registered global shortcut", shortcut, ok ? "ok" : "failed");
     if (!ok) {
@@ -847,9 +823,9 @@ let lastUpdateCheck: Date = null;
  */
 function setAppUpdateStatus(status: string) {
     appUpdateStatus = status;
-    if (windows["main"] != null) {
-        windows["main"].webContents.send("app-update-status", appUpdateStatus);
-    }
+    electron.BrowserWindow.getAllWindows().forEach((window) => {
+        window.webContents.send("app-update-status", appUpdateStatus);
+    });
 }
 
 /**
@@ -933,9 +909,14 @@ async function installAppUpdate() {
         detail: "A new version has been downloaded. Restart the application to apply the updates.",
     };
 
-    await electron.dialog.showMessageBox(windows["main"], dialogOpts).then(({ response }) => {
-        if (response === 0) autoUpdater.quitAndInstall();
-    });
+    const allWindows = electron.BrowserWindow.getAllWindows();
+    if (allWindows.length > 0) {
+        await electron.dialog
+            .showMessageBox(electron.BrowserWindow.getFocusedWindow() ?? allWindows[0], dialogOpts)
+            .then(({ response }) => {
+                if (response === 0) autoUpdater.quitAndInstall();
+            });
+    }
 }
 
 electron.ipcMain.on("install-app-update", () => fireAndForget(() => installAppUpdate()));
@@ -1007,10 +988,12 @@ function configureAutoUpdater(enabled: boolean) {
     }
     setTimeout(runActiveTimer, 5000); // start active timer, wait 5s just to be safe
     await app.whenReady();
-    await createMainWindowWrap();
+    await createWindowWrap();
+    await createWindowWrap();
+
     app.on("activate", () => {
         if (electron.BrowserWindow.getAllWindows().length === 0) {
-            createMainWindowWrap().then();
+            createWindowWrap().then();
         }
         checkForUpdates();
     });

src/electron/preload.js

@@ -4,6 +4,7 @@ contextBridge.exposeInMainWorld("api", {
     hideWindow: () => ipc.Renderer.send("hide-window"),
     toggleDeveloperTools: () => ipcRenderer.send("toggle-developer-tools"),
     getId: () => ipcRenderer.sendSync("get-id"),
+    getWindowId: () => ipcRenderer.sendSync("get-window-id"),
     getPlatform: () => ipcRenderer.sendSync("get-platform"),
     getIsDev: () => ipcRenderer.sendSync("get-isdev"),
     getAuthKey: () => ipcRenderer.sendSync("get-authkey"),

src/index.ts

@@ -6,9 +6,11 @@ import * as React from "react";
 import { createRoot } from "react-dom/client";
 import { sprintf } from "sprintf-js";
 import { App } from "@/app/app";
+import { App2 } from "@/app2/app";
 import * as DOMPurify from "dompurify";
 import { loadFonts } from "@/util/fontutil";
 import * as textmeasure from "@/util/textmeasure";
+import { getApi } from "./models";
 
 // @ts-ignore
 let VERSION = __WAVETERM_VERSION__;
@@ -18,7 +20,12 @@ let BUILD = __WAVETERM_BUILD__;
 loadFonts();
 
 document.addEventListener("DOMContentLoaded", () => {
-    let reactElem = React.createElement(App, null, null);
+    let reactElem;
+    if (getApi().getWindowId() === 1) {
+        reactElem = React.createElement(App, null, null);
+    } else {
+        reactElem = React.createElement(App2, null, null);
+    }
     let elem = document.getElementById("app");
     let root = createRoot(elem);
     document.fonts.ready.then(() => {

src/types/custom.d.ts

@@ -943,6 +943,7 @@ declare global {
         hideWindow: () => void;
         toggleDeveloperTools: () => void;
         getId: () => string;
+        getWindowId: () => number;
         getIsDev: () => boolean;
         getPlatform: () => string;
         getAuthKey: () => string;

tsconfig.json

@@ -16,6 +16,7 @@
         "baseUrl": "./", 
         "paths": {
             "@/app/*": ["src/app/*"], // Points to the src folder
+            "@/app2/*": ["src/app2/*"], // Points to the src folder
             "@/util/*": ["src/util/*"], // Points to the src folder
             "@/models": ["src/models/index"], // Points directly to the index file
             "@/models/*": ["src/models/*"], // For everything else inside models

wavesrv/cmd/main-server.go

@@ -5,7 +5,6 @@ package main
 
 import (
 	"context"
-	"crypto/tls"
 	"encoding/base64"
 	"encoding/json"
 	"errors"
@@ -15,7 +14,6 @@ import (
 	"io/fs"
 	"log"
 	"mime/multipart"
-	"net"
 	"net/http"
 	"os"
 	"os/signal"
@@ -1130,6 +1128,11 @@ func main() {
 		log.Printf("[error] migrate up: %v\n", err)
 		return
 	}
+	// err = blockstore.MigrateBlockstore()
+	// if err != nil {
+	// 	log.Printf("[error] migrate blockstore: %v\n", err)
+	// 	return
+	// }
 	clientData, err := sstore.EnsureClientData(context.Background())
 	if err != nil {
 		log.Printf("[error] ensuring client data: %v\n", err)
@@ -1155,11 +1158,6 @@ func main() {
 	if err != nil {
 		log.Printf("[error] resetting screen focus: %v\n", err)
 	}
-	tlsCert, err := waveenc.CreateSelfSignedLocalHostTlsCert()
-	if err != nil {
-		log.Printf("[error] creating self-signed tls cert: %v\n", err)
-		return
-	}
 
 	log.Printf("PCLOUD_ENDPOINT=%s\n", pcloud.GetEndpoint())
 	startupActivityUpdate()
@@ -1196,25 +1194,16 @@ func main() {
 	if scbase.IsDevMode() {
 		serverAddr = MainServerDevAddr
 	}
-	tlsConfig := &tls.Config{}
-	tlsConfig.NextProtos = []string{"h2", "http/1.1"}
-	tlsConfig.Certificates = []tls.Certificate{*tlsCert}
 	server := &http.Server{
 		Addr:           serverAddr,
 		ReadTimeout:    HttpReadTimeout,
 		WriteTimeout:   HttpWriteTimeout,
 		MaxHeaderBytes: HttpMaxHeaderBytes,
 		Handler:        http.TimeoutHandler(gr, HttpTimeoutDuration, "Timeout"),
-		TLSConfig:      tlsConfig,
 	}
 	server.SetKeepAlivesEnabled(false)
-	netListener, err := net.Listen("tcp", serverAddr)
-	if err != nil {
-		log.Printf("[error] cannot listen on %s: %v\n", serverAddr, err)
-		return
-	}
 	log.Printf("Running main server on %s\n", serverAddr)
-	err = server.ServeTLS(netListener, "", "")
+	err = server.ListenAndServe()
 	if err != nil {
 		log.Printf("ERROR: %v\n", err)
 	}

wavesrv/db/blockstore-migrations/000001_init.down.sql

@@ -0,0 +1 @@
+-- nothing

wavesrv/db/blockstore-migrations/000001_init.up.sql

@@ -0,0 +1,19 @@
+CREATE TABLE block_file (
+    blockid varchar(36) NOT NULL,
+    name varchar(200) NOT NULL,
+    maxsize bigint NOT NULL,
+    circular boolean NOT NULL,
+    size bigint NOT NULL,
+    createdts bigint NOT NULL,
+    modts bigint NOT NULL,
+    meta json NOT NULL,
+    PRIMARY KEY (blockid, name)
+);
+
+CREATE TABLE block_data (
+    blockid varchar(36) NOT NULL,
+    name varchar(200) NOT NULL,
+    partidx int NOT NULL,
+    data blob NOT NULL,
+    PRIMARY KEY(blockid, name, partidx)
+);

wavesrv/db/db.go

@@ -10,3 +10,6 @@ import "embed"
 
 //go:embed migrations/*.sql
 var MigrationFS embed.FS
+
+//go:embed blockstore-migrations/*.sql
+var BlockstoreMigrationFS embed.FS

wavesrv/go.mod

@@ -5,7 +5,6 @@ go 1.22
 toolchain go1.22.0
 
 require (
-	github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9
 	github.com/alessio/shellescape v1.4.1
 	github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2
 	github.com/creack/pty v1.1.18

wavesrv/go.sum

@@ -1,5 +1,3 @@
-github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 h1:ez/4by2iGztzR4L0zgAOR8lTQK9VlyBVVd7G4omaOQs=
-github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
 github.com/alessio/shellescape v1.4.1 h1:V7yhSDDn8LP4lc4jS8pFkt0zCnzVJlG5JXy9BVKJUX0=
 github.com/alessio/shellescape v1.4.1/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
 github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 h1:7Ip0wMmLHLRJdrloDxZfhMm0xrLXZS8+COSu2bXmEQs=
@@ -57,7 +55,6 @@ github.com/sawka/txwrap v0.1.2 h1:v8xS0Z1LE7/6vMZA81PYihI+0TSR6Zm1MalzzBIuXKc=
 github.com/sawka/txwrap v0.1.2/go.mod h1:T3nlw2gVpuolo6/XEetvBbk1oMXnY978YmBFy1UyHvw=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/wavetermdev/ssh_config v0.0.0-20240306041034-17e2087ebde2 h1:onqZrJVap1sm15AiIGTfWzdr6cEF0KdtddeuuOVhzyY=
@@ -74,8 +71,6 @@ golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
 golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 mvdan.cc/sh/v3 v3.7.0 h1:lSTjdP/1xsddtaKfGg7Myu7DnlHItd3/M2tomOcNNBg=

wavesrv/pkg/blockstore/blockstore.go

@@ -10,8 +10,6 @@ import (
 	"strings"
 	"sync"
 	"time"
-
-	"github.com/alecthomas/units"
 )
 
 type FileOptsType struct {
@@ -32,7 +30,11 @@ type FileInfo struct {
 	Meta      FileMeta
 }
 
-const MaxBlockSize = int64(128 * units.Kilobyte)
+const UnitsKB = 1024 * 1024
+const UnitsMB = 1024 * UnitsKB
+const UnitsGB = 1024 * UnitsMB
+
+const MaxBlockSize = int64(128 * UnitsKB)
 const DefaultFlushTimeout = 1 * time.Second
 
 type CacheEntry struct {
@@ -79,16 +81,23 @@ type BlockStore interface {
 	GetAllBlockIds(ctx context.Context) []string
 }
 
-var cache map[string]*CacheEntry = make(map[string]*CacheEntry)
+var blockstoreCache map[string]*CacheEntry = make(map[string]*CacheEntry)
 var globalLock *sync.Mutex = &sync.Mutex{}
 var appendLock *sync.Mutex = &sync.Mutex{}
 var flushTimeout = DefaultFlushTimeout
 var lastWriteTime time.Time
 
+// for testing
+func clearCache() {
+	globalLock.Lock()
+	defer globalLock.Unlock()
+	blockstoreCache = make(map[string]*CacheEntry)
+}
+
 func InsertFileIntoDB(ctx context.Context, fileInfo FileInfo) error {
 	metaJson, err := json.Marshal(fileInfo.Meta)
 	if err != nil {
-		return fmt.Errorf("Error writing file %s to db: %v", fileInfo.Name, err)
+		return fmt.Errorf("error writing file %s to db: %v", fileInfo.Name, err)
 	}
 	txErr := WithTx(ctx, func(tx *TxWrap) error {
 		query := `INSERT INTO block_file VALUES (?, ?, ?, ?, ?, ?, ?, ?)`
@@ -96,7 +105,7 @@ func InsertFileIntoDB(ctx context.Context, fileInfo FileInfo) error {
 		return nil
 	})
 	if txErr != nil {
-		return fmt.Errorf("Error writing file %s to db: %v", fileInfo.Name, txErr)
+		return fmt.Errorf("error writing file %s to db: %v", fileInfo.Name, txErr)
 	}
 	return nil
 }
@@ -104,7 +113,7 @@ func InsertFileIntoDB(ctx context.Context, fileInfo FileInfo) error {
 func WriteFileToDB(ctx context.Context, fileInfo FileInfo) error {
 	metaJson, err := json.Marshal(fileInfo.Meta)
 	if err != nil {
-		return fmt.Errorf("Error writing file %s to db: %v", fileInfo.Name, err)
+		return fmt.Errorf("error writing file %s to db: %v", fileInfo.Name, err)
 	}
 	txErr := WithTx(ctx, func(tx *TxWrap) error {
 		query := `UPDATE block_file SET blockid = ?, name = ?, maxsize = ?, circular = ?, size = ?, createdts = ?, modts = ?, meta = ? where blockid = ? and name = ?`
@@ -112,7 +121,7 @@ func WriteFileToDB(ctx context.Context, fileInfo FileInfo) error {
 		return nil
 	})
 	if txErr != nil {
-		return fmt.Errorf("Error writing file %s to db: %v", fileInfo.Name, txErr)
+		return fmt.Errorf("error writing file %s to db: %v", fileInfo.Name, txErr)
 	}
 	return nil
 
@@ -125,7 +134,7 @@ func WriteDataBlockToDB(ctx context.Context, blockId string, name string, index
 		return nil
 	})
 	if txErr != nil {
-		return fmt.Errorf("Error writing data block to db: %v", txErr)
+		return fmt.Errorf("error writing data block to db: %v", txErr)
 	}
 	return nil
 }
@@ -152,7 +161,7 @@ func WriteToCacheBlockNum(ctx context.Context, blockId string, name string, p []
 	defer cacheEntry.Lock.Unlock()
 	block, err := GetCacheBlock(ctx, blockId, name, cacheNum, pullFromDB)
 	if err != nil {
-		return 0, 0, fmt.Errorf("Error getting cache block: %v", err)
+		return 0, 0, fmt.Errorf("error getting cache block: %v", err)
 	}
 	var bytesWritten = 0
 	blockLen := len(block.data)
@@ -192,7 +201,7 @@ func ReadFromCacheBlock(ctx context.Context, blockId string, name string, block
 		}
 	}()
 	if pos > len(block.data) {
-		return 0, fmt.Errorf("Reading past end of cache block, should never happen")
+		return 0, fmt.Errorf("reading past end of cache block, should never happen")
 	}
 	bytesWritten := 0
 	index := pos
@@ -216,7 +225,7 @@ func ReadFromCacheBlock(ctx context.Context, blockId string, name string, block
 	return bytesWritten, nil
 }
 
-const MaxSizeError = "Hit Max Size"
+const MaxSizeError = "MaxSizeError"
 
 func WriteToCacheBuf(buf *[]byte, p []byte, pos int, length int, maxWrite int64) (int, error) {
 	bytesToWrite := length
@@ -260,7 +269,7 @@ func GetValuesFromCacheId(cacheId string) (blockId string, name string) {
 func GetCacheEntry(ctx context.Context, blockId string, name string) (*CacheEntry, bool) {
 	globalLock.Lock()
 	defer globalLock.Unlock()
-	if curCacheEntry, found := cache[GetCacheId(blockId, name)]; found {
+	if curCacheEntry, found := blockstoreCache[GetCacheId(blockId, name)]; found {
 		return curCacheEntry, true
 	} else {
 		return nil, false
@@ -279,7 +288,7 @@ func GetCacheEntryOrPopulate(ctx context.Context, blockId string, name string) (
 		if cacheEntry, found := GetCacheEntry(ctx, blockId, name); found {
 			return cacheEntry, nil
 		} else {
-			return nil, fmt.Errorf("Error getting cache entry %v %v", blockId, name)
+			return nil, fmt.Errorf("error getting cache entry %v %v", blockId, name)
 		}
 	}
 
@@ -288,16 +297,16 @@ func GetCacheEntryOrPopulate(ctx context.Context, blockId string, name string) (
 func SetCacheEntry(ctx context.Context, cacheId string, cacheEntry *CacheEntry) {
 	globalLock.Lock()
 	defer globalLock.Unlock()
-	if _, found := cache[cacheId]; found {
+	if _, found := blockstoreCache[cacheId]; found {
 		return
 	}
-	cache[cacheId] = cacheEntry
+	blockstoreCache[cacheId] = cacheEntry
 }
 
 func DeleteCacheEntry(ctx context.Context, blockId string, name string) {
 	globalLock.Lock()
 	defer globalLock.Unlock()
-	delete(cache, GetCacheId(blockId, name))
+	delete(blockstoreCache, GetCacheId(blockId, name))
 }
 
 func GetCacheBlock(ctx context.Context, blockId string, name string, cacheNum int, pullFromDB bool) (*CacheBlock, error) {
@@ -392,7 +401,7 @@ func WriteAtHelper(ctx context.Context, blockId string, name string, p []byte, o
 	}
 	fInfo, err := Stat(ctx, blockId, name)
 	if err != nil {
-		return 0, fmt.Errorf("Write At err: %v", err)
+		return 0, fmt.Errorf("WriteAt err: %v", err)
 	}
 	if off > fInfo.Opts.MaxSize && fInfo.Opts.Circular {
 		numOver := off / fInfo.Opts.MaxSize
@@ -416,12 +425,12 @@ func WriteAtHelper(ctx context.Context, blockId string, name string, p []byte, o
 					b, err := WriteAtHelper(ctx, blockId, name, p, 0, false)
 					bytesWritten += b
 					if err != nil {
-						return bytesWritten, fmt.Errorf("Write to cache error: %v", err)
+						return bytesWritten, fmt.Errorf("write to cache error: %v", err)
 					}
 					break
 				}
 			} else {
-				return bytesWritten, fmt.Errorf("Write to cache error: %v", err)
+				return bytesWritten, fmt.Errorf("write to cache error: %v", err)
 			}
 		}
 		if len(p) == b {
@@ -452,7 +461,7 @@ func GetAllBlockSizes(dataBlocks []*CacheBlock) (int, int) {
 }
 
 func FlushCache(ctx context.Context) error {
-	for _, cacheEntry := range cache {
+	for _, cacheEntry := range blockstoreCache {
 		err := WriteFileToDB(ctx, *cacheEntry.Info)
 		if err != nil {
 			return err
@@ -485,14 +494,14 @@ func ReadAt(ctx context.Context, blockId string, name string, p *[]byte, off int
 	bytesRead := 0
 	fInfo, err := Stat(ctx, blockId, name)
 	if err != nil {
-		return 0, fmt.Errorf("Read At err: %v", err)
+		return 0, fmt.Errorf("ReadAt err: %v", err)
 	}
 	if off > fInfo.Opts.MaxSize && fInfo.Opts.Circular {
 		numOver := off / fInfo.Opts.MaxSize
 		off = off - (numOver * fInfo.Opts.MaxSize)
 	}
 	if off > fInfo.Size {
-		return 0, fmt.Errorf("Read At error: tried to read past the end of the file")
+		return 0, fmt.Errorf("ReadAt error: tried to read past the end of the file")
 	}
 	endReadPos := math.Min(float64(int64(len(*p))+off), float64(fInfo.Size))
 	bytesToRead := int64(endReadPos) - off
@@ -505,7 +514,7 @@ func ReadAt(ctx context.Context, blockId string, name string, p *[]byte, off int
 	for index := curCacheNum; index < curCacheNum+numCaches; index++ {
 		curCacheBlock, err := GetCacheBlock(ctx, blockId, name, index, true)
 		if err != nil {
-			return bytesRead, fmt.Errorf("Error getting cache block: %v", err)
+			return bytesRead, fmt.Errorf("error getting cache block: %v", err)
 		}
 		cacheOffset := off - (int64(index) * MaxBlockSize)
 		if cacheOffset < 0 {
@@ -540,7 +549,7 @@ func ReadAt(ctx context.Context, blockId string, name string, p *[]byte, off int
 					break
 				}
 			} else {
-				return bytesRead, fmt.Errorf("Read from cache error: %v", err)
+				return bytesRead, fmt.Errorf("read from cache error: %v", err)
 			}
 		}
 	}
@@ -552,7 +561,7 @@ func AppendData(ctx context.Context, blockId string, name string, p []byte) (int
 	defer appendLock.Unlock()
 	fInfo, err := Stat(ctx, blockId, name)
 	if err != nil {
-		return 0, fmt.Errorf("Append stat error: %v", err)
+		return 0, fmt.Errorf("append stat error: %v", err)
 	}
 	return WriteAt(ctx, blockId, name, p, fInfo.Size)
 }
@@ -564,12 +573,12 @@ func DeleteFile(ctx context.Context, blockId string, name string) error {
 }
 
 func DeleteBlock(ctx context.Context, blockId string) error {
-	for cacheId, _ := range cache {
+	for cacheId := range blockstoreCache {
 		curBlockId, name := GetValuesFromCacheId(cacheId)
 		if curBlockId == blockId {
 			err := DeleteFile(ctx, blockId, name)
 			if err != nil {
-				return fmt.Errorf("Error deleting %v %v: %v", blockId, name, err)
+				return fmt.Errorf("error deleting %v %v: %v", blockId, name, err)
 			}
 		}
 	}

wavesrv/pkg/blockstore/blockstore_dbops.go

@@ -8,11 +8,16 @@ import (
 	"path"
 	"sync"
 
+	"github.com/golang-migrate/migrate/v4"
+	_ "github.com/golang-migrate/migrate/v4/database/sqlite3"
+	"github.com/golang-migrate/migrate/v4/source/iofs"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/sawka/txwrap"
 	"github.com/wavetermdev/waveterm/wavesrv/pkg/dbutil"
 	"github.com/wavetermdev/waveterm/wavesrv/pkg/scbase"
+
+	dbfs "github.com/wavetermdev/waveterm/wavesrv/db"
 )
 
 const DBFileName = "blockstore.db"
@@ -21,12 +26,64 @@ type SingleConnDBGetter struct {
 	SingleConnLock *sync.Mutex
 }
 
-var dbWrap *SingleConnDBGetter
+var dbWrap *SingleConnDBGetter = &SingleConnDBGetter{SingleConnLock: &sync.Mutex{}}
 
 type TxWrap = txwrap.TxWrap
 
-func InitDBState() {
-	dbWrap = &SingleConnDBGetter{SingleConnLock: &sync.Mutex{}}
+func MakeBlockstoreMigrate() (*migrate.Migrate, error) {
+	fsVar, err := iofs.New(dbfs.BlockstoreMigrationFS, "blockstore-migrations")
+	if err != nil {
+		return nil, fmt.Errorf("opening iofs: %w", err)
+	}
+	dbUrl := fmt.Sprintf("sqlite3://%s", GetDBName())
+	m, err := migrate.NewWithSourceInstance("iofs", fsVar, dbUrl)
+	if err != nil {
+		return nil, fmt.Errorf("making blockstore migration db[%s]: %w", GetDBName(), err)
+	}
+	return m, nil
+}
+
+func MigrateBlockstore() error {
+	log.Printf("migrate blockstore\n")
+	m, err := MakeBlockstoreMigrate()
+	if err != nil {
+		return err
+	}
+	curVersion, dirty, err := GetMigrateVersion(m)
+	if dirty {
+		return fmt.Errorf("cannot migrate up, database is dirty")
+	}
+	if err != nil {
+		return fmt.Errorf("cannot get current migration version: %v", err)
+	}
+	defer m.Close()
+	err = m.Up()
+	if err != nil && err != migrate.ErrNoChange {
+		return fmt.Errorf("migrating blockstore: %w", err)
+	}
+	newVersion, _, err := GetMigrateVersion(m)
+	if err != nil {
+		return fmt.Errorf("cannot get new migration version: %v", err)
+	}
+	if newVersion != curVersion {
+		log.Printf("[db] blockstore migration done, version %d -> %d\n", curVersion, newVersion)
+	}
+	return nil
+}
+
+func GetMigrateVersion(m *migrate.Migrate) (uint, bool, error) {
+	if m == nil {
+		var err error
+		m, err = MakeBlockstoreMigrate()
+		if err != nil {
+			return 0, false, err
+		}
+	}
+	curVersion, dirty, err := m.Version()
+	if err == migrate.ErrNilVersion {
+		return 0, false, nil
+	}
+	return curVersion, dirty, err
 }
 
 func (dbg *SingleConnDBGetter) GetDB(ctx context.Context) (*sqlx.DB, error) {
@@ -62,8 +119,12 @@ func WithTxRtn[RT any](ctx context.Context, fn func(tx *TxWrap) (RT, error)) (RT
 var globalDBLock = &sync.Mutex{}
 var globalDB *sqlx.DB
 var globalDBErr error
+var overrideDBName string
 
 func GetDBName() string {
+	if overrideDBName != "" {
+		return overrideDBName
+	}
 	scHome := scbase.GetWaveHomeDir()
 	return path.Join(scHome, DBFileName)
 }

wavesrv/pkg/sstore/migrate.go

@@ -17,7 +17,7 @@ import (
 	_ "github.com/golang-migrate/migrate/v4/source/file"
 	"github.com/golang-migrate/migrate/v4/source/iofs"
 	_ "github.com/mattn/go-sqlite3"
-	sh2db "github.com/wavetermdev/waveterm/wavesrv/db"
+	dbfs "github.com/wavetermdev/waveterm/wavesrv/db"
 
 	"github.com/golang-migrate/migrate/v4"
 )
@@ -29,7 +29,7 @@ const CmdLineSpecialMigration = 20
 const RISpecialMigration = 30
 
 func MakeMigrate() (*migrate.Migrate, error) {
-	fsVar, err := iofs.New(sh2db.MigrationFS, "migrations")
+	fsVar, err := iofs.New(dbfs.MigrationFS, "migrations")
 	if err != nil {
 		return nil, fmt.Errorf("opening iofs: %w", err)
 	}

wavesrv/pkg/waveenc/cert.go

@@ -1,55 +0,0 @@
-// Copyright 2024, Command Line Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-package waveenc
-
-import (
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/tls"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"math/big"
-	"net"
-	"time"
-)
-
-func CreateSelfSignedLocalHostTlsCert() (*tls.Certificate, error) {
-	serialNumber, err := rand.Int(rand.Reader, big.NewInt(1000000000))
-	if err != nil {
-		return nil, err
-	}
-	notBeforeTime, err := time.Parse("2006-01-02", "2020-01-01")
-	if err != nil {
-		return nil, err
-	}
-	notAfterTime, err := time.Parse("2006-01-02", "2030-01-01")
-	if err != nil {
-		return nil, err
-	}
-	certTemplate := &x509.Certificate{
-		SerialNumber:          serialNumber,
-		Subject:               pkix.Name{CommonName: "127.0.0.1"},
-		NotBefore:             notBeforeTime,
-		NotAfter:              notAfterTime,
-		KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment | x509.KeyUsageCertSign,
-		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
-		BasicConstraintsValid: true,
-		IPAddresses:           []net.IP{net.ParseIP("127.0.0.1")},
-		DNSNames:              []string{"localhost"},
-		IsCA:                  true,
-	}
-	privateKey, err := rsa.GenerateKey(rand.Reader, 4096)
-	if err != nil {
-		return nil, err
-	}
-	publicKey := privateKey.Public()
-	derBytes, err := x509.CreateCertificate(rand.Reader, certTemplate, certTemplate, publicKey, privateKey)
-	if err != nil {
-		return nil, err
-	}
-	var tlsCert tls.Certificate
-	tlsCert.Certificate = append(tlsCert.Certificate, derBytes)
-	tlsCert.PrivateKey = privateKey
-	return &tlsCert, nil
-}

webpack/webpack.electron.js

@@ -60,6 +60,7 @@ var electronCommon = {
         extensions: [".ts", ".tsx", ".js"],
         alias: {
             "@/app": path.resolve(__dirname, "../src/app/"),
+            "@/app2": path.resolve(__dirname, "../src/app2/"),
             "@/util": path.resolve(__dirname, "../src/util/"),
             "@/models": path.resolve(__dirname, "../src/models/"),
             "@/common": path.resolve(__dirname, "../src/app/common/"),