split models/model

src/app/appconst.ts

@@ -8,7 +8,6 @@ export const SESSION_SETTINGS = "sessionSettings";
 export const LINE_SETTINGS = "lineSettings";
 export const CLIENT_SETTINGS = "clientSettings";
 export const TAB_SWITCHER = "tabSwitcher";
-export const USER_INPUT = "userInput";
 
 export const LineContainer_Main = "main";
 export const LineContainer_History = "history";

src/app/common/elements/markdown.less

@@ -5,7 +5,6 @@
     margin-bottom: 10px;
     font-family: @markdown-font;
     font-size: 14px;
-    overflow-wrap: break-word;
 
     code {
         background-color: @markdown-highlight;

src/app/common/elements/passwordfield.tsx

@@ -60,13 +60,7 @@ class PasswordField extends TextField {
         };
 
         return (
-            <div
+            <div className={cn(`wave-textfield wave-password ${className || ""}`, { focused: focused, error: error })}>
-                className={cn(`wave-textfield wave-password ${className || ""}`, {
-                    focused: focused,
-                    error: error,
-                    "no-label": !label,
-                })}
-            >
                 {decoration?.startDecoration && <>{decoration.startDecoration}</>}
                 <div className="wave-textfield-inner">
                     <label

src/app/common/modals/index.tsx

@@ -9,4 +9,3 @@ export { TabSwitcherModal } from "./tabswitcher";
 export { SessionSettingsModal } from "./sessionsettings";
 export { ScreenSettingsModal } from "./screensettings";
 export { LineSettingsModal } from "./linesettings";
-export { UserInputModal } from "./userinput";

src/app/common/modals/provider.tsx

@@ -17,7 +17,7 @@ class ModalsProvider extends React.Component {
         for (let i = 0; i < store.length; i++) {
             let entry = store[i];
             let Comp = entry.component;
-            rtn.push(<Comp key={entry.uniqueKey} {...entry.props} />);
+            rtn.push(<Comp key={entry.uniqueKey} />);
         }
         return <>{rtn}</>;
     }

src/app/common/modals/registry.tsx

@@ -12,21 +12,19 @@ import {
     SessionSettingsModal,
     ScreenSettingsModal,
     LineSettingsModal,
-    UserInputModal,
 } from "../modals";
 import * as constants from "../../appconst";
 
-const modalsRegistry: { [key: string]: React.ComponentType } = {
+const modalsRegistry: { [key: string]: () => React.ReactElement } = {
-    [constants.ABOUT]: AboutModal,
+    [constants.ABOUT]: () => <AboutModal />,
-    [constants.CREATE_REMOTE]: CreateRemoteConnModal,
+    [constants.CREATE_REMOTE]: () => <CreateRemoteConnModal />,
-    [constants.VIEW_REMOTE]: ViewRemoteConnDetailModal,
+    [constants.VIEW_REMOTE]: () => <ViewRemoteConnDetailModal />,
-    [constants.EDIT_REMOTE]: EditRemoteConnModal,
+    [constants.EDIT_REMOTE]: () => <EditRemoteConnModal />,
-    [constants.ALERT]: AlertModal,
+    [constants.ALERT]: () => <AlertModal />,
-    [constants.SCREEN_SETTINGS]: ScreenSettingsModal,
+    [constants.SCREEN_SETTINGS]: () => <ScreenSettingsModal />,
-    [constants.SESSION_SETTINGS]: SessionSettingsModal,
+    [constants.SESSION_SETTINGS]: () => <SessionSettingsModal />,
-    [constants.LINE_SETTINGS]: LineSettingsModal,
+    [constants.LINE_SETTINGS]: () => <LineSettingsModal />,
-    [constants.TAB_SWITCHER]: TabSwitcherModal,
+    [constants.TAB_SWITCHER]: () => <TabSwitcherModal />,
-    [constants.USER_INPUT]: UserInputModal,
 };
 
 export { modalsRegistry };

src/app/common/modals/userinput.less

@@ -1,15 +0,0 @@
-@import "../../../app/common/themes/themes.less";
-
-.userinput-modal {
-    width: 500px;
-
-    .wave-modal-content {
-        .wave-modal-body {
-            padding: 20px 20px;
-
-            .userinput-query {
-                margin-bottom: 10px;
-            }
-        }
-    }
-}

src/app/common/modals/userinput.tsx

@@ -1,88 +0,0 @@
-import * as React from "react";
-import { GlobalModel } from "../../../models";
-import { Choose, When, If } from "tsx-control-statements/components";
-import { Modal, PasswordField, Markdown } from "../elements";
-import { UserInputRequest } from "../../../types/types";
-
-import "./userinput.less";
-
-export const UserInputModal = (userInputRequest: UserInputRequest) => {
-    const [responseText, setResponseText] = React.useState("");
-    const [countdown, setCountdown] = React.useState(Math.floor(userInputRequest.timeoutms / 1000));
-
-    const closeModal = React.useCallback(() => {
-        GlobalModel.sendUserInput({
-            type: "userinputresp",
-            requestid: userInputRequest.requestid,
-            errormsg: "Canceled by the user",
-        });
-        GlobalModel.remotesModel.closeModal();
-    }, [responseText, userInputRequest]);
-
-    const handleSendText = React.useCallback(() => {
-        GlobalModel.sendUserInput({
-            type: "userinputresp",
-            requestid: userInputRequest.requestid,
-            text: responseText,
-        });
-        GlobalModel.remotesModel.closeModal();
-    }, [responseText, userInputRequest]);
-
-    const handleSendConfirm = React.useCallback(
-        (response: boolean) => {
-            GlobalModel.sendUserInput({
-                type: "userinputresp",
-                requestid: userInputRequest.requestid,
-                confirm: response,
-            });
-            GlobalModel.remotesModel.closeModal();
-        },
-        [userInputRequest]
-    );
-
-    React.useEffect(() => {
-        let timeout: ReturnType<typeof setTimeout>;
-        if (countdown == 0) {
-            timeout = setTimeout(() => {
-                GlobalModel.remotesModel.closeModal();
-            }, 300);
-        } else {
-            timeout = setTimeout(() => {
-                setCountdown(countdown - 1);
-            }, 1000);
-        }
-        return () => clearTimeout(timeout);
-    }, [countdown]);
-
-    return (
-        <Modal className="userinput-modal">
-            <Modal.Header onClose={closeModal} title={userInputRequest.title + ` (${countdown})`} />
-            <div className="wave-modal-body">
-                <div className="userinput-query">
-                    <If condition={userInputRequest.markdown}>
-                        <Markdown text={userInputRequest.querytext} />
-                    </If>
-                    <If condition={!userInputRequest.markdown}>{userInputRequest.querytext}</If>
-                </div>
-                <Choose>
-                    <When condition={userInputRequest.responsetype == "text"}>
-                        <PasswordField onChange={setResponseText} value={responseText} maxLength={400} />
-                    </When>
-                </Choose>
-            </div>
-            <Choose>
-                <When condition={userInputRequest.responsetype == "text"}>
-                    <Modal.Footer onCancel={closeModal} onOk={handleSendText} okLabel="Continue" />
-                </When>
-                <When condition={userInputRequest.responsetype == "confirm"}>
-                    <Modal.Footer
-                        onCancel={() => handleSendConfirm(false)}
-                        onOk={() => handleSendConfirm(true)}
-                        okLabel="Yes"
-                        cancelLabel="No"
-                    />
-                </When>
-            </Choose>
-        </Modal>
-    );
-};

src/app/common/modals/viewremoteconndetail.less

@@ -54,8 +54,6 @@
             }
 
             .remote-detail {
-                width: 100%;
-
                 .settings-field {
                     display: flex;
                     flex-direction: row;
@@ -93,9 +91,8 @@
                 }
 
                 .terminal-wrapper {
+                    width: 100%;
                     margin-top: 5px;
-                    overflow-x: auto;
-                    overflow-y: hidden;
 
                     .terminal-connectelem {
                         height: 163px !important; // Needed to override plugin height
@@ -114,6 +111,7 @@
 
                         .xterm-screen {
                             padding: 10px;
+                            width: 541px !important; // Needed to override plugin width
                         }
                     }
                 }

src/app/common/modals/viewremoteconndetail.tsx

@@ -12,10 +12,12 @@ import * as T from "../../../types/types";
 import { Modal, Tooltip, Button, Status } from "../elements";
 import * as util from "../../../util/util";
 import * as textmeasure from "../../../util/textmeasure";
-import * as appconst from "../../appconst";
 
 import "./viewremoteconndetail.less";
 
+const RemotePtyRows = 9;
+const RemotePtyCols = 80;
+
 @mobxReact.observer
 class ViewRemoteConnDetailModal extends React.Component<{}, {}> {
     termRef: React.RefObject<any> = React.createRef();
@@ -291,7 +293,7 @@ class ViewRemoteConnDetailModal extends React.Component<{}, {}> {
         let model = this.model;
         let isTermFocused = this.model.remoteTermWrapFocus.get();
         let termFontSize = GlobalModel.termFontSize.get();
-        let termWidth = textmeasure.termWidthFromCols(appconst.RemotePtyCols, termFontSize);
+        let termWidth = textmeasure.termWidthFromCols(RemotePtyCols, termFontSize);
         let remoteAliasText = util.isBlank(remote.remotealias) ? "(none)" : remote.remotealias;
         let selectedRemoteStatus = this.getSelectedRemote().status;
 
@@ -369,7 +371,7 @@ class ViewRemoteConnDetailModal extends React.Component<{}, {}> {
                                 ref={this.termRef}
                                 data-remoteid={remote.remoteid}
                                 style={{
-                                    height: textmeasure.termHeightFromRows(appconst.RemotePtyRows, termFontSize),
+                                    height: textmeasure.termHeightFromRows(RemotePtyRows, termFontSize),
                                     width: termWidth,
                                 }}
                             ></div>

src/electron/emain.ts

@@ -14,7 +14,6 @@ import { sprintf } from "sprintf-js";
 import { v4 as uuidv4 } from "uuid";
 import { checkKeyPressed, adaptFromElectronKeyEvent, setKeyUtilPlatform } from "../util/keyutil";
 import { platform } from "os";
-import * as T from "../types/types";
 
 const WaveAppPathVarName = "WAVETERM_APP_PATH";
 const WaveDevVarName = "WAVETERM_DEV";
@@ -38,25 +37,21 @@ ensureDir(waveHome);
 // normalize darwin/x64 to darwin/amd64 for GOARCH compatibility
 let unamePlatform = process.platform;
 let unameArch: string = process.arch;
-``;
 if (unameArch == "x64") {
     unameArch = "amd64";
 }
-let logger: winston.Logger;
+let logger;
-let transports: winston.transport[] = [
+let loggerConfig = {
-    new winston.transports.File({ filename: path.join(waveHome, "waveterm-app.log"), level: "info" }),
-];
-if (isDev) {
-    transports.push(new winston.transports.Console());
-}
-let loggerConfig: winston.LoggerOptions = {
     level: "info",
     format: winston.format.combine(
         winston.format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }),
         winston.format.printf((info) => `${info.timestamp} ${info.message}`)
     ),
-    transports: transports,
+    transports: [new winston.transports.File({ filename: path.join(waveHome, "waveterm-app.log"), level: "info" })],
 };
+if (isDev) {
+    loggerConfig.transports.push(new winston.transports.Console());
+}
 logger = winston.createLogger(loggerConfig);
 function log(...msg) {
     try {
@@ -80,7 +75,7 @@ if (isDev) {
 }
 let app = electron.app;
 app.setName(isDev ? "Wave (Dev)" : "Wave");
-let waveSrvProc: child_process.ChildProcessWithoutNullStreams | null = null;
+let waveSrvProc = null;
 let waveSrvShouldRestart = false;
 
 electron.dialog.showErrorBox = (title, content) => {
@@ -106,8 +101,8 @@ function checkPromptMigrate() {
         // don't migrate if we're running dev version or if wave home directory already exists
         return;
     }
-    let homeDir: string = process.env.HOME as string;
+    let homeDir = process.env.HOME;
-    let promptHome: string = path.join(homeDir, "prompt");
+    let promptHome = path.join(homeDir, "prompt");
     if (!fs.existsSync(promptHome) || !fs.existsSync(path.join(promptHome, "prompt.db"))) {
         // make sure we have a valid prompt home directory (prompt.db must exist inside)
         return;
@@ -175,7 +170,7 @@ function readAuthKey() {
     return authKeyStr.trim();
 }
 
-let menuTemplate: (Electron.MenuItem | Electron.MenuItemConstructorOptions)[] = [
+let menuTemplate = [
     {
         role: "appMenu",
         submenu: [
@@ -255,7 +250,7 @@ function shFrameNavHandler(event: any, url: any) {
     return;
 }
 
-function createMainWindow(clientData: T.ClientDataType | null) {
+function createMainWindow(clientData) {
     let bounds = calcBounds(clientData);
     setKeyUtilPlatform(platform());
     let win = new electron.BrowserWindow({
@@ -614,9 +609,7 @@ function runWaveSrv() {
         pReject(new Error(sprintf("failed to start local server (%s)", waveSrvCmd)));
         if (waveSrvShouldRestart) {
             waveSrvShouldRestart = false;
-            // small timeout here so we can reuse the listen socket
+            this.runWaveSrv();
-            // this is normally only used in dev mode for debugging
-            setTimeout(runWaveSrv, 500);
         }
     });
     proc.on("spawn", (e) => {
@@ -651,7 +644,7 @@ electron.ipcMain.on("context-editmenu", (event, { x, y }, opts) => {
     }
     console.log("context-editmenu");
     let menu = new electron.Menu();
-    let menuItem: Electron.MenuItem;
+    let menuItem = null;
     if (opts.showCut) {
         menuItem = new electron.MenuItem({ label: "Cut", role: "cut" });
         menu.append(menuItem);
@@ -664,7 +657,7 @@ electron.ipcMain.on("context-editmenu", (event, { x, y }, opts) => {
 });
 
 async function createMainWindowWrap() {
-    let clientData: T.ClientDataType | null = null;
+    let clientData = null;
     try {
         clientData = await getClientDataPoll(1);
     } catch (e) {

src/models/input.ts

@@ -13,10 +13,10 @@ import {
     HistoryQueryOpts,
     HistoryTypeStrs,
     OpenAICmdInfoChatMessageType,
-    OV,
-    StrWithPos,
 } from "../types/types";
+import { StrWithPos } from "../types/types";
 import * as appconst from "../app/appconst";
+import { OV } from "../types/types";
 import { Model } from "./model";
 import { GlobalCommandRunner } from "./global";
 
@@ -207,6 +207,7 @@ class InputModel {
             this.historyQueryOpts.set(opts);
             let bestIndex = this.findBestNewIndex(oldItem);
             setTimeout(() => this.setHistoryIndex(bestIndex, true), 10);
+            return;
         })();
     }
 
@@ -623,17 +624,13 @@ class InputModel {
     }
 
     openAIAssistantChat(): void {
-        mobx.action(() => {
+        this.aIChatShow.set(true);
-            this.aIChatShow.set(true);
+        this.setAIChatFocus();
-            this.setAIChatFocus();
-        })();
     }
 
     closeAIAssistantChat(): void {
-        mobx.action(() => {
+        this.aIChatShow.set(false);
-            this.aIChatShow.set(false);
+        this.giveFocus();
-            this.giveFocus();
-        })();
     }
 
     clearAIAssistantChat(): void {
@@ -724,6 +721,14 @@ class InputModel {
     setCurLine(val: string): void {
         let hidx = this.historyIndex.get();
         mobx.action(() => {
+            // if (val == "\" ") {
+            //     this.setInputMode("comment");
+            //     val = "";
+            // }
+            // if (val == "//") {
+            //     this.setInputMode("global");
+            //     val = "";
+            // }
             if (this.modHistory.length <= hidx) {
                 this.modHistory.length = hidx + 1;
             }

src/models/modals.ts

@@ -8,14 +8,14 @@ import { modalsRegistry } from "../app/common/modals/registry";
 import { OArr } from "../types/types";
 
 class ModalsModel {
-    store: OArr<ModalStoreEntry> = mobx.observable.array([], { name: "ModalsModel-store", deep: false });
+    store: OArr<ModalStoreEntry> = mobx.observable.array([], { name: "ModalsModel-store" });
 
-    pushModal(modalId: string, props?: any) {
+    pushModal(modalId: string) {
         const modalFactory = modalsRegistry[modalId];
 
         if (modalFactory && !this.store.some((modal) => modal.id === modalId)) {
             mobx.action(() => {
-                this.store.push({ id: modalId, component: modalFactory, uniqueKey: uuidv4(), props });
+                this.store.push({ id: modalId, component: modalFactory, uniqueKey: uuidv4() });
             })();
         }
     }

src/models/model_old.ts

@@ -51,8 +51,6 @@ import {
     HistoryViewDataType,
     AlertMessageType,
     HistorySearchParams,
-    UserInputRequest,
-    UserInputResponsePacket,
     FocusTypeStrs,
     ScreenLinesType,
     HistoryTypeStrs,
@@ -3378,14 +3376,14 @@ class RemotesModel {
 }
 
 class ModalsModel {
-    store: OArr<T.ModalStoreEntry> = mobx.observable.array([], { name: "ModalsModel-store", deep: false });
+    store: OArr<T.ModalStoreEntry> = mobx.observable.array([], { name: "ModalsModel-store" });
 
-    pushModal(modalId: string, props?: any) {
+    pushModal(modalId: string) {
         const modalFactory = modalsRegistry[modalId];
 
         if (modalFactory && !this.store.some((modal) => modal.id === modalId)) {
             mobx.action(() => {
-                this.store.push({ id: modalId, component: modalFactory, uniqueKey: uuidv4(), props: props });
+                this.store.push({ id: modalId, component: modalFactory, uniqueKey: uuidv4() });
             })();
         }
     }
@@ -4186,10 +4184,6 @@ class Model {
                 this.getScreenById_single(snc.screenid)?.setNumRunningCmds(snc.num);
             }
         }
-        if ("userinputrequest" in update) {
-            let userInputRequest: UserInputRequest = update.userinputrequest;
-            this.modalsModel.pushModal(appconst.USER_INPUT, userInputRequest);
-        }
     }
 
     updateRemotes(remotes: RemoteType[]): void {
@@ -4597,10 +4591,6 @@ class Model {
         this.ws.pushMessage(inputPacket);
     }
 
-    sendUserInput(userInputResponsePacket: UserInputResponsePacket) {
-        this.ws.pushMessage(userInputResponsePacket);
-    }
-
     sendCmdInputText(screenId: string, sp: T.StrWithPos) {
         let pk: T.CmdInputTextPacketType = {
             type: "cmdinputtext",

src/models/remotes.ts

@@ -12,6 +12,9 @@ import { GlobalCommandRunner } from "./global";
 import { Model } from "./model";
 import { getTermPtyData } from "../util/modelutil";
 
+const RemotePtyRows = 8; // also in main.tsx
+const RemotePtyCols = 80;
+
 class RemotesModel {
     globalModel: Model;
     selectedRemoteId: OV<string> = mobx.observable.box(null, {
@@ -177,14 +180,14 @@ class RemotesModel {
             return;
         }
         let termOpts = {
-            rows: appconst.RemotePtyRows,
+            rows: RemotePtyRows,
-            cols: appconst.RemotePtyCols,
+            cols: RemotePtyCols,
             flexrows: false,
             maxptysize: 64 * 1024,
         };
         let termWrap = new TermWrap(elem, {
             termContext: { remoteId: remoteId },
-            usedRows: appconst.RemotePtyRows,
+            usedRows: RemotePtyRows,
             termOpts: termOpts,
             winSize: null,
             keyHandler: (e, termWrap) => {

src/models/screenlines.ts

@@ -139,7 +139,7 @@ class ScreenLines {
                     return;
                 }
                 let lineIdx = 0;
-                for (lineIdx; lineIdx < lines.length; lineIdx++) {
+                for (lineIdx = 0; lineIdx < lines.length; lineIdx++) {
                     let lineId = lines[lineIdx].lineid;
                     let curTs = lines[lineIdx].ts;
                     if (lineId == line.lineid) {

src/plugins/terminal/terminal.less

@@ -3,10 +3,10 @@
 
 .terminal-wrapper {
     .xterm-viewport {
-        overflow: hidden;
+        overflow-y: hidden;
     }
     &:hover .xterm-viewport,
     &:focus-within .xterm-viewport {
-        overflow: auto;
+        overflow-y: auto;
     }
 }

src/types/types.ts

@@ -29,6 +29,7 @@ type SessionDataType = {
 
     // for updates
     remove?: boolean;
+    full?: boolean;
 };
 
 type LineStateType = { [k: string]: any };
@@ -91,6 +92,7 @@ type ScreenDataType = {
     anchor: { anchorline: number; anchoroffset: number };
 
     // for updates
+    full?: boolean;
     remove?: boolean;
 };
 
@@ -258,11 +260,6 @@ type CmdDataType = {
     restarted?: boolean;
 };
 
-type LineUpdateType = {
-    line: LineType;
-    cmd: CmdDataType;
-};
-
 type PtyDataUpdateType = {
     screenid: string;
     lineid: string;
@@ -312,48 +309,30 @@ type ScreenNumRunningCommandsUpdateType = {
     num: number;
 };
 
-type ConnectUpdateType = {
-    sessions: SessionDataType[];
-    screens: ScreenDataType[];
-    remotes: RemoteType[];
-    screenstatusindicators: ScreenStatusIndicatorUpdateType[];
-    screennumrunningcommands: ScreenNumRunningCommandsUpdateType[];
-    activesessionid: string;
-};
-
-type BookmarksUpdateType = {
-    bookmarks: BookmarkType[];
-    selectedbookmark: string;
-};
-
-type MainViewUpdateType = {
-    mainview: string;
-    historyview?: HistoryViewDataType;
-    bookmarksview?: BookmarksUpdateType;
-};
-
 type ModelUpdateType = {
     interactive: boolean;
-    session?: SessionDataType;
+    sessions?: SessionDataType[];
     activesessionid?: string;
-    screen?: ScreenDataType;
+    screens?: ScreenDataType[];
     screenlines?: ScreenLinesType;
-    line?: LineUpdateType;
+    line?: LineType;
+    lines?: LineType[];
     cmd?: CmdDataType;
     info?: InfoType;
     cmdline?: StrWithPos;
-    remote?: RemoteType;
+    remotes?: RemoteType[];
     history?: HistoryInfoType;
-    connect?: ConnectUpdateType;
+    connect?: boolean;
-    mainview?: MainViewUpdateType;
+    mainview?: string;
-    bookmarks?: BookmarksUpdateType;
+    bookmarks?: BookmarkType[];
+    selectedbookmark?: string;
     clientdata?: ClientDataType;
+    historyviewdata?: HistoryViewDataType;
     remoteview?: RemoteViewType;
     openaicmdinfochat?: OpenAICmdInfoChatMessageType[];
     alertmessage?: AlertMessageType;
-    screenstatusindicator?: ScreenStatusIndicatorUpdateType;
+    screenstatusindicators?: ScreenStatusIndicatorUpdateType[];
-    screennumrunningcommands?: ScreenNumRunningCommandsUpdateType;
+    screennumrunningcommands?: ScreenNumRunningCommandsUpdateType[];
-    userinputrequest?: UserInputRequest;
 };
 
 type HistoryViewDataType = {
@@ -435,7 +414,7 @@ type ContextMenuOpts = {
     showCut?: boolean;
 };
 
-type UpdateMessage = PtyDataUpdateType | ModelUpdateType[];
+type UpdateMessage = PtyDataUpdateType | ModelUpdateType;
 
 type RendererContext = {
     screenId: string;
@@ -560,14 +539,6 @@ type ReleaseInfoType = {
     latestversion: string;
 };
 
-type ClientWinSizeType = {
-    width: number;
-    height: number;
-    top: number;
-    left: number;
-    fullscreen: boolean;
-};
-
 type ClientDataType = {
     clientid: string;
     userid: string;
@@ -577,7 +548,6 @@ type ClientDataType = {
     dbversion: number;
     openaiopts?: OpenAIOptsType;
     releaseinfo?: ReleaseInfoType;
-    winsize: ClientWinSizeType;
 };
 
 type OpenAIOptsType = {
@@ -625,23 +595,6 @@ type HistorySearchParams = {
     filterCmds?: boolean;
 };
 
-type UserInputRequest = {
-    requestid: string;
-    querytext: string;
-    responsetype: string;
-    title: string;
-    markdown: boolean;
-    timeoutms: number;
-};
-
-type UserInputResponsePacket = {
-    type: string;
-    requestid: string;
-    text?: string;
-    confirm?: boolean;
-    errormsg?: string;
-};
-
 type RenderModeType = "normal" | "collapsed" | "expanded";
 
 type WebScreen = {
@@ -777,7 +730,6 @@ type ModalStoreEntry = {
     id: string;
     component: React.ComponentType;
     uniqueKey: string;
-    props?: any;
 };
 
 type StrWithPos = {
@@ -857,8 +809,6 @@ export type {
     RenderModeType,
     AlertMessageType,
     HistorySearchParams,
-    UserInputRequest,
-    UserInputResponsePacket,
     ScreenLinesType,
     FocusTypeStrs,
     HistoryTypeStrs,
@@ -895,7 +845,6 @@ export type {
     CmdInputTextPacketType,
     OpenAICmdInfoChatMessageType,
     ScreenStatusIndicatorUpdateType,
-    ScreenNumRunningCommandsUpdateType,
     OV,
     OArr,
     OMap,

src/util/util.ts

@@ -1,4 +1,4 @@
-// Copyright 2024, Command Line Inc.
+// Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
 import * as mobx from "mobx";
@@ -17,7 +17,7 @@ function isBlank(s: string): boolean {
 }
 
 function handleNotOkResp(resp: any, url: URL): Promise<any> {
-    const errMsg = sprintf(
+    let errMsg = sprintf(
         "Bad status code response from fetch '%s': code=%d %s",
         url.toString(),
         resp.status,
@@ -41,18 +41,18 @@ function handleNotOkResp(resp: any, url: URL): Promise<any> {
 }
 
 function fetchJsonData(resp: any, ctErr: boolean): Promise<any> {
-    const contentType = resp.headers.get("Content-Type");
+    let contentType = resp.headers.get("Content-Type");
-    if (contentType?.startsWith("application/json")) {
+    if (contentType != null && contentType.startsWith("application/json")) {
         return resp.text().then((textData) => {
             let rtnData: any = null;
             try {
                 rtnData = JSON.parse(textData);
             } catch (err) {
-                const errMsg = sprintf("Unparseable JSON: " + err.message);
+                let errMsg = sprintf("Unparseable JSON: " + err.message);
-                const rtnErr = new Error(errMsg);
+                let rtnErr = new Error(errMsg);
                 throw rtnErr;
             }
-            if (rtnData?.error) {
+            if (rtnData != null && rtnData.error) {
                 throw new Error(rtnData.error);
             }
             return rtnData;
@@ -67,23 +67,23 @@ function handleJsonFetchResponse(url: URL, resp: any): Promise<any> {
     if (!resp.ok) {
         return handleNotOkResp(resp, url);
     }
-    const rtnData = fetchJsonData(resp, true);
+    let rtnData = fetchJsonData(resp, true);
     return rtnData;
 }
 
 function base64ToString(b64: string): string {
-    const stringBytes = base64.toByteArray(b64);
+    let stringBytes = base64.toByteArray(b64);
     return new TextDecoder().decode(stringBytes);
 }
 
 function stringToBase64(input: string): string {
-    const stringBytes = new TextEncoder().encode(input);
+    let stringBytes = new TextEncoder().encode(input);
     return base64.fromByteArray(stringBytes);
 }
 
 function base64ToArray(b64: string): Uint8Array {
-    const rawStr = atob(b64);
+    let rawStr = atob(b64);
-    const rtnArr = new Uint8Array(new ArrayBuffer(rawStr.length));
+    let rtnArr = new Uint8Array(new ArrayBuffer(rawStr.length));
     for (let i = 0; i < rawStr.length; i++) {
         rtnArr[i] = rawStr.charCodeAt(i);
     }
@@ -92,6 +92,7 @@ function base64ToArray(b64: string): Uint8Array {
 
 interface IDataType {
     remove?: boolean;
+    full?: boolean;
 }
 
 interface IObjType<DataType> {
@@ -112,28 +113,31 @@ function genMergeSimpleData<T extends ISimpleDataType>(
     if (dataArr == null || dataArr.length == 0) {
         return;
     }
-    const objMap: Record<string, T> = {};
+    let objMap: Record<string, T> = {};
-    for (const obj of objs) {
+    for (let i = 0; i < objs.length; i++) {
-        const id = idFn(obj);
+        let obj = objs[i];
+        let id = idFn(obj);
         objMap[id] = obj;
     }
-    for (const dataItem of dataArr) {
+    for (let i = 0; i < dataArr.length; i++) {
+        let dataItem = dataArr[i];
         if (dataItem == null) {
             console.log("genMergeSimpleData, null item");
             console.trace();
         }
-        const id = idFn(dataItem);
+        let id = idFn(dataItem);
         if (dataItem.remove) {
             delete objMap[id];
+            continue;
         } else {
             objMap[id] = dataItem;
         }
     }
-    const newObjs = Object.values(objMap);
+    let newObjs = Object.values(objMap);
     if (sortIdxFn) {
         newObjs.sort((a, b) => {
-            const astr = sortIdxFn(a);
+            let astr = sortIdxFn(a);
-            const bstr = sortIdxFn(b);
+            let bstr = sortIdxFn(b);
             return astr.localeCompare(bstr);
         });
     }
@@ -151,18 +155,20 @@ function genMergeData<ObjType extends IObjType<DataType>, DataType extends IData
     if (dataArr == null || dataArr.length == 0) {
         return;
     }
-    const objMap: Record<string, ObjType> = {};
+    let objMap: Record<string, ObjType> = {};
-    for (const obj of objs) {
+    for (let i = 0; i < objs.length; i++) {
-        const id = objIdFn(obj);
+        let obj = objs[i];
+        let id = objIdFn(obj);
         objMap[id] = obj;
     }
-    for (const dataItem of dataArr) {
+    for (let i = 0; i < dataArr.length; i++) {
+        let dataItem = dataArr[i];
         if (dataItem == null) {
             console.log("genMergeData, null item");
             console.trace();
             continue;
         }
-        const id = dataIdFn(dataItem);
+        let id = dataIdFn(dataItem);
         let obj = objMap[id];
         if (dataItem.remove) {
             if (obj != null) {
@@ -172,13 +178,17 @@ function genMergeData<ObjType extends IObjType<DataType>, DataType extends IData
             continue;
         }
         if (obj == null) {
+            if (!dataItem.full) {
+                console.log("cannot create object, dataitem is not full", objs, dataItem);
+                continue;
+            }
             obj = ctorFn(dataItem);
             objMap[id] = obj;
             continue;
         }
         obj.mergeData(dataItem);
     }
-    const newObjs = Object.values(objMap);
+    let newObjs = Object.values(objMap);
     if (sortIdxFn) {
         newObjs.sort((a, b) => {
             return sortIdxFn(a) - sortIdxFn(b);
@@ -194,17 +204,18 @@ function genMergeDataMap<ObjType extends IObjType<DataType>, DataType extends ID
     dataIdFn: (data: DataType) => string,
     ctorFn: (data: DataType) => ObjType
 ): { added: string[]; removed: string[] } {
-    const rtn: { added: string[]; removed: string[] } = { added: [], removed: [] };
+    let rtn: { added: string[]; removed: string[] } = { added: [], removed: [] };
     if (dataArr == null || dataArr.length == 0) {
         return rtn;
     }
-    for (const dataItem of dataArr) {
+    for (let i = 0; i < dataArr.length; i++) {
+        let dataItem = dataArr[i];
         if (dataItem == null) {
             console.log("genMergeDataMap, null item");
             console.trace();
             continue;
         }
-        const id = dataIdFn(dataItem);
+        let id = dataIdFn(dataItem);
         let obj = objMap.get(id);
         if (dataItem.remove) {
             if (obj != null) {
@@ -215,6 +226,10 @@ function genMergeDataMap<ObjType extends IObjType<DataType>, DataType extends ID
             continue;
         }
         if (obj == null) {
+            if (!dataItem.full) {
+                console.log("cannot create object, dataitem is not full", dataItem);
+                continue;
+            }
             obj = ctorFn(dataItem);
             objMap.set(id, obj);
             rtn.added.push(id);
@@ -247,23 +262,23 @@ function incObs(inum: mobx.IObservableValue<number>) {
 
 // @check:font
 function loadFonts() {
-    const jbmFontNormal = new FontFace("JetBrains Mono", "url('public/fonts/jetbrains-mono-v13-latin-regular.woff2')", {
+    let jbmFontNormal = new FontFace("JetBrains Mono", "url('public/fonts/jetbrains-mono-v13-latin-regular.woff2')", {
         style: "normal",
         weight: "400",
     });
-    const jbmFont200 = new FontFace("JetBrains Mono", "url('public/fonts/jetbrains-mono-v13-latin-200.woff2')", {
+    let jbmFont200 = new FontFace("JetBrains Mono", "url('public/fonts/jetbrains-mono-v13-latin-200.woff2')", {
         style: "normal",
         weight: "200",
     });
-    const jbmFont700 = new FontFace("JetBrains Mono", "url('public/fonts/jetbrains-mono-v13-latin-700.woff2')", {
+    let jbmFont700 = new FontFace("JetBrains Mono", "url('public/fonts/jetbrains-mono-v13-latin-700.woff2')", {
         style: "normal",
         weight: "700",
     });
-    const faFont = new FontFace("FontAwesome", "url(public/fonts/fontawesome-webfont-4.7.woff2)", {
+    let faFont = new FontFace("FontAwesome", "url(public/fonts/fontawesome-webfont-4.7.woff2)", {
         style: "normal",
         weight: "normal",
     });
-    const docFonts: any = document.fonts; // work around ts typing issue
+    let docFonts: any = document.fonts; // work around ts typing issue
     docFonts.add(jbmFontNormal);
     docFonts.add(jbmFont200);
     docFonts.add(jbmFont700);
@@ -281,13 +296,13 @@ function getTodayStr(): string {
 }
 
 function getYesterdayStr(): string {
-    const d = new Date();
+    let d = new Date();
     d.setDate(d.getDate() - 1);
     return getDateStr(d);
 }
 
 function getDateStr(d: Date): string {
-    const yearStr = String(d.getFullYear());
+    let yearStr = String(d.getFullYear());
     let monthStr = String(d.getMonth() + 1);
     if (monthStr.length == 1) {
         monthStr = "0" + monthStr;
@@ -296,30 +311,31 @@ function getDateStr(d: Date): string {
     if (dayStr.length == 1) {
         dayStr = "0" + dayStr;
     }
-    const dowStr = DOW_STRS[d.getDay()];
+    let dowStr = DOW_STRS[d.getDay()];
     return dowStr + " " + yearStr + "-" + monthStr + "-" + dayStr;
 }
 
 function getRemoteConnVal(r: RemoteType): number {
-    switch (r.status) {
+    if (r.status == "connected") {
-        case "connected":
+        return 1;
-            return 1;
-        case "connecting":
-            return 2;
-        case "disconnected":
-            return 3;
-        case "error":
-            return 4;
-        default:
-            return 5;
     }
+    if (r.status == "connecting") {
+        return 2;
+    }
+    if (r.status == "disconnected") {
+        return 3;
+    }
+    if (r.status == "error") {
+        return 4;
+    }
+    return 5;
 }
 
 function sortAndFilterRemotes(origRemotes: RemoteType[]): RemoteType[] {
-    const remotes = origRemotes.filter((r) => !r.archived);
+    let remotes = origRemotes.filter((r) => !r.archived);
     remotes.sort((a, b) => {
-        const connValA = getRemoteConnVal(a);
+        let connValA = getRemoteConnVal(a);
-        const connValB = getRemoteConnVal(b);
+        let connValB = getRemoteConnVal(b);
         if (connValA != connValB) {
             return connValA - connValB;
         }
@@ -356,7 +372,7 @@ function openLink(url: string): void {
     window.open(url, "_blank");
 }
 
-function getColorRGB(colorInput: string) {
+function getColorRGB(colorInput) {
     const tempElement = document.createElement("div");
     tempElement.style.color = colorInput;
     document.body.appendChild(tempElement);
@@ -383,7 +399,7 @@ function getRemoteName(remote: RemoteType): string {
     if (remote == null) {
         return "";
     }
-    const { remotealias, remotecanonicalname } = remote;
+    let { remotealias, remotecanonicalname } = remote;
     return remotealias ? `${remotealias} [${remotecanonicalname}]` : remotecanonicalname;
 }