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

add screenid to cmd, remove sessionid from screenlines

Browse Source
This commit is contained in:
sawka 2023-03-15 18:13:36 -07:00
parent 962edd1d76
commit efb63a1466
3 changed files with 55 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.tsx
View File

@ -2032,9 +2032,9 @@ class ScreenWindowView extends React.Component<{screen : Screen}, {}> {
getScreenLines() : ScreenLines {
let {screen} = this.props;
let win = GlobalModel.getScreenLinesById(screen.sessionId, screen.screenId);
let win = GlobalModel.getScreenLinesById(screen.screenId);
if (win == null) {
win = GlobalModel.loadScreenLines(screen.sessionId, screen.screenId);
win = GlobalModel.loadScreenLines(screen.screenId);
}
return win;
}

122
src/model.ts
View File

@ -168,6 +168,7 @@ function ces(s : string) {
class Cmd {
sessionId : string;
screenId : string;
remote : RemotePtrType;
remoteId : string;
cmdId : string;
@ -175,6 +176,7 @@ class Cmd {
constructor(cmd : CmdDataType) {
this.sessionId = cmd.sessionid;
this.screenId = cmd.screenid;
this.cmdId = cmd.cmdid;
this.remote = cmd.remote;
this.data = mobx.observable.box(cmd, {deep: false, name: "cmd-data"});
@ -185,7 +187,7 @@ class Cmd {
let origData = this.data.get();
this.data.set(cmd);
if (origData != null && cmd != null && origData.status != cmd.status) {
GlobalModel.cmdStatusUpdate(this.sessionId, this.cmdId, origData.status, cmd.status);
GlobalModel.cmdStatusUpdate(this.screenId, this.cmdId, origData.status, cmd.status);
}
})();
}
@ -649,7 +651,7 @@ class Screen {
}
getScreenLines() : ScreenLines {
return GlobalModel.getScreenLinesById(this.sessionId, this.screenId);
return GlobalModel.getScreenLinesById(this.screenId);
}
getFocusType() : FocusTypeStrs {
@ -680,15 +682,13 @@ class Screen {
}
class ScreenLines {
sessionId : string;
screenId : string;
loaded : OV<boolean> = mobx.observable.box(false, {name: "slines-loaded"});
loadError : OV<string> = mobx.observable.box(null);
lines : OArr<LineType> = mobx.observable.array([], {name: "slines-lines", deep: false});
cmds : Record<string, Cmd> = {};
constructor(sessionId : string, screenId : string) {
this.sessionId = sessionId;
constructor(screenId : string) {
this.screenId = screenId;
}
@ -2494,12 +2494,12 @@ class Model {
};
}
cmdStatusUpdate(sessionId : string, cmdId : string, origStatus : string, newStatus : string) {
cmdStatusUpdate(screenId : string, cmdId : string, origStatus : string, newStatus : string) {
let wasRunning = cmdStatusIsRunning(origStatus);
let isRunning = cmdStatusIsRunning(newStatus);
if (wasRunning && !isRunning) {
// console.log("cmd status", sessionId, cmdId, origStatus, "=>", newStatus);
let lines = this.getActiveLinesByCmdId(sessionId, cmdId);
// console.log("cmd status", screenId, cmdId, origStatus, "=>", newStatus);
let lines = this.getActiveLinesByCmdId(screenId, cmdId);
for (let ptr of lines) {
let screen = ptr.screen;
let renderer = screen.getRenderer(cmdId);
@ -2710,21 +2710,20 @@ class Model {
})();
}
getScreenLinesById(sessionId : string, screenId : string) : ScreenLines {
return this.screenLines.get(sessionId + "/" + screenId);
getScreenLinesById(screenId : string) : ScreenLines {
return this.screenLines.get(screenId);
}
updateScreenLines(slines : ScreenLinesType, load : boolean) {
mobx.action(() => {
let winKey = slines.sessionid + "/" + slines.screenid;
let existingWin = this.screenLines.get(winKey);
let existingWin = this.screenLines.get(slines.screenid);
if (existingWin == null) {
if (!load) {
console.log("cannot update screen-lines that does not exist", winKey);
console.log("cannot update screen-lines that does not exist", slines.screenid);
return;
}
let newWindow = new ScreenLines(slines.sessionid, slines.screenid);
this.screenLines.set(winKey, newWindow);
let newWindow = new ScreenLines(slines.screenid);
this.screenLines.set(slines.screenid, newWindow);
newWindow.updateData(slines, load);
return;
}
@ -2737,13 +2736,7 @@ class Model {
removeScreenLinesByScreenId(screenId : string) {
mobx.action(() => {
for (let winKey of this.screenLines.keys()) {
let win = this.screenLines.get(winKey);
if (win.screenId == screenId) {
this.screenLines.delete(winKey);
return;
}
}
this.screenLines.delete(screenId);
})();
}
@ -2751,6 +2744,10 @@ class Model {
return this.screenMap.get(screenId);
}
getScreenById_single(screenId : string) : Screen {
return this.screenMap.get(screenId);
}
getSessionScreens(sessionId : string) : Screen[] {
let rtn : Screen[] = [];
for (let screen of this.screenMap.values()) {
@ -2766,7 +2763,7 @@ class Model {
if (screen == null) {
return null;
}
return this.screenLines.get(screen.sessionId + "/" + screen.screenId);
return this.screenLines.get(screen.screenId);
}
getActiveScreen() : Screen {
@ -2778,17 +2775,18 @@ class Model {
}
addLineCmd(line : LineType, cmd : CmdDataType, interactive : boolean) {
let win = this.getScreenLinesById(line.sessionid, line.screenid);
if (win == null) {
let slines = this.getScreenLinesById(line.screenid);
if (slines == null) {
return;
}
win.addLineCmd(line, cmd, interactive);
slines.addLineCmd(line, cmd, interactive);
}
updateCmd(cmd : CmdDataType) {
this.screenLines.forEach((win : ScreenLines) => {
win.updateCmd(cmd);
});
let slines = this.screenLines.get(cmd.screenid);
if (slines != null) {
slines.updateCmd(cmd);
}
}
isInfoUpdate(update : UpdateMessage) : boolean {
@ -2910,7 +2908,7 @@ class Model {
}
_loadScreenLinesAsync(newWin : ScreenLines) {
this.screenLines.set(newWin.sessionId + "/" + newWin.screenId, newWin);
this.screenLines.set(newWin.screenId, newWin);
let usp = new URLSearchParams({screenid: newWin.screenId});
let url = new URL(GlobalModel.getBaseHostPort() + "/api/get-screen-lines?" + usp.toString());
let fetchHeaders = GlobalModel.getFetchHeaders();
@ -2927,8 +2925,8 @@ class Model {
});
}
loadScreenLines(sessionId : string, screenId : string) : ScreenLines {
let newWin = new ScreenLines(sessionId, screenId);
loadScreenLines(screenId : string) : ScreenLines {
let newWin = new ScreenLines(screenId);
setTimeout(() => this._loadScreenLinesAsync(newWin), 0);
return newWin;
}
@ -2970,60 +2968,42 @@ class Model {
if (session == null) {
return null;
}
let slines = this.getScreenLinesById(line.sessionid, line.screenid);
let slines = this.getScreenLinesById(line.screenid);
if (slines == null) {
return null;
}
return slines.getCmd(line.cmdid);
}
getCmdByIds(sessionid : string, cmdid : string) : Cmd {
for (let win of this.screenLines.values()) {
if (win.sessionId != sessionid) {
continue;
}
let cmd = win.getCmd(cmdid);
if (cmd != null) {
return cmd;
}
}
return null;
}
getActiveLinesByCmdId(sessionid : string, cmdid : string) : SWLinePtr[] {
getActiveLinesByCmdId(screenId : string, cmdid : string) : SWLinePtr[] {
let rtn : SWLinePtr[] = [];
let session = this.getSessionById(sessionid);
if (session == null) {
let slines = this.screenLines.get(screenId);
if (slines == null) {
return [];
}
for (let win of this.screenLines.values()) {
if (win.sessionId != sessionid) {
continue;
}
if (!win.loaded.get()) {
continue;
}
let cmd = win.getCmd(cmdid);
if (cmd == null) {
continue;
}
let winLine : LineType = null;
for (let i=0; i<win.lines.length; i++) {
if (win.lines[i].cmdid == cmdid) {
winLine = win.lines[i];
break;
}
}
if (winLine != null) {
let screen = this.getScreenById(win.sessionId, win.screenId);
rtn.push({line : winLine, slines: win, screen: screen});
if (!slines.loaded.get()) {
return [];
}
let cmd = slines.getCmd(cmdid);
if (cmd == null) {
return [];
}
let line : LineType = null;
for (let i=0; i<slines.lines.length; i++) {
if (slines.lines[i].cmdid == cmdid) {
line = slines.lines[i];
break;
}
}
if (line != null) {
let screen = this.getScreenById_single(slines.screenId);
rtn.push({line : line, slines: slines, screen: screen});
}
return rtn;
}
updatePtyData(ptyMsg : PtyDataUpdateType) : void {
let activeLinePtrs = this.getActiveLinesByCmdId(ptyMsg.sessionid, ptyMsg.cmdid);
let activeLinePtrs = this.getActiveLinesByCmdId(ptyMsg.screenid, ptyMsg.cmdid);
for (let lineptr of activeLinePtrs) {
lineptr.screen.updatePtyData(ptyMsg);
}

3
src/types.ts
View File

@ -215,6 +215,7 @@ type CmdDoneInfoType = {
type CmdDataType = {
sessionid : string,
screenid : string,
cmdid : string,
remote : RemotePtrType,
cmdstr : string,
@ -231,6 +232,7 @@ type CmdDataType = {
type PtyDataUpdateType = {
sessionid : string,
screenid : string,
cmdid : string,
remoteid : string,
ptypos : number,
@ -239,7 +241,6 @@ type PtyDataUpdateType = {
};
type ScreenLinesType = {
sessionid : string,
screenid : string,
lines : LineType[],
cmds : CmdDataType[],