fix(striker-ui): correct server screenshot loading, stale, display

striker-ui/components/Display/Preview.tsx

@@ -1,6 +1,6 @@
 import {
   DesktopWindows as DesktopWindowsIcon,
-  PowerOffOutlined as PowerOffOutlinedIcon,
+  PowerSettingsNewOutlined as PowerSettingsNewOutlinedIcon,
 } from '@mui/icons-material';
 import {
   Box,
@@ -9,18 +9,24 @@ import {
 } from '@mui/material';
 import { FC, ReactNode, useEffect, useMemo, useState } from 'react';
 
-import API_BASE_URL from '../../lib/consts/API_BASE_URL';
+import {
-import { BORDER_RADIUS, GREY } from '../../lib/consts/DEFAULT_THEME';
+  BORDER_RADIUS,
+  GREY,
+  UNSELECTED,
+} from '../../lib/consts/DEFAULT_THEME';
 
+import api from '../../lib/api';
 import FlexBox from '../FlexBox';
 import IconButton, { IconButtonProps } from '../IconButton';
 import { InnerPanel, InnerPanelHeader, Panel, PanelHeader } from '../Panels';
 import Spinner from '../Spinner';
 import { BodyText, HeaderText } from '../Text';
+import { last } from '../../lib/time';
 
 type PreviewOptionalProps = {
   externalPreview?: string;
   headerEndAdornment?: ReactNode;
+  isExternalLoading?: boolean;
   isExternalPreviewStale?: boolean;
   isFetchPreview?: boolean;
   isShowControls?: boolean;
@@ -28,6 +34,7 @@ type PreviewOptionalProps = {
   onClickConnectButton?: IconButtonProps['onClick'];
   onClickPreview?: MUIIconButtonProps['onClick'];
   serverName?: string;
+  serverState?: string;
 };
 
 type PreviewProps = PreviewOptionalProps & {
@@ -40,6 +47,7 @@ const PREVIEW_DEFAULT_PROPS: Required<
   Pick<PreviewOptionalProps, 'onClickConnectButton' | 'onClickPreview'> = {
   externalPreview: '',
   headerEndAdornment: null,
+  isExternalLoading: false,
   isExternalPreviewStale: false,
   isFetchPreview: true,
   isShowControls: true,
@@ -47,6 +55,7 @@ const PREVIEW_DEFAULT_PROPS: Required<
   onClickConnectButton: undefined,
   onClickPreview: undefined,
   serverName: '',
+  serverState: '',
 };
 
 const PreviewPanel: FC<{ isUseInnerPanel: boolean }> = ({
@@ -78,12 +87,14 @@ const PreviewPanelHeader: FC<{
 const Preview: FC<PreviewProps> = ({
   externalPreview = PREVIEW_DEFAULT_PROPS.externalPreview,
   headerEndAdornment,
+  isExternalLoading = PREVIEW_DEFAULT_PROPS.isExternalLoading,
   isExternalPreviewStale = PREVIEW_DEFAULT_PROPS.isExternalPreviewStale,
   isFetchPreview = PREVIEW_DEFAULT_PROPS.isFetchPreview,
   isShowControls = PREVIEW_DEFAULT_PROPS.isShowControls,
   isUseInnerPanel = PREVIEW_DEFAULT_PROPS.isUseInnerPanel,
   onClickPreview: previewClickHandler,
   serverName,
+  serverState = PREVIEW_DEFAULT_PROPS.serverState,
   serverUUID,
   onClickConnectButton: connectButtonClickHandle = previewClickHandler,
 }) => {
@@ -93,11 +104,12 @@ const Preview: FC<PreviewProps> = ({
 
   const previewButtonContent = useMemo(
     () =>
-      preview ? (
+      serverState === 'running' ? (
+        <>
           <Box
             alt=""
             component="img"
-          src={`data:image/png;base64,${preview}`}
+            src={`data:image;base64,${preview}`}
             sx={{
               height: '100%',
               opacity: isPreviewStale ? '0.4' : '1',
@@ -105,46 +117,53 @@ const Preview: FC<PreviewProps> = ({
               width: '100%',
             }}
           />
+          {isPreviewStale && (
+            <BodyText sx={{ position: 'absolute' }}>Outdated</BodyText>
+          )}
+        </>
       ) : (
-        <PowerOffOutlinedIcon
+        <PowerSettingsNewOutlinedIcon
           sx={{
-            height: '100%',
+            color: UNSELECTED,
-            width: '100%',
+            height: '80%',
+            width: '80%',
           }}
         />
       ),
-    [isPreviewStale, isUseInnerPanel, preview],
+    [isPreviewStale, isUseInnerPanel, preview, serverState],
   );
 
   useEffect(() => {
     if (isFetchPreview) {
       (async () => {
         try {
-          const response = await fetch(
+          const { data } = await api.get<{
-            `${API_BASE_URL}/server/${serverUUID}?ss=1`,
+            screenshot: string;
-            {
+            timestamp: number;
-              method: 'GET',
+          }>(`/server/${serverUUID}?ss=1`);
-              headers: {
+
-                'Content-Type': 'application/json',
+          const { screenshot, timestamp } = data;
-              },
-            },
-          );
-          const { screenshot: fetchedScreenshot } = await response.json();
 
-          setPreview(fetchedScreenshot);
+          setPreview(screenshot);
-          setIsPreviewStale(false);
+          setIsPreviewStale(!last(timestamp, 300));
         } catch {
           setIsPreviewStale(true);
         } finally {
           setIsPreviewLoading(false);
         }
       })();
-    } else if (externalPreview) {
+    } else if (!isExternalLoading) {
       setPreview(externalPreview);
       setIsPreviewStale(isExternalPreviewStale);
       setIsPreviewLoading(false);
     }
-  }, [externalPreview, isExternalPreviewStale, isFetchPreview, serverUUID]);
+  }, [
+    externalPreview,
+    isExternalLoading,
+    isExternalPreviewStale,
+    isFetchPreview,
+    serverUUID,
+  ]);
 
   return (
     <PreviewPanel isUseInnerPanel={isUseInnerPanel}>
@@ -153,12 +172,13 @@ const Preview: FC<PreviewProps> = ({
       </PreviewPanelHeader>
       <FlexBox row sx={{ '& > :first-child': { flexGrow: 1 } }}>
         {/* Box wrapper below is required to keep external preview size sane. */}
-        <Box>
+        <Box textAlign="center">
           {isPreviewLoading ? (
             <Spinner mt="1em" mb="1em" />
           ) : (
             <MUIIconButton
               component="span"
+              disabled={!preview}
               onClick={previewClickHandler}
               sx={{
                 borderRadius: BORDER_RADIUS,
@@ -170,7 +190,7 @@ const Preview: FC<PreviewProps> = ({
             </MUIIconButton>
           )}
         </Box>
-        {isShowControls && (
+        {isShowControls && preview && (
           <FlexBox>
             <IconButton onClick={connectButtonClickHandle}>
               <DesktopWindowsIcon />

striker-ui/components/Servers.tsx

@@ -335,7 +335,7 @@ const Servers = ({ anvil }: { anvil: AnvilListItem[] }): JSX.Element => {
                       className={classes.button}
                       key={server.serverUUID}
                       component={showCheckbox ? 'div' : 'a'}
-                      href={`/server?uuid=${server.serverUUID}&server_name=${server.serverName}`}
+                      href={`/server?uuid=${server.serverUUID}&server_name=${server.serverName}&server_state=${server.serverState}`}
                       onClick={() => handleChange(server.serverUUID)}
                     >
                       <Box display="flex" flexDirection="row" width="100%">

striker-ui/pages/index.tsx

@@ -17,9 +17,11 @@ import { Panel, PanelHeader } from '../components/Panels';
 import periodicFetch from '../lib/fetchers/periodicFetch';
 import ProvisionServerDialog from '../components/ProvisionServerDialog';
 import Spinner from '../components/Spinner';
+import { last } from '../lib/time';
 
 type ServerListItem = ServerOverviewMetadata & {
   isScreenshotStale?: boolean;
+  loading?: boolean;
   screenshot: string;
 };
 
@@ -47,15 +49,17 @@ const createServerPreviewContainer = (
         anvilName,
         anvilUUID,
         isScreenshotStale,
+        loading,
         screenshot,
         serverName,
+        serverState,
         serverUUID,
       }) => (
         <Preview
           externalPreview={screenshot}
           headerEndAdornment={[
             <Link
-              href={`/server?uuid=${serverUUID}&server_name=${serverName}`}
+              href={`/server?uuid=${serverUUID}&server_name=${serverName}&server_state=${serverState}`}
               key={`server_list_to_server_${serverUUID}`}
             >
               {serverName}
@@ -70,6 +74,7 @@ const createServerPreviewContainer = (
               {anvilName}
             </Link>,
           ]}
+          isExternalLoading={loading}
           isExternalPreviewStale={isScreenshotStale}
           isFetchPreview={false}
           isShowControls={false}
@@ -77,9 +82,10 @@ const createServerPreviewContainer = (
           key={`server-preview-${serverUUID}`}
           onClickPreview={() => {
             router.push(
-              `/server?uuid=${serverUUID}&server_name=${serverName}&vnc=1`,
+              `/server?uuid=${serverUUID}&server_name=${serverName}&server_state=${serverState}&vnc=1`,
             );
           }}
+          serverState={serverState}
           serverUUID={serverUUID}
         />
       ),
@@ -150,15 +156,19 @@ const Dashboard: FC = () => {
               ?.screenshot || '';
           const item: ServerListItem = {
             ...serverOverview,
+            loading: true,
             screenshot: previousScreenshot,
           };
 
-          fetchJSON<{ screenshot: string }>(
+          fetchJSON<{ screenshot: string; timestamp: number }>(
             `${API_BASE_URL}/server/${serverUUID}?ss=1`,
           )
-            .then(({ screenshot }) => {
+            .then(({ screenshot, timestamp }) => {
+              if (screenshot.length === 0) return;
+
+              item.isScreenshotStale = !last(timestamp, 300);
+              item.loading = false;
               item.screenshot = screenshot;
-              item.isScreenshotStale = false;
 
               const allServersWithScreenshots = [...serverListItems];
 
@@ -174,6 +184,9 @@ const Dashboard: FC = () => {
             })
             .catch(() => {
               item.isScreenshotStale = true;
+            })
+            .finally(() => {
+              item.loading = false;
             });
 
           return item;

striker-ui/pages/server/index.tsx

@@ -34,10 +34,12 @@ const Server = (): JSX.Element => {
   const [previewMode, setPreviewMode] = useState<boolean>(true);
 
   const router = useRouter();
-  const { server_name, uuid, vnc } = router.query;
+  const { server_name, server_state, uuid, vnc } = router.query;
+
   const isConnectVNC: boolean = (vnc?.toString() || '').length > 0;
-  const serverUUID: string = uuid?.toString() || '';
   const serverName: string = server_name?.toString() || '';
+  const serverState: string = server_state?.toString() || '';
+  const serverUUID: string = uuid?.toString() || '';
 
   useEffect(() => {
     if (isConnectVNC) {
@@ -58,6 +60,7 @@ const Server = (): JSX.Element => {
               setPreviewMode(false);
             }}
             serverName={serverName}
+            serverState={serverState}
             serverUUID={serverUUID}
           />
         </Box>