@axium/storage 0.7.8 → 0.7.10

package/dist/hooks.d.ts

@@ -0,0 +1,8 @@
+import type { InitOptions, OpOptions } from '@axium/server/database';
+import './common.js';
+import './server.js';
+export declare function statusText(): Promise<string>;
+export declare function db_init(opt: InitOptions): Promise<void>;
+export declare function db_wipe(opt: OpOptions): Promise<void>;
+export declare function remove(opt: OpOptions): Promise<void>;
+export declare function clean(opt: OpOptions): Promise<void>;

package/dist/{plugin.js → hooks.js}

@@ -4,10 +4,9 @@ import config from '@axium/server/config';
 import { count, createIndex, database, warnExists } from '@axium/server/database';
 import { done, start } from '@axium/server/io';
 import { sql } from 'kysely';
-import pkg from '../package.json' with { type: 'json' };
 import './common.js';
 import './server.js';
-async function statusText() {
+export async function statusText() {
     const { storage: items } = await count('storage');
     const { size } = await database
         .selectFrom('storage')
@@ -15,7 +14,7 @@ async function statusText() {
         .executeTakeFirstOrThrow();
     return `${items} items totaling ${formatBytes(Number(size))}`;
 }
-async function db_init(opt) {
+export async function db_init(opt) {
     start('Creating table storage');
     await database.schema
         .createTable('storage')
@@ -39,18 +38,18 @@ async function db_init(opt) {
     await createIndex('storage', 'parentId');
     await acl.createTable('storage');
 }
-async function db_wipe(opt) {
+export async function db_wipe(opt) {
     start('Removing data from user storage');
     await database.deleteFrom('storage').execute().then(done);
     await acl.wipeTable('storage');
 }
-async function remove(opt) {
+export async function remove(opt) {
     start('Dropping table storage');
     await database.schema.dropTable('storage').execute();
     await acl.dropTable('storage');
     done();
 }
-async function clean(opt) {
+export async function clean(opt) {
     start('Removing expired trash items');
     const nDaysAgo = new Date(Date.now() - 86400000 * config.storage.trash_duration);
     await database
@@ -60,8 +59,3 @@ async function clean(opt) {
         .executeTakeFirstOrThrow()
         .then(done);
 }
-export default {
-    ...pkg,
-    statusText,
-    hooks: { db_init, db_wipe, remove, clean },
-};

package/dist/server.js

@@ -1,5 +1,5 @@
-import { Permission } from '@axium/core/access';
-import { addEvent, audit, Severity } from '@axium/server/audit';
+import { Permission, Severity } from '@axium/core';
+import { addEvent, audit } from '@axium/server/audit';
 import { checkAuthForItem, checkAuthForUser, getSessionAndUser } from '@axium/server/auth';
 import { addConfigDefaults, config } from '@axium/server/config';
 import { database, expectedTypes } from '@axium/server/database';
@@ -113,19 +113,19 @@ export async function deleteRecursive(itemId, deleteSelf) {
 addRoute({
     path: '/api/storage/item/:id',
     params: { id: z.uuid() },
-    async GET(event) {
+    async GET(request, params) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const itemId = event.params.id;
-        const { item } = await checkAuthForItem(event, 'storage', itemId, Permission.Read);
+        const itemId = params.id;
+        const { item } = await checkAuthForItem(request, 'storage', itemId, Permission.Read);
         return parseItem(item);
     },
-    async PATCH(event) {
+    async PATCH(request, params) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const itemId = event.params.id;
-        const body = await parseBody(event, StorageItemUpdate);
-        await checkAuthForItem(event, 'storage', itemId, Permission.Manage);
+        const itemId = params.id;
+        const body = await parseBody(request, StorageItemUpdate);
+        await checkAuthForItem(request, 'storage', itemId, Permission.Manage);
         const values = {};
         if ('publicPermission' in body)
             values.publicPermission = body.publicPermission;
@@ -145,11 +145,11 @@ addRoute({
             .executeTakeFirstOrThrow()
             .catch(withError('Could not update item')));
     },
-    async DELETE(event) {
+    async DELETE(request, params) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const itemId = event.params.id;
-        const auth = await checkAuthForItem(event, 'storage', itemId, Permission.Manage);
+        const itemId = params.id;
+        const auth = await checkAuthForItem(request, 'storage', itemId, Permission.Manage);
         const item = parseItem(auth.item);
         await deleteRecursive(itemId, item.type != 'inode/directory');
         return item;
@@ -158,11 +158,11 @@ addRoute({
 addRoute({
     path: '/api/storage/directory/:id',
     params: { id: z.uuid() },
-    async GET(event) {
+    async GET(request, params) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const itemId = event.params.id;
-        const { item } = await checkAuthForItem(event, 'storage', itemId, Permission.Read);
+        const itemId = params.id;
+        const { item } = await checkAuthForItem(request, 'storage', itemId, Permission.Read);
         if (item.type != 'inode/directory')
             error(409, 'Item is not a directory');
         const items = await database
@@ -176,20 +176,20 @@ addRoute({
 });
 addRoute({
     path: '/raw/storage',
-    async PUT(event) {
+    async PUT(request) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const token = getToken(event);
+        const token = getToken(request);
         if (!token)
             error(401, 'Missing session token');
         const { userId } = await getSessionAndUser(token).catch(withError('Invalid session token', 401));
         const [usage, limits] = await Promise.all([currentUsage(userId), getLimits(userId)]).catch(withError('Could not fetch usage and/or limits'));
-        const name = event.request.headers.get('x-name');
+        const name = request.headers.get('x-name');
         if (!name)
             error(400, 'Missing name header');
         if (name.length > 255)
             error(400, 'Name is too long');
-        const maybeParentId = event.request.headers.get('x-parent');
+        const maybeParentId = request.headers.get('x-parent');
         const parentId = maybeParentId
             ? await z
                 .uuid()
@@ -197,22 +197,22 @@ addRoute({
                 .catch(() => error(400, 'Invalid parent ID'))
             : null;
         if (parentId)
-            await checkAuthForItem(event, 'storage', parentId, Permission.Edit);
-        const size = Number(event.request.headers.get('content-length'));
+            await checkAuthForItem(request, 'storage', parentId, Permission.Edit);
+        const size = Number(request.headers.get('content-length'));
         if (Number.isNaN(size))
             error(411, 'Missing or invalid content length header');
-        if (usage.items >= limits.user_items)
+        if (limits.user_items && usage.items >= limits.user_items)
             error(409, 'Too many items');
-        if ((usage.bytes + size) / 1_000_000 >= limits.user_size)
+        if (limits.user_size && (usage.bytes + size) / 1_000_000 >= limits.user_size)
             error(413, 'Not enough space');
-        if (size > limits.item_size * 1_000_000)
+        if (limits.item_size && size > limits.item_size * 1_000_000)
             error(413, 'File size exceeds maximum size');
-        const content = await event.request.bytes();
+        const content = await request.bytes();
         if (content.byteLength > size) {
             await audit('storage_size_mismatch', userId, { item: null });
             error(400, 'Content length does not match size header');
         }
-        const type = event.request.headers.get('content-type') || 'application/octet-stream';
+        const type = request.headers.get('content-type') || 'application/octet-stream';
         const isDirectory = type == 'inode/directory';
         if (isDirectory && size > 0)
             error(400, 'Directories can not have content');
@@ -260,11 +260,11 @@ addRoute({
 addRoute({
     path: '/raw/storage/:id',
     params: { id: z.uuid() },
-    async GET(event) {
+    async GET(request, params) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const itemId = event.params.id;
-        const { item } = await checkAuthForItem(event, 'storage', itemId, Permission.Read);
+        const itemId = params.id;
+        const { item } = await checkAuthForItem(request, 'storage', itemId, Permission.Read);
         if (item.trashedAt)
             error(410, 'Trashed items can not be downloaded');
         const content = new Uint8Array(readFileSync(join(config.storage.data, item.id)));
@@ -275,31 +275,31 @@ addRoute({
             },
         });
     },
-    async POST(event) {
+    async POST(request, params) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const itemId = event.params.id;
-        const { item, session } = await checkAuthForItem(event, 'storage', itemId, Permission.Edit);
+        const itemId = params.id;
+        const { item, session } = await checkAuthForItem(request, 'storage', itemId, Permission.Edit);
         if (item.immutable)
             error(405, 'Item is immutable');
         if (item.type == 'inode/directory')
             error(409, 'Directories do not have content');
         if (item.trashedAt)
             error(410, 'Trashed items can not be changed');
-        const type = event.request.headers.get('content-type') || 'application/octet-stream';
+        const type = request.headers.get('content-type') || 'application/octet-stream';
         if (type != item.type) {
             await audit('storage_type_mismatch', session?.userId, { item: item.id });
             error(400, 'Content type does not match existing item type');
         }
-        const size = Number(event.request.headers.get('content-length'));
+        const size = Number(request.headers.get('content-length'));
         if (Number.isNaN(size))
             error(411, 'Missing or invalid content length header');
         const [usage, limits] = await Promise.all([currentUsage(item.userId), getLimits(item.userId)]).catch(withError('Could not fetch usage and/or limits'));
-        if ((usage.bytes + size - item.size) / 1_000_000 >= limits.user_size)
+        if (limits.user_size && (usage.bytes + size - item.size) / 1_000_000 >= limits.user_size)
             error(413, 'Not enough space');
-        if (size > limits.item_size * 1_000_000)
+        if (limits.item_size && size > limits.item_size * 1_000_000)
             error(413, 'File size exceeds maximum size');
-        const content = await event.request.bytes();
+        const content = await request.bytes();
         if (content.byteLength > size) {
             await audit('storage_size_mismatch', session?.userId, { item: item.id });
             error(400, 'Actual content length does not match header');
@@ -326,19 +326,19 @@ addRoute({
 addRoute({
     path: '/api/users/:id/storage',
     params: { id: z.uuid() },
-    async OPTIONS(event) {
+    async OPTIONS(request, params) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const userId = event.params.id;
-        await checkAuthForUser(event, userId);
+        const userId = params.id;
+        await checkAuthForUser(request, userId);
         const [usage, limits] = await Promise.all([currentUsage(userId), getLimits(userId)]).catch(withError('Could not fetch data'));
         return { usage, limits };
     },
-    async GET(event) {
+    async GET(request, params) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const userId = event.params.id;
-        await checkAuthForUser(event, userId);
+        const userId = params.id;
+        await checkAuthForUser(request, userId);
         const [items, usage, limits] = await Promise.all([
             database.selectFrom('storage').where('userId', '=', userId).where('trashedAt', 'is', null).selectAll().execute(),
             currentUsage(userId),
@@ -350,11 +350,11 @@ addRoute({
 addRoute({
     path: '/api/users/:id/storage/root',
     params: { id: z.uuid() },
-    async GET(event) {
+    async GET(request, params) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const userId = event.params.id;
-        await checkAuthForUser(event, userId);
+        const userId = params.id;
+        await checkAuthForUser(request, userId);
         const items = await database
             .selectFrom('storage')
             .where('userId', '=', userId)
@@ -376,11 +376,11 @@ function existsInACL(column, userId) {
 addRoute({
     path: '/api/users/:id/storage/shared',
     params: { id: z.uuid() },
-    async GET(event) {
+    async GET(request, params) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const userId = event.params.id;
-        await checkAuthForUser(event, userId);
+        const userId = params.id;
+        await checkAuthForUser(request, userId);
         const items = await database
             .selectFrom('storage as item')
             .selectAll('item')
@@ -395,11 +395,11 @@ addRoute({
 addRoute({
     path: '/api/users/:id/storage/trash',
     params: { id: z.uuid() },
-    async GET(event) {
+    async GET(request, params) {
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
-        const userId = event.params.id;
-        await checkAuthForUser(event, userId);
+        const userId = params.id;
+        await checkAuthForUser(request, userId);
         const items = await database
             .selectFrom('storage')
             .where('userId', '=', userId)

package/lib/List.svelte

@@ -1,11 +1,11 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
 	import { FormDialog, Icon } from '@axium/client/components';
+	import '@axium/client/styles/list';
 	import { formatBytes } from '@axium/core/format';
 	import { forMime as iconForMime } from '@axium/core/icons';
 	import { getDirectoryMetadata, updateItemMetadata } from '@axium/storage/client';
 	import type { StorageItemMetadata } from '@axium/storage/common';
-	import '../styles/list.css';
 
 	let {
 		items = $bindable(),

package/lib/Usage.svelte

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

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@axium/storage",
-	"version": "0.7.8",
-	"author": "James Prevett <axium@jamespre.dev> (https://jamespre.dev)",
+	"version": "0.7.10",
+	"author": "James Prevett <axium@jamespre.dev>",
 	"description": "User file storage for Axium",
 	"funding": {
 		"type": "individual",
@@ -27,20 +27,19 @@
 		"./components/*": "./lib/*.svelte",
 		"./styles/*": "./styles/*.css"
 	},
-	"routes": "routes",
 	"files": [
 		"dist",
 		"lib",
-		"routes",
-		"styles"
+		"build",
+		"routes"
 	],
 	"scripts": {
 		"build": "tsc"
 	},
 	"peerDependencies": {
-		"@axium/client": ">=0.4.4",
-		"@axium/core": ">=0.7.0",
-		"@axium/server": ">=0.23.0",
+		"@axium/client": ">=0.5.0",
+		"@axium/core": ">=0.8.0",
+		"@axium/server": ">=0.25.0",
 		"@sveltejs/kit": "^2.27.3",
 		"utilium": "^2.3.8"
 	},
@@ -48,11 +47,16 @@
 		"blakejs": "^1.2.1",
 		"zod": "^4.0.5"
 	},
-	"apps": [
-		{
-			"id": "files",
-			"name": "Files",
-			"icon": "folders"
-		}
-	]
+	"axium": {
+		"http_handler": "./build/handler.js",
+		"hooks": "./dist/hooks.js",
+		"routes": "./routes",
+		"apps": [
+			{
+				"id": "files",
+				"name": "Files",
+				"icon": "folders"
+			}
+		]
+	}
 }

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

@@ -1,8 +1,8 @@
 <script lang="ts">
+	import { Icon } from '@axium/client/components';
+	import '@axium/client/styles/list';
 	import { formatBytes } from '@axium/core/format';
 	import { forMime as iconForMime } from '@axium/core/icons';
-	import { Icon } from '@axium/client/components';
-	import '@axium/storage/styles/list';
 	import type { PageProps } from './$types';
 
 	const { data }: PageProps = $props();

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

@@ -1,9 +1,9 @@
 <script lang="ts">
+	import { FormDialog, Icon } from '@axium/client/components';
+	import '@axium/client/styles/list';
 	import { formatBytes } from '@axium/core/format';
 	import { forMime as iconForMime } from '@axium/core/icons';
-	import { FormDialog, Icon } from '@axium/client/components';
 	import { deleteItem, updateItemMetadata } from '@axium/storage/client';
-	import '@axium/storage/styles/list';
 	import type { PageProps } from './$types';
 
 	const { data }: PageProps = $props();

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

@@ -1,11 +1,8 @@
 <script lang="ts">
+	import { Icon, NumberBar } from '@axium/client/components';
 	import { formatBytes } from '@axium/core/format';
-	import { forMime } from '@axium/core/icons';
-	import { FormDialog, Icon, NumberBar } from '@axium/client/components';
-	import { deleteItem, updateItemMetadata } from '@axium/storage/client';
-	import type { StorageItemUpdate } from '@axium/storage/common';
 	import { StorageList } from '@axium/storage/components';
-	import '@axium/storage/styles/list';
+	import '@axium/client/styles/list';
 
 	const { data } = $props();
 	const { limits } = data.info;
@@ -14,7 +11,9 @@
 	const usage = $state(data.info.usage);
 
 	let dialogs = $state<Record<string, HTMLDialogElement>>({});
-	let barText = $derived(`Using ${formatBytes(usage?.bytes)} of ${formatBytes(limits.user_size * 1_000_000)}`);
+	let barText = $derived(
+		`Using ${formatBytes(usage?.bytes)} ${limits.user_size ? 'of ' + formatBytes(limits.user_size * 1_000_000) : ''}`
+	);
 </script>
 
 <svelte:head>

package/dist/plugin.d.ts

@@ -1,67 +0,0 @@
-import type { InitOptions, OpOptions } from '@axium/server/database';
-import './common.js';
-import './server.js';
-declare function statusText(): Promise<string>;
-declare function db_init(opt: InitOptions): Promise<void>;
-declare function db_wipe(opt: OpOptions): Promise<void>;
-declare function remove(opt: OpOptions): Promise<void>;
-declare function clean(opt: OpOptions): Promise<void>;
-declare const _default: {
-    statusText: typeof statusText;
-    hooks: {
-        db_init: typeof db_init;
-        db_wipe: typeof db_wipe;
-        remove: typeof remove;
-        clean: typeof clean;
-    };
-    name: string;
-    version: string;
-    author: string;
-    description: string;
-    funding: {
-        type: string;
-        url: string;
-    };
-    license: string;
-    repository: {
-        type: string;
-        url: string;
-    };
-    homepage: string;
-    bugs: {
-        url: string;
-    };
-    type: string;
-    main: string;
-    types: string;
-    exports: {
-        ".": string;
-        "./*": string;
-        "./sidebar": string;
-        "./components": string;
-        "./components/*": string;
-        "./styles/*": string;
-    };
-    routes: string;
-    files: string[];
-    scripts: {
-        build: string;
-    };
-    peerDependencies: {
-        "@axium/client": string;
-        "@axium/core": string;
-        "@axium/server": string;
-        "@sveltejs/kit": string;
-        utilium: string;
-    };
-    dependencies: {
-        blakejs: string;
-        zod: string;
-    };
-    apps: {
-        id: string;
-        name: string;
-        icon: string;
-    }[];
-};
-export default _default;

package/styles/list.css

@@ -1,50 +0,0 @@
-.list {
-	display: flex;
-	flex-direction: column;
-	padding: 0.5em;
-}
-
-.list-header {
-	font-weight: bold;
-	border-bottom: 1.5px solid var(--fg-accent);
-}
-
-.list-item-container {
-	text-decoration: none;
-	color: inherit;
-}
-
-.list-item {
-	display: grid;
-	grid-template-columns: 1em 4fr 15em 5em repeat(3, 1em);
-	align-items: center;
-	gap: 1em;
-	padding: 0.5em;
-	overflow: hidden;
-	text-wrap: nowrap;
-}
-
-.list-item:not(.list-header, :first-child) {
-	border-top: 1px solid var(--fg-accent);
-}
-
-.list-item:not(.list-header):hover {
-	background-color: var(--bg-alt);
-	cursor: pointer;
-}
-
-p.list-empty {
-	text-align: center;
-	color: #888;
-	margin-top: 1em;
-	font-style: italic;
-}
-
-.list-item .action {
-	visibility: hidden;
-}
-
-.list-item:hover .action {
-	visibility: visible;
-	cursor: pointer;
-}