@axium/server 0.41.1 → 0.42.1

package/dist/api/admin.js

@@ -66,7 +66,7 @@ addRoute({
             error(404, 'Plugin not found');
         }
         if (config) {
-            const { schema } = serverConfigs.get(name) || {};
+            const schema = serverConfigs.get(name) || null;
             if (!schema)
                 error(400, 'Plugin does not have a configuration schema');
             if (!plugin._configPath)

package/dist/api/images.d.ts

@@ -0,0 +1,11 @@
+export interface ImageUploadConfig {
+    enabled: boolean;
+    /** Max size in KB */
+    max_size: number;
+    /** Max pixels per dimension */
+    max_length: number;
+}
+export declare function checkImageUpload(request: Request, cfg: ImageUploadConfig, userId: string): Promise<{
+    data: Uint8Array<ArrayBuffer>;
+    type: string;
+}>;

package/dist/api/{pfp.js → images.js}

@@ -26,6 +26,31 @@ catch {
         warn('Can not determine profile picture dimensions because neither image-size or ImageMagick is available');
     }
 }
+export async function checkImageUpload(request, cfg, userId) {
+    const { enabled, max_size, max_length } = cfg;
+    if (!enabled)
+        error(503, 'Image uploads are disabled');
+    await checkAuthForUser(request, userId);
+    const type = request.headers.get('content-type');
+    if (!type)
+        error(400, 'Missing Content-Type header');
+    if (!type.startsWith('image/'))
+        error(415, 'Only image files are allowed');
+    const size = Number(request.headers.get('content-length'));
+    if (!Number.isSafeInteger(size))
+        error(400, 'Invalid Content-Length header');
+    if (max_size && size / 1000 > max_size)
+        error(413, `Image must be smaller than ${max_size} KB`);
+    const data = await request.bytes();
+    if (data.byteLength != size)
+        error(400, 'Content-Length does not match actual data size');
+    const { width, height } = imageSize?.(data) || { width: 0, height: 0 };
+    if (imageSize && (!width || !height))
+        error(400, 'Invalid image dimensions');
+    if (max_length && (width > max_length || height > max_length))
+        error(413, `Image must be smaller than ${max_length}x${max_length} pixels`);
+    return { data, type };
+}
 addRoute({
     path: '/raw/pfp/:id',
     params: { id: z.uuid() },
@@ -76,28 +101,7 @@ addRoute({
         });
     },
     async POST(request, { id: userId }) {
-        const { enabled, max_size, max_length } = config.user_pfp;
-        if (!enabled)
-            error(503, 'Custom profile pictures are disabled');
-        await checkAuthForUser(request, userId);
-        const type = request.headers.get('content-type');
-        if (!type)
-            error(400, 'Missing Content-Type header');
-        if (!type.startsWith('image/'))
-            error(415, 'Only image files are allowed');
-        const size = Number(request.headers.get('content-length'));
-        if (!Number.isSafeInteger(size))
-            error(400, 'Invalid Content-Length header');
-        if (max_size && size / 1000 > max_size)
-            error(413, `Profile picture must be smaller than ${max_size} KB`);
-        const data = await request.bytes();
-        if (data.byteLength != size)
-            error(400, 'Content-Length does not match actual data size');
-        const { width, height } = imageSize?.(data) || { width: 0, height: 0 };
-        if (imageSize && (!width || !height))
-            error(400, 'Invalid image dimensions');
-        if (max_length && (width > max_length || height > max_length))
-            error(413, `Profile picture must be smaller than ${max_length}x${max_length} pixels`);
+        const { data, type } = await checkImageUpload(request, config.user_pfp, userId);
         const { isInsert } = await db
             .insertInto('profile_pictures')
             .values({ userId, data, type })

package/dist/api/index.d.ts

@@ -2,7 +2,7 @@ import './acl.js';
 import './admin.js';
 import './metadata.js';
 import './passkeys.js';
-import './pfp.js';
+import './images.js';
 import './register.js';
 import './session.js';
 import './users.js';

package/dist/api/index.js

@@ -2,7 +2,7 @@ import './acl.js';
 import './admin.js';
 import './metadata.js';
 import './passkeys.js';
-import './pfp.js';
+import './images.js';
 import './register.js';
 import './session.js';
 import './users.js';

package/dist/auth.js

@@ -51,8 +51,8 @@ export async function getSession(sessionId) {
 export async function requireSession(request, sensitive = false) {
     const token = getToken(request, sensitive);
     if (!token)
-        error(401, 'Missing session token');
-    const session = await getSessionAndUser(token).catch(withError('Invalid or expired session token', 401));
+        error(401, 'Missing session (you are not logged in)');
+    const session = await getSessionAndUser(token).catch(withError('Invalid or expired session', 401));
     if (session.user.isSuspended)
         error(403, 'User is suspended');
     return session;

package/dist/config.js

@@ -253,7 +253,7 @@ export async function loadConfig(path, options = {}) {
                 if (!existsSync(configPath))
                     continue;
                 try {
-                    const data = io.readJSON(configPath, serverConfig.schema.partial());
+                    const data = io.readJSON(configPath, serverConfig.partial());
                     deepAssign(plugin.config, data, true);
                     io.debug(`Loaded config for plugin ${plugin.name} from ${configPath}`);
                 }

package/dist/db/connection.js

@@ -11,6 +11,11 @@ export function connect() {
         return (database = globalThis[sym]);
     database = new Kysely({
         dialect: new PostgresDialect({ pool: new pg.Pool(config.db) }),
+        log(event) {
+            if (event.level != 'error')
+                return;
+            io.error('Query failed:', event.query.sql);
+        },
     });
     globalThis[sym] = database;
     io.debug('Connected to database!');

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/server",
-	"version": "0.41.1",
+	"version": "0.42.1",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"funding": {
 		"type": "individual",
@@ -48,9 +48,9 @@
 	},
 	"peerDependencies": {
 		"@axium/client": ">=0.21.0",
-		"@axium/core": ">=0.24.0",
+		"@axium/core": ">=0.26.0",
 		"kysely": "^0.28.0",
-		"utilium": "^2.6.0",
+		"utilium": "^3.0.0",
 		"zod": "^4.0.5"
 	},
 	"dependencies": {

package/routes/account/+page.svelte

@@ -7,7 +7,7 @@
 	import type { PageProps } from './$types';
 	import { toast, toastStatus } from '@axium/client/toast';
 	import { contextMenu } from '@axium/client/attachments';
-	import { upload } from 'utilium/dom.js';
+	import { upload } from 'utilium/dom';
 
 	const { data }: PageProps = $props();
 	const { canVerify } = data;

package/routes/admin/plugins/+page.svelte

@@ -16,7 +16,7 @@
 <h2>{text('page.admin.plugins.heading')}</h2>
 
 {#each data.plugins as plugin}
-	{@const cfg = serverConfigs.get(plugin.name)}
+	{@const schema = serverConfigs.get(plugin.name)}
 	<div class="plugin">
 		<h3>
 			{plugin.name}<Version
@@ -46,14 +46,12 @@
 			{:else}<i>{text('generic.none')}</i>{/if}
 		</p>
 		<p>{plugin.description}</p>
-		{#if cfg && plugin.config}
+		{#if schema && plugin.config}
 			<h4>{text('page.admin.plugins.configuration')}</h4>
-			{@const { schema, labels } = cfg}
 			<ZodForm
 				rootValue={plugin.config}
 				idPrefix={plugin.name}
 				{schema}
-				{labels}
 				updateValue={config => fetchAPI('POST', 'admin/plugins', { plugin: plugin.name, config })}
 			/>
 		{/if}

package/dist/api/pfp.d.ts

@@ -1 +0,0 @@
-export {};