@axium/storage 0.16.2 → 0.16.4

package/dist/client/api.js

@@ -43,6 +43,7 @@ export async function uploadItem(file, opt = {}) {
     if (!opt.name)
         throw 'item name is required';
     const content = await file.bytes();
+    opt.onProgress?.(0, content.length);
     /** For big files, it takes a *really* long time to compute the hash, so we just don't do it ahead of time and leave it up to the server. */
     const hash = content.length < uploadConfig.hashThreshold * 1_000_000 ? blake2b(content).toHex() : null;
     const upload = await fetchAPI('PUT', 'storage', {

package/dist/server/item.js

@@ -101,7 +101,11 @@ export function startUpload(init, session) {
     mkdirSync(temp_dir, { recursive: true });
     const file = join(temp_dir, token.toHex());
     const fd = openSync(file, 'a');
+    let removed = false;
     function remove() {
+        if (removed)
+            return;
+        removed = true;
         inProgress.delete(token.toBase64());
         closeSync(fd);
     }

package/dist/server/raw.js

@@ -115,7 +115,7 @@ addRoute({
         if (hash.toHex() != upload.init.hash)
             error(409, 'Hash mismatch');
         upload.remove();
-        return await createNewItem(upload.init, upload.userId, path => {
+        const item = await createNewItem(upload.init, upload.userId, path => {
             try {
                 renameSync(upload.file, path);
             }
@@ -123,9 +123,15 @@ addRoute({
                 if (e.code != 'EXDEV')
                     throw e;
                 writeFileSync(path, readFileSync(upload.file));
-                unlinkSync(upload.file);
             }
         });
+        try {
+            unlinkSync(upload.file);
+        }
+        catch {
+            // probably renamed
+        }
+        return item;
     },
 });
 addRoute({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/storage",
-	"version": "0.16.2",
+	"version": "0.16.4",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "User file storage for Axium",
 	"funding": {