mirror of
https://github.com/wavetermdev/waveterm
synced 2026-04-21 22:47:16 +00:00
902ff9baf1
This adds the ability to stream `tar` archives over channels between `wsh` instances. The main use cases for this are remote copy and move operations. It also completes the `wavefs` implementation of the FileShare interface to allow copy/move interoperability between wavefiles and other storage types. The tar streaming functionality has been broken out into the new `tarcopy` package for easy reuse. New `fileshare` functions are added for `CopyInternal`, which allows copying files internal to a filesystem to bypass the expensive interop layer, and `MoveInternal`, which does the same for moving a file within a filesystem. Copying between remotes is now handled by `CopyRemote`, which accepts the source `FileShareClient` as a parameter. `wsh` connections use the same implementation for `CopyInternal` and `CopyRemote` as they need to request the channel on the remote destination, since we don't offer a way to pass channels as a parameter to a remote call. This also adds a recursive `-r` flag to `wsh file rm` to allow for deleting a directory and all its contents. S3 support will be addressed in a future PR. --------- Co-authored-by: sawka <mike@commandline.dev> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
62 lines
1.5 KiB
Go
62 lines
1.5 KiB
Go
// Copyright 2025, Command Line Inc.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package wshutil
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/wavetermdev/waveterm/pkg/util/utilfn"
|
|
)
|
|
|
|
// special I/O wrappers for wshrpc
|
|
// * terminal (wrap with OSC codes)
|
|
// * stream (json lines)
|
|
// * websocket (json packets)
|
|
|
|
func AdaptStreamToMsgCh(input io.Reader, output chan []byte) error {
|
|
return utilfn.StreamToLines(input, func(line []byte) {
|
|
output <- line
|
|
})
|
|
}
|
|
|
|
func AdaptOutputChToStream(outputCh chan []byte, output io.Writer) error {
|
|
drain := false
|
|
defer func() {
|
|
if drain {
|
|
go func() {
|
|
for range outputCh {
|
|
}
|
|
}()
|
|
}
|
|
}()
|
|
for msg := range outputCh {
|
|
if _, err := output.Write(msg); err != nil {
|
|
drain = true
|
|
return fmt.Errorf("error writing to output (AdaptOutputChToStream): %w", err)
|
|
}
|
|
// write trailing newline
|
|
if _, err := output.Write([]byte{'\n'}); err != nil {
|
|
drain = true
|
|
return fmt.Errorf("error writing trailing newline to output (AdaptOutputChToStream): %w", err)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func AdaptMsgChToPty(outputCh chan []byte, oscEsc string, output io.Writer) error {
|
|
if len(oscEsc) != 5 {
|
|
panic("oscEsc must be 5 characters")
|
|
}
|
|
for msg := range outputCh {
|
|
barr, err := EncodeWaveOSCBytes(oscEsc, msg)
|
|
if err != nil {
|
|
return fmt.Errorf("error encoding osc message (AdaptMsgChToPty): %w", err)
|
|
}
|
|
if _, err := output.Write(barr); err != nil {
|
|
return fmt.Errorf("error writing osc message (AdaptMsgChToPty): %w", err)
|
|
}
|
|
}
|
|
return nil
|
|
}
|