forked from wrenn/wrenn
pptx704
4b2ff279f7
- Add multi-session Terminal tab with xterm.js (session tabs, close, reconnect) - Keep terminal mounted across tab switches to preserve sessions - Persist active tab in URL (?tab=terminal) so refresh stays on terminal - Buffer keystrokes (50ms) to reduce per-character RPC overhead - Add WebSocket auth via ?token= query param for browser WS connections - Enable ws:true in Vite dev proxy for WebSocket support envd fixes (pre-existing bugs exposed by multi-session terminals): - Fix getProcess tag Range: inverted return values caused early stop when multiple tagged processes existed, making SendInput fail with "not found" - Fix multiplexer deadlock: blocking send to cancelled fork's unbuffered channel prevented process cleanup. Now uses buffered channels (cap 64) with non-blocking fallback
86 lines
2.3 KiB
Go
86 lines
2.3 KiB
Go
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package process
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"connectrpc.com/connect"
|
|
"github.com/go-chi/chi/v5"
|
|
"github.com/rs/zerolog"
|
|
|
|
"git.omukk.dev/wrenn/sandbox/envd/internal/execcontext"
|
|
"git.omukk.dev/wrenn/sandbox/envd/internal/logs"
|
|
"git.omukk.dev/wrenn/sandbox/envd/internal/services/cgroups"
|
|
"git.omukk.dev/wrenn/sandbox/envd/internal/services/process/handler"
|
|
rpc "git.omukk.dev/wrenn/sandbox/envd/internal/services/spec/process"
|
|
spec "git.omukk.dev/wrenn/sandbox/envd/internal/services/spec/process/processconnect"
|
|
"git.omukk.dev/wrenn/sandbox/envd/internal/utils"
|
|
)
|
|
|
|
type Service struct {
|
|
processes *utils.Map[uint32, *handler.Handler]
|
|
logger *zerolog.Logger
|
|
defaults *execcontext.Defaults
|
|
cgroupManager cgroups.Manager
|
|
}
|
|
|
|
func newService(l *zerolog.Logger, defaults *execcontext.Defaults, cgroupManager cgroups.Manager) *Service {
|
|
return &Service{
|
|
logger: l,
|
|
processes: utils.NewMap[uint32, *handler.Handler](),
|
|
defaults: defaults,
|
|
cgroupManager: cgroupManager,
|
|
}
|
|
}
|
|
|
|
func Handle(server *chi.Mux, l *zerolog.Logger, defaults *execcontext.Defaults, cgroupManager cgroups.Manager) *Service {
|
|
service := newService(l, defaults, cgroupManager)
|
|
|
|
interceptors := connect.WithInterceptors(logs.NewUnaryLogInterceptor(l))
|
|
|
|
path, h := spec.NewProcessHandler(service, interceptors)
|
|
|
|
server.Mount(path, h)
|
|
|
|
return service
|
|
}
|
|
|
|
func (s *Service) getProcess(selector *rpc.ProcessSelector) (*handler.Handler, error) {
|
|
var proc *handler.Handler
|
|
|
|
switch selector.GetSelector().(type) {
|
|
case *rpc.ProcessSelector_Pid:
|
|
p, ok := s.processes.Load(selector.GetPid())
|
|
if !ok {
|
|
return nil, connect.NewError(connect.CodeNotFound, fmt.Errorf("process with pid %d not found", selector.GetPid()))
|
|
}
|
|
|
|
proc = p
|
|
case *rpc.ProcessSelector_Tag:
|
|
tag := selector.GetTag()
|
|
|
|
s.processes.Range(func(_ uint32, value *handler.Handler) bool {
|
|
if value.Tag == nil {
|
|
return true // no tag, keep looking
|
|
}
|
|
|
|
if *value.Tag == tag {
|
|
proc = value
|
|
return false // found, stop iterating
|
|
}
|
|
|
|
return true // different tag, keep looking
|
|
})
|
|
|
|
if proc == nil {
|
|
return nil, connect.NewError(connect.CodeNotFound, fmt.Errorf("process with tag %s not found", tag))
|
|
}
|
|
|
|
default:
|
|
return nil, connect.NewError(connect.CodeUnimplemented, fmt.Errorf("invalid input type %T", selector))
|
|
}
|
|
|
|
return proc, nil
|
|
}
|