Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-22 16:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

updates to allow cmd tailing to work with mshell

Browse Source
This commit is contained in:
sawka 2022-07-07 21:39:25 -07:00
parent 4cc55c46ca
commit 45dfeb69f6
6 changed files with 49 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/main-server.go
View File

@ -87,7 +87,8 @@ func MakeWSState(clientId string) (*WSState, error) {
rtn.ConnectTime = time.Now()
rtn.PacketCh = make(chan packet.PacketType, WSStatePacketChSize)
chSender := packet.MakeChannelPacketSender(rtn.PacketCh)
rtn.Tailer, err = cmdtail.MakeTailer(chSender)
gen := scbase.ScFileNameGenerator{ScHome: scbase.GetScHomeDir()}
rtn.Tailer, err = cmdtail.MakeTailer(chSender, gen)
if err != nil {
return nil, err
}
@ -198,9 +199,18 @@ func HandleWs(w http.ResponseWriter, r *http.Request) {
continue
}
if pk.GetType() == "getcmd" {
err = state.Tailer.AddWatch(pk.(*packet.GetCmdPacketType))
getPk := pk.(*packet.GetCmdPacketType)
done, err := state.Tailer.AddWatch(getPk)
if err != nil {
// TODO: send responseerror
respPk := packet.MakeErrorResponsePacket(getPk.ReqId, err)
fmt.Printf("[error] adding watch to tailer: %v\n", err)
fmt.Printf("%v\n", respPk)
}
if done {
respPk := packet.MakeResponsePacket(getPk.ReqId, true)
fmt.Printf("%v\n", respPk)
// TODO: send response
}
continue
}
@ -455,15 +465,12 @@ func ProcessFeCommandPacket(ctx context.Context, pk *scpacket.FeCommandPacketTyp
fmt.Printf("GOT cd RESP: %v\n", resp)
return nil, nil
}
rtnLine, err := sstore.AddCmdLine(ctx, pk.SessionId, pk.WindowId, pk.UserId)
cmdId := uuid.New().String()
cmd, err := remote.RunCommand(ctx, pk, cmdId)
if err != nil {
return nil, err
}
cmd, err := remote.RunCommand(ctx, pk, rtnLine.CmdId)
if err != nil {
return nil, err
}
err = sstore.InsertCmd(ctx, cmd)
rtnLine, err := sstore.AddCmdLine(ctx, pk.SessionId, pk.WindowId, pk.UserId, cmd)
if err != nil {
return nil, err
}
@ -595,12 +602,11 @@ func main() {
fmt.Printf("[error] ensuring local remote: %v\n", err)
return
}
defaultSession, err := sstore.EnsureDefaultSession(context.Background())
_, err = sstore.EnsureDefaultSession(context.Background())
if err != nil {
fmt.Printf("[error] ensuring default session: %v\n", err)
return
}
fmt.Printf("session: %v\n", defaultSession)
err = remote.LoadRemotes(context.Background())
if err != nil {
fmt.Printf("[error] loading remotes: %v\n", err)

6
pkg/remote/remote.go
View File

@ -223,6 +223,10 @@ func RunCommand(ctx context.Context, pk *scpacket.FeCommandPacketType, cmdId str
DonePk: nil,
RunOut: nil,
}
err = sstore.AppendToCmdPtyBlob(ctx, cmd.SessionId, cmd.CmdId, nil)
if err != nil {
return nil, err
}
return cmd, nil
}
@ -316,7 +320,7 @@ func (runner *MShellProc) ProcessPackets() {
if ack != nil {
runner.ServerProc.Input.SendPacket(ack)
}
fmt.Printf("data %s fd=%d len=%d eof=%v err=%v\n", dataPk.CK, dataPk.FdNum, len(realData), dataPk.Eof, dataPk.Error)
// fmt.Printf("data %s fd=%d len=%d eof=%v err=%v\n", dataPk.CK, dataPk.FdNum, len(realData), dataPk.Eof, dataPk.Error)
continue
}
if pk.GetType() == packet.CmdDataPacketStr {

13
pkg/scbase/scbase.go
View File

@ -8,6 +8,7 @@ import (
"path"
"sync"
"github.com/scripthaus-dev/mshell/pkg/base"
"golang.org/x/sys/unix"
)
@ -109,3 +110,15 @@ func RemotePtyOut(remoteId string) (string, error) {
}
return fmt.Sprintf("%s/%s.ptyout", rdir, remoteId), nil
}
type ScFileNameGenerator struct {
ScHome string
}
func (g ScFileNameGenerator) PtyOutFile(ck base.CommandKey) string {
return path.Join(g.ScHome, SessionsDirBaseName, ck.GetSessionId(), ck.GetCmdId()+".ptyout")
}
func (g ScFileNameGenerator) RunOutFile(ck base.CommandKey) string {
return path.Join(g.ScHome, SessionsDirBaseName, ck.GetSessionId(), ck.GetCmdId()+".runout")
}

25
pkg/sstore/dbops.go
View File

@ -167,7 +167,7 @@ func InsertSessionWithName(ctx context.Context, sessionName string) error {
})
}
func InsertLine(ctx context.Context, line *LineType) error {
func InsertLine(ctx context.Context, line *LineType, cmd *CmdType) error {
if line == nil {
return fmt.Errorf("line cannot be nil")
}
@ -188,27 +188,14 @@ func InsertLine(ctx context.Context, line *LineType) error {
query = `INSERT INTO line ( sessionid, windowid, lineid, ts, userid, linetype, text, cmdid)
VALUES (:sessionid,:windowid,:lineid,:ts,:userid,:linetype,:text,:cmdid)`
tx.NamedExecWrap(query, line)
return nil
})
}
func InsertCmd(ctx context.Context, cmd *CmdType) error {
if cmd == nil {
return fmt.Errorf("cmd cannot be nil")
}
return WithTx(ctx, func(tx *TxWrap) error {
var sessionId string
query := `SELECT sessionid FROM session WHERE sessionid = ?`
hasSession := tx.GetWrap(&sessionId, query, cmd.SessionId)
if !hasSession {
return fmt.Errorf("session not found, cannot insert cmd")
}
cmdMap := cmd.ToMap()
query = `
if cmd != nil {
cmdMap := cmd.ToMap()
query = `
INSERT INTO cmd ( sessionid, cmdid, remoteid, cmdstr, remotestate, termopts, status, startpk, donepk, runout)
VALUES (:sessionid,:cmdid,:remoteid,:cmdstr,:remotestate,:termopts,:status,:startpk,:donepk,:runout)
`
tx.NamedExecWrap(query, cmdMap)
tx.NamedExecWrap(query, cmdMap)
}
return nil
})
}

3
pkg/sstore/fileops.go
View File

@ -16,6 +16,9 @@ func AppendToCmdPtyBlob(ctx context.Context, sessionId string, cmdId string, dat
if err != nil {
return err
}
if len(data) == 0 {
return nil
}
_, err = fd.Write(data)
if err != nil {
return err

13
pkg/sstore/sstore.go
View File

@ -11,7 +11,6 @@ import (
"sync"
"time"
"github.com/google/uuid"
"github.com/jmoiron/sqlx"
"github.com/scripthaus-dev/mshell/pkg/base"
"github.com/scripthaus-dev/mshell/pkg/packet"
@ -245,14 +244,14 @@ func CmdFromMap(m map[string]interface{}) *CmdType {
return &cmd
}
func makeNewLineCmd(sessionId string, windowId string, userId string) *LineType {
func makeNewLineCmd(sessionId string, windowId string, userId string, cmdId string) *LineType {
rtn := &LineType{}
rtn.SessionId = sessionId
rtn.WindowId = windowId
rtn.Ts = time.Now().UnixMilli()
rtn.UserId = userId
rtn.LineType = LineTypeCmd
rtn.CmdId = uuid.New().String()
rtn.CmdId = cmdId
return rtn
}
@ -269,16 +268,16 @@ func makeNewLineText(sessionId string, windowId string, userId string, text stri
func AddCommentLine(ctx context.Context, sessionId string, windowId string, userId string, commentText string) (*LineType, error) {
rtnLine := makeNewLineText(sessionId, windowId, userId, commentText)
err := InsertLine(ctx, rtnLine)
err := InsertLine(ctx, rtnLine, nil)
if err != nil {
return nil, err
}
return rtnLine, nil
}
func AddCmdLine(ctx context.Context, sessionId string, windowId string, userId string) (*LineType, error) {
rtnLine := makeNewLineCmd(sessionId, windowId, userId)
err := InsertLine(ctx, rtnLine)
func AddCmdLine(ctx context.Context, sessionId string, windowId string, userId string, cmd *CmdType) (*LineType, error) {
rtnLine := makeNewLineCmd(sessionId, windowId, userId, cmd.CmdId)
err := InsertLine(ctx, rtnLine, cmd)
if err != nil {
return nil, err
}