@axium/server 0.26.3 → 0.28.0

package/dist/requests.d.ts

@@ -1,4 +1,4 @@
-import type { User, UserInternal } from '@axium/core';
+import { type User, type UserInternal } from '@axium/core';
 import * as z from 'zod';
 import type { ServerRoute } from './routes.js';
 /**

package/dist/requests.js

@@ -1,7 +1,10 @@
+import {} from '@axium/core';
+import * as io from '@axium/core/io';
 import { userProtectedFields, userPublicFields } from '@axium/core/user';
 import * as cookie from 'cookie_v1';
 import { pick } from 'utilium';
 import * as z from 'zod';
+import { audit } from './audit.js';
 import { createSession } from './auth.js';
 import { config } from './config.js';
 export function isResponseError(e) {
@@ -25,7 +28,7 @@ export function redirect(location, status = 302) {
 export function json(data, init) {
     const response = Response.json(data, init);
     if (!response.headers.has('content-length')) {
-        response.headers.set('content-length', JSON.stringify(data).length.toString());
+        response.headers.set('content-length', new TextEncoder().encode(JSON.stringify(data)).length.toString());
     }
     return response;
 }
@@ -71,6 +74,10 @@ export function withError(text, code = 500) {
     return function (e) {
         if (e.name == 'ResponseError')
             throw e;
+        if (code == 500) {
+            void audit('response_error', undefined, { stack: e.stack });
+            io.error('(in response) ' + e.stack);
+        }
         error(code, text + (config.debug && e.message ? `: ${e.message}` : ''));
     };
 }

package/dist/routes.d.ts

@@ -1,53 +1,53 @@
 import type { RequestMethod } from '@axium/core/requests';
 import type { Component } from 'svelte';
 import type z from 'zod';
-type _Params = Partial<Record<string, string>>;
+type RouteParams = Record<string, z.ZodType>;
+type ParamValues<P extends RouteParams> = {
+    [K in keyof P]: z.infer<P[K]>;
+};
 export type MaybePromise<T> = T | Promise<T>;
-export type EndpointHandlers<Params extends _Params = _Params, This = unknown> = Partial<Record<RequestMethod, (this: This, request: Request, params: Params) => MaybePromise<object | Response>>>;
-export type RouteParamOptions = z.ZodType;
-export interface CommonRouteOptions<Params extends _Params = _Params> {
-    path: string;
-    params?: {
-        [K in keyof Params]?: RouteParamOptions;
-    };
-}
+export type EndpointHandlers<Params, This = unknown> = Partial<Record<RequestMethod, (this: This, request: Request, params: Params) => MaybePromise<object | Response>>>;
 /**
  * A route with server-side handlers for different HTTP methods.
  */
-export interface ServerRouteOptions<Params extends _Params = _Params> extends CommonRouteOptions<Params>, EndpointHandlers<Params, RouteCommon> {
+export interface ServerRouteInit<Params extends RouteParams = RouteParams> extends EndpointHandlers<ParamValues<Params>, RouteCommon<Params>> {
+    path: string;
+    params?: Params;
     api?: boolean;
 }
-export interface WebRouteOptions extends CommonRouteOptions {
+export interface WebRouteInit<Params extends RouteParams = RouteParams> {
+    path: string;
+    params?: Params;
     load?(request: Request): object | Promise<object>;
     /** the Svelte page */
     page?: Component;
 }
-export type RouteOptions = ServerRouteOptions | WebRouteOptions;
-export interface RouteCommon {
+export type RouteInit<Params extends RouteParams = RouteParams> = ServerRouteInit<Params> | WebRouteInit<Params>;
+export interface RouteCommon<Params extends RouteParams = RouteParams> {
     path: string;
-    params?: Record<string, RouteParamOptions>;
+    params?: Params;
 }
-export interface ServerRoute extends RouteCommon, EndpointHandlers {
+export interface ServerRoute<Params extends RouteParams = RouteParams> extends RouteCommon<Params>, EndpointHandlers<ParamValues<Params>> {
     api: boolean;
     server: true;
 }
-export interface WebRoute extends RouteCommon {
+export interface WebRoute<Params extends RouteParams = RouteParams> extends RouteCommon<Params> {
     server: false;
     load?(request: Request): object | Promise<object>;
     page: Component;
 }
-export type Route = ServerRoute | WebRoute;
+export type Route<Params extends RouteParams = RouteParams> = ServerRoute<Params> | WebRoute<Params>;
 /**
  * @internal
  */
-export declare const routes: Map<string, Route>;
+export declare const routes: Map<string, Route<any>>;
 /**
  * @category Plugin API
  */
-export declare function addRoute(opt: RouteOptions): void;
+export declare function addRoute<const P extends RouteParams = RouteParams>(opt: RouteInit<P>): void;
 /**
  * Resolve a request URL into a route.
  * This handles parsing of parameters in the URL.
  */
-export declare function resolveRoute(url: URL): [Route, params: object] | void;
+export declare function resolveRoute<P extends RouteParams = RouteParams>(url: URL): [Route<P>, params: ParamValues<P>] | void;
 export {};

package/dist/routes.js

@@ -27,8 +27,9 @@ export function addRoute(opt) {
  */
 export function resolveRoute(url) {
     const { pathname } = url;
-    if (routes.has(pathname) && !pathname.split('/').some(p => p.startsWith(':')))
+    if (routes.has(pathname) && !pathname.split('/').some(p => p.startsWith(':'))) {
         return [routes.get(pathname), {}];
+    }
     // Otherwise we must have a parameterized route
     _routes: for (const route of routes.values()) {
         const params = {};

package/dist/serve.js

@@ -131,7 +131,7 @@ async function _runRoute(run, request, params) {
 async function _getLinkedBuildHandler(buildPath = '../build/handler.js') {
     const { handler: handleFrontendRequest } = await import(buildPath);
     return function handle(req, res) {
-        const url = new URL(req.url, config.auth.origin);
+        const url = new URL(req.url, config.origin);
         const [route, params = {}] = resolveRoute(url) ?? [];
         if (!route && url.pathname === '/' && config.debug_home) {
             res.writeHead(303, { Location: '/_axium/default' }).end();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/server",
-	"version": "0.26.3",
+	"version": "0.28.0",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"funding": {
 		"type": "individual",
@@ -31,6 +31,7 @@
 		"assets",
 		"dist",
 		"routes",
+		"schemas",
 		"svelte.config.js",
 		"web.tsconfig.json",
 		"template.html",
@@ -38,15 +39,16 @@
 		"axium.service"
 	],
 	"bin": {
-		"axium": "dist/cli.js"
+		"axium": "dist/main.js"
 	},
 	"scripts": {
 		"build": "tsc",
+		"build:schemas": "mkdir -p schemas && npx axium config schema -j > schemas/config.json && npx axium db schema -j > schemas/db.json",
 		"clean": "rm -rf build .svelte-kit node_modules/{.vite,.vite-temp}"
 	},
 	"peerDependencies": {
-		"@axium/client": ">=0.6.0",
-		"@axium/core": ">=0.10.0",
+		"@axium/client": ">=0.9.0",
+		"@axium/core": ">=0.12.0",
 		"kysely": "^0.28.0",
 		"utilium": "^2.3.8",
 		"zod": "^4.0.5"

package/routes/account/+page.svelte

@@ -8,8 +8,6 @@
 	const { data }: PageProps = $props();
 	const { canVerify } = data;
 
-	const dialogs = $state<Record<string, HTMLDialogElement>>({});
-
 	let verificationSent = $state(false);
 	let currentSession = $state(data.currentSession);
 	let user = $state(data.user);
@@ -27,7 +25,7 @@
 </svelte:head>
 
 {#snippet action(name: string, i: string = 'pen')}
-	<button style:display="contents" onclick={() => dialogs[name].showModal()}>
+	<button style:display="contents" commandfor={name} command="show-modal">
 		<Icon {i} --size="16px" />
 	</button>
 {/snippet}
@@ -45,7 +43,7 @@
 			<p>{user.name}</p>
 			{@render action('edit_name')}
 		</div>
-		<FormDialog bind:dialog={dialogs.edit_name} submit={_editUser} submitText="Change">
+		<FormDialog id="edit_name" submit={_editUser} submitText="Change">
 			<div>
 				<label for="name">What do you want to be called?</label>
 				<input name="name" type="text" value={user.name || ''} required />
@@ -67,7 +65,7 @@
 			</p>
 			{@render action('edit_email')}
 		</div>
-		<FormDialog bind:dialog={dialogs.edit_email} submit={_editUser} submitText="Change">
+		<FormDialog id="edit_email" submit={_editUser} submitText="Change">
 			<div>
 				<label for="email">Email Address</label>
 				<input name="email" type="email" value={user.email || ''} required />
@@ -80,11 +78,11 @@
 			<ClipboardCopy value={user.id} --size="16px" />
 		</div>
 		<span>
-			<button class="signout" onclick={() => dialogs.logout.showModal()}>Sign Out</button>
-			<button style:cursor="pointer" onclick={() => dialogs.delete.showModal()} class="danger">Delete Account</button>
-			<Logout bind:dialog={dialogs.logout} />
+			<button class="signout" command="show-modal" commandfor="logout">Sign Out</button>
+			<button style:cursor="pointer" command="show-modal" commandfor="delete" class="danger">Delete Account</button>
+			<Logout />
 			<FormDialog
-				bind:dialog={dialogs.delete}
+				id="delete"
 				submit={() => deleteUser(user.id).then(() => (window.location.href = '/'))}
 				submitText="Delete Account"
 				submitDanger
@@ -110,9 +108,9 @@
 					<p class="subtle"><i>Unnamed</i></p>
 				{/if}
 				<p>Created {passkey.createdAt.toLocaleString()}</p>
-				{@render action('edit_passkey#' + passkey.id)}
+				{@render action('edit_passkey:' + passkey.id)}
 				{#if passkeys.length > 1}
-					{@render action('delete_passkey#' + passkey.id, 'trash')}
+					{@render action('delete_passkey:' + passkey.id, 'trash')}
 				{:else}
 					<dfn title="You must have at least one passkey" class="disabled">
 						<Icon i="trash-slash" --fill="#888" --size="16px" />
@@ -120,7 +118,7 @@
 				{/if}
 			</div>
 			<FormDialog
-				bind:dialog={dialogs['edit_passkey#' + passkey.id]}
+				id={'edit_passkey:' + passkey.id}
 				submit={data => {
 					if (typeof data.name != 'string') throw 'Passkey name must be a string';
 					passkey.name = data.name;
@@ -134,7 +132,7 @@
 				</div>
 			</FormDialog>
 			<FormDialog
-				bind:dialog={dialogs['delete_passkey#' + passkey.id]}
+				id={'delete_passkey:' + passkey.id}
 				submit={() => deletePasskey(passkey.id).then(() => passkeys.splice(passkeys.indexOf(passkey), 1))}
 				submitText="Delete"
 				submitDanger={true}

package/routes/admin/audit/[id]/+page.svelte

@@ -40,4 +40,9 @@
 
 <h4>Extra Data</h4>
 
-<pre>{JSON.stringify(event.extra, null, 4)}</pre>
+{#if event.name == 'response_error'}
+	<h5>Error Stack</h5>
+	<pre>{event.extra.stack}</pre>
+{:else}
+	<pre>{JSON.stringify(event.extra, null, 4)}</pre>
+{/if}

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

@@ -15,7 +15,11 @@
 	<p><strong>Author:</strong> {plugin.author}</p>
 	<p>
 		<strong>Provided apps:</strong>
-		{#if plugin.apps?.length}{plugin.apps?.map(a => a.name).join(', ')}{:else}<i>None</i>{/if}
+		{#if plugin.apps?.length}
+			{#each plugin.apps as app, i}
+				<a href="/{app.id}">{app.name}</a>{i != plugin.apps.length - 1 ? ', ' : ''}
+			{/each}
+		{:else}<i>None</i>{/if}
 	</p>
 	<p>{plugin.description}</p>
 {:else}

package/schemas/config.json

@@ -0,0 +1,207 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "type": "object",
+    "properties": {
+        "admin_api": {
+            "type": "boolean"
+        },
+        "allow_new_users": {
+            "type": "boolean"
+        },
+        "apps": {
+            "type": "object",
+            "properties": {
+                "disabled": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "additionalProperties": {}
+        },
+        "audit": {
+            "type": "object",
+            "properties": {
+                "allow_raw": {
+                    "type": "boolean"
+                },
+                "retention": {
+                    "type": "number",
+                    "minimum": 0
+                },
+                "min_severity": {
+                    "type": "string",
+                    "enum": [
+                        "emergency",
+                        "alert",
+                        "critical",
+                        "error",
+                        "warning",
+                        "notice",
+                        "info",
+                        "debug",
+                        "Emergency",
+                        "Alert",
+                        "Critical",
+                        "Error",
+                        "Warning",
+                        "Notice",
+                        "Info",
+                        "Debug"
+                    ]
+                },
+                "auto_suspend": {
+                    "type": "string",
+                    "enum": [
+                        "emergency",
+                        "alert",
+                        "critical",
+                        "error",
+                        "warning",
+                        "notice",
+                        "info",
+                        "debug",
+                        "Emergency",
+                        "Alert",
+                        "Critical",
+                        "Error",
+                        "Warning",
+                        "Notice",
+                        "Info",
+                        "Debug"
+                    ]
+                }
+            },
+            "additionalProperties": {}
+        },
+        "auth": {
+            "type": "object",
+            "properties": {
+                "passkey_probation": {
+                    "type": "number"
+                },
+                "rp_id": {
+                    "type": "string"
+                },
+                "rp_name": {
+                    "type": "string"
+                },
+                "secure_cookies": {
+                    "type": "boolean"
+                },
+                "verification_timeout": {
+                    "type": "number"
+                },
+                "email_verification": {
+                    "type": "boolean"
+                },
+                "header_only": {
+                    "type": "boolean"
+                }
+            },
+            "additionalProperties": {}
+        },
+        "db": {
+            "type": "object",
+            "properties": {
+                "host": {
+                    "type": "string"
+                },
+                "port": {
+                    "type": "number"
+                },
+                "password": {
+                    "type": "string"
+                },
+                "user": {
+                    "type": "string"
+                },
+                "database": {
+                    "type": "string"
+                }
+            },
+            "additionalProperties": {}
+        },
+        "debug": {
+            "type": "boolean"
+        },
+        "debug_home": {
+            "type": "boolean"
+        },
+        "log": {
+            "type": "object",
+            "properties": {
+                "level": {
+                    "type": "string",
+                    "enum": [
+                        "error",
+                        "warn",
+                        "notice",
+                        "info",
+                        "debug"
+                    ]
+                },
+                "console": {
+                    "type": "boolean"
+                }
+            },
+            "additionalProperties": {}
+        },
+        "origin": {
+            "type": "string"
+        },
+        "request_size_limit": {
+            "type": "number",
+            "minimum": 0
+        },
+        "show_duplicate_state": {
+            "type": "boolean"
+        },
+        "web": {
+            "type": "object",
+            "properties": {
+                "disable_cache": {
+                    "type": "boolean"
+                },
+                "port": {
+                    "type": "number",
+                    "minimum": 1,
+                    "maximum": 65535
+                },
+                "prefix": {
+                    "type": "string"
+                },
+                "routes": {
+                    "type": "string"
+                },
+                "secure": {
+                    "type": "boolean"
+                },
+                "ssl_key": {
+                    "type": "string"
+                },
+                "ssl_cert": {
+                    "type": "string"
+                },
+                "build": {
+                    "type": "string"
+                }
+            },
+            "additionalProperties": {}
+        },
+        "include": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "plugins": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        }
+    },
+    "additionalProperties": {}
+}