Improve download file error handling

akash-network · Oct 19, 2023 · f01618b · f01618b
1 parent 974d757
commit f01618b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/deploy-web/src/components/deploymentDetail/ShellDownloadModal.tsx b/deploy-web/src/components/deploymentDetail/ShellDownloadModal.tsx
@@ -68,8 +68,9 @@ export const ShellDownloadModal = ({ selectedLease, onCloseClick, selectedServic
     <Dialog open={true} maxWidth="xs" fullWidth onClose={onCloseClick}>
       <DialogTitle className={classes.dialogTitle}>Download file</DialogTitle>
       <DialogContent>
-        <Alert severity="info" className={classes.alert}>
-          <Typography variant="caption">Enter the path of a file on the server to be downloaded to your computer. Example: ~/app/logs.txt</Typography>
+        <Typography variant="caption">Enter the path of a file on the server to be downloaded to your computer. Example: /app/logs.txt</Typography>
+        <Alert severity="warning" className={classes.alert}>
+          <Typography variant="caption">This is an experimental feature and may not work reliably.</Typography>
         </Alert>
 
         <form onSubmit={handleSubmit(onSubmit)} ref={formRef}>

diff --git a/deploy-web/src/context/BackgroundTaskProvider/BackgroundTaskProvider.tsx b/deploy-web/src/context/BackgroundTaskProvider/BackgroundTaskProvider.tsx
@@ -158,24 +158,29 @@ export const BackgroundTaskProvider = ({ children }) => {
     let fileContent: Buffer | null = null;
 
     ws.onmessage = event => {
-      let jsonData, exitCode, errorMessage;
+      let exitCode, errorMessage;
       try {
         const message = JSON.parse(event.data).message;
 
         const bufferData = Buffer.from(message.data.slice(1));
         const stringData = bufferData.toString("utf-8").replace(/^\n|\n$/g, "");
 
-        jsonData = JSON.parse(stringData);
-        exitCode = jsonData["exit_code"];
-        errorMessage = jsonData["message"];
+        try {
+          const jsonData = JSON.parse(stringData);
+          exitCode = jsonData["exit_code"];
+          errorMessage = jsonData["message"];
+        } catch (err) {}
 
         if (exitCode !== undefined) {
           if (errorMessage) {
             console.error(`An error has occured: ${errorMessage}`);
+          } else if (fileContent === null) {
+            console.log("File content null");
+          } else {
+            console.log("Download done: " + fileContent.length);
+            isFinished = true;
           }
-          console.log("Download done: " + fileContent.length);
 
-          isFinished = true;
           ws.close();
         } else {
           if (!fileContent) {
@@ -188,6 +193,7 @@ export const BackgroundTaskProvider = ({ children }) => {
         }
       } catch (error) {
         console.log(error);
+        ws.close();
       }
     };
 
@@ -202,7 +208,7 @@ export const BackgroundTaskProvider = ({ children }) => {
       } else {
         console.log("No file / Failed");
         closeSnackbar(snackbarKey);
-        enqueueSnackbar("Failed to download logs", { variant: "error" });
+        enqueueSnackbar("Failed to download file", { variant: "error" });
       }
     };
     ws.onopen = () => {