@axium/storage 0.19.1 → 0.20.0

package/db.json

@@ -79,6 +79,26 @@
 					}
 				}
 			}
+		},
+		{
+			"delta": true,
+			"alter_tables": {
+				"storage": {
+					"add_constraints": {
+						"unique_name_parentId": { "type": "unique", "on": ["name", "parentId"] }
+					}
+				}
+			}
+		},
+		{
+			"delta": true,
+			"alter_tables": {
+				"storage": {
+					"alter_columns": {
+						"size": { "type": "bigint" }
+					}
+				}
+			}
 		}
 	],
 	"wipe": ["storage", "acl.storage"],

package/dist/client/cli.js

@@ -26,7 +26,7 @@ cli.command('usage')
     .action(async () => {
     const { limits, itemCount, usedBytes } = await api.getUserStats(session().userId);
     console.log(`Items: ${itemCount} ${limits.user_items ? ' / ' + limits.user_items : ''}`);
-    console.log(`Space: ${formatBytes(usedBytes)} ${limits.user_size ? ' / ' + formatBytes(limits.user_size * 1_000_000) : ''}`);
+    console.log(`Space: ${formatBytes(usedBytes)} ${limits.user_size ? ' / ' + formatBytes(limits.user_size * 1000000n) : ''}`);
 });
 cli.command('ls')
     .alias('list')

package/dist/client/local.d.ts

@@ -14,7 +14,7 @@ declare const StorageCache: z.ZodObject<{
         name: z.ZodString;
         userId: z.ZodUUID;
         parentId: z.ZodNullable<z.ZodUUID>;
-        size: z.ZodInt;
+        size: z.ZodCoercedBigInt<unknown>;
         trashedAt: z.ZodNullable<z.ZodCoercedDate<unknown>>;
         type: z.ZodString;
         metadata: z.ZodRecord<z.ZodString, z.ZodUnknown>;

package/dist/common.d.ts

@@ -23,7 +23,7 @@ export declare const StorageItemMetadata: z.ZodObject<{
     name: z.ZodString;
     userId: z.ZodUUID;
     parentId: z.ZodNullable<z.ZodUUID>;
-    size: z.ZodInt;
+    size: z.ZodCoercedBigInt<unknown>;
     trashedAt: z.ZodNullable<z.ZodCoercedDate<unknown>>;
     type: z.ZodString;
     metadata: z.ZodRecord<z.ZodString, z.ZodUnknown>;
@@ -61,16 +61,18 @@ export declare const StorageItemSorting: z.ZodObject<{
     descending: z.ZodOptional<z.ZodBoolean>;
     by: z.ZodLiteral<"name" | "createdAt" | "modifiedAt" | "size">;
 }, z.core.$strip>;
+export interface StorageItemSorting extends z.infer<typeof StorageItemSorting> {
+}
 export declare const syncProtocolVersion = 0;
 export declare const StorageLimits: z.ZodObject<{
     item_size: z.ZodInt;
     user_items: z.ZodInt;
-    user_size: z.ZodInt;
+    user_size: z.ZodCoercedBigInt<unknown>;
 }, z.core.$strip>;
 export interface StorageLimits extends z.infer<typeof StorageLimits> {
 }
 export declare const StorageStats: z.ZodObject<{
-    usedBytes: z.ZodInt;
+    usedBytes: z.ZodCoercedBigInt<unknown>;
     itemCount: z.ZodInt;
     lastModified: z.ZodCoercedDate<unknown>;
     lastTrashed: z.ZodNullable<z.ZodCoercedDate<unknown>>;
@@ -81,9 +83,9 @@ export declare const UserStorageInfo: z.ZodObject<{
     limits: z.ZodObject<{
         item_size: z.ZodInt;
         user_items: z.ZodInt;
-        user_size: z.ZodInt;
+        user_size: z.ZodCoercedBigInt<unknown>;
     }, z.core.$strip>;
-    usedBytes: z.ZodInt;
+    usedBytes: z.ZodCoercedBigInt<unknown>;
     itemCount: z.ZodInt;
     lastModified: z.ZodCoercedDate<unknown>;
     lastTrashed: z.ZodNullable<z.ZodCoercedDate<unknown>>;
@@ -101,7 +103,7 @@ export declare const UserStorage: z.ZodObject<{
         name: z.ZodString;
         userId: z.ZodUUID;
         parentId: z.ZodNullable<z.ZodUUID>;
-        size: z.ZodInt;
+        size: z.ZodCoercedBigInt<unknown>;
         trashedAt: z.ZodNullable<z.ZodCoercedDate<unknown>>;
         type: z.ZodString;
         metadata: z.ZodRecord<z.ZodString, z.ZodUnknown>;
@@ -135,9 +137,9 @@ export declare const UserStorage: z.ZodObject<{
     limits: z.ZodObject<{
         item_size: z.ZodInt;
         user_items: z.ZodInt;
-        user_size: z.ZodInt;
+        user_size: z.ZodCoercedBigInt<unknown>;
     }, z.core.$strip>;
-    usedBytes: z.ZodInt;
+    usedBytes: z.ZodCoercedBigInt<unknown>;
     itemCount: z.ZodInt;
     lastModified: z.ZodCoercedDate<unknown>;
     lastTrashed: z.ZodNullable<z.ZodCoercedDate<unknown>>;
@@ -206,7 +208,7 @@ export declare const StorageConfig: z.ZodObject<{
     limits: z.ZodObject<{
         item_size: z.ZodInt;
         user_items: z.ZodInt;
-        user_size: z.ZodInt;
+        user_size: z.ZodCoercedBigInt<unknown>;
     }, z.core.$strip>;
     trash_duration: z.ZodNumber;
     temp_dir: z.ZodString;
@@ -219,7 +221,7 @@ declare module '@axium/core/plugins' {
 }
 export declare const StorageItemInit: z.ZodObject<{
     name: z.ZodString;
-    size: z.ZodInt;
+    size: z.ZodCoercedBigInt<unknown>;
     type: z.ZodString;
     parentId: z.ZodOptional<z.ZodNullable<z.ZodUUID>>;
     hash: z.ZodOptional<z.ZodNullable<z.ZodCustomStringFormat<"hex">>>;
@@ -247,7 +249,7 @@ export declare const UploadInitResult: z.ZodDiscriminatedUnion<[z.ZodObject<{
         name: z.ZodString;
         userId: z.ZodUUID;
         parentId: z.ZodNullable<z.ZodUUID>;
-        size: z.ZodInt;
+        size: z.ZodCoercedBigInt<unknown>;
         trashedAt: z.ZodNullable<z.ZodCoercedDate<unknown>>;
         type: z.ZodString;
         metadata: z.ZodRecord<z.ZodString, z.ZodUnknown>;
@@ -286,9 +288,9 @@ declare const StorageAPI: {
             limits: z.ZodObject<{
                 item_size: z.ZodInt;
                 user_items: z.ZodInt;
-                user_size: z.ZodInt;
+                user_size: z.ZodCoercedBigInt<unknown>;
             }, z.core.$strip>;
-            usedBytes: z.ZodInt;
+            usedBytes: z.ZodCoercedBigInt<unknown>;
             itemCount: z.ZodInt;
             lastModified: z.ZodCoercedDate<unknown>;
             lastTrashed: z.ZodNullable<z.ZodCoercedDate<unknown>>;
@@ -309,7 +311,7 @@ declare const StorageAPI: {
                 name: z.ZodString;
                 userId: z.ZodUUID;
                 parentId: z.ZodNullable<z.ZodUUID>;
-                size: z.ZodInt;
+                size: z.ZodCoercedBigInt<unknown>;
                 trashedAt: z.ZodNullable<z.ZodCoercedDate<unknown>>;
                 type: z.ZodString;
                 metadata: z.ZodRecord<z.ZodString, z.ZodUnknown>;
@@ -343,9 +345,9 @@ declare const StorageAPI: {
             limits: z.ZodObject<{
                 item_size: z.ZodInt;
                 user_items: z.ZodInt;
-                user_size: z.ZodInt;
+                user_size: z.ZodCoercedBigInt<unknown>;
             }, z.core.$strip>;
-            usedBytes: z.ZodInt;
+            usedBytes: z.ZodCoercedBigInt<unknown>;
             itemCount: z.ZodInt;
             lastModified: z.ZodCoercedDate<unknown>;
             lastTrashed: z.ZodNullable<z.ZodCoercedDate<unknown>>;
@@ -362,7 +364,7 @@ declare const StorageAPI: {
             name: z.ZodString;
             userId: z.ZodUUID;
             parentId: z.ZodNullable<z.ZodUUID>;
-            size: z.ZodInt;
+            size: z.ZodCoercedBigInt<unknown>;
             trashedAt: z.ZodNullable<z.ZodCoercedDate<unknown>>;
             type: z.ZodString;
             metadata: z.ZodRecord<z.ZodString, z.ZodUnknown>;
@@ -405,7 +407,7 @@ declare const StorageAPI: {
             name: z.ZodString;
             userId: z.ZodUUID;
             parentId: z.ZodNullable<z.ZodUUID>;
-            size: z.ZodInt;
+            size: z.ZodCoercedBigInt<unknown>;
             trashedAt: z.ZodNullable<z.ZodCoercedDate<unknown>>;
             type: z.ZodString;
             metadata: z.ZodRecord<z.ZodString, z.ZodUnknown>;
@@ -448,7 +450,7 @@ declare const StorageAPI: {
             name: z.ZodString;
             userId: z.ZodUUID;
             parentId: z.ZodNullable<z.ZodUUID>;
-            size: z.ZodInt;
+            size: z.ZodCoercedBigInt<unknown>;
             trashedAt: z.ZodNullable<z.ZodCoercedDate<unknown>>;
             type: z.ZodString;
             metadata: z.ZodRecord<z.ZodString, z.ZodUnknown>;
@@ -493,7 +495,7 @@ declare const StorageAPI: {
         }, z.core.$strip>;
         readonly PUT: readonly [z.ZodObject<{
             name: z.ZodString;
-            size: z.ZodInt;
+            size: z.ZodCoercedBigInt<unknown>;
             type: z.ZodString;
             parentId: z.ZodOptional<z.ZodNullable<z.ZodUUID>>;
             hash: z.ZodOptional<z.ZodNullable<z.ZodCustomStringFormat<"hex">>>;
@@ -518,7 +520,7 @@ declare const StorageAPI: {
                 name: z.ZodString;
                 userId: z.ZodUUID;
                 parentId: z.ZodNullable<z.ZodUUID>;
-                size: z.ZodInt;
+                size: z.ZodCoercedBigInt<unknown>;
                 trashedAt: z.ZodNullable<z.ZodCoercedDate<unknown>>;
                 type: z.ZodString;
                 metadata: z.ZodRecord<z.ZodString, z.ZodUnknown>;
@@ -573,7 +575,7 @@ declare const StorageAPI: {
             name: z.ZodString;
             userId: z.ZodUUID;
             parentId: z.ZodNullable<z.ZodUUID>;
-            size: z.ZodInt;
+            size: z.ZodCoercedBigInt<unknown>;
             trashedAt: z.ZodNullable<z.ZodCoercedDate<unknown>>;
             type: z.ZodString;
             metadata: z.ZodRecord<z.ZodString, z.ZodUnknown>;
@@ -618,7 +620,7 @@ declare const StorageAPI: {
             name: z.ZodString;
             userId: z.ZodUUID;
             parentId: z.ZodNullable<z.ZodUUID>;
-            size: z.ZodInt;
+            size: z.ZodCoercedBigInt<unknown>;
             trashedAt: z.ZodNullable<z.ZodCoercedDate<unknown>>;
             type: z.ZodString;
             metadata: z.ZodRecord<z.ZodString, z.ZodUnknown>;
@@ -659,7 +661,7 @@ declare const StorageAPI: {
             name: z.ZodString;
             userId: z.ZodUUID;
             parentId: z.ZodNullable<z.ZodUUID>;
-            size: z.ZodInt;
+            size: z.ZodCoercedBigInt<unknown>;
             trashedAt: z.ZodNullable<z.ZodCoercedDate<unknown>>;
             type: z.ZodString;
             metadata: z.ZodRecord<z.ZodString, z.ZodUnknown>;
@@ -704,7 +706,7 @@ declare const StorageAPI: {
             name: z.ZodString;
             userId: z.ZodUUID;
             parentId: z.ZodNullable<z.ZodUUID>;
-            size: z.ZodInt;
+            size: z.ZodCoercedBigInt<unknown>;
             trashedAt: z.ZodNullable<z.ZodCoercedDate<unknown>>;
             type: z.ZodString;
             metadata: z.ZodRecord<z.ZodString, z.ZodUnknown>;
@@ -747,7 +749,7 @@ declare const StorageAPI: {
             name: z.ZodString;
             userId: z.ZodUUID;
             parentId: z.ZodNullable<z.ZodUUID>;
-            size: z.ZodInt;
+            size: z.ZodCoercedBigInt<unknown>;
             trashedAt: z.ZodNullable<z.ZodCoercedDate<unknown>>;
             type: z.ZodString;
             metadata: z.ZodRecord<z.ZodString, z.ZodUnknown>;
@@ -790,7 +792,7 @@ declare const StorageAPI: {
             name: z.ZodString;
             userId: z.ZodUUID;
             parentId: z.ZodNullable<z.ZodUUID>;
-            size: z.ZodInt;
+            size: z.ZodCoercedBigInt<unknown>;
             trashedAt: z.ZodNullable<z.ZodCoercedDate<unknown>>;
             type: z.ZodString;
             metadata: z.ZodRecord<z.ZodString, z.ZodUnknown>;

package/dist/common.js

@@ -26,7 +26,7 @@ export const StorageItemMetadata = z.object({
     name: z.string(),
     userId: z.uuid(),
     parentId: z.uuid().nullable(),
-    size: z.int().nonnegative(),
+    size: z.coerce.bigint().nonnegative(),
     trashedAt: z.coerce.date().nullable(),
     type: z.string(),
     metadata: z.record(z.string(), z.unknown()),
@@ -44,10 +44,10 @@ export const StorageLimits = z.object({
     /** Maximum number of items per user */
     user_items: z.int().nonnegative(),
     /** The maximum storage size per user in MB */
-    user_size: z.int().nonnegative(),
+    user_size: z.coerce.bigint().nonnegative(),
 });
 export const StorageStats = z.object({
-    usedBytes: z.int().nonnegative(),
+    usedBytes: z.coerce.bigint().nonnegative(),
     itemCount: z.int().nonnegative(),
     lastModified: z.coerce.date(),
     lastTrashed: z.coerce.date().nullable(),
@@ -126,7 +126,7 @@ export const StorageConfig = StoragePublicConfig.safeExtend({
 setServerConfig('@axium/storage', StorageConfig);
 export const StorageItemInit = z.object({
     name: z.string(),
-    size: z.int().nonnegative(),
+    size: z.coerce.bigint().nonnegative(),
     type: z.string(),
     parentId: z.uuid().nullish(),
     hash: z.hex().nullish(),

package/dist/server/batch.js

@@ -25,8 +25,8 @@ addRoute({
         const batchHeaderSize = Number(req.headers.get('x-batch-header-size'));
         if (!Number.isSafeInteger(batchHeaderSize) || batchHeaderSize < 2)
             error(400, 'Invalid or missing header, X-Batch-Header-Size');
-        const size = Number(req.headers.get('content-length'));
-        if (Number.isNaN(size))
+        const size = BigInt(req.headers.get('content-length') || '-1');
+        if (size < 0n)
             error(411, 'Missing or invalid content length header');
         const raw = await req.bytes();
         if (raw.byteLength - batchHeaderSize > size) {
@@ -77,7 +77,8 @@ addRoute({
             acl.check(item.acl, changedIds.has(item.id) ? { write: true } : { manage: true });
             error(403, 'Missing permission for item: ' + item.id);
         }
-        if (limits.user_size && (usage.usedBytes + size - items.reduce((sum, item) => sum + item.size, 0)) / 1_000_000 >= limits.user_size)
+        if (limits.user_size &&
+            (usage.usedBytes + size - items.reduce((sum, item) => sum + item.size, 0n)) / 1000000n >= limits.user_size)
             error(413, 'Not enough space');
         const tx = await database.startTransaction().execute();
         const results = new Map();
@@ -88,7 +89,7 @@ addRoute({
                 const result = await tx
                     .updateTable('storage')
                     .where('id', '=', itemId)
-                    .set({ size, modifiedAt: new Date(), hash })
+                    .set({ size: BigInt(size), modifiedAt: new Date(), hash })
                     .returningAll()
                     .executeTakeFirstOrThrow();
                 writeFileSync(join(getConfig('@axium/storage').data, result.id), content);

package/dist/server/cli.js

@@ -15,7 +15,7 @@ cli.command('usage')
         .selectFrom('storage')
         .select(eb => eb.fn.sum('size').as('size'))
         .executeTakeFirstOrThrow();
-    console.log(`${items} items totaling ${formatBytes(Number(size))}`);
+    console.log(`${items} items totaling ${formatBytes(BigInt(size))}`);
 });
 const _byteSize = (msg) => (v) => parseByteSize(v) ?? io.exit(msg);
 cli.command('query')
@@ -48,7 +48,7 @@ cli.command('query')
     }
     let validMinSize = false;
     if (opt.minSize !== undefined) {
-        if (opt.minSize == 0)
+        if (opt.minSize == 0n)
             io.warn('Minimum size of 0 has no effect, ignoring.');
         else {
             query = query.where('size', '>=', opt.minSize);

package/dist/server/config.js

@@ -50,6 +50,6 @@ export async function getLimits(userId) {
     catch {
         limits = structuredClone(getConfig('@axium/storage').limits);
     }
-    limits.user_size ||= Number(await _unlimitedLimit());
+    limits.user_size ||= await _unlimitedLimit();
     return limits;
 }

package/dist/server/db.js

@@ -25,9 +25,11 @@ export async function getUserStats(userId) {
         eb.fn.max('trashedAt').as('lastTrashed'),
     ])
         .executeTakeFirstOrThrow();
-    result.usedBytes = Number(result.usedBytes || 0);
-    result.itemCount = Number(result.itemCount);
-    return result;
+    return {
+        ...result,
+        usedBytes: BigInt(result.usedBytes || 0n),
+        itemCount: Number(result.itemCount),
+    };
 }
 export async function get(itemId) {
     const result = await database

package/dist/server/hooks.js

@@ -12,7 +12,7 @@ export function load() {
 export async function statusText() {
     const { storage: items } = await count('storage');
     const size = await getTotalUse();
-    return `${items} items totaling ${formatBytes(Number(size))}`;
+    return `${items} items totaling ${formatBytes(size)}`;
 }
 export async function clean(opt) {
     start('Removing expired trash items');

package/dist/server/item.d.ts

@@ -16,7 +16,7 @@ export interface UploadInfo {
     file: string;
     fd: number;
     hash: Hash;
-    uploadedBytes: number;
+    uploadedBytes: bigint;
     sessionId: string;
     userId: string;
     init: StorageItemInit;

package/dist/server/item.js

@@ -31,11 +31,11 @@ export async function checkNewItem(init, session) {
         : null;
     if (parentId)
         await authSessionForItem('storage', parentId, { write: true }, session);
-    if (Number.isNaN(size))
+    if (BigInt(size) < 0n)
         error(411, 'Missing or invalid content length');
     if (limits.user_items && usage.itemCount >= limits.user_items)
         error(409, 'Too many items');
-    if (limits.user_size && (usage.usedBytes + size) / 1_000_000 >= limits.user_size)
+    if (limits.user_size && (usage.usedBytes + size) / 1000000n >= limits.user_size)
         error(413, 'Not enough space');
     if (limits.item_size && size > limits.item_size * 1_000_000)
         error(413, 'File size exceeds maximum size');
@@ -77,7 +77,14 @@ export async function createNewItem(init, userId, writeContent) {
             hash,
         })
             .returningAll()
-            .executeTakeFirstOrThrow());
+            .executeTakeFirstOrThrow()
+            .catch(e => {
+            if (!(e instanceof Error))
+                throw e;
+            if (e.message.includes('unique_name_parentId') && e.message.includes('duplicate'))
+                error(409, 'A file with that name already exists in this folder.');
+            throw e;
+        }));
         const path = join(dataDir, item.id);
         if (existing)
             linkSync(join(dataDir, existing.id), path);
@@ -113,7 +120,7 @@ export function startUpload(init, session) {
         hash: createHash('BLAKE2b512'),
         file,
         fd,
-        uploadedBytes: 0,
+        uploadedBytes: 0n,
         sessionId: session.id,
         userId: session.userId,
         init,

package/dist/server/raw.js

@@ -64,6 +64,15 @@ import '../polyfills.js';
 import { getLimits } from './config.js';
 import { getUserStats, parseItem } from './db.js';
 import { checkNewItem, createNewItem, requireUpload } from './item.js';
+function contentDispositionFor(name) {
+    const fallback = name
+        .replace(/[\r\n]/g, '')
+        .replace(/[^\x20-\x7E]/g, '_')
+        .trim()
+        .replace(/[\\"]/g, '\\$&') || 'download';
+    const encoded = encodeURIComponent(name.replace(/[\r\n]/g, '')).replace(/['()*]/g, char => '%' + char.charCodeAt(0).toString(16).toUpperCase());
+    return `attachment; filename="${fallback}"; filename*=UTF-8''${encoded}`;
+}
 addRoute({
     path: '/raw/storage',
     async PUT(request) {
@@ -73,7 +82,7 @@ addRoute({
         const { userId } = session;
         const name = request.headers.get('x-name'); // checked in `checkNewItem`
         const parentId = request.headers.get('x-parent');
-        const size = Number(request.headers.get('x-size'));
+        const size = BigInt(request.headers.get('x-size') || -1);
         const type = request.headers.get('content-type') || 'application/octet-stream';
         const content = await request.bytes();
         if (content.byteLength > size) {
@@ -92,22 +101,22 @@ addRoute({
         if (!getConfig('@axium/storage').enabled)
             error(503, 'User storage is disabled');
         const upload = await requireUpload(request);
-        const size = Number(request.headers.get('content-length'));
-        if (Number.isNaN(size))
+        const size = BigInt(request.headers.get('content-length') || -1);
+        if (size < 0n)
             error(411, 'Missing or invalid content length');
         if (upload.uploadedBytes + size > upload.init.size)
             error(413, 'Upload exceeds allowed size');
         const content = await request.bytes();
-        if (content.byteLength != size) {
+        if (content.byteLength != Number(size)) {
             await audit('storage_size_mismatch', upload.userId, { item: null });
             error(400, `Content length mismatch: expected ${size}, got ${content.byteLength}`);
         }
-        const offset = Number(request.headers.get('x-offset'));
+        const offset = BigInt(request.headers.get('x-offset') || -1);
         if (offset != upload.uploadedBytes)
             error(400, `Expected offset ${upload.uploadedBytes} but got ${offset}`);
         writeSync(upload.fd, content); // opened with 'a', this appends
         upload.hash.update(content);
-        upload.uploadedBytes += size;
+        upload.uploadedBytes += BigInt(size);
         if (upload.uploadedBytes != upload.init.size)
             return new Response(null, { status: 204 });
         const hash = upload.hash.digest();
@@ -149,14 +158,14 @@ addRoute({
             const range = request.headers.get('range');
             const fd = openSync(path, 'r');
             const _ = __addDisposableResource(env_1, { [Symbol.dispose]: () => closeSync(fd) }, false);
-            let start = 0, end = item.size - 1, length = item.size;
+            let start = 0, end = Number(item.size - 1n), length = Number(item.size);
             if (range) {
-                const [_start, _end = item.size - 1] = range
+                const [_start, _end = end] = range
                     .replace(/bytes=/, '')
                     .split('-')
                     .map(val => (val && Number.isSafeInteger(parseInt(val)) ? parseInt(val) : undefined));
-                start = typeof _start == 'number' ? _start : item.size - _end;
-                end = typeof _start == 'number' ? _end : item.size - 1;
+                start = typeof _start == 'number' ? _start : Number(item.size) - _end;
+                end = typeof _start == 'number' ? _end : end;
                 length = end - start + 1;
             }
             if (start >= item.size || end >= item.size || start > end || start < 0) {
@@ -168,13 +177,13 @@ addRoute({
             const content = new Uint8Array(length);
             readSync(fd, content, 0, length, start);
             return new Response(content, {
-                status: length == item.size ? 200 : 206,
+                status: BigInt(length) == item.size ? 200 : 206,
                 headers: {
                     'Content-Range': `bytes ${start}-${end}/${item.size}`,
                     'Accept-Ranges': 'bytes',
                     'Content-Length': String(length),
                     'Content-Type': item.type,
-                    'Content-Disposition': `attachment; filename="${item.name}"`,
+                    'Content-Disposition': contentDispositionFor(item.name),
                 },
             });
         }
@@ -205,7 +214,7 @@ addRoute({
         if (Number.isNaN(size))
             error(411, 'Missing or invalid content length header');
         const [usage, limits] = await Promise.all([getUserStats(item.userId), getLimits(item.userId)]).catch(withError('Could not fetch usage and/or limits'));
-        if (limits.user_size && (usage.usedBytes + size - item.size) / 1_000_000 >= limits.user_size)
+        if (limits.user_size && (usage.usedBytes + BigInt(size) - item.size) / 1000000n >= limits.user_size)
             error(413, 'Not enough space');
         if (limits.item_size && size > limits.item_size * 1_000_000)
             error(413, 'File size exceeds maximum size');
@@ -220,7 +229,7 @@ addRoute({
             const result = await tx
                 .updateTable('storage')
                 .where('id', '=', itemId)
-                .set({ size, modifiedAt: new Date(), hash })
+                .set({ size: BigInt(size), modifiedAt: new Date(), hash })
                 .returningAll()
                 .executeTakeFirstOrThrow();
             writeFileSync(join(getConfig('@axium/storage').data, result.id), content);

package/lib/Add.svelte

@@ -38,7 +38,6 @@
 	<span class="menu-item" onclick={() => uploadDialog.showModal()}><Icon i="upload" />{text('storage.Add.upload')}</span>
 	{@render _item('inode/directory', text('storage.Add.new_folder'))}
 	{@render _item('text/plain', text('storage.Add.plain_text'))}
-	{@render _item('text/x-uri', text('storage.Add.url'), true)}
 </Popover>
 
 <FormDialog

package/lib/List.svelte

@@ -7,9 +7,10 @@
 	import type { AccessControllable, UserPublic } from '@axium/core';
 	import { formatBytes } from '@axium/core/format';
 	import { forMime as iconForMime } from '@axium/core/icons';
+	import { errorText } from '@axium/core/io';
 	import { getDirectoryMetadata, updateItemMetadata } from '@axium/storage/client';
 	import { copyShortURL, formatItemName } from '@axium/storage/client/frontend';
-	import type { StorageItemMetadata } from '@axium/storage/common';
+	import { StorageItemSorting, type StorageItemMetadata } from '@axium/storage/common';
 	import Preview from './Preview.svelte';
 
 	let {
@@ -23,6 +24,31 @@
 	const activeItem = $derived(items[activeIndex]);
 	const activeItemName = $derived(formatItemName(activeItem));
 	const dialogs = $state<Record<string, HTMLDialogElement>>({});
+
+	const search = new URLSearchParams(location.search);
+	let sort = $state<StorageItemSorting | null>();
+	try {
+		sort = StorageItemSorting.parse({
+			by: search.get('sortBy'),
+			descending: search.has('descending'),
+		});
+	} catch (e) {
+		console.log('Ignoring invalid sorting parameters', errorText(e));
+	}
+
+	const sortedItems = $derived(
+		items
+			.map((item, i) => [item, i] as const)
+			.toSorted(
+				sort
+					? ([_a], [_b]) => {
+							const [a, b] = sort?.descending ? [_b, _a] : [_a, _b];
+							// @ts-expect-error 2362 — `Date`s have a `valueOf` and can be treated like numbers
+							return sort.by == 'name' ? a.name.localeCompare(b.name) : a[sort.by] - b[sort.by];
+						}
+					: undefined
+			)
+	);
 </script>
 
 {#snippet action(name: string, icon: string, i: number, preview: boolean = false)}
@@ -40,11 +66,19 @@
 <div class="list">
 	<div class="list-item list-header">
 		<span></span>
-		<span>{text('storage.generic.name')}</span>
-		<span>{text('storage.List.last_modified')}</span>
-		<span>{text('storage.List.size')}</span>
+		{#each [['name', 'storage.generic.name'], ['modifiedAt', 'storage.List.last_modified'], ['size', 'storage.List.size']] as const as [key, translation]}
+			<span
+				class="header-column"
+				onclick={() => (sort = sort?.descending === false ? null : { by: key, descending: !sort?.descending })}
+			>
+				{#if sort?.by == key}
+					<Icon i="sort-{sort.descending ? 'down' : 'up'}" />
+				{/if}
+				<span>{text(translation)}</span>
+			</span>
+		{/each}
 	</div>
-	{#each items as item, i (item.id)}
+	{#each sortedItems as [item, i] (item.id)}
 		<div
 			class="list-item"
 			onclick={async () => {
@@ -167,6 +201,15 @@
 		grid-template-columns: 1em 4fr 15em 5em repeat(4, 1em);
 	}
 
+	.header-column {
+		display: inline-flex;
+		align-items: center;
+
+		&:hover {
+			cursor: pointer;
+		}
+	}
+
 	@media (width < 700px) {
 		.item-actions {
 			display: none;

package/lib/Preview.svelte

@@ -70,11 +70,11 @@
 </div>
 <div class="preview-content">
 	{#if item.type.startsWith('image/')}
-		<img src={item.dataURL} alt={item.name} width="100%" />
+		<img src={item.dataURL} alt={item.name} />
 	{:else if item.type.startsWith('audio/')}
 		<audio src={item.dataURL} controls></audio>
 	{:else if item.type.startsWith('video/')}
-		<video src={item.dataURL} controls width="100%">
+		<video src={item.dataURL} controls>
 			<track kind="captions" />
 		</video>
 	{:else if item.type == 'application/pdf'}
@@ -195,7 +195,12 @@
 
 	.preview-content {
 		position: absolute;
-		inset: 3em 10em 0;
+		inset: 3em 10em 1em;
+		display: flex;
+		text-align: center;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
 
 		.full-fill {
 			position: absolute;
@@ -211,6 +216,12 @@
 			background-color: var(--bg-menu);
 			font-family: monospace;
 		}
+
+		img,
+		video {
+			max-width: 100%;
+			max-height: 100%;
+		}
 	}
 
 	.no-preview {

package/lib/Usage.svelte

@@ -15,11 +15,11 @@
 		<p>
 			<a href="/files/usage">
 				<NumberBar
-					max={info.limits.user_size && info.limits.user_size * 1_000_000}
+					max={info.limits.user_size && info.limits.user_size * 1_000_000n}
 					value={info.usedBytes}
 					text="{formatBytes(info.usedBytes)} {!info.limits.user_size
 						? ''
-						: '/ ' + formatBytes(info.limits.user_size * 1_000_000)}"
+						: '/ ' + formatBytes(info.limits.user_size * 1_000_000n)}"
 				/>
 			</a>
 		</p>

package/locales/en.json

@@ -70,8 +70,7 @@
 			"new_folder": "New Folder",
 			"plain_text": "Plain Text",
 			"text": "Add",
-			"upload": "Upload",
-			"url": "URL"
+			"upload": "Upload"
 		},
 		"List": {
 			"copy_link": "Copy Link",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/storage",
-	"version": "0.19.1",
+	"version": "0.20.0",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "User file storage for Axium",
 	"funding": {
@@ -40,8 +40,8 @@
 		"build": "tsc"
 	},
 	"peerDependencies": {
-		"@axium/client": ">=0.19.0",
-		"@axium/core": ">=0.19.0",
+		"@axium/client": ">=0.19.1",
+		"@axium/core": ">=0.22.0",
 		"@axium/server": ">=0.39.0",
 		"@sveltejs/kit": "^2.27.3",
 		"utilium": "^2.6.3"

package/routes/files/usage/+page.svelte

@@ -12,7 +12,7 @@
 
 	let barText = $derived(
 		limits.user_size
-			? text('page.files.usage.bar_text', { used: formatBytes(usedBytes), total: formatBytes(limits.user_size * 1_000_000) })
+			? text('page.files.usage.bar_text', { used: formatBytes(usedBytes), total: formatBytes(limits.user_size * 1_000_000n) })
 			: text('page.files.usage.bar_text_unlimited', { used: formatBytes(usedBytes) })
 	);
 </script>
@@ -23,6 +23,6 @@
 
 <h2>{text('page.files.usage.heading')}</h2>
 
-<p><NumberBar max={limits.user_size * 1_000_000} value={usedBytes} text={barText} /></p>
+<p><NumberBar max={limits.user_size * 1_000_000n} value={usedBytes} text={barText} /></p>
 
 <List bind:items emptyText={text('page.files.usage.empty')} user={data.session?.user} />