@nxtedition/lib 19.0.29 → 19.0.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.0.29",
+  "version": "19.0.30",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/s3.js

@@ -127,10 +127,6 @@ export async function upload(
     throw new Error(`Invalid ContentLength: ${ContentLength}`)
   }
 
-  const dir = await fs.promises.mkdtemp(path.join(tmpdir, 's3-upload-'))
-  outerSignal?.throwIfAborted()
-
-  await fs.promises.stat(dir)
   outerSignal?.throwIfAborted()
 
   const queue = new PQueue({ concurrency: queueSize })
@@ -142,7 +138,11 @@ export async function upload(
   outerSignal?.addEventListener('abort', abort)
 
   let uploadId
+  let uploadDir
   try {
+    uploadDir = await fs.promises.mkdtemp(path.join(tmpdir, 's3-upload-'))
+    signal.throwIfAborted()
+
     const multipartUploadOutput = await s3.send(
       new AWS.CreateMultipartUploadCommand({
         Bucket,
@@ -155,14 +155,14 @@ export async function upload(
     const uploader = {
       size: 0,
       hasher: crypto.createHash('md5'),
-      part: new PartUploader(dir, 1, signal),
+      part: new PartUploader(uploadDir, 1, signal),
       number: 1,
     }
 
     const maybeFlush = (minSize) => {
       if (uploader.part.size && (minSize == null || uploader.part.size >= minSize)) {
         const part = uploader.part
-        uploader.part = new PartUploader(dir, ++uploader.number, signal)
+        uploader.part = new PartUploader(uploadDir, ++uploader.number, signal)
 
         const promise = queue.add(() => part.end(s3, { Bucket, Key, UploadId: uploadId }))
         promises.push(promise)
@@ -253,6 +253,8 @@ export async function upload(
     throw err
   } finally {
     outerSignal?.removeEventListener('abort', abort)
-    await fs.promises.rmdir(dir, { recursive: true })
+    if (uploadDir) {
+      await fs.promises.rmdir(uploadDir, { recursive: true })
+    }
   }
 }