@axium/server 0.25.0 → 0.26.0

package/dist/config.d.ts

@@ -9,8 +9,8 @@ export declare const ConfigSchema: z.ZodObject<{
     audit: z.ZodOptional<z.ZodObject<{
         allow_raw: z.ZodOptional<z.ZodBoolean>;
         retention: z.ZodOptional<z.ZodNumber>;
-        min_severity: z.ZodOptional<z.ZodLiteral<"error" | "debug" | "Emergency" | "Alert" | "Critical" | "Error" | "Warning" | "Notice" | "Info" | "Debug" | "emergency" | "alert" | "critical" | "warning" | "notice" | "info">>;
-        auto_suspend: z.ZodOptional<z.ZodLiteral<"error" | "debug" | "Emergency" | "Alert" | "Critical" | "Error" | "Warning" | "Notice" | "Info" | "Debug" | "emergency" | "alert" | "critical" | "warning" | "notice" | "info">>;
+        min_severity: z.ZodOptional<z.ZodLiteral<"Emergency" | "Alert" | "Critical" | "Error" | "Warning" | "Notice" | "Info" | "Debug" | "emergency" | "alert" | "critical" | "error" | "warning" | "notice" | "info" | "debug">>;
+        auto_suspend: z.ZodOptional<z.ZodLiteral<"Emergency" | "Alert" | "Critical" | "Error" | "Warning" | "Notice" | "Info" | "Debug" | "emergency" | "alert" | "critical" | "error" | "warning" | "notice" | "info" | "debug">>;
     }, z.core.$loose>>;
     auth: z.ZodOptional<z.ZodObject<{
         origin: z.ZodOptional<z.ZodString>;
@@ -34,9 +34,9 @@ export declare const ConfigSchema: z.ZodObject<{
     log: z.ZodOptional<z.ZodObject<{
         level: z.ZodOptional<z.ZodEnum<{
             error: "error";
-            debug: "debug";
             notice: "notice";
             info: "info";
+            debug: "debug";
             warn: "warn";
         }>>;
         console: z.ZodOptional<z.ZodBoolean>;
@@ -82,8 +82,8 @@ export declare const FileSchema: z.ZodObject<{
     audit: z.ZodOptional<z.ZodOptional<z.ZodObject<{
         allow_raw: z.ZodOptional<z.ZodBoolean>;
         retention: z.ZodOptional<z.ZodNumber>;
-        min_severity: z.ZodOptional<z.ZodLiteral<"error" | "debug" | "Emergency" | "Alert" | "Critical" | "Error" | "Warning" | "Notice" | "Info" | "Debug" | "emergency" | "alert" | "critical" | "warning" | "notice" | "info">>;
-        auto_suspend: z.ZodOptional<z.ZodLiteral<"error" | "debug" | "Emergency" | "Alert" | "Critical" | "Error" | "Warning" | "Notice" | "Info" | "Debug" | "emergency" | "alert" | "critical" | "warning" | "notice" | "info">>;
+        min_severity: z.ZodOptional<z.ZodLiteral<"Emergency" | "Alert" | "Critical" | "Error" | "Warning" | "Notice" | "Info" | "Debug" | "emergency" | "alert" | "critical" | "error" | "warning" | "notice" | "info" | "debug">>;
+        auto_suspend: z.ZodOptional<z.ZodLiteral<"Emergency" | "Alert" | "Critical" | "Error" | "Warning" | "Notice" | "Info" | "Debug" | "emergency" | "alert" | "critical" | "error" | "warning" | "notice" | "info" | "debug">>;
     }, z.core.$loose>>>;
     auth: z.ZodOptional<z.ZodOptional<z.ZodObject<{
         origin: z.ZodOptional<z.ZodString>;
@@ -107,9 +107,9 @@ export declare const FileSchema: z.ZodObject<{
     log: z.ZodOptional<z.ZodOptional<z.ZodObject<{
         level: z.ZodOptional<z.ZodEnum<{
             error: "error";
-            debug: "debug";
             notice: "notice";
             info: "info";
+            debug: "debug";
             warn: "warn";
         }>>;
         console: z.ZodOptional<z.ZodBoolean>;

package/dist/config.js

@@ -1,10 +1,11 @@
+import * as io from '@axium/core/node/io';
+import { loadPlugin } from '@axium/core/node/plugins';
 import { levelText } from 'logzen';
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path/posix';
 import { capitalize, deepAssign, omit } from 'utilium';
 import * as z from 'zod';
-import { _setDebugOutput, dirs, logger, output } from './io.js';
-import { loadPlugin } from './plugins.js';
+import { dirs, logger, systemDir } from './io.js';
 import { _duplicateStateWarnings, _unique } from './state.js';
 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)]);
@@ -152,8 +153,8 @@ export default config;
 export const FileSchema = z
     .looseObject({
     ...ConfigSchema.shape,
-    include: z.array(z.string()),
-    plugins: z.array(z.string()),
+    include: z.string().array(),
+    plugins: z.string().array(),
 })
     .partial();
 export function addConfigDefaults(other, _target = config, _noDefault = false) {
@@ -174,10 +175,10 @@ export function addConfigDefaults(other, _target = config, _noDefault = false) {
  */
 export function setConfig(other) {
     deepAssign(config, other);
-    logger.detach(output);
+    logger.detach(io);
     if (config.log.console)
-        logger.attach(output, { output: config.log.level });
-    _setDebugOutput(config.debug);
+        logger.attach(io, { output: config.log.level });
+    io._setDebugOutput(config.debug);
     _duplicateStateWarnings(config.show_duplicate_state);
 }
 const kWasIncluded = Symbol.for('_wasIncluded');
@@ -192,9 +193,20 @@ export async function loadConfig(path, options = {}) {
         json = JSON.parse(readFileSync(path, 'utf8'));
     }
     catch (e) {
+        if (path == join(systemDir, 'config.json') && 'code' in e && e.code === 'ENOENT') {
+            try {
+                writeFileSync(path, '{}');
+            }
+            catch {
+                io.warn('Failed to create the main configuration file (/etc/axium/config.json): ' + e.message);
+                return;
+            }
+            io.debug('Created main configuration file (fresh install?)');
+            return;
+        }
         if (!options.optional)
             throw e;
-        output.debug(`Skipping config at ${path} (${e.message})`);
+        io.debug(`Skipping config at ${path} (${e.message})`);
         return;
     }
     let file;
@@ -204,16 +216,16 @@ export async function loadConfig(path, options = {}) {
     catch (e) {
         if (!options.loose)
             throw e;
-        output.debug(`Loading invalid config from ${path} (${e.message})`);
+        io.debug(`Loading invalid config from ${path} (${e.message})`);
         file = json;
     }
     configFiles.set(path, { ...file, [kWasIncluded]: !!options._markIncluded });
     setConfig(file);
-    output.debug('Loaded config: ' + path);
+    io.debug('Loaded config: ' + path);
     for (const include of file.include ?? [])
         await loadConfig(resolve(dirname(path), include), { ...options, optional: true, _markIncluded: true });
     for (const plugin of file.plugins ?? [])
-        await loadPlugin(plugin, path, options.safe);
+        await loadPlugin('server', plugin, path, options.safe);
 }
 export async function loadDefaultConfigs(safe = false) {
     for (const path of findConfigPaths()) {
@@ -237,7 +249,7 @@ export async function reloadConfigs(safe = false) {
     setConfig(defaultConfig);
     for (const path of paths)
         await loadConfig(path, { safe });
-    output.info('Reloaded configuration files');
+    io.info('Reloaded configuration files');
 }
 /**
  * Update the current config and write the updated config to the appropriate file
@@ -252,7 +264,7 @@ export function saveConfigTo(path, changed) {
     setConfig(changed);
     const config = configFiles.get(path) ?? {};
     Object.assign(config, { ...changed, db: { ...config.db, ...changed.db } });
-    output.debug(`Wrote config to ${path}`);
+    io.debug(`Wrote config to ${path}`);
     writeFileSync(path, JSON.stringify(config));
 }
 /**

package/dist/database.js

@@ -50,14 +50,15 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
     var e = new Error(message);
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 });
+import * as io from '@axium/core/node/io';
+import { plugins } from '@axium/core/plugins';
 import { Kysely, PostgresDialect, sql } from 'kysely';
 import { jsonObjectFrom } from 'kysely/helpers/postgres';
 import { randomBytes } from 'node:crypto';
 import { readFileSync, writeFileSync } from 'node:fs';
 import pg from 'pg';
 import config from './config.js';
-import * as io from './io.js';
-import { plugins } from './plugins.js';
+import { styleText } from 'node:util';
 const sym = Symbol.for('Axium:database');
 export let database;
 export function connect() {
@@ -280,7 +281,7 @@ export async function init(opt) {
         for (const plugin of plugins.values()) {
             if (!plugin._hooks?.db_init)
                 continue;
-            io.plugin(plugin.name);
+            io.log(styleText('whiteBright', 'Running plugin: '), plugin.name);
             await plugin._hooks?.db_init(opt);
         }
     }
@@ -435,7 +436,7 @@ export async function clean(opt) {
     for (const plugin of plugins.values()) {
         if (!plugin._hooks?.clean)
             continue;
-        io.plugin(plugin.name);
+        io.log(styleText('whiteBright', 'Running plugin: '), plugin.name);
         await plugin._hooks?.clean(opt);
     }
 }
@@ -446,7 +447,7 @@ export async function uninstall(opt) {
     for (const plugin of plugins.values()) {
         if (!plugin._hooks?.remove)
             continue;
-        io.plugin(plugin.name);
+        io.log(styleText('whiteBright', 'Running plugin: '), plugin.name);
         await plugin._hooks?.remove(opt);
     }
     await _sql('DROP DATABASE axium', 'Dropping database');
@@ -472,7 +473,7 @@ export async function wipe(opt) {
     for (const plugin of plugins.values()) {
         if (!plugin._hooks?.db_wipe)
             continue;
-        io.plugin(plugin.name);
+        io.log(styleText('whiteBright', 'Running plugin: '), plugin.name);
         await plugin._hooks?.db_wipe(opt);
     }
     for (const table of ['users', 'passkeys', 'sessions', 'verifications']) {

package/dist/io.d.ts

@@ -2,46 +2,6 @@ import { Logger } from 'logzen';
 export declare const systemDir = "/etc/axium";
 export declare const dirs: string[];
 export declare const logger: Logger;
-/**
- * @internal
- */
-export declare const output: {
-    constructor: {
-        name: string;
-    };
-    error(message: string): void;
-    warn(message: string): void;
-    info(message: string): void;
-    log(message: string): void;
-    debug(message: string): void;
-};
-export declare function setCommandTimeout(value: number): void;
-/**
- * Run a system command with the fancy "Example... done."
- * @internal
- */
-export declare function run(message: string, command: string): Promise<string>;
-/** Yet another convenience function */
-export declare function exit(message: string | Error, code?: number): never;
-export declare function handleError(e: number | string | Error): void;
-export type OutputTag = 'debug' | 'info' | 'warn' | 'error' | 'start' | 'done' | 'plugin';
-export interface Output {
-    (tag: 'done'): void;
-    (tag: Exclude<OutputTag, 'done'>, message: string): void;
-}
-export declare let _debugOutput: boolean;
-/**
- * Enable or disable debug output.
- */
-export declare function _setDebugOutput(enabled: boolean): void;
-export declare function useTaggedOutput(output: Output | null): void;
-export declare function done(): void;
-export declare function start(message: string): void;
-export declare function plugin(name: string): void;
-export declare function debug(message: string): void;
-export declare function info(message: string): void;
-export declare function warn(message: string): void;
-export declare function error(message: string): void;
 /** @internal */
 export declare const _portMethods: readonly ["node-cap"];
 /** @internal */
@@ -63,13 +23,3 @@ export interface PortOptions {
  * If the origin has a port, passkeys do not work correctly with some password managers.
  */
 export declare function restrictedPorts(opt: PortOptions): Promise<void>;
-/**
- * This is a factory for handling errors when performing operations.
- * The handler will allow the parent scope to continue if a relation already exists,
- * rather than fatally exiting.
- */
-export declare function someWarnings(...allowList: [RegExp, string?][]): (error: string | Error) => void;
-/**
- * Get a human-readable string for a date that also fits into CLIs well (fixed-width)
- */
-export declare function prettyDate(date: Date): string;

package/dist/io.js

@@ -1,8 +1,7 @@
+import * as io from '@axium/core/node/io';
 import { Logger } from 'logzen';
-import { exec } from 'node:child_process';
 import * as fs from 'node:fs';
 import { dirname, join, resolve } from 'node:path/posix';
-import { styleText } from 'node:util';
 import { _unique } from './state.js';
 export const systemDir = '/etc/axium';
 export const dirs = _unique('dirs', [systemDir]);
@@ -22,130 +21,7 @@ export const logger = new Logger({
     hideWarningStack: true,
     noGlobalConsole: true,
 });
-/**
- * @internal
- */
-export const output = {
-    constructor: { name: 'Console' },
-    error(message) {
-        console.error(message.startsWith('\x1b') ? message : styleText('red', message));
-    },
-    warn(message) {
-        console.warn(message.startsWith('\x1b') ? message : styleText('yellow', message));
-    },
-    info(message) {
-        console.info(message.startsWith('\x1b') ? message : styleText('blue', message));
-    },
-    log(message) {
-        console.log(message);
-    },
-    debug(message) {
-        _debugOutput && console.debug(message.startsWith('\x1b') ? message : styleText('gray', message));
-    },
-};
-logger.attach(output);
-let timeout = 1000;
-export function setCommandTimeout(value) {
-    timeout = value;
-}
-/**
- * Run a system command with the fancy "Example... done."
- * @internal
- */
-export async function run(message, command) {
-    let stderr;
-    try {
-        start(message);
-        const { promise, resolve, reject } = Promise.withResolvers();
-        exec(command, { timeout }, (err, stdout, _stderr) => {
-            stderr = _stderr.startsWith('ERROR:') ? _stderr.slice(6).trim() : _stderr;
-            if (err)
-                reject('[command]');
-            else
-                resolve(stdout);
-        });
-        const value = await promise;
-        done();
-        return value;
-    }
-    catch (error) {
-        throw error == '[command]'
-            ? stderr?.slice(0, 100) || 'failed.'
-            : typeof error == 'object' && 'message' in error
-                ? error.message
-                : error;
-    }
-}
-/** Yet another convenience function */
-export function exit(message, code = 1) {
-    if (message instanceof Error)
-        message = message.message;
-    output.error(message);
-    process.exit(code);
-}
-export function handleError(e) {
-    if (typeof e == 'number')
-        process.exit(e);
-    else
-        exit(e);
-}
-export let _debugOutput = false;
-/**
- * Enable or disable debug output.
- */
-export function _setDebugOutput(enabled) {
-    _debugOutput = enabled;
-}
-function defaultOutput(tag, message = '') {
-    switch (tag) {
-        case 'debug':
-            _debugOutput && output.debug(message);
-            break;
-        case 'info':
-            console.log(message);
-            break;
-        case 'warn':
-            console.warn(styleText('yellow', message));
-            break;
-        case 'error':
-            console.error(styleText('red', message));
-            break;
-        case 'start':
-            process.stdout.write(message + '... ');
-            break;
-        case 'done':
-            console.log('done.');
-            break;
-        case 'plugin':
-            console.log(styleText('whiteBright', 'Running plugin: ' + message));
-    }
-}
-let _taggedOutput = defaultOutput;
-export function useTaggedOutput(output) {
-    _taggedOutput = output;
-}
-// Shortcuts for tagged output
-export function done() {
-    _taggedOutput?.('done');
-}
-export function start(message) {
-    _taggedOutput?.('start', message);
-}
-export function plugin(name) {
-    _taggedOutput?.('plugin', name);
-}
-export function debug(message) {
-    _taggedOutput?.('debug', message);
-}
-export function info(message) {
-    _taggedOutput?.('info', message);
-}
-export function warn(message) {
-    _taggedOutput?.('warn', message);
-}
-export function error(message) {
-    _taggedOutput?.('error', message);
-}
+logger.attach(io);
 /** @internal */
 export const _portMethods = ['node-cap'];
 /** @internal */
@@ -156,72 +32,48 @@ export const _portActions = ['enable', 'disable'];
  * If the origin has a port, passkeys do not work correctly with some password managers.
  */
 export async function restrictedPorts(opt) {
-    start('Checking for root privileges');
+    io.start('Checking for root privileges');
     if (process.getuid?.() != 0)
         throw 'root privileges are needed to change restricted ports.';
-    done();
-    start('Checking ports method');
+    io.done();
+    io.start('Checking ports method');
     if (!_portMethods.includes(opt.method))
         throw 'invalid';
-    done();
-    start('Checking ports action');
+    io.done();
+    io.start('Checking ports action');
     if (!_portActions.includes(opt.action))
         throw 'invalid';
-    done();
+    io.done();
     switch (opt.method) {
         case 'node-cap': {
-            const setcap = await run('Finding setcap', 'command -v setcap')
+            const setcap = await io
+                .run('Finding setcap', 'command -v setcap')
                 .then(e => e.trim())
                 .catch(() => {
-                warn('not in path.');
-                start('Checking for /usr/sbin/setcap');
+                io.warn('not in path.');
+                io.start('Checking for /usr/sbin/setcap');
                 fs.accessSync('/usr/sbin/setcap', fs.constants.X_OK);
-                done();
+                io.done();
                 return '/usr/sbin/setcap';
             });
-            debug('Using setcap at ' + setcap);
+            io.debug('Using setcap at ' + setcap);
             let { node } = opt;
-            node ||= await run('Finding node', 'command -v node')
+            node ||= await io
+                .run('Finding node', 'command -v node')
                 .then(e => e.trim())
                 .catch(() => {
-                warn('not in path.');
-                start('Checking for /usr/bin/node');
+                io.warn('not in path.');
+                io.start('Checking for /usr/bin/node');
                 fs.accessSync('/usr/bin/node', fs.constants.X_OK);
-                done();
+                io.done();
                 return '/usr/bin/node';
             });
-            start('Resolving real path for node');
+            io.start('Resolving real path for node');
             node = fs.realpathSync(node);
-            done();
-            debug('Using node at ' + node);
-            await run('Setting ports capability', `${setcap} cap_net_bind_service=${opt.action == 'enable' ? '+' : '-'}ep ${node}`);
+            io.done();
+            io.debug('Using node at ' + node);
+            await io.run('Setting ports capability', `${setcap} cap_net_bind_service=${opt.action == 'enable' ? '+' : '-'}ep ${node}`);
             break;
         }
     }
 }
-/**
- * This is a factory for handling errors when performing operations.
- * The handler will allow the parent scope to continue if a relation already exists,
- * rather than fatally exiting.
- */
-export function someWarnings(...allowList) {
-    return (error) => {
-        error = typeof error == 'object' && 'message' in error ? error.message : error;
-        for (const [pattern, message = error] of allowList) {
-            if (!pattern.test(error))
-                continue;
-            warn(message);
-            return;
-        }
-        throw error;
-    };
-}
-const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-// Shortcut to convert to 2-digit. Mostly used to make the line shorter.
-const _2 = (v) => v.toString().padStart(2, '0');
-/**
- * Get a human-readable string for a date that also fits into CLIs well (fixed-width)
- */
-export function prettyDate(date) {
-    return `${date.getFullYear()} ${months[date.getMonth()]} ${_2(date.getDate())} ${_2(date.getHours())}:${_2(date.getMinutes())}:${_2(date.getSeconds())}.${date.getMilliseconds().toString().padStart(3, '0')}`;
-}

package/dist/linking.js

@@ -1,8 +1,8 @@
+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 config from './config.js';
-import * as io from './io.js';
-import { plugins } from './plugins.js';
 const textFor = {
     builtin: 'built-in routes',
 };
@@ -17,12 +17,12 @@ export function* listRouteLinks(options = {}) {
         yield { text, id: '#builtin', from: link, to: resolve(import.meta.dirname, '../routes') };
     }
     for (const plugin of plugins.values()) {
-        if (!plugin.routes)
+        if (!plugin.server?.routes)
             continue;
         if (options.only && !options.only.includes(plugin.name))
             continue;
         const [text, link] = info(plugin.name);
-        const to = resolve(join(plugin.dirname, plugin.routes));
+        const to = resolve(join(plugin.dirname, plugin.server.routes));
         yield { text, id: plugin.name, from: link, to };
     }
 }

package/dist/requests.d.ts

@@ -34,7 +34,11 @@ export declare function redirect(location: string, status?: number): never;
 export declare function json(data: object, init?: ResponseInit): Response;
 export declare function parseBody<const Schema extends z.ZodType, const Result extends z.infer<Schema> = z.infer<Schema>>(request: Request, schema: Schema): Promise<Result>;
 export declare function getToken(request: Request, sensitive?: boolean): string | undefined;
-export declare function createSessionData(userId: string, elevated?: boolean): Promise<Response>;
+export interface CreateSessionOptions {
+    elevated?: boolean;
+    noCookie?: boolean;
+}
+export declare function createSessionData(userId: string, { elevated, noCookie }?: CreateSessionOptions): Promise<Response>;
 export declare function stripUser(user: UserInternal, includeProtected?: boolean): User;
 export declare function withError(text: string, code?: number): (e: Error | ResponseError) => never;
 export declare function handleAPIRequest(request: Request, params: Record<string, any>, route: ServerRoute): Promise<Response>;

package/dist/requests.js

@@ -1,5 +1,5 @@
 import { userProtectedFields, userPublicFields } from '@axium/core/user';
-import * as cookie from 'cookie';
+import * as cookie from 'cookie_v1';
 import { pick } from 'utilium';
 import * as z from 'zod';
 import { createSession } from './auth.js';
@@ -49,9 +49,11 @@ export function getToken(request, sensitive = false) {
         return cookie.parse(request.headers.get('cookie') || '')[sensitive ? 'elevated_token' : 'session_token'];
     }
 }
-export async function createSessionData(userId, elevated = false) {
+export async function createSessionData(userId, { elevated = false, noCookie } = {}) {
     const { token, expires } = await createSession(userId, elevated);
     const response = json({ userId, token: elevated ? '[[redacted:elevated]]' : token }, { status: 201 });
+    if (noCookie)
+        return response;
     const cookies = cookie.serialize(elevated ? 'elevated_token' : 'session_token', token, {
         httpOnly: true,
         path: '/',

package/dist/routes.js

@@ -1,6 +1,6 @@
-import { apps } from './apps.js';
+import { apps } from '@axium/core';
+import { debug } from '@axium/core/node/io';
 import config from './config.js';
-import { output } from './io.js';
 import { _unique } from './state.js';
 /**
  * @internal
@@ -19,7 +19,7 @@ export function addRoute(opt) {
     if (route.api && !route.server)
         throw new Error(`API routes cannot have a client page: ${route.path}`);
     routes.set(route.path, route);
-    output.debug('Added route: ' + route.path);
+    debug('Added route: ' + route.path);
 }
 /**
  * Resolve a request URL into a route.

package/dist/serve.d.ts

@@ -1,5 +1,9 @@
 import '@axium/server/api/index';
 import type { Server } from 'node:http';
+export declare const appDisabledContent: {
+    head: string;
+    body: string;
+};
 export interface ServeOptions {
     secure: boolean;
     ssl_key: string;

package/dist/serve.js

@@ -1,17 +1,18 @@
+import { apps } from '@axium/core';
+import { _debugOutput, debug, warn, info } from '@axium/core/node/io';
+import { plugins } from '@axium/core/plugins';
 import '@axium/server/api/index';
 import { loadDefaultConfigs, reloadConfigs } from '@axium/server/config';
 import { clean, connect, database } from '@axium/server/database';
-import { _debugOutput, dirs, logger, output } from '@axium/server/io';
+import { dirs, logger } from '@axium/server/io';
 import { allLogLevels } from 'logzen';
 import { createWriteStream, readFileSync } from 'node:fs';
 import { createServer, ServerResponse } from 'node:http';
 import { createServer as createSecureServer } from 'node:https';
 import { join } from 'node:path/posix';
 import { styleText } from 'node:util';
-import { appDisabledContent, apps } from './apps.js';
 import config from './config.js';
 import { convertFromResponse, convertToRequest } from './internal_requests.js';
-import { plugins } from './plugins.js';
 import { error, handleAPIRequest, handleResponseError, json, noCacheHeaders } from './requests.js';
 import { resolveRoute } from './routes.js';
 const template = readFileSync(join(import.meta.dirname, '../template.html'), 'utf-8');
@@ -24,6 +25,10 @@ function fillSvelteKitTemplate({ head, body }, env = {}, nonce = '') {
         .replaceAll('%sveltekit.nonce%', nonce)
         .replace(/%sveltekit\.env\.([^%]+)%/g, (_match, key) => env[key] ?? ''));
 }
+export const appDisabledContent = {
+    head: '<title>App Disabled</title>',
+    body: '<h1>App Disabled</h1><p>This app is currently disabled.</p>',
+};
 async function handleRequestDefault(req) {
     const url = new URL(req.url);
     const [route, params] = resolveRoute(url) ?? [];
@@ -74,15 +79,15 @@ function __next(error) {
 async function _getMultiBuildHandler() {
     const handlers = [];
     for (const plugin of plugins.values()) {
-        if (!plugin.http_handler)
+        if (!plugin.server?.http_handler)
             continue;
         try {
-            const { handler } = await import(join(plugin.dirname, plugin.http_handler));
+            const { handler } = await import(join(plugin.dirname, plugin.server.http_handler));
             handlers.push(handler);
-            output.debug(`Loaded plugin handler: ${plugin.name}`);
+            debug(`Loaded plugin handler: ${plugin.name}`);
         }
         catch (e) {
-            output.warn(`Failed to load plugin HTTP handler for ${plugin.name} ${_debugOutput ? ': ' + (e instanceof Error ? e.message : e) : ''}`);
+            warn(`Failed to load plugin HTTP handler for ${plugin.name} ${_debugOutput ? ': ' + (e instanceof Error ? e.message : e) : ''}`);
         }
     }
     // @ts-expect-error 7016 - it is plain JS
@@ -178,7 +183,7 @@ export async function init() {
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
     process.on('beforeExit', () => database.destroy());
     process.on('SIGHUP', () => {
-        output.info('Reloading configuration due to SIGHUP.');
+        info('Reloading configuration due to SIGHUP.');
         void reloadConfigs();
     });
 }