@gen3/workspaces 0.12.50 → 0.12.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/TODO.md +2 -2
- package/dist/dts/components/KernelLifecyclePanel/ActiveKernelsPanel.d.ts.map +1 -1
- package/dist/dts/components/KernelLifecyclePanel/ActiveKernelsPanel.js +2 -0
- package/dist/dts/components/KernelLifecyclePanel/ActiveKernelsPanel.js.map +1 -1
- package/dist/dts/components/MicroContainerReduxPanel.d.ts.map +1 -1
- package/dist/dts/components/MicroContainerReduxPanel.js +0 -1
- package/dist/dts/components/MicroContainerReduxPanel.js.map +1 -1
- package/dist/dts/core/hatcheryApi.d.ts.map +1 -1
- package/dist/dts/core/hatcheryApi.js +21 -6
- package/dist/dts/core/hatcheryApi.js.map +1 -1
- package/dist/dts/core/jegGatewayApi.d.ts +75 -8
- package/dist/dts/core/jegGatewayApi.d.ts.map +1 -1
- package/dist/dts/core/jegGatewayApi.js +2 -0
- package/dist/dts/core/jegGatewayApi.js.map +1 -1
- package/dist/dts/providers/useGatewayConnectionStatus.d.ts.map +1 -1
- package/dist/dts/providers/useGatewayConnectionStatus.js +5 -1
- package/dist/dts/providers/useGatewayConnectionStatus.js.map +1 -1
- package/dist/dts/providers/useJEGWorkspaceResourceMonitor.d.ts.map +1 -1
- package/dist/dts/providers/useJEGWorkspaceResourceMonitor.js +69 -41
- package/dist/dts/providers/useJEGWorkspaceResourceMonitor.js.map +1 -1
- package/dist/dts/providers/useMicroContainerRedux.d.ts.map +1 -1
- package/dist/dts/providers/useMicroContainerRedux.js +7 -14
- package/dist/dts/providers/useMicroContainerRedux.js.map +1 -1
- package/dist/dts/server/workspaceAssetsHandler.js +2 -2
- package/dist/dts/server/workspaceAssetsHandler.js.map +1 -1
- package/dist/index/cjs/index.js +109 -64
- package/dist/index/cjs/index.js.map +1 -1
- package/dist/index/esm/index.js +109 -64
- package/dist/index/esm/index.js.map +1 -1
- package/dist/server/cjs/server.js +2 -2
- package/dist/server/cjs/server.js.map +1 -1
- package/dist/server/esm/server.js +2 -2
- package/dist/server/esm/server.js.map +1 -1
- package/package.json +4 -4
|
@@ -60,7 +60,7 @@ export function useMicroContainerRedux(tag, enabled) {
|
|
|
60
60
|
const workspaceContainerStatus = useCoreSelector(selectJEGActiveWorkspaceStatus);
|
|
61
61
|
const [containerHash, setContainerHash] = useState(null);
|
|
62
62
|
const coreDispatch = useCoreDispatch();
|
|
63
|
-
// get the options for the workspace could move to parent
|
|
63
|
+
// get the options for the workspace could move to parent
|
|
64
64
|
const { data: optionData, error: optionsError } = useDoesHatcheryOptionExistsQuery(tag, { skip: containerHash !== null });
|
|
65
65
|
const [launchTrigger, { isError: isWorkspaceLaunchError, error: workspaceLaunchError },] = useLaunchHatcheryWorkspaceMutation();
|
|
66
66
|
const [terminateWorkspace, { isError: isTerminateError, error: workspaceTerminateError },] = useTerminateHatcheryWorkspaceMutation();
|
|
@@ -99,7 +99,8 @@ export function useMicroContainerRedux(tag, enabled) {
|
|
|
99
99
|
coreDispatch(setJEGActiveWorkspaceStatus(WorkspaceStatus.LaunchError));
|
|
100
100
|
}
|
|
101
101
|
else {
|
|
102
|
-
|
|
102
|
+
// Keep status as Launching — the monitor will promote to Running
|
|
103
|
+
// once the pod actually reports running status
|
|
103
104
|
coreDispatch(setJEGActiveWorkspaceId({ id: containerHash ?? 'default' }));
|
|
104
105
|
}
|
|
105
106
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
@@ -118,19 +119,11 @@ export function useMicroContainerRedux(tag, enabled) {
|
|
|
118
119
|
const terminate = useCallback(async () => {
|
|
119
120
|
if (!enabled || workspaceContainerStatus === WorkspaceStatus.Terminating)
|
|
120
121
|
return; // skip if already terminating
|
|
121
|
-
// coreDispatch(setJEGActiveWorkspaceStatus(WorkspaceStatus.Running));
|
|
122
122
|
const containerId = containerHash ? encodeURIComponent(containerHash) : '';
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
coreDispatch(setJEGRequestedWorkspaceStatus(RequestedWorkspaceStatus.Terminate));
|
|
128
|
-
coreDispatch(setJEGActiveWorkspaceStatus(WorkspaceStatus.Terminating));
|
|
129
|
-
}
|
|
130
|
-
catch (_error) {
|
|
131
|
-
coreDispatch(setJEGRequestedWorkspaceStatus(RequestedWorkspaceStatus.Terminate));
|
|
132
|
-
coreDispatch(setJEGActiveWorkspaceStatus(WorkspaceStatus.Terminating));
|
|
133
|
-
}
|
|
123
|
+
// Fire-and-forget: errors are handled by the useDeepCompareEffect watching isTerminateError
|
|
124
|
+
terminateWorkspace(containerId);
|
|
125
|
+
coreDispatch(setJEGRequestedWorkspaceStatus(RequestedWorkspaceStatus.Terminate));
|
|
126
|
+
coreDispatch(setJEGActiveWorkspaceStatus(WorkspaceStatus.Terminating));
|
|
134
127
|
}, [
|
|
135
128
|
enabled,
|
|
136
129
|
workspaceContainerStatus,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMicroContainerRedux.js","sourceRoot":"","sources":["../../../src/providers/useMicroContainerRedux.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAClE,OAAO,EACL,gCAAgC,EAChC,kCAAkC,EAClC,qCAAqC,GACtC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,qBAAqB,EACrB,wBAAwB,EACxB,8BAA8B,EAC9B,uBAAuB,EACvB,2BAA2B,EAC3B,8BAA8B,EAC9B,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAE/C;;;;;;;;;;;GAWG;AACH,MAAM,wBAAwB,GAAG,CAC/B,KAAc,EACd,cAAsB,EACd,EAAE;IACV,IAAI,qBAAqB,CAAC,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,qBAAqB,GAAG,CAAC,KAAa,EAAE,OAAe,EAAE,EAAE;IAC/D,yCAAyC;IACzC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC,oCAAoC;IAE3D,aAAa,CAAC,IAAI,CAAC;QACjB,KAAK;QACL,OAAO;QACP,QAAQ,EAAE,YAAY;KACvB,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,sBAAsB,CACpC,GAAW,EACX,OAAgB;IAEhB,MAAM,wBAAwB,GAAG,eAAe,CAC9C,8BAA8B,CAC/B,CAAC;IACF,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAgB,IAAI,CAAC,CAAC;IACxE,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IAEvC
|
|
1
|
+
{"version":3,"file":"useMicroContainerRedux.js","sourceRoot":"","sources":["../../../src/providers/useMicroContainerRedux.ts"],"names":[],"mappings":"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"}
|
|
@@ -152,10 +152,10 @@ function injectBranding(html, branding) {
|
|
|
152
152
|
catch (error) {
|
|
153
153
|
// empty or malformed — start fresh
|
|
154
154
|
if (error instanceof Error) {
|
|
155
|
-
console.
|
|
155
|
+
console.warn('Failed to parse existing JSON', error.message);
|
|
156
156
|
}
|
|
157
157
|
else {
|
|
158
|
-
console.
|
|
158
|
+
console.warn('Failed to parse existing JSON', error);
|
|
159
159
|
}
|
|
160
160
|
}
|
|
161
161
|
if (branding.appName)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspaceAssetsHandler.js","sourceRoot":"","sources":["../../../src/server/workspaceAssetsHandler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"workspaceAssetsHandler.js","sourceRoot":"","sources":["../../../src/server/workspaceAssetsHandler.ts"],"names":[],"mappings":"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"}
|
package/dist/index/cjs/index.js
CHANGED
|
@@ -339,22 +339,34 @@ const HatcheryWithTags = core$1.gen3Api.enhanceEndpoints({
|
|
|
339
339
|
'Hatchery'
|
|
340
340
|
]
|
|
341
341
|
});
|
|
342
|
-
|
|
343
|
-
|
|
342
|
+
/*
|
|
343
|
+
* Hatchery states:
|
|
344
|
+
*
|
|
345
|
+
* `Terminating` - The workspace is shutting down
|
|
346
|
+
* `Launching` - The workspace is starting up
|
|
347
|
+
* `Stopped` - The workspace is in a failed state and must be terminated
|
|
348
|
+
* `Running` - The workspace is running and ready to be used
|
|
349
|
+
* `Not Found` - The workspace could not be found
|
|
350
|
+
*/ const StatusStringToHatcheryServiceStatus = {
|
|
351
|
+
launching: [
|
|
344
352
|
'launching',
|
|
345
353
|
'pending',
|
|
346
|
-
'starting'
|
|
354
|
+
'starting'
|
|
355
|
+
],
|
|
356
|
+
running: [
|
|
347
357
|
'running',
|
|
348
358
|
'ready'
|
|
349
359
|
],
|
|
350
360
|
stopped: [
|
|
351
|
-
'
|
|
352
|
-
'stopped',
|
|
353
|
-
'terminated'
|
|
361
|
+
'stopped'
|
|
354
362
|
],
|
|
355
|
-
|
|
363
|
+
terminating: [
|
|
356
364
|
'terminating',
|
|
357
365
|
'stopping'
|
|
366
|
+
],
|
|
367
|
+
unknown: [
|
|
368
|
+
'not found',
|
|
369
|
+
'unknown'
|
|
358
370
|
]
|
|
359
371
|
};
|
|
360
372
|
const hatcheryApi = HatcheryWithTags.injectEndpoints({
|
|
@@ -397,17 +409,22 @@ const hatcheryApi = HatcheryWithTags.injectEndpoints({
|
|
|
397
409
|
transformResponse: (response)=>{
|
|
398
410
|
const results = (response.status || 'unknown').toLowerCase();
|
|
399
411
|
let hatcheryStatus = HatcheryServiceState.unknown;
|
|
400
|
-
if (results
|
|
412
|
+
if (StatusStringToHatcheryServiceStatus.unknown.includes(results)) {
|
|
413
|
+
hatcheryStatus = HatcheryServiceState.unknown;
|
|
414
|
+
}
|
|
415
|
+
if (StatusStringToHatcheryServiceStatus.launching.includes(results)) {
|
|
416
|
+
hatcheryStatus = HatcheryServiceState.launching;
|
|
417
|
+
}
|
|
401
418
|
if (StatusStringToHatcheryServiceStatus.running.includes(results)) {
|
|
402
419
|
hatcheryStatus = HatcheryServiceState.running;
|
|
403
420
|
}
|
|
404
421
|
if (StatusStringToHatcheryServiceStatus.stopped.includes(results)) {
|
|
405
422
|
hatcheryStatus = HatcheryServiceState.stopped;
|
|
406
423
|
}
|
|
407
|
-
if (StatusStringToHatcheryServiceStatus.
|
|
424
|
+
if (StatusStringToHatcheryServiceStatus.terminating.includes(results)) {
|
|
408
425
|
hatcheryStatus = HatcheryServiceState.terminating;
|
|
409
426
|
}
|
|
410
|
-
// return other
|
|
427
|
+
// return other stats from the hatchery response
|
|
411
428
|
return {
|
|
412
429
|
status: hatcheryStatus,
|
|
413
430
|
idleTimeLimit: response.idleTimeLimit,
|
|
@@ -559,7 +576,7 @@ const { useDoesHatcheryOptionExistsQuery, useHatcheryOptionsQuery, useLazyHatche
|
|
|
559
576
|
const workspaceContainerStatus = core$1.useCoreSelector(core$1.selectJEGActiveWorkspaceStatus);
|
|
560
577
|
const [containerHash, setContainerHash] = React.useState(null);
|
|
561
578
|
const coreDispatch = core$1.useCoreDispatch();
|
|
562
|
-
// get the options for the workspace could move to parent
|
|
579
|
+
// get the options for the workspace could move to parent
|
|
563
580
|
const { data: optionData, error: optionsError } = useDoesHatcheryOptionExistsQuery(tag, {
|
|
564
581
|
skip: containerHash !== null
|
|
565
582
|
});
|
|
@@ -597,7 +614,8 @@ const { useDoesHatcheryOptionExistsQuery, useHatcheryOptionsQuery, useLazyHatche
|
|
|
597
614
|
// launch error, will show error message and then reset
|
|
598
615
|
coreDispatch(core$1.setJEGActiveWorkspaceStatus(core$1.WorkspaceStatus.LaunchError));
|
|
599
616
|
} else {
|
|
600
|
-
|
|
617
|
+
// Keep status as Launching — the monitor will promote to Running
|
|
618
|
+
// once the pod actually reports running status
|
|
601
619
|
coreDispatch(core$1.setJEGActiveWorkspaceId({
|
|
602
620
|
id: containerHash ?? 'default'
|
|
603
621
|
}));
|
|
@@ -616,18 +634,11 @@ const { useDoesHatcheryOptionExistsQuery, useHatcheryOptionsQuery, useLazyHatche
|
|
|
616
634
|
]);
|
|
617
635
|
const terminate = React.useCallback(async ()=>{
|
|
618
636
|
if (!enabled || workspaceContainerStatus === core$1.WorkspaceStatus.Terminating) return; // skip if already terminating
|
|
619
|
-
// coreDispatch(setJEGActiveWorkspaceStatus(WorkspaceStatus.Running));
|
|
620
637
|
const containerId = containerHash ? encodeURIComponent(containerHash) : '';
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
coreDispatch(core$1.setJEGRequestedWorkspaceStatus(core$1.RequestedWorkspaceStatus.Terminate));
|
|
626
|
-
coreDispatch(core$1.setJEGActiveWorkspaceStatus(core$1.WorkspaceStatus.Terminating));
|
|
627
|
-
} catch (_error) {
|
|
628
|
-
coreDispatch(core$1.setJEGRequestedWorkspaceStatus(core$1.RequestedWorkspaceStatus.Terminate));
|
|
629
|
-
coreDispatch(core$1.setJEGActiveWorkspaceStatus(core$1.WorkspaceStatus.Terminating));
|
|
630
|
-
}
|
|
638
|
+
// Fire-and-forget: errors are handled by the useDeepCompareEffect watching isTerminateError
|
|
639
|
+
terminateWorkspace(containerId);
|
|
640
|
+
coreDispatch(core$1.setJEGRequestedWorkspaceStatus(core$1.RequestedWorkspaceStatus.Terminate));
|
|
641
|
+
coreDispatch(core$1.setJEGActiveWorkspaceStatus(core$1.WorkspaceStatus.Terminating));
|
|
631
642
|
}, [
|
|
632
643
|
enabled,
|
|
633
644
|
workspaceContainerStatus,
|
|
@@ -684,10 +695,10 @@ const notifyUser = (title, message, status = 0)=>{
|
|
|
684
695
|
// TODO: convert to seconds/minutes for readability
|
|
685
696
|
const WorkspacePollingInterval = {
|
|
686
697
|
[core$1.WorkspaceStatus.NotFound]: 0,
|
|
687
|
-
[core$1.WorkspaceStatus.Launching]: frontend.convertSecondsToMilliseconds(
|
|
688
|
-
[core$1.WorkspaceStatus.Terminating]: frontend.convertSecondsToMilliseconds(
|
|
689
|
-
[core$1.WorkspaceStatus.Running]: frontend.convertSecondsToMilliseconds(
|
|
690
|
-
[core$1.WorkspaceStatus.Stopped]: frontend.convertSecondsToMilliseconds(
|
|
698
|
+
[core$1.WorkspaceStatus.Launching]: frontend.convertSecondsToMilliseconds(5),
|
|
699
|
+
[core$1.WorkspaceStatus.Terminating]: frontend.convertSecondsToMilliseconds(5),
|
|
700
|
+
[core$1.WorkspaceStatus.Running]: frontend.convertSecondsToMilliseconds(60),
|
|
701
|
+
[core$1.WorkspaceStatus.Stopped]: frontend.convertSecondsToMilliseconds(60),
|
|
691
702
|
[core$1.WorkspaceStatus.Errored]: frontend.convertSecondsToMilliseconds(10),
|
|
692
703
|
[core$1.WorkspaceStatus.LaunchError]: frontend.convertSecondsToMilliseconds(10),
|
|
693
704
|
[core$1.WorkspaceStatus.TerminateError]: frontend.convertSecondsToMilliseconds(10),
|
|
@@ -698,7 +709,8 @@ const workspaceShutdownAlertLimit = 30000; // 5 minutes: 5 * 60 * 1000 TODO Figu
|
|
|
698
709
|
* Monitors resource usage.
|
|
699
710
|
* Handles state changes and polls for workspace status using the JEG APIs
|
|
700
711
|
*/ const useJEGWorkspaceResourceMonitor = (workspaceId = null, monitorWorkspace)=>{
|
|
701
|
-
|
|
712
|
+
// start with default polling interval of 1 second
|
|
713
|
+
const [pollingInterval, setPollingInterval] = React.useState(frontend.convertSecondsToMilliseconds(1));
|
|
702
714
|
const [error, setError] = React.useState(null);
|
|
703
715
|
const { data: workspaceStatusData, isError: isWorkspaceStatusError, error: workspaceStatusError } = useHatcheryStatusQuery(workspaceId, {
|
|
704
716
|
pollingInterval: pollingInterval,
|
|
@@ -744,17 +756,37 @@ const workspaceShutdownAlertLimit = 30000; // 5 minutes: 5 * 60 * 1000 TODO Figu
|
|
|
744
756
|
error
|
|
745
757
|
]);
|
|
746
758
|
useDeepCompare.useDeepCompareEffect(()=>{
|
|
759
|
+
// No status data means we are not polling
|
|
747
760
|
if (!workspaceStatusData) return;
|
|
748
|
-
// LaunchError is set client-side by the launch() call and cleared by the
|
|
761
|
+
// LaunchError is set client-side by the launch() call from useMicroContainerRedux and cleared by the
|
|
749
762
|
// auto-reset timer in the panel. Polling data must not override it or the
|
|
750
|
-
// timer will be
|
|
763
|
+
// timer will be canceled before it fires.
|
|
751
764
|
if (activeStatus === core$1.WorkspaceStatus.LaunchError) return;
|
|
752
765
|
const workspaceQueryStatus = hatcheryStateToWorkspaceStatus(workspaceStatusData?.status);
|
|
766
|
+
// handle cases of unknown, running, terminating, or launching
|
|
767
|
+
if (workspaceStatusData.status === HatcheryServiceState.unknown) {
|
|
768
|
+
// check for unknown state
|
|
769
|
+
// NotFound means pod is not running
|
|
770
|
+
// either starting up
|
|
771
|
+
// or finally terminated.
|
|
772
|
+
if (requestedStatus === core$1.RequestedWorkspaceStatus.Launch) {
|
|
773
|
+
// if the workspace becomes idle too long after a Launch request, switch to
|
|
774
|
+
// Unset and NotFound.
|
|
775
|
+
console.warn("requested status is Launch, but workspace pod isn't running yet.");
|
|
776
|
+
return;
|
|
777
|
+
}
|
|
778
|
+
// both requested status and workspace pod status are the same, so stop all polling
|
|
779
|
+
setPollingInterval(WorkspacePollingInterval[core$1.WorkspaceStatus.NotFound]);
|
|
780
|
+
dispatch(core$1.setJEGActiveWorkspaceStatus(core$1.WorkspaceStatus.NotFound));
|
|
781
|
+
if (requestedStatus === core$1.RequestedWorkspaceStatus.Terminate) {
|
|
782
|
+
// Cleanup termination after terminated
|
|
783
|
+
dispatch(core$1.setJEGRequestedWorkspaceStatus(core$1.RequestedWorkspaceStatus.Unset));
|
|
784
|
+
}
|
|
785
|
+
return;
|
|
786
|
+
}
|
|
753
787
|
// Check if the workspace is running.
|
|
754
788
|
// If so: need to check workspace idle if set
|
|
755
|
-
// and ensure the pay model is queried
|
|
756
789
|
if (workspaceStatusData.status === HatcheryServiceState.running) {
|
|
757
|
-
// const { idleTimeLimit, lastActivityTime } = workspaceStatusData;
|
|
758
790
|
// in some state other than idle
|
|
759
791
|
if (!idleTimeLimit || idleTimeLimit <= 0) {
|
|
760
792
|
// Workspace is running, but no idle limit set.
|
|
@@ -764,6 +796,7 @@ const workspaceShutdownAlertLimit = 30000; // 5 minutes: 5 * 60 * 1000 TODO Figu
|
|
|
764
796
|
setPollingInterval(WorkspacePollingInterval[core$1.WorkspaceStatus.Running]);
|
|
765
797
|
return;
|
|
766
798
|
}
|
|
799
|
+
// handle if idle time is defined
|
|
767
800
|
if (idleTimeLimit && idleTimeLimit > 0 && lastActivityTime && lastActivityTime > 0) {
|
|
768
801
|
const remainingWorkspaceKernelLife = idleTimeLimit - (Date.now() - lastActivityTime);
|
|
769
802
|
if (remainingWorkspaceKernelLife <= 0) {
|
|
@@ -771,7 +804,7 @@ const workspaceShutdownAlertLimit = 30000; // 5 minutes: 5 * 60 * 1000 TODO Figu
|
|
|
771
804
|
// so terminate
|
|
772
805
|
(async ()=>{
|
|
773
806
|
try {
|
|
774
|
-
if (workspaceId) await terminateWorkspace(workspaceId).unwrap();
|
|
807
|
+
if (workspaceId) await terminateWorkspace(encodeURIComponent(workspaceId)).unwrap();
|
|
775
808
|
} catch (error) {
|
|
776
809
|
const errorMessage = error.message || 'Unknown error occurred';
|
|
777
810
|
console.error('Workspace termination failed: ', errorMessage);
|
|
@@ -788,44 +821,48 @@ const workspaceShutdownAlertLimit = 30000; // 5 minutes: 5 * 60 * 1000 TODO Figu
|
|
|
788
821
|
setError('Workspace has been idle for too long. Will shutdown soon');
|
|
789
822
|
}
|
|
790
823
|
}
|
|
791
|
-
|
|
792
|
-
|
|
793
|
-
|
|
794
|
-
|
|
795
|
-
|
|
796
|
-
|
|
824
|
+
}
|
|
825
|
+
// Stopped means the pod is in a failed state — auto-terminate it
|
|
826
|
+
if (workspaceStatusData.status === HatcheryServiceState.stopped) {
|
|
827
|
+
(async ()=>{
|
|
828
|
+
try {
|
|
829
|
+
if (workspaceId) await terminateWorkspace(encodeURIComponent(workspaceId)).unwrap();
|
|
830
|
+
} catch (error) {
|
|
831
|
+
const errorMessage = error.message || 'Unknown error occurred';
|
|
832
|
+
console.error('Workspace termination of stopped pod failed: ', errorMessage);
|
|
833
|
+
notifyUser('Workspace Error', `Failed to terminate stopped workspace: ${errorMessage}`, 2);
|
|
797
834
|
}
|
|
798
|
-
|
|
835
|
+
})();
|
|
836
|
+
dispatch(core$1.setJEGRequestedWorkspaceStatus(core$1.RequestedWorkspaceStatus.Terminate));
|
|
837
|
+
dispatch(core$1.setJEGActiveWorkspaceStatus(core$1.WorkspaceStatus.Terminating));
|
|
838
|
+
setPollingInterval(WorkspacePollingInterval[core$1.WorkspaceStatus.Terminating]);
|
|
839
|
+
notifyUser('Workspace Stopped', 'Workspace entered a failed state and is being terminated', 2);
|
|
840
|
+
return;
|
|
841
|
+
}
|
|
842
|
+
if (requestedStatus === core$1.RequestedWorkspaceStatus.Launch) {
|
|
843
|
+
// if we have a launch error then requested status has not been met
|
|
844
|
+
if (workspaceQueryStatus === core$1.WorkspaceStatus.LaunchError) {
|
|
799
845
|
dispatch(core$1.setJEGRequestedWorkspaceStatus(core$1.RequestedWorkspaceStatus.Unset));
|
|
846
|
+
dispatch(core$1.setJEGActiveWorkspaceStatus(core$1.WorkspaceStatus.LaunchError));
|
|
847
|
+
return;
|
|
800
848
|
}
|
|
801
|
-
if (
|
|
849
|
+
if (workspaceQueryStatus === core$1.WorkspaceStatus.NotFound) {
|
|
850
|
+
return; // pod not yet created, keep waiting
|
|
851
|
+
}
|
|
852
|
+
if (workspaceQueryStatus === core$1.WorkspaceStatus.Running) {
|
|
853
|
+
// workspace is running — requested status has been met
|
|
854
|
+
dispatch(core$1.setJEGRequestedWorkspaceStatus(core$1.RequestedWorkspaceStatus.Unset));
|
|
855
|
+
dispatch(core$1.setJEGActiveWorkspaceStatus(core$1.WorkspaceStatus.Running));
|
|
802
856
|
return;
|
|
803
857
|
}
|
|
858
|
+
// still launching — update active status but keep requestedStatus as Launch
|
|
804
859
|
dispatch(core$1.setJEGActiveWorkspaceStatus(workspaceQueryStatus));
|
|
805
|
-
setPollingInterval(WorkspacePollingInterval[workspaceQueryStatus]);
|
|
806
860
|
return;
|
|
807
861
|
}
|
|
808
|
-
if (
|
|
809
|
-
// NotFound means pod is not running
|
|
810
|
-
// either starting up
|
|
811
|
-
// or finally terminated.
|
|
812
|
-
if (requestedStatus === core$1.RequestedWorkspaceStatus.Launch) {
|
|
813
|
-
// if the workspace becomes idle too long after a Launch request, switch to
|
|
814
|
-
// Unset and NotFound.
|
|
815
|
-
console.warn("requested status is Launch, but workspace pod isn't running yet.");
|
|
816
|
-
return;
|
|
817
|
-
} else {
|
|
818
|
-
// both requested status and workspace pod status are the same, so stop all polling
|
|
819
|
-
setPollingInterval(WorkspacePollingInterval[core$1.WorkspaceStatus.NotFound]);
|
|
820
|
-
dispatch(core$1.setJEGActiveWorkspaceStatus(core$1.WorkspaceStatus.NotFound));
|
|
821
|
-
if (requestedStatus === core$1.RequestedWorkspaceStatus.Terminate) {
|
|
822
|
-
// Cleanup termination after terminated
|
|
823
|
-
dispatch(core$1.setJEGRequestedWorkspaceStatus(core$1.RequestedWorkspaceStatus.Unset));
|
|
824
|
-
}
|
|
825
|
-
}
|
|
862
|
+
if (requestedStatus === core$1.RequestedWorkspaceStatus.Terminate) {
|
|
826
863
|
return;
|
|
827
864
|
}
|
|
828
|
-
// if here, update active workspace status and polling
|
|
865
|
+
// if here, update active workspace status and polling for other states
|
|
829
866
|
dispatch(core$1.setJEGActiveWorkspaceStatus(workspaceQueryStatus));
|
|
830
867
|
setPollingInterval(WorkspacePollingInterval[workspaceQueryStatus]);
|
|
831
868
|
}, [
|
|
@@ -835,8 +872,9 @@ const workspaceShutdownAlertLimit = 30000; // 5 minutes: 5 * 60 * 1000 TODO Figu
|
|
|
835
872
|
activeStatus
|
|
836
873
|
]);
|
|
837
874
|
React.useEffect(()=>{
|
|
875
|
+
// time out if exceeding maximum start timee
|
|
838
876
|
if (requestedStatus === core$1.RequestedWorkspaceStatus.Launch && core$1.isTimeGreaterThan(requestedStatusTimestamp, MAXIMUM_START_TIME_IN_MINUTES)) {
|
|
839
|
-
if (workspaceId) terminateWorkspace(workspaceId);
|
|
877
|
+
if (workspaceId) terminateWorkspace(encodeURIComponent(workspaceId));
|
|
840
878
|
dispatch(core$1.setJEGRequestedWorkspaceStatus(core$1.RequestedWorkspaceStatus.Terminate));
|
|
841
879
|
setError('Workspace failed to start. Shutting down');
|
|
842
880
|
}
|
|
@@ -914,7 +952,6 @@ const MicroContainerReduxPanel = ({ compact = false })=>{
|
|
|
914
952
|
requestedStatusTimestamp,
|
|
915
953
|
status
|
|
916
954
|
]);
|
|
917
|
-
console.log('MicroContainerReduxPanel: status', status);
|
|
918
955
|
/* ── Auto-reset after 15 s in launch-error state ── */ React.useEffect(()=>{
|
|
919
956
|
if (status !== core$1.WorkspaceStatus.LaunchError) return;
|
|
920
957
|
const t = setTimeout(()=>resetStatus(), 6_000);
|
|
@@ -1509,6 +1546,8 @@ const jegGatewayApi = GatewayWithTags.injectEndpoints({
|
|
|
1509
1546
|
overrideExisting: true
|
|
1510
1547
|
});
|
|
1511
1548
|
const { useActiveKernelsQuery, useLaunchKernelMutation, useTerminateKernelMutation, useJegGatewayStatusQuery, useReapKernelsMutation } = jegGatewayApi;
|
|
1549
|
+
// select active kernels
|
|
1550
|
+
jegGatewayApi.endpoints.activeKernels.select();
|
|
1512
1551
|
|
|
1513
1552
|
const ActiveKernelInfoPanel = ({ kernelId, kernelName, executionState, uptimeMinutes, onOpenNotebook, forceTerminate = false, rowSpec, connections = 0 })=>{
|
|
1514
1553
|
const [terminateKernel, { isLoading: isTerminatingLoading, isError: isTerminatingError, error: terminatingError }] = useTerminateKernelMutation();
|
|
@@ -1653,6 +1692,8 @@ const PanelStyle$1 = 'min-w-0 rounded-sm border-2 border-base-lighter bg-base-ma
|
|
|
1653
1692
|
const ActiveKernelsPanel = ()=>{
|
|
1654
1693
|
const { data: kernels, isLoading, isError, error } = useActiveKernelsQuery(undefined, {
|
|
1655
1694
|
pollingInterval: 10000,
|
|
1695
|
+
refetchOnMountOrArgChange: 1800,
|
|
1696
|
+
refetchOnFocus: true,
|
|
1656
1697
|
selectFromResult: ({ data, isLoading, isError, error })=>({
|
|
1657
1698
|
data,
|
|
1658
1699
|
isLoading,
|
|
@@ -1951,7 +1992,11 @@ function useGatewayConnectionStatus() {
|
|
|
1951
1992
|
setGatewayMessage(message ?? null);
|
|
1952
1993
|
}, []);
|
|
1953
1994
|
// get the status of the gateway
|
|
1954
|
-
const { data: gatewayStatusData, isFetching: isGatewayFetching, isError } = useJegGatewayStatusQuery(
|
|
1995
|
+
const { data: gatewayStatusData, isFetching: isGatewayFetching, isError } = useJegGatewayStatusQuery(undefined, {
|
|
1996
|
+
pollingInterval: 10000,
|
|
1997
|
+
refetchOnMountOrArgChange: 1800,
|
|
1998
|
+
refetchOnFocus: true
|
|
1999
|
+
});
|
|
1955
2000
|
const gatewayServiceStatus = React.useMemo(()=>{
|
|
1956
2001
|
if (isGatewayFetching) return 'fetching';
|
|
1957
2002
|
if (!isError) return 'service_unavailable';
|