@axium/storage 0.16.1 → 0.16.3

package/dist/client/api.js

@@ -3,6 +3,20 @@ import { blake2b } from 'blakejs';
 import { prettifyError } from 'zod';
 import { StorageItemMetadata } from '../common.js';
 import '../polyfills.js';
+const uploadConfig = {
+    /**
+     * Requests below this amount in MB will be hashed client-side to avoid bandwidth usage.
+     * This is most useful when the client has plenty of compute but a poor network connection.
+     * For good connections, this isn't really useful since it takes longer than just uploading.
+     * Note that hashing takes a really long time client-side though.
+     */
+    hashThreshold: 10,
+    /**
+     * Set an upper limit for chunk size in MB, independent of `max_transfer_size`.
+     * Smaller chunks means better UX but more latency from RTT and more requests.
+     */
+    uxChunkSize: 10,
+};
 function rawStorage(suffix) {
     const raw = '/raw/storage' + (suffix ? '/' + suffix : '');
     if (prefix[0] == '/')
@@ -29,10 +43,9 @@ export async function uploadItem(file, opt = {}) {
     if (!opt.name)
         throw 'item name is required';
     const content = await file.bytes();
-    /**
-     * 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 < 10_000_000 ? blake2b(content).toHex() : null;
+    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', {
         parentId: opt.parentId,
         name: opt.name,
@@ -42,10 +55,12 @@ export async function uploadItem(file, opt = {}) {
     });
     if (upload.status == 'created')
         return upload.item;
-    let chunkSize = upload.max_transfer_size * 1_000_000;
+    let chunkSize = Math.min(upload.max_transfer_size, uploadConfig.uxChunkSize);
     if (globalThis.navigator?.connection) {
-        chunkSize = Math.min(upload.max_transfer_size, conTypeToSpeed[globalThis.navigator.connection.effectiveType]) * 1_000_000;
+        chunkSize = Math.min(chunkSize, conTypeToSpeed[globalThis.navigator.connection.effectiveType]);
     }
+    // MB -> bytes
+    chunkSize *= 1_000_000;
     let response;
     for (let offset = 0; offset < content.length; offset += chunkSize) {
         const size = Math.min(chunkSize, content.length - offset);

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.1",
+	"version": "0.16.3",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "User file storage for Axium",
 	"funding": {