mirror of
https://github.com/wavetermdev/waveterm.git
synced 2025-01-10 19:58:00 +01:00
a639d72e30
* take a stab at fixing #99. ignore invalid output before we see a real packet. the complication here was ensuring we always output a real packet in every flow so we don't actually lose valid errors. * add ping packets to prime the parser (when in ignoreUntilValid mode)
136 lines
3.6 KiB
Go
136 lines
3.6 KiB
Go
// Copyright 2023, Command Line Inc.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package shexec
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"os/exec"
|
|
"time"
|
|
|
|
"github.com/wavetermdev/waveterm/waveshell/pkg/base"
|
|
"github.com/wavetermdev/waveterm/waveshell/pkg/packet"
|
|
"golang.org/x/mod/semver"
|
|
)
|
|
|
|
// TODO - track buffer sizes for sending input
|
|
|
|
const NotFoundVersion = "v0.0"
|
|
|
|
type ClientProc struct {
|
|
Cmd *exec.Cmd
|
|
InitPk *packet.InitPacketType
|
|
StartTs time.Time
|
|
StdinWriter io.WriteCloser
|
|
StdoutReader io.ReadCloser
|
|
StderrReader io.ReadCloser
|
|
Input *packet.PacketSender
|
|
Output *packet.PacketParser
|
|
}
|
|
|
|
// returns (clientproc, initpk, error)
|
|
func MakeClientProc(ctx context.Context, ecmd *exec.Cmd) (*ClientProc, *packet.InitPacketType, error) {
|
|
inputWriter, err := ecmd.StdinPipe()
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("creating stdin pipe: %v", err)
|
|
}
|
|
stdoutReader, err := ecmd.StdoutPipe()
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("creating stdout pipe: %v", err)
|
|
}
|
|
stderrReader, err := ecmd.StderrPipe()
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("creating stderr pipe: %v", err)
|
|
}
|
|
startTs := time.Now()
|
|
err = ecmd.Start()
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("running local client: %w", err)
|
|
}
|
|
sender := packet.MakePacketSender(inputWriter, nil)
|
|
stdoutPacketParser := packet.MakePacketParser(stdoutReader, &packet.PacketParserOpts{IgnoreUntilValid: true})
|
|
stderrPacketParser := packet.MakePacketParser(stderrReader, nil)
|
|
packetParser := packet.CombinePacketParsers(stdoutPacketParser, stderrPacketParser, true)
|
|
cproc := &ClientProc{
|
|
Cmd: ecmd,
|
|
StartTs: startTs,
|
|
StdinWriter: inputWriter,
|
|
StdoutReader: stdoutReader,
|
|
StderrReader: stderrReader,
|
|
Input: sender,
|
|
Output: packetParser,
|
|
}
|
|
|
|
var pk packet.PacketType
|
|
select {
|
|
case pk = <-packetParser.MainCh:
|
|
case <-ctx.Done():
|
|
cproc.Close()
|
|
return nil, nil, ctx.Err()
|
|
}
|
|
if pk != nil {
|
|
if pk.GetType() != packet.InitPacketStr {
|
|
cproc.Close()
|
|
return nil, nil, fmt.Errorf("invalid packet received from mshell client: %s", packet.AsString(pk))
|
|
}
|
|
initPk := pk.(*packet.InitPacketType)
|
|
if initPk.NotFound {
|
|
cproc.Close()
|
|
return nil, initPk, fmt.Errorf("mshell client not found")
|
|
}
|
|
if semver.MajorMinor(initPk.Version) != semver.MajorMinor(base.MShellVersion) {
|
|
cproc.Close()
|
|
return nil, initPk, fmt.Errorf("invalid remote mshell version '%s', must be '=%s'", initPk.Version, semver.MajorMinor(base.MShellVersion))
|
|
}
|
|
cproc.InitPk = initPk
|
|
}
|
|
if cproc.InitPk == nil {
|
|
cproc.Close()
|
|
return nil, nil, fmt.Errorf("no init packet received from mshell client")
|
|
}
|
|
return cproc, cproc.InitPk, nil
|
|
}
|
|
|
|
func (cproc *ClientProc) Close() {
|
|
if cproc.Input != nil {
|
|
cproc.Input.Close()
|
|
}
|
|
if cproc.StdinWriter != nil {
|
|
cproc.StdinWriter.Close()
|
|
}
|
|
if cproc.StdoutReader != nil {
|
|
cproc.StdoutReader.Close()
|
|
}
|
|
if cproc.StderrReader != nil {
|
|
cproc.StderrReader.Close()
|
|
}
|
|
if cproc.Cmd != nil {
|
|
cproc.Cmd.Process.Kill()
|
|
}
|
|
}
|
|
|
|
func (cproc *ClientProc) ProxySingleOutput(ck base.CommandKey, sender *packet.PacketSender, packetCallback func(packet.PacketType)) {
|
|
sentDonePk := false
|
|
for pk := range cproc.Output.MainCh {
|
|
if packetCallback != nil {
|
|
packetCallback(pk)
|
|
}
|
|
if pk.GetType() == packet.CmdDonePacketStr {
|
|
sentDonePk = true
|
|
}
|
|
sender.SendPacket(pk)
|
|
}
|
|
exitErr := cproc.Cmd.Wait()
|
|
if !sentDonePk {
|
|
endTs := time.Now()
|
|
cmdDuration := endTs.Sub(cproc.StartTs)
|
|
donePacket := packet.MakeCmdDonePacket(ck)
|
|
donePacket.Ts = endTs.UnixMilli()
|
|
donePacket.ExitCode = GetExitCode(exitErr)
|
|
donePacket.DurationMs = int64(cmdDuration / time.Millisecond)
|
|
sender.SendPacket(donePacket)
|
|
}
|
|
}
|