Remove temporary files after direct download abort (merge commit)

Merge branch 'feature/remove-temp-files' into 'main'
* Fix removal of temp files for multiple concurrent downloads

* Remove temporary files after direct download abort

Closes #1230
See merge request https://gitlab.ci.csc.fi/sds-dev/sd-connect/swift-browser-ui/-/merge_requests/308

Approved-by: Hang Le <[email protected]>
Approved-by: Joonatan Mäkinen <[email protected]>
Co-authored-by: Monika Radaviciute <[email protected]>
Merged by Joonatan Mäkinen <[email protected]>

Author: Joonatan Mäkinen

swift_browser_ui_frontend/wasm/js/crypt-post-downworker.js

@@ -25,6 +25,7 @@ let downProgressInterval = undefined;
 let totalDone = 0;
 let totalToDo = 0;
 let aborted = false;
+let cancelled = false;
 
 // Use a 50 MiB segment when downloading
 const DOWNLOAD_SEGMENT_SIZE = 1024 * 1024 * 50;
@@ -66,6 +67,7 @@ if (inServiceWorker) {
 // Create a download session
 function createDownloadSession(container, handle, archive) {
   aborted = false; //reset
+  cancelled = false;
 
   let keypairPtr = Module.ccall(
     "create_keypair",
@@ -292,6 +294,7 @@ class FileSlicer {
     await this.getStart();
 
     while (!this.done) {
+      if (cancelled) return;
       if (this.output instanceof WritableStream) {
         await this.output.write(this.chunk);
       } else {
@@ -321,6 +324,7 @@ class FileSlicer {
 
     // Slice the file and write decrypted content to output
     while (!this.done) {
+      if (cancelled) return;
       await this.getSlice();
 
       if (this.output instanceof WritableStream) {
@@ -361,6 +365,13 @@ class FileSlicer {
     );
     return true;
   }
+
+  async abortStream() {
+    if (this.output instanceof WritableStream) {
+      //stop writing to stream
+      await this.output.abort();
+    }
+  }
 }
 
 function clear() {
@@ -372,7 +383,8 @@ function clear() {
   totalToDo = 0;
 }
 
-function abortDownloads(direct, abortReason) {
+async function abortDownloads(direct, abortReason) {
+  aborted = true;
   const msg = {
     eventType: "abort",
     reason: abortReason,
@@ -386,7 +398,7 @@ function abortDownloads(direct, abortReason) {
     });
   }
   clear();
-  aborted = true;
+
   for (let container in downloads) {
     finishDownloadSession(container);
   }
@@ -511,10 +523,18 @@ async function beginDownloadInSession(
       res = await slicer.sliceFile().catch(() => {
         return false;
       });
-      if (!res) {
-        if (!aborted) abortDownloads(!inServiceWorker, "error");
-        return;
+    }
+    if (!res) {
+      await slicer.abortStream().then(async() => {
+        //remove temporary files
+        if (downloads[container].direct) {
+          await downloads[container].handle.remove();
+        }
+      });
+      if (!aborted) {
+        await abortDownloads(!inServiceWorker, cancelled ? "cancel" : "error");
       }
+      return;
     }
   }
 
@@ -711,7 +731,7 @@ self.addEventListener("message", async (e) => {
       clear();
       break;
     case "cancel":
-      abortDownloads(!inServiceWorker, "cancel");
+      cancelled = true;
       break;
   }
 });