waveterm/backup
0
0
Fork 0
mirror of https://github.com/wavetermdev/backup.git synced 2026-08-05 13:57:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

add /screen:reset to remove all remote instances for screen

Browse Source
This commit is contained in:
sawka
2023-01-31 17:56:56 -08:00
parent 6ea1dd65bb
commit 108517bd08
3 changed files with 76 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cmdrunner/cmdrunner.go
+52 -4
View File
@@ -134,6 +134,7 @@ func init() {
registerCmdAlias("screen:new", ScreenOpenCommand)
registerCmdFn("screen:set", ScreenSetCommand)
registerCmdFn("screen:showall", ScreenShowAllCommand)
registerCmdFn("screen:reset", ScreenResetCommand)
registerCmdAlias("remote", RemoteCommand)
registerCmdFn("remote:show", RemoteShowCommand)
@@ -145,6 +146,7 @@ func init() {
registerCmdFn("remote:connect", RemoteConnectCommand)
registerCmdFn("remote:install", RemoteInstallCommand)
registerCmdFn("remote:installcancel", RemoteInstallCancelCommand)
registerCmdFn("remote:reset", RemoteResetCommand)
registerCmdFn("sw:set", SwSetCommand)
registerCmdFn("sw:resize", SwResizeCommand)
@@ -1004,6 +1006,52 @@ func ScreenShowAllCommand(ctx context.Context, pk *scpacket.FeCommandPacketType)
}, nil
}
func ScreenResetCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (sstore.UpdatePacket, error) {
ids, err := resolveUiIds(ctx, pk, R_Session|R_Screen)
if err != nil {
return nil, err
}
screen, err := sstore.GetScreenById(ctx, ids.SessionId, ids.ScreenId)
if err != nil {
return nil, fmt.Errorf("error retrieving screen: %v", err)
}
localRemote := remote.GetLocalRemote()
if localRemote == nil {
return nil, fmt.Errorf("error getting local remote (not found)")
}
rptr := sstore.RemotePtrType{RemoteId: localRemote.RemoteId}
var windows []*sstore.WindowType
sessionUpdate := &sstore.SessionType{SessionId: ids.SessionId}
for _, sw := range screen.Windows {
ris, err := sstore.WindowReset(ctx, ids.SessionId, sw.WindowId)
if err != nil {
return nil, fmt.Errorf("error resetting screen window: %v", err)
}
sessionUpdate.Remotes = append(sessionUpdate.Remotes, ris...)
err = sstore.UpdateCurRemote(ctx, ids.SessionId, sw.WindowId, rptr)
if err != nil {
return nil, fmt.Errorf("cannot reset window remote back to local: %w", err)
}
winUpdate := &sstore.WindowType{SessionId: ids.SessionId, WindowId: sw.WindowId, CurRemote: rptr}
windows = append(windows, winUpdate)
}
outputStr := "reset screen state (all remote state reset)"
cmd, err := makeStaticCmd(ctx, "screen:reset", ids, pk.GetRawStr(), []byte(outputStr))
if err != nil {
// TODO tricky error since the command was a success, but we can't show the output
return nil, err
}
update, err := addLineForCmd(ctx, "/screen:reset", false, ids, cmd)
if err != nil {
// TODO tricky error since the command was a success, but we can't show the output
return nil, err
}
update.Interactive = pk.Interactive
update.Windows = windows
update.Sessions = []*sstore.SessionType{sessionUpdate}
return update, nil
}
func RemoteArchiveCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (sstore.UpdatePacket, error) {
ids, err := resolveUiIds(ctx, pk, R_Session|R_Window|R_Remote)
if err != nil {
@@ -1016,11 +1064,11 @@ func RemoteArchiveCommand(ctx context.Context, pk *scpacket.FeCommandPacketType)
update := sstore.InfoMsgUpdate("remote [%s] archived", ids.Remote.DisplayName)
localRemote := remote.GetLocalRemote()
if localRemote != nil {
update.Window = &sstore.WindowType{
update.Windows = []*sstore.WindowType{&sstore.WindowType{
SessionId: ids.SessionId,
WindowId: ids.WindowId,
CurRemote: sstore.RemotePtrType{RemoteId: localRemote.GetRemoteId()},
}
}}
}
return update, nil
}
@@ -1102,11 +1150,11 @@ func CrCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (sstore.Up
return nil, fmt.Errorf("/cr error: cannot update curremote: %w", err)
}
update := sstore.ModelUpdate{
Window: &sstore.WindowType{
Windows: []*sstore.WindowType{&sstore.WindowType{
SessionId: ids.SessionId,
WindowId: ids.WindowId,
CurRemote: *rptr,
},
}},
Info: &sstore.InfoMsgType{
InfoMsg: fmt.Sprintf("current remote = %q", remoteName),
TimeoutMs: 2000,
pkg/sstore/dbops.go
+23 -2
View File
@@ -1252,7 +1252,7 @@ func ArchiveWindowLines(ctx context.Context, sessionId string, windowId string)
if err != nil {
return nil, err
}
return &ModelUpdate{Window: win}, nil
return &ModelUpdate{Windows: []*WindowType{win}}, nil
}
func PurgeWindowLines(ctx context.Context, sessionId string, windowId string) (*ModelUpdate, error) {
@@ -1289,7 +1289,7 @@ func PurgeWindowLines(ctx context.Context, sessionId string, windowId string) (*
}
win.Lines = append(win.Lines, line)
}
return &ModelUpdate{Window: win}, nil
return &ModelUpdate{Windows: []*WindowType{win}}, nil
}
func GetRunningWindowCmds(ctx context.Context, sessionId string, windowId string) ([]*CmdType, error) {
@@ -1317,6 +1317,27 @@ func UpdateCmdTermOpts(ctx context.Context, sessionId string, cmdId string, term
return txErr
}
// returns riids of deleted RIs
func WindowReset(ctx context.Context, sessionId string, windowId string) ([]*RemoteInstance, error) {
var delRis []*RemoteInstance
txErr := WithTx(ctx, func(tx *TxWrap) error {
query := `SELECT windowid FROM window WHERE sessionid = ? AND windowid = ?`
if !tx.Exists(query, sessionId, windowId) {
return fmt.Errorf("window does not exist")
}
query = `SELECT riid FROM remote_instance WHERE sessionid = ? AND windowid = ?`
riids := tx.SelectStrings(query, sessionId, windowId)
for _, riid := range riids {
ri := &RemoteInstance{SessionId: sessionId, WindowId: windowId, RIId: riid, Remove: true}
delRis = append(delRis, ri)
}
query = `DELETE FROM remote_instance WHERE sessionid = ? AND windowid = ?`
tx.ExecWrap(query, sessionId, windowId)
return nil
})
return delRis, txErr
}
func DeleteSession(ctx context.Context, sessionId string) (UpdatePacket, error) {
var newActiveSessionId string
txErr := WithTx(ctx, func(tx *TxWrap) error {
pkg/sstore/updatebus.go
+1 -1
View File
@@ -32,7 +32,7 @@ func (PtyDataUpdate) UpdateType() string {
type ModelUpdate struct {
Sessions []*SessionType `json:"sessions,omitempty"`
ActiveSessionId string `json:"activesessionid,omitempty"`
Window *WindowType `json:"window,omitempty"`
Windows []*WindowType `json:"windows,omitempty"`
ScreenWindows []*ScreenWindowType `json:"screenwindows,omitempty"`
Line *LineType `json:"line,omitempty"`
Cmd *CmdType `json:"cmd,omitempty"`