@axium/server 0.32.1 → 0.33.1

package/dist/api/admin.js

@@ -1,8 +1,11 @@
 import { AuditFilter, Severity } from '@axium/core';
+import { errorText, writeJSON } from '@axium/core/node/io';
 import { getVersionInfo } from '@axium/core/node/packages';
-import { plugins } from '@axium/core/plugins';
+import { _findPlugin, plugins, PluginUpdate, serverConfigs } from '@axium/core/plugins';
 import { jsonObjectFrom } from 'kysely/helpers/postgres';
-import { omit } from 'utilium';
+import { mkdirSync } from 'node:fs';
+import { dirname } from 'node:path/posix';
+import { deepAssign, omit } from 'utilium';
 import * as z from 'zod';
 import { audit, events, getEvents } from '../audit.js';
 import { createVerification, requireSession } from '../auth.js';
@@ -52,6 +55,30 @@ addRoute({
             .values()
             .map(async (p) => Object.assign(omit(p, '_hooks', '_client'), p.update_checks ? await getVersionInfo(p.specifier, p.loadedBy) : { latest: null })));
     },
+    async POST(req) {
+        await assertAdmin(this, req);
+        const { plugin: name, config } = await parseBody(req, PluginUpdate);
+        let plugin;
+        try {
+            plugin = _findPlugin(name);
+        }
+        catch {
+            error(404, 'Plugin not found');
+        }
+        if (config) {
+            const { schema } = serverConfigs.get(name) || {};
+            if (!schema)
+                error(400, 'Plugin does not have a configuration schema');
+            if (!plugin._configPath)
+                error(503, 'Plugin configuration path is not set');
+            plugin.config ||= {};
+            const parsed = await schema.parseAsync(config).catch(e => error(400, errorText(e)));
+            deepAssign(plugin.config, parsed);
+            mkdirSync(dirname(plugin._configPath), { recursive: true });
+            writeJSON(plugin._configPath, plugin.config);
+        }
+        return {};
+    },
 });
 addRoute({
     path: '/api/admin/users',

package/dist/config.d.ts

@@ -1,6 +1,6 @@
 import { type DeepRequired } from 'utilium';
 import * as z from 'zod';
-export declare let ConfigSchema: z.ZodObject<{
+export declare const Config: z.ZodObject<{
     admin_api: z.ZodOptional<z.ZodBoolean>;
     allow_new_users: z.ZodOptional<z.ZodBoolean>;
     apps: z.ZodOptional<z.ZodObject<{
@@ -21,7 +21,7 @@ export declare let ConfigSchema: z.ZodObject<{
     }, z.core.$loose>>;
     db: z.ZodOptional<z.ZodObject<{
         host: z.ZodOptional<z.ZodString>;
-        port: z.ZodOptional<z.ZodNumber>;
+        port: z.ZodOptional<z.ZodInt>;
         password: z.ZodOptional<z.ZodString>;
         user: z.ZodOptional<z.ZodString>;
         database: z.ZodOptional<z.ZodString>;
@@ -56,10 +56,9 @@ export declare let ConfigSchema: z.ZodObject<{
         build: z.ZodOptional<z.ZodString>;
     }, z.core.$loose>>;
 }, z.core.$loose>;
-export declare function addConfig<T extends z.core.$ZodLooseShape>(shape: T): void;
-export interface Config extends z.infer<typeof ConfigSchema> {
+export interface Config extends z.infer<typeof Config> {
 }
-export declare const configFiles: Map<string, File>;
+export declare const configFiles: Map<string, ConfigFile>;
 export declare function plainConfig(): Omit<DeepRequired<Config>, keyof typeof configShortcuts>;
 export declare const defaultConfig: DeepRequired<Config>;
 declare const configShortcuts: {
@@ -70,12 +69,12 @@ declare const configShortcuts: {
     save: typeof saveConfig;
     saveTo: typeof saveConfigTo;
     set: typeof setConfig;
-    files: Map<string, File>;
+    files: Map<string, ConfigFile>;
     defaults: DeepRequired<Config>;
 };
 export declare const config: DeepRequired<Config> & typeof configShortcuts;
 export default config;
-export declare const FileSchema: z.ZodObject<{
+export declare const ConfigFile: z.ZodObject<{
     include: z.ZodOptional<z.ZodArray<z.ZodString>>;
     plugins: z.ZodOptional<z.ZodArray<z.ZodString>>;
     admin_api: z.ZodOptional<z.ZodOptional<z.ZodBoolean>>;
@@ -98,7 +97,7 @@ export declare const FileSchema: z.ZodObject<{
     }, z.core.$loose>>>;
     db: z.ZodOptional<z.ZodOptional<z.ZodObject<{
         host: z.ZodOptional<z.ZodString>;
-        port: z.ZodOptional<z.ZodNumber>;
+        port: z.ZodOptional<z.ZodInt>;
         password: z.ZodOptional<z.ZodString>;
         user: z.ZodOptional<z.ZodString>;
         database: z.ZodOptional<z.ZodString>;
@@ -133,9 +132,8 @@ export declare const FileSchema: z.ZodObject<{
         build: z.ZodOptional<z.ZodString>;
     }, z.core.$loose>>>;
 }, z.core.$loose>;
-export interface File extends z.infer<typeof FileSchema> {
+export interface ConfigFile extends z.infer<typeof ConfigFile> {
 }
-export declare function addConfigDefaults(other: Config, _target?: Record<string, any>, _noDefault?: boolean): void;
 /**
  * Update the current config
  */

package/dist/config.js

@@ -7,9 +7,10 @@ import { capitalize, deepAssign, omit } from 'utilium';
 import * as z from 'zod';
 import { dirs, logger, systemDir } from './io.js';
 import { _duplicateStateWarnings, _unique } from './state.js';
+import { serverConfigs, toBaseName } from '@axium/core';
 const audit_severity_levels = ['emergency', 'alert', 'critical', 'error', 'warning', 'notice', 'info', 'debug'];
 const z_audit_severity = z.literal([...audit_severity_levels, ...audit_severity_levels.map(capitalize)]);
-export let ConfigSchema = z
+export const Config = z
     .looseObject({
     /** Whether /api/admin is enabled */
     admin_api: z.boolean(),
@@ -42,7 +43,7 @@ export let ConfigSchema = z
     db: z
         .looseObject({
         host: z.string(),
-        port: z.number(),
+        port: z.int().min(1).max(65535),
         password: z.string(),
         user: z.string(),
         database: z.string(),
@@ -82,9 +83,6 @@ export let ConfigSchema = z
         .partial(),
 })
     .partial();
-export function addConfig(shape) {
-    ConfigSchema = z.looseObject({ ...ConfigSchema.shape, ...shape });
-}
 export const configFiles = _unique('configFiles', new Map());
 export function plainConfig() {
     return omit(config, Object.keys(configShortcuts));
@@ -161,26 +159,13 @@ export const config = _unique('config', {
 });
 export default config;
 // config from file
-export const FileSchema = z
+export const ConfigFile = z
     .looseObject({
-    ...ConfigSchema.shape,
+    ...Config.shape,
     include: z.string().array(),
     plugins: z.string().array(),
 })
     .partial();
-export function addConfigDefaults(other, _target = config, _noDefault = false) {
-    if (!_noDefault)
-        deepAssign(defaultConfig, other);
-    for (const [key, value] of Object.entries(other)) {
-        if (!(key in _target) || _target[key] === null || _target[key] === undefined || Number.isNaN(_target[key])) {
-            _target[key] = value;
-            continue;
-        }
-        if (typeof value == 'object' && value != null && typeof _target[key] == 'object') {
-            addConfigDefaults(value, _target[key], true);
-        }
-    }
-}
 /**
  * Update the current config
  */
@@ -222,7 +207,7 @@ export async function loadConfig(path, options = {}) {
     }
     let file;
     try {
-        file = FileSchema.parse(json);
+        file = ConfigFile.parse(json);
         if (file.web?.build)
             file.web.build = resolve(dirname(path), file.web.build);
     }
@@ -241,6 +226,25 @@ export async function loadConfig(path, options = {}) {
         const plugin = await loadPlugin('server', pluginPath, path, options.safe);
         if (!plugin)
             continue;
+        const serverConfig = serverConfigs.get(plugin.name);
+        if (serverConfig) {
+            plugin.config ||= {};
+            let configPath;
+            for (const dir of dirs) {
+                configPath = join(dir, 'plugins', toBaseName(plugin.name) + '.json');
+                if (!existsSync(configPath))
+                    continue;
+                try {
+                    const data = io.readJSON(configPath, serverConfig.schema.partial());
+                    deepAssign(plugin.config, data);
+                    io.debug(`Loaded config for plugin ${plugin.name} from ${configPath}`);
+                }
+                catch (e) {
+                    io.warn(`Failed to load config for plugin ${plugin.name} at ${configPath}: ${e}`);
+                }
+            }
+            plugin._configPath = configPath;
+        }
     }
 }
 export async function loadDefaultConfigs(safe = false) {

package/dist/database.d.ts

@@ -439,7 +439,7 @@ export declare const SchemaFile: z.ZodObject<{
         drop_indexes: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodTemplateLiteral<`${string}:${string}`>>>>;
     }, z.core.$strict>], "delta">>;
     wipe: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString>>>;
-    latest: z.ZodOptional<z.ZodNumber>;
+    latest: z.ZodOptional<z.ZodInt32>;
     acl_tables: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>>;
 }, z.core.$strip>;
 export interface SchemaFile extends z.infer<typeof SchemaFile> {
@@ -555,11 +555,11 @@ export declare function getFullSchema(opt?: {
     versions: Record<string, number>;
 };
 export declare const UpgradesInfo: z.ZodObject<{
-    current: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodInt>>;
+    current: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodInt32>>;
     upgrades: z.ZodDefault<z.ZodArray<z.ZodObject<{
         timestamp: z.ZodCoercedDate<unknown>;
-        from: z.ZodRecord<z.ZodString, z.ZodInt>;
-        to: z.ZodRecord<z.ZodString, z.ZodInt>;
+        from: z.ZodRecord<z.ZodString, z.ZodInt32>;
+        to: z.ZodRecord<z.ZodString, z.ZodInt32>;
     }, z.core.$strip>>>;
 }, z.core.$strip>;
 export interface UpgradesInfo extends z.infer<typeof UpgradesInfo> {

package/dist/database.js

@@ -352,7 +352,7 @@ export const SchemaFile = z.object({
     /** List of tables to wipe */
     wipe: z.string().array().optional().default([]),
     /** Set the latest version, defaults to the last one */
-    latest: z.number().nonnegative().optional(),
+    latest: z.int32().nonnegative().optional(),
     /** Maps tables to their ACL tables, e.g. `"storage": "acl.storage"` */
     acl_tables: z.record(z.string(), z.string()).optional().default({}),
 });
@@ -416,7 +416,7 @@ const schemaToIntrospected = {
     integer: 'int4',
     'text[]': '_text',
 };
-const VersionMap = z.record(z.string(), z.int().nonnegative());
+const VersionMap = z.record(z.string(), z.int32().nonnegative());
 export const UpgradesInfo = z.object({
     current: VersionMap.default({}),
     upgrades: z.object({ timestamp: z.coerce.date(), from: VersionMap, to: VersionMap }).array().default([]),

package/dist/linking.d.ts

@@ -12,5 +12,6 @@ export declare function listRouteLinks(options?: LinkOptions): Generator<LinkInf
  * Symlinks .svelte page routes for plugins and the server into a project's routes directory.
  */
 export declare function linkRoutes(options?: LinkOptions): void;
+export declare function writePluginHooks(): void;
 export declare function unlinkRoutes(options?: LinkOptions): void;
 export {};

package/dist/linking.js

@@ -1,7 +1,7 @@
 import * as io from '@axium/core/node/io';
 import { plugins } from '@axium/core/plugins';
-import { existsSync, symlinkSync, unlinkSync } from 'node:fs';
-import { join, resolve } from 'node:path/posix';
+import { existsSync, symlinkSync, unlinkSync, writeFileSync } from 'node:fs';
+import { join, relative, resolve } from 'node:path/posix';
 import config from './config.js';
 const textFor = {
     builtin: 'built-in routes',
@@ -54,6 +54,20 @@ export function linkRoutes(options = {}) {
         }
     }
 }
+export function writePluginHooks() {
+    const hooksPath = join(import.meta.dirname, '../.hooks.js');
+    io.start('Writing web client hooks for plugins');
+    let hooks = `// auto-generated plugin hooks //\n`;
+    for (const plugin of plugins.values()) {
+        if (!plugin.server?.web_client_hooks)
+            continue;
+        const specifier = relative(resolve(import.meta.dirname, '..'), resolve(plugin.dirname, plugin.server.web_client_hooks));
+        hooks += `import '${specifier}';\n`;
+    }
+    writeFileSync(hooksPath, hooks, 'utf8');
+    io.done();
+    io.debug('Wrote', hooksPath);
+}
 export function unlinkRoutes(options = {}) {
     for (const info of listRouteLinks(options)) {
         const { text, from } = info;

package/dist/main.js

@@ -66,10 +66,10 @@ import * as z from 'zod';
 import $pkg from '../package.json' with { type: 'json' };
 import { audit, getEvents, styleSeverity } from './audit.js';
 import { diffUpdate, lookupUser, userText } from './cli.js';
-import config, { configFiles, FileSchema, saveConfigTo } from './config.js';
+import config, { ConfigFile, configFiles, saveConfigTo } from './config.js';
 import * as db from './database.js';
 import { _portActions, _portMethods, restrictedPorts } from './io.js';
-import { linkRoutes, listRouteLinks, unlinkRoutes } from './linking.js';
+import { linkRoutes, listRouteLinks, unlinkRoutes, writePluginHooks } from './linking.js';
 import { serve } from './serve.js';
 async function rlConfirm(question = 'Is this ok') {
     const { data, error } = z
@@ -97,7 +97,7 @@ function configReplacer(opt) {
         return opt.redact && ['password', 'secret'].includes(key) ? '[redacted]' : value;
     };
 }
-var rl, safe, configFromCLI, noAutoDB, opts, axiumDB, axiumConfig, axiumPlugin, axiumApps, argUserLookup;
+var rl, safe, debug, configFromCLI, noAutoDB, opts, axiumDB, axiumConfig, axiumPlugin, axiumApps, argUserLookup;
 const env_1 = { stack: [], error: void 0, hasError: false };
 try {
     rl = __addDisposableResource(env_1, createInterface({
@@ -105,14 +105,23 @@ try {
         output: process.stdout,
     }), false);
     // Need these before Command is set up (e.g. for CLI integrations)
-    ({ safe, config: configFromCLI } = parseArgs({
+    ({
+        safe,
+        debug,
+        config: configFromCLI
+    } = parseArgs({
         options: {
             safe: { type: 'boolean', default: z.stringbool().default(false).parse(process.env.SAFE?.toLowerCase()) },
+            debug: { type: 'boolean', default: z.stringbool().default(false).parse(process.env.DEBUG?.toLowerCase()) },
             config: { type: 'string', short: 'c' },
         },
         allowPositionals: true,
         strict: false,
     }).values);
+    if (debug) {
+        io._setDebugOutput(true);
+        config.set({ debug: true });
+    }
     await config.loadDefaults(safe);
     if (configFromCLI)
         await config.load(configFromCLI, { safe });
@@ -495,7 +504,7 @@ try {
         .action(() => {
         const opt = axiumConfig.optsWithGlobals();
         try {
-            const schema = z.toJSONSchema(FileSchema, { io: 'input' });
+            const schema = z.toJSONSchema(ConfigFile, { io: 'input' });
             console.log(opt.json ? JSON.stringify(schema, configReplacer(opt), 4) : schema);
         }
         catch (e) {
@@ -777,6 +786,7 @@ try {
             return;
         }
         linkRoutes(linkOpts);
+        writePluginHooks();
     });
     program
         .command('audit')

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/server",
-	"version": "0.32.1",
+	"version": "0.33.1",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"funding": {
 		"type": "individual",
@@ -47,8 +47,8 @@
 		"clean": "rm -rf build .svelte-kit node_modules/{.vite,.vite-temp}"
 	},
 	"peerDependencies": {
-		"@axium/client": ">=0.11.0",
-		"@axium/core": ">=0.17.0",
+		"@axium/client": ">=0.12.0",
+		"@axium/core": ">=0.18.0",
 		"kysely": "^0.28.0",
 		"utilium": "^2.6.0",
 		"zod": "^4.0.5"

package/routes/account/+page.svelte

@@ -1,7 +1,9 @@
 <script lang="ts">
-	import { ClipboardCopy, FormDialog, Icon, Logout, Preferences, SessionList } from '@axium/client/components';
+	import { ClipboardCopy, FormDialog, Icon, Logout, SessionList, ZodForm } from '@axium/client/components';
+	import { fetchAPI } from '@axium/client/requests';
 	import '@axium/client/styles/account';
 	import { createPasskey, deletePasskey, deleteUser, sendVerificationEmail, updatePasskey, updateUser } from '@axium/client/user';
+	import { preferenceLabels, Preferences } from '@axium/core/preferences';
 	import { getUserImage } from '@axium/core/user';
 	import type { PageProps } from './$types';
 
@@ -161,7 +163,13 @@
 
 	<div id="preferences" class="section main">
 		<h3>Preferences</h3>
-		<Preferences userId={user.id} bind:preferences={user.preferences} />
+		<ZodForm
+			bind:rootValue={user.preferences}
+			idPrefix="preferences"
+			schema={Preferences}
+			labels={preferenceLabels}
+			updateValue={(preferences: Preferences) => fetchAPI('PATCH', 'users/:id', { preferences }, user.id)}
+		/>
 	</div>
 </div>
 

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

@@ -1,5 +1,7 @@
 <script lang="ts">
-	import { Version } from '@axium/client/components';
+	import { Version, ZodForm } from '@axium/client/components';
+	import { fetchAPI } from '@axium/client/requests';
+	import { serverConfigs } from '@axium/core';
 
 	const { data } = $props();
 </script>
@@ -11,6 +13,7 @@
 <h2>Plugins</h2>
 
 {#each data.plugins as plugin}
+	{@const cfg = serverConfigs.get(plugin.name)}
 	<div class="plugin">
 		<h3>{plugin.name}<Version v={plugin.version} latest={plugin.latest} /></h3>
 		<p>
@@ -35,6 +38,17 @@
 			{:else}<i>None</i>{/if}
 		</p>
 		<p>{plugin.description}</p>
+		{#if cfg && plugin.config}
+			<h4>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}
 	</div>
 {:else}
 	<i>No plugins loaded.</i>
@@ -60,4 +74,8 @@
 	.apps a {
 		text-decoration: underline;
 	}
+
+	.plugin :global(label:not(.checkbox)) {
+		font-family: monospace;
+	}
 </style>

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

@@ -1,7 +1,9 @@
 <script lang="ts">
-	import { ClipboardCopy, Preferences, SessionList, Icon, FormDialog } from '@axium/client/components';
+	import { ClipboardCopy, FormDialog, Icon, SessionList, ZodForm } from '@axium/client/components';
+	import { fetchAPI } from '@axium/client/requests';
 	import '@axium/client/styles/account';
 	import { deleteUser } from '@axium/client/user';
+	import { preferenceLabels, Preferences } from '@axium/core';
 	import { formatDateRange } from '@axium/core/format';
 
 	const { data } = $props();
@@ -108,7 +110,12 @@
 
 <div id="preferences" class="section main">
 	<h3>Preferences</h3>
-	<Preferences userId={user.id} bind:preferences={user.preferences} />
+	<ZodForm
+		bind:rootValue={user.preferences}
+		schema={Preferences}
+		labels={preferenceLabels}
+		updateValue={(preferences: Preferences) => fetchAPI('PATCH', 'users/:id', { preferences }, user.id)}
+	/>
 </div>
 
 <style>

package/schemas/config.json

@@ -103,7 +103,9 @@
                     "type": "string"
                 },
                 "port": {
-                    "type": "number"
+                    "type": "integer",
+                    "minimum": 1,
+                    "maximum": 65535
                 },
                 "password": {
                     "type": "string"

package/schemas/db.json

@@ -875,8 +875,9 @@
             }
         },
         "latest": {
-            "type": "number",
-            "minimum": 0
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 2147483647
         },
         "acl_tables": {
             "default": {},

package/svelte.config.js

@@ -22,6 +22,7 @@ export default {
 			routes: config.web.routes,
 			hooks: {
 				universal: '/dev/null',
+				client: join(import.meta.dirname, '.hooks.js'),
 			},
 		},
 	},