@axium/server 0.7.2 → 0.7.5

package/dist/cli.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import { Argument, Option, program } from 'commander';
+import { randomBytes } from 'node:crypto';
 import { styleText } from 'node:util';
 import { getByString, isJSON, setByString } from 'utilium';
 import $pkg from '../package.json' with { type: 'json' };
@@ -24,6 +25,10 @@ program.hook('preAction', async function (_, action) {
     opt.force && output.warn('--force: Protections disabled.');
     if (opt.debug === false)
         config.set({ debug: false });
+    if (!config.auth.secret) {
+        config.save({ auth: { secret: process.env.AUTH_SECRET || randomBytes(32).toString('base64') } }, true);
+        output.debug('Auto-generated a new auth secret');
+    }
 });
 // Options shared by multiple (sub)commands
 const opts = {
@@ -98,33 +103,46 @@ axiumDB
     await db.wipe(opt).catch(exit);
     await db.database.destroy();
 });
-const axiumConfig = program.command('config').description('Manage the configuration').addOption(opts.global).option('-j, --json', 'values are JSON encoded');
+const axiumConfig = program
+    .command('config')
+    .description('Manage the configuration')
+    .addOption(opts.global)
+    .option('-j, --json', 'values are JSON encoded')
+    .option('-r, --redact', 'Do not output sensitive values');
+function configReplacer(opt) {
+    return (key, value) => {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+        return opt.redact && ['password', 'secret'].includes(key) ? '[redacted]' : value;
+    };
+}
 axiumConfig
     .command('dump')
     .description('Output the entire current configuration')
     .action(() => {
-    const value = config;
-    console.log(axiumConfig.optsWithGlobals().json ? JSON.stringify(value) : value);
+    const opt = axiumConfig.optsWithGlobals();
+    const value = config.plain();
+    console.log(opt.json ? JSON.stringify(value, configReplacer(opt), 4) : value);
 });
 axiumConfig
     .command('get')
     .description('Get a config value')
     .argument('<key>', 'the key to get')
     .action((key) => {
-    const value = getByString(config, key);
-    console.log(axiumConfig.optsWithGlobals().json ? JSON.stringify(value) : value);
+    const opt = axiumConfig.optsWithGlobals();
+    const value = getByString(config.plain(), key);
+    console.log(opt.json ? JSON.stringify(value, configReplacer(opt), 4) : value);
 });
 axiumConfig
     .command('set')
     .description('Set a config value. Note setting objects is not supported.')
     .argument('<key>', 'the key to set')
     .argument('<value>', 'the value')
-    .action((key, value, opt) => {
-    const useJSON = axiumConfig.optsWithGlobals().json;
-    if (useJSON && !isJSON(value))
+    .action((key, value) => {
+    const opt = axiumConfig.optsWithGlobals();
+    if (opt.json && !isJSON(value))
         exit('Invalid JSON');
     const obj = {};
-    setByString(obj, key, useJSON ? JSON.parse(value) : value);
+    setByString(obj, key, opt.json ? JSON.parse(value) : value);
     config.save(obj, opt.global);
 });
 axiumConfig
@@ -216,6 +234,7 @@ program
     .addOption(opts.force)
     .addOption(opts.host)
     .action(async (opt) => {
+    config.save({ auth: { secret: randomBytes(32).toString('base64') } }, true);
     await db.init({ ...opt, skip: opt.dbSkip }).catch(handleError);
     await restrictedPorts({ method: 'node-cap', action: 'enable' }).catch(handleError);
 });

package/dist/config.d.ts

@@ -166,10 +166,12 @@ export declare const Schema: z.ZodObject<{
 export interface Config extends Record<string, unknown>, z.infer<typeof Schema> {
 }
 export declare const configFiles: Map<string, PartialRecursive<Config>>;
+export declare function plainConfig(): Omit<Config, keyof typeof configShortcuts>;
 declare const configShortcuts: {
     findPath: typeof findConfigPath;
     load: typeof loadConfig;
     loadDefaults: typeof loadDefaultConfigs;
+    plain: typeof plainConfig;
     save: typeof saveConfig;
     saveTo: typeof saveConfigTo;
     set: typeof setConfig;

package/dist/config.js

@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { levelText } from 'logzen';
-import { readFileSync, writeFileSync } from 'node:fs';
-import { dirname, join } from 'node:path/posix';
-import { deepAssign } from 'utilium';
+import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path/posix';
+import { deepAssign, omit } from 'utilium';
 import * as z from 'zod';
 import { findDir, logger, output } from './io.js';
 import { loadPlugin } from './plugins.js';
@@ -32,10 +32,14 @@ export const Schema = z
 })
     .passthrough();
 export const configFiles = new Map();
+export function plainConfig() {
+    return omit(config, Object.keys(configShortcuts));
+}
 const configShortcuts = {
     findPath: findConfigPath,
     load: loadConfig,
     loadDefaults: loadDefaultConfigs,
+    plain: plainConfig,
     save: saveConfig,
     saveTo: saveConfigTo,
     set: setConfig,
@@ -102,11 +106,14 @@ export async function loadConfig(path, options = {}) {
     for (const include of file.include ?? [])
         await loadConfig(join(dirname(path), include), { optional: true });
     for (const plugin of file.plugins ?? [])
-        await loadPlugin(plugin);
+        await loadPlugin(plugin.startsWith('.') ? resolve(dirname(path), plugin) : plugin);
 }
 export async function loadDefaultConfigs() {
-    await loadConfig(findConfigPath(true), { optional: true });
-    await loadConfig(findConfigPath(false), { optional: true });
+    for (const path of [findConfigPath(true), findConfigPath(false)]) {
+        if (!existsSync(path))
+            writeFileSync(path, '{}');
+        await loadConfig(path, { optional: true });
+    }
 }
 /**
  * Update the current config and write the updated config to the appropriate file

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/server",
-	"version": "0.7.2",
+	"version": "0.7.5",
 	"author": "James Prevett <axium@jamespre.dev> (https://jamespre.dev)",
 	"funding": {
 		"type": "individual",
@@ -44,7 +44,7 @@
 		"bcryptjs": "^3.0.2",
 		"commander": "^13.1.0",
 		"kysely": "^0.27.5",
-		"logzen": "^0.6.2",
+		"logzen": "^0.7.0",
 		"pg": "^8.14.1",
 		"utilium": "^2.3.0",
 		"zod-validation-error": "^3.4.0"

package/web/lib/Icon.svelte

@@ -1,41 +1,23 @@
 <script lang="ts">
-	import { onMount } from 'svelte';
-
+	import light from './icons/light.svg';
+	import solid from './icons/solid.svg';
+	import regular from './icons/regular.svg';
+	const urls = { light, solid, regular };
 	const { i } = $props();
 
-	const withStyle = i.includes('/') ? i : 'solid/' + i;
-	const href = `https://site-assets.fontawesome.com/releases/v6.7.2/svgs/${withStyle}.svg`;
-
-	let content = $state('');
-
-	// Fetch and inline the SVG content on component mount
-	onMount(async () => {
-		const res = await fetch(href);
-
-		if (!res.ok) {
-			console.error('Failed to fetch icon:', res.statusText);
-			return;
-		}
-
-		const text = await res.text();
-
-		const doc = new DOMParser().parseFromString(text, 'image/svg+xml');
-		const errorNode = doc.querySelector('parsererror');
-
-		if (errorNode || doc.documentElement?.nodeName != 'svg') {
-			console.error('Invalid SVG');
-			return;
-		}
-
-		content = text;
-	});
+	const [style, id] = i.includes('/') ? i.split('/') : ['solid', i];
+	const url = urls[style];
 </script>
 
 <svelte:head>
-	<link rel="preload" {href} />
+	<link rel="preload" href={url} />
 </svelte:head>
 
-<span>{@html content}</span>
+<span>
+	<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="1em" height="1em">
+		<use href="{url}#{id}" />
+	</svg>
+</span>
 
 <style>
 	span {