Skip to content

Commit 467a70d

Browse files
sawkasawka
committed
Merge remote-tracking branch 'origin/main' into sawka/remove-large-file-transfer
2 parents 91b2054 + 01a26d5 commit 467a70d

45 files changed

Lines changed: 2335 additions & 581 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/server/main-server.go‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"github.com/wavetermdev/waveterm/pkg/service"
2929
"github.com/wavetermdev/waveterm/pkg/telemetry"
3030
"github.com/wavetermdev/waveterm/pkg/telemetry/telemetrydata"
31+
"github.com/wavetermdev/waveterm/pkg/util/envutil"
3132
"github.com/wavetermdev/waveterm/pkg/util/shellutil"
3233
"github.com/wavetermdev/waveterm/pkg/util/sigutil"
3334
"github.com/wavetermdev/waveterm/pkg/util/utilfn"
@@ -79,7 +80,7 @@ func doShutdown(reason string) {
7980
log.Printf("shutting down: %s\n", reason)
8081
ctx, cancelFn := context.WithTimeout(context.Background(), 5*time.Second)
8182
defer cancelFn()
82-
go blockcontroller.StopAllBlockControllers()
83+
go blockcontroller.StopAllBlockControllersForShutdown()
8384
shutdownActivityUpdate()
8485
sendTelemetryWrapper()
8586
// TODO deal with flush in progress
@@ -162,15 +163,9 @@ func sendDiagnosticPing() bool {
162163
if err != nil || !isOnline {
163164
return false
164165
}
165-
clientData, err := wstore.DBGetSingleton[*waveobj.Client](ctx)
166-
if err != nil {
167-
return false
168-
}
169-
if clientData == nil {
170-
return false
171-
}
166+
clientId := wstore.GetClientId()
172167
usageTelemetry := telemetry.IsTelemetryEnabled()
173-
wcloud.SendDiagnosticPing(ctx, clientData.OID, usageTelemetry)
168+
wcloud.SendDiagnosticPing(ctx, clientId, usageTelemetry)
174169
return true
175170
}
176171

@@ -226,12 +221,8 @@ func sendTelemetryWrapper() {
226221
ctx, cancelFn := context.WithTimeout(context.Background(), 15*time.Second)
227222
defer cancelFn()
228223
beforeSendActivityUpdate(ctx)
229-
client, err := wstore.DBGetSingleton[*waveobj.Client](ctx)
230-
if err != nil {
231-
log.Printf("[error] getting client data for telemetry: %v\n", err)
232-
return
233-
}
234-
err = wcloud.SendAllTelemetry(client.OID)
224+
clientId := wstore.GetClientId()
225+
err := wcloud.SendAllTelemetry(clientId)
235226
if err != nil {
236227
log.Printf("[error] sending telemetry: %v\n", err)
237228
}
@@ -392,7 +383,10 @@ func createMainWshClient() {
392383
wshfs.RpcClient = rpc
393384
wshutil.DefaultRouter.RegisterTrustedLeaf(rpc, wshutil.DefaultRoute)
394385
wps.Broker.SetClient(wshutil.DefaultRouter)
395-
localConnWsh := wshutil.MakeWshRpc(wshrpc.RpcContext{Conn: wshrpc.LocalConnName}, wshremote.MakeRemoteRpcServerImpl(nil, wshutil.DefaultRouter, wshclient.GetBareRpcClient(), true), "conn:local")
386+
localInitialEnv := envutil.PruneInitialEnv(envutil.SliceToMap(os.Environ()))
387+
sockName := wavebase.GetDomainSocketName()
388+
remoteImpl := wshremote.MakeRemoteRpcServerImpl(nil, wshutil.DefaultRouter, wshclient.GetBareRpcClient(), true, localInitialEnv, sockName)
389+
localConnWsh := wshutil.MakeWshRpc(wshrpc.RpcContext{Conn: wshrpc.LocalConnName}, remoteImpl, "conn:local")
396390
go wshremote.RunSysInfoLoop(localConnWsh, wshrpc.LocalConnName)
397391
wshutil.DefaultRouter.RegisterTrustedLeaf(localConnWsh, wshutil.MakeConnectionRouteId(wshrpc.LocalConnName))
398392
}

‎cmd/wsh/cmd/wshcmd-connserver.go‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"github.com/wavetermdev/waveterm/pkg/baseds"
2020
"github.com/wavetermdev/waveterm/pkg/panichandler"
2121
"github.com/wavetermdev/waveterm/pkg/remote/fileshare/wshfs"
22+
"github.com/wavetermdev/waveterm/pkg/util/envutil"
2223
"github.com/wavetermdev/waveterm/pkg/util/packetparser"
2324
"github.com/wavetermdev/waveterm/pkg/util/sigutil"
2425
"github.com/wavetermdev/waveterm/pkg/wavebase"
@@ -42,6 +43,7 @@ var connServerRouterDomainSocket bool
4243
var connServerConnName string
4344
var connServerDev bool
4445
var ConnServerWshRouter *wshutil.WshRouter
46+
var connServerInitialEnv map[string]string
4547

4648
func init() {
4749
serverCmd.Flags().BoolVar(&connServerRouter, "router", false, "run in local router mode (stdio upstream)")
@@ -120,18 +122,18 @@ func runListener(listener net.Listener, router *wshutil.WshRouter) {
120122
}
121123
}
122124

123-
func setupConnServerRpcClientWithRouter(router *wshutil.WshRouter) (*wshutil.WshRpc, error) {
125+
func setupConnServerRpcClientWithRouter(router *wshutil.WshRouter, sockName string) (*wshutil.WshRpc, error) {
124126
routeId := wshutil.MakeConnectionRouteId(connServerConnName)
125127
rpcCtx := wshrpc.RpcContext{
126128
RouteId: routeId,
127129
Conn: connServerConnName,
128130
}
129-
131+
130132
bareRouteId := wshutil.MakeRandomProcRouteId()
131133
bareClient := wshutil.MakeWshRpc(wshrpc.RpcContext{}, &wshclient.WshServer{}, bareRouteId)
132134
router.RegisterTrustedLeaf(bareClient, bareRouteId)
133-
134-
connServerClient := wshutil.MakeWshRpc(rpcCtx, wshremote.MakeRemoteRpcServerImpl(os.Stdout, router, bareClient, false), routeId)
135+
136+
connServerClient := wshutil.MakeWshRpc(rpcCtx, wshremote.MakeRemoteRpcServerImpl(os.Stdout, router, bareClient, false, connServerInitialEnv, sockName), routeId)
135137
router.RegisterTrustedLeaf(connServerClient, routeId)
136138
return connServerClient, nil
137139
}
@@ -170,8 +172,10 @@ func serverRunRouter() error {
170172
}()
171173
router.RegisterUpstream(termProxy)
172174

175+
sockName := getRemoteDomainSocketName()
176+
173177
// setup the connserver rpc client first
174-
client, err := setupConnServerRpcClientWithRouter(router)
178+
client, err := setupConnServerRpcClientWithRouter(router, sockName)
175179
if err != nil {
176180
return fmt.Errorf("error setting up connserver rpc client: %v", err)
177181
}
@@ -267,23 +271,19 @@ func serverRunRouterDomainSocket(jwtToken string) error {
267271
// register the domain socket connection as upstream
268272
router.RegisterUpstream(upstreamProxy)
269273

270-
// setup the connserver rpc client (leaf)
271-
client, err := setupConnServerRpcClientWithRouter(router)
272-
if err != nil {
273-
return fmt.Errorf("error setting up connserver rpc client: %v", err)
274-
}
275-
wshfs.RpcClient = client
274+
// use the router's control RPC to authenticate with upstream
275+
controlRpc := router.GetControlRpc()
276276

277277
// authenticate with the upstream router using the JWT
278-
_, err = wshclient.AuthenticateCommand(client, jwtToken, &wshrpc.RpcOpts{Route: wshutil.ControlRoute})
278+
_, err = wshclient.AuthenticateCommand(controlRpc, jwtToken, &wshrpc.RpcOpts{Route: wshutil.ControlRootRoute})
279279
if err != nil {
280280
return fmt.Errorf("error authenticating with upstream: %v", err)
281281
}
282282
log.Printf("authenticated with upstream router")
283283

284284
// fetch and set JWT public key
285285
log.Printf("trying to get JWT public key")
286-
jwtPublicKeyB64, err := wshclient.GetJwtPublicKeyCommand(client, nil)
286+
jwtPublicKeyB64, err := wshclient.GetJwtPublicKeyCommand(controlRpc, nil)
287287
if err != nil {
288288
return fmt.Errorf("error getting jwt public key: %v", err)
289289
}
@@ -297,6 +297,13 @@ func serverRunRouterDomainSocket(jwtToken string) error {
297297
}
298298
log.Printf("got JWT public key")
299299

300+
// now setup the connserver rpc client
301+
client, err := setupConnServerRpcClientWithRouter(router, sockName)
302+
if err != nil {
303+
return fmt.Errorf("error setting up connserver rpc client: %v", err)
304+
}
305+
wshfs.RpcClient = client
306+
300307
// set up the local domain socket listener for local wsh commands
301308
unixListener, err := MakeRemoteUnixListener()
302309
if err != nil {
@@ -323,7 +330,11 @@ func serverRunRouterDomainSocket(jwtToken string) error {
323330
}
324331

325332
func serverRunNormal(jwtToken string) error {
326-
err := setupRpcClient(wshremote.MakeRemoteRpcServerImpl(os.Stdout, nil, nil, false), jwtToken)
333+
sockName, err := wshutil.ExtractUnverifiedSocketName(jwtToken)
334+
if err != nil {
335+
return fmt.Errorf("error extracting socket name from JWT: %v", err)
336+
}
337+
err = setupRpcClient(wshremote.MakeRemoteRpcServerImpl(os.Stdout, nil, nil, false, connServerInitialEnv, sockName), jwtToken)
327338
if err != nil {
328339
return err
329340
}
@@ -359,6 +370,8 @@ func askForJwtToken() (string, error) {
359370
}
360371

361372
func serverRun(cmd *cobra.Command, args []string) error {
373+
connServerInitialEnv = envutil.PruneInitialEnv(envutil.SliceToMap(os.Environ()))
374+
362375
var logFile *os.File
363376
if connServerDev {
364377
var err error

‎cmd/wsh/cmd/wshcmd-jobdebug.go‎

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ var jobDebugPruneCmd = &cobra.Command{
4646
RunE: jobDebugPruneRun,
4747
}
4848

49-
var jobDebugExitCmd = &cobra.Command{
50-
Use: "exit",
51-
Short: "exit a job manager",
52-
RunE: jobDebugExitRun,
49+
var jobDebugTerminateCmd = &cobra.Command{
50+
Use: "terminate",
51+
Short: "terminate a job manager",
52+
RunE: jobDebugTerminateRun,
5353
}
5454

5555
var jobDebugDisconnectCmd = &cobra.Command{
@@ -98,7 +98,7 @@ var jobDebugDetachJobCmd = &cobra.Command{
9898
var jobIdFlag string
9999
var jobDebugJsonFlag bool
100100
var jobConnFlag string
101-
var exitJobIdFlag string
101+
var terminateJobIdFlag string
102102
var disconnectJobIdFlag string
103103
var reconnectJobIdFlag string
104104
var reconnectConnNameFlag string
@@ -112,7 +112,7 @@ func init() {
112112
jobDebugCmd.AddCommand(jobDebugDeleteCmd)
113113
jobDebugCmd.AddCommand(jobDebugDeleteAllCmd)
114114
jobDebugCmd.AddCommand(jobDebugPruneCmd)
115-
jobDebugCmd.AddCommand(jobDebugExitCmd)
115+
jobDebugCmd.AddCommand(jobDebugTerminateCmd)
116116
jobDebugCmd.AddCommand(jobDebugDisconnectCmd)
117117
jobDebugCmd.AddCommand(jobDebugReconnectCmd)
118118
jobDebugCmd.AddCommand(jobDebugReconnectConnCmd)
@@ -126,8 +126,8 @@ func init() {
126126
jobDebugDeleteCmd.Flags().StringVar(&jobIdFlag, "jobid", "", "job id to delete (required)")
127127
jobDebugDeleteCmd.MarkFlagRequired("jobid")
128128

129-
jobDebugExitCmd.Flags().StringVar(&exitJobIdFlag, "jobid", "", "job id to exit (required)")
130-
jobDebugExitCmd.MarkFlagRequired("jobid")
129+
jobDebugTerminateCmd.Flags().StringVar(&terminateJobIdFlag, "jobid", "", "job id to terminate (required)")
130+
jobDebugTerminateCmd.MarkFlagRequired("jobid")
131131

132132
jobDebugDisconnectCmd.Flags().StringVar(&disconnectJobIdFlag, "jobid", "", "job id to disconnect (required)")
133133
jobDebugDisconnectCmd.MarkFlagRequired("jobid")
@@ -178,12 +178,15 @@ func jobDebugListRun(cmd *cobra.Command, args []string) error {
178178
return nil
179179
}
180180

181-
fmt.Printf("%-36s %-20s %-9s %-10s %-30s %-8s %-10s\n", "OID", "Connection", "Connected", "Manager", "Cmd", "ExitCode", "Stream")
181+
fmt.Printf("%-36s %-20s %-9s %-10s %-6s %-30s %-8s %-10s %-8s\n", "OID", "Connection", "Connected", "Manager", "Reason", "Cmd", "ExitCode", "Stream", "Attached")
182182
for _, job := range rtnData {
183183
connectedStatus := "no"
184184
if connectedMap[job.OID] {
185185
connectedStatus = "yes"
186186
}
187+
if job.TerminateOnReconnect {
188+
connectedStatus += "*"
189+
}
187190

188191
streamStatus := "-"
189192
if job.StreamDone {
@@ -205,8 +208,26 @@ func jobDebugListRun(cmd *cobra.Command, args []string) error {
205208
}
206209
}
207210

208-
fmt.Printf("%-36s %-20s %-9s %-10s %-30s %-8s %-10s\n",
209-
job.OID, job.Connection, connectedStatus, job.JobManagerStatus, job.Cmd, exitCode, streamStatus)
211+
doneReason := "-"
212+
if job.JobManagerDoneReason == "startuperror" {
213+
doneReason = "serr"
214+
} else if job.JobManagerDoneReason == "gone" {
215+
doneReason = "gone"
216+
} else if job.JobManagerDoneReason == "terminated" {
217+
doneReason = "term"
218+
}
219+
220+
attachedBlock := "-"
221+
if job.AttachedBlockId != "" {
222+
if len(job.AttachedBlockId) >= 8 {
223+
attachedBlock = job.AttachedBlockId[:8]
224+
} else {
225+
attachedBlock = job.AttachedBlockId
226+
}
227+
}
228+
229+
fmt.Printf("%-36s %-20s %-9s %-10s %-6s %-30s %-8s %-10s %-8s\n",
230+
job.OID, job.Connection, connectedStatus, job.JobManagerStatus, doneReason, job.Cmd, exitCode, streamStatus, attachedBlock)
210231
}
211232
return nil
212233
}
@@ -277,13 +298,13 @@ func jobDebugPruneRun(cmd *cobra.Command, args []string) error {
277298
return nil
278299
}
279300

280-
func jobDebugExitRun(cmd *cobra.Command, args []string) error {
281-
err := wshclient.JobControllerExitJobCommand(RpcClient, exitJobIdFlag, nil)
301+
func jobDebugTerminateRun(cmd *cobra.Command, args []string) error {
302+
err := wshclient.JobControllerExitJobCommand(RpcClient, terminateJobIdFlag, nil)
282303
if err != nil {
283-
return fmt.Errorf("exiting job manager: %w", err)
304+
return fmt.Errorf("terminating job manager: %w", err)
284305
}
285306

286-
fmt.Printf("Job manager for %s exited successfully\n", exitJobIdFlag)
307+
fmt.Printf("Job manager for %s terminated successfully\n", terminateJobIdFlag)
287308
return nil
288309
}
289310

‎frontend/app/store/wshclientapi.ts‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@ class RpcApiType {
9292
return client.wshRpcCall("connreinstallwsh", data, opts);
9393
}
9494

95+
// command "connserverinit" [call]
96+
ConnServerInitCommand(client: WshClient, data: CommandConnServerInitData, opts?: RpcOpts): Promise<void> {
97+
return client.wshRpcCall("connserverinit", data, opts);
98+
}
99+
95100
// command "connstatus" [call]
96101
ConnStatusCommand(client: WshClient, opts?: RpcOpts): Promise<ConnStatus[]> {
97102
return client.wshRpcCall("connstatus", null, opts);
@@ -112,6 +117,11 @@ class RpcApiType {
112117
return client.wshRpcCall("controllerappendoutput", data, opts);
113118
}
114119

120+
// command "controllerdestroy" [call]
121+
ControllerDestroyCommand(client: WshClient, data: string, opts?: RpcOpts): Promise<void> {
122+
return client.wshRpcCall("controllerdestroy", data, opts);
123+
}
124+
115125
// command "controllerinput" [call]
116126
ControllerInputCommand(client: WshClient, data: CommandBlockInputData, opts?: RpcOpts): Promise<void> {
117127
return client.wshRpcCall("controllerinput", data, opts);
@@ -122,11 +132,6 @@ class RpcApiType {
122132
return client.wshRpcCall("controllerresync", data, opts);
123133
}
124134

125-
// command "controllerstop" [call]
126-
ControllerStopCommand(client: WshClient, data: string, opts?: RpcOpts): Promise<void> {
127-
return client.wshRpcCall("controllerstop", data, opts);
128-
}
129-
130135
// command "createblock" [call]
131136
CreateBlockCommand(client: WshClient, data: CommandCreateBlockData, opts?: RpcOpts): Promise<ORef> {
132137
return client.wshRpcCall("createblock", data, opts);

‎frontend/app/view/term/term.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@ const TerminalView = ({ blockId, model }: ViewComponentProps<TermViewModel>) =>
298298
useWebGl: !termSettings?.["term:disablewebgl"],
299299
sendDataHandler: model.sendDataToController.bind(model),
300300
nodeModel: model.nodeModel,
301-
jobId: blockData?.jobid,
302301
}
303302
);
304303
(window as any).term = termWrap;

‎frontend/app/view/term/termwrap.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ type TermWrapOptions = {
4949
useWebGl?: boolean;
5050
sendDataHandler?: (data: string) => void;
5151
nodeModel?: BlockNodeModel;
52-
jobId?: string;
5352
};
5453

5554
// for xterm OSC handlers, we return true always because we "own" the OSC number.
@@ -375,7 +374,6 @@ function handleOsc16162Command(data: string, blockId: string, loaded: boolean, t
375374
export class TermWrap {
376375
tabId: string;
377376
blockId: string;
378-
jobId: string;
379377
ptyOffset: number;
380378
dataBytesProcessed: number;
381379
terminal: Terminal;
@@ -423,7 +421,6 @@ export class TermWrap {
423421
this.loaded = false;
424422
this.tabId = tabId;
425423
this.blockId = blockId;
426-
this.jobId = waveOptions.jobId;
427424
this.sendDataHandler = waveOptions.sendDataHandler;
428425
this.nodeModel = waveOptions.nodeModel;
429426
this.ptyOffset = 0;
@@ -498,7 +495,7 @@ export class TermWrap {
498495
}
499496

500497
getZoneId(): string {
501-
return this.jobId ?? this.blockId;
498+
return this.blockId;
502499
}
503500

504501
resetCompositionState() {

‎frontend/app/view/tsunami/tsunami.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ class TsunamiViewModel extends WebViewModel {
118118
this.doControllerResync(false, "resync", false);
119119
}
120120

121-
stopController() {
122-
const prtn = RpcApi.ControllerStopCommand(TabRpcClient, this.blockId);
123-
prtn.catch((e) => console.log("error stopping controller", e));
121+
destroyController() {
122+
const prtn = RpcApi.ControllerDestroyCommand(TabRpcClient, this.blockId);
123+
prtn.catch((e) => console.log("error destroying controller", e));
124124
}
125125

126126
async restartController() {
@@ -130,7 +130,7 @@ class TsunamiViewModel extends WebViewModel {
130130
this.triggerRestartAtom();
131131
try {
132132
// Stop the controller first
133-
await RpcApi.ControllerStopCommand(TabRpcClient, this.blockId);
133+
await RpcApi.ControllerDestroyCommand(TabRpcClient, this.blockId);
134134
// Wait a bit for the controller to fully stop
135135
await new Promise((resolve) => setTimeout(resolve, 300));
136136
// Then resync to restart it
@@ -202,7 +202,7 @@ class TsunamiViewModel extends WebViewModel {
202202
const tsunamiItems: ContextMenuItem[] = [
203203
{
204204
label: "Stop WaveApp",
205-
click: () => this.stopController(),
205+
click: () => this.destroyController(),
206206
},
207207
{
208208
label: "Restart WaveApp",

0 commit comments

Comments
 (0)