Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-02-24 03:01:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

unify interactive/ws updates

Browse Source
This commit is contained in:
sawka 2022-07-15 17:48:25 -07:00
parent d297477807
commit 4a853ffa02
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/model.ts
View File

@ -4,7 +4,7 @@ import {boundMethod} from "autobind-decorator";
import {handleJsonFetchResponse, base64ToArray, genMergeData} from "./util";
import {TermWrap} from "./term";
import {v4 as uuidv4} from "uuid";
import type {SessionDataType, WindowDataType, LineType, RemoteType, HistoryItem, RemoteInstanceType, CmdDataType, FeCmdPacketType, TermOptsType, RemoteStateType, ScreenDataType, ScreenWindowType, ScreenOptsType, LayoutType, PtyDataUpdateType, SessionUpdateType, WindowUpdateType, UpdateMessage} from "./types";
import type {SessionDataType, WindowDataType, LineType, RemoteType, HistoryItem, RemoteInstanceType, CmdDataType, FeCmdPacketType, TermOptsType, RemoteStateType, ScreenDataType, ScreenWindowType, ScreenOptsType, LayoutType, PtyDataUpdateType, SessionUpdateType, WindowUpdateType, UpdateMessage, LineCmdUpdateType} from "./types";
import {WSControl} from "./ws";
var GlobalUser = "sawka";
@ -505,7 +505,7 @@ class Model {
this.clientId = getApi().getId();
this.loadRemotes();
this.loadSessionList();
this.ws = new WSControl(this.clientId, this.runUpdate.bind(this))
this.ws = new WSControl(this.clientId, (message : any) => this.runUpdate(message, false));
this.ws.reconnect();
getApi().onTCmd(this.onTCmd.bind(this));
getApi().onICmd(this.onICmd.bind(this));
@ -547,7 +547,7 @@ class Model {
return this.ws.open.get();
}
runUpdate(update : UpdateMessage) {
runUpdate(update : UpdateMessage, interactive : boolean) {
if ("ptydata64" in update) {
let ptyMsg : PtyDataUpdateType = update;
let activeScreen = this.getActiveScreen();
@ -572,7 +572,10 @@ class Model {
}
}
})();
}
if ("line" in update) {
let lineMsg : LineCmdUpdateType = update;
this.addLineCmd(lineMsg.line, lineMsg.cmd, interactive);
}
console.log("run-update>", update);
}
@ -687,8 +690,9 @@ class Model {
let url = sprintf("http://localhost:8080/api/run-command");
fetch(url, {method: "post", body: JSON.stringify(cmdPk)}).then((resp) => handleJsonFetchResponse(url, resp)).then((data) => {
mobx.action(() => {
if (data.data != null && data.data.line != null) {
this.addLineCmd(data.data.line, data.data.cmd, true);
let update = data.data;
if (update != null) {
this.runUpdate(update, true);
}
})();
}).catch((err) => {

12
src/types.ts
View File

@ -172,14 +172,20 @@ type PtyDataUpdateType = {
};
type SessionUpdateType = {
sessions: SessionDataType[],
sessions : SessionDataType[],
};
type UpdateMessage = PtyDataUpdateType | SessionUpdateType;
type LineCmdUpdateType = {
line : LineType,
cmd : CmdDataType,
remove : boolean,
}
type UpdateMessage = PtyDataUpdateType | SessionUpdateType | LineCmdUpdateType;
type WindowUpdateType = {
window: WindowDataType,
remove: boolean,
}
export type {SessionDataType, LineType, RemoteType, RemoteStateType, RemoteInstanceType, WindowDataType, HistoryItem, CmdRemoteStateType, FeCmdPacketType, TermOptsType, CmdStartPacketType, CmdDonePacketType, CmdDataType, ScreenDataType, ScreenOptsType, ScreenWindowType, LayoutType, PtyDataUpdateType, SessionUpdateType, WindowUpdateType, UpdateMessage};
export type {SessionDataType, LineType, RemoteType, RemoteStateType, RemoteInstanceType, WindowDataType, HistoryItem, CmdRemoteStateType, FeCmdPacketType, TermOptsType, CmdStartPacketType, CmdDonePacketType, CmdDataType, ScreenDataType, ScreenOptsType, ScreenWindowType, LayoutType, PtyDataUpdateType, SessionUpdateType, WindowUpdateType, UpdateMessage, LineCmdUpdateType};