@axium/server 0.3.0 → 0.3.2

package/dist/cli.js

@@ -5,7 +5,7 @@ import { getByString, isJSON, setByString } from 'utilium';
 import $pkg from '../package.json' with { type: 'json' };
 import * as config from './config.js';
 import * as db from './database.js';
-import { _portActions, _portMethods, exit, output, restrictedPorts } from './io.js';
+import { _portActions, _portMethods, exit, handleError, output, restrictedPorts } from './io.js';
 program
     .version($pkg.version)
     .name('axium')
@@ -166,16 +166,9 @@ program
     .description('Enable or disable use of restricted ports (e.g. 443)')
     .addArgument(new Argument('<action>', 'The action to take').choices(_portActions))
     .addOption(new Option('-m, --method <method>', 'the method to use').choices(_portMethods).default('node-cap'))
-    .action((action, opt) => {
-    try {
-        restrictedPorts({ ...opt, action });
-    }
-    catch (e) {
-        if (typeof e == 'number')
-            process.exit(e);
-        else
-            exit(e);
-    }
+    .option('-N, --node <path>', 'the path to the node binary')
+    .action(async (action, opt) => {
+    await restrictedPorts({ ...opt, action }).catch(handleError);
 });
 program
     .command('init')
@@ -183,12 +176,7 @@ program
     .addOption(opts.force)
     .addOption(opts.host)
     .action(async (opt) => {
-    await db.init({ ...opt, skip: opt.dbSkip }).catch((e) => {
-        if (typeof e == 'number')
-            process.exit(e);
-        else
-            exit(e);
-    });
-    restrictedPorts({ method: 'node-cap', action: 'enable' });
+    await db.init({ ...opt, skip: opt.dbSkip }).catch(handleError);
+    await restrictedPorts({ method: 'node-cap', action: 'enable' }).catch(handleError);
 });
 program.parse();

package/dist/database.js

@@ -51,11 +51,10 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 });
 import { Kysely, PostgresDialect, sql } from 'kysely';
-import { exec } from 'node:child_process';
 import { randomBytes } from 'node:crypto';
 import pg from 'pg';
 import * as config from './config.js';
-import { _fixOutput } from './io.js';
+import { _fixOutput, run } from './io.js';
 export let database;
 export function connect() {
     if (database)
@@ -87,29 +86,6 @@ export async function statusText() {
         throw typeof error == 'object' && 'message' in error ? error.message : error;
     }
 }
-/**
- * Convenience function for `sudo -u postgres psql -c "${command}"`, plus `report` coolness.
- * @internal
- */
-async function execSQL(opts, command, message) {
-    let stderr;
-    try {
-        opts.output('start', message);
-        const { promise, resolve, reject } = Promise.withResolvers();
-        exec(`sudo -u postgres psql -c "${command}"`, opts, (err, _, _stderr) => {
-            stderr = _stderr.startsWith('ERROR:') ? _stderr.slice(6).trim() : _stderr;
-            if (err)
-                reject('[command]');
-            else
-                resolve();
-        });
-        await promise;
-        opts.output('done');
-    }
-    catch (error) {
-        throw error == '[command]' ? stderr?.slice(0, 100) || 'failed.' : typeof error == 'object' && 'message' in error ? error.message : error;
-    }
-}
 function shouldRecreate(opt) {
     if (opt.skip) {
         opt.output('warn', 'already exists. (skipped)\n');
@@ -130,7 +106,7 @@ export async function init(opt) {
             config.save({ db: { password: randomBytes(32).toString('base64') } }, true);
             opt.output('debug', 'Generated password and wrote to global config');
         }
-        const _sql = (command, message) => execSQL(opt, command, message);
+        const _sql = (command, message) => run(opt, message, `sudo -u postgres psql -c "${command}"`);
         await _sql('CREATE DATABASE axium', 'Creating database').catch(async (error) => {
             if (error != 'database "axium" already exists')
                 throw error;
@@ -252,9 +228,10 @@ export async function init(opt) {
  */
 export async function uninstall(opt) {
     _fixOutput(opt);
-    await execSQL(opt, 'DROP DATABASE axium', 'Dropping database');
-    await execSQL(opt, 'REVOKE ALL PRIVILEGES ON SCHEMA public FROM axium', 'Revoking schema privileges');
-    await execSQL(opt, 'DROP USER axium', 'Dropping user');
+    const _sql = (command, message) => run(opt, message, `sudo -u postgres psql -c "${command}"`);
+    await _sql('DROP DATABASE axium', 'Dropping database');
+    await _sql('REVOKE ALL PRIVILEGES ON SCHEMA public FROM axium', 'Revoking schema privileges');
+    await _sql('DROP USER axium', 'Dropping user');
 }
 /**
  * Removes all data from tables.

package/dist/io.d.ts

@@ -15,10 +15,16 @@ export declare const output: {
     log(message: string): void;
     debug(message: string): void;
 };
+/**
+ * Run a system command with the fancy "Example... done."
+ * @internal
+ */
+export declare function run(opts: WithOutput & {
+    timeout?: number;
+}, message: string, command: string): Promise<string>;
 /** Yet another convenience function */
 export declare function exit(message: string | Error, code?: number): never;
-/** Convenience function for `example... [done. / error]` */
-export declare function report<T>(promise: Promise<T>, message: string, success?: string): Promise<T>;
+export declare function handleError(e: number | string | Error): void;
 export type OutputState = 'done' | 'log' | 'warn' | 'error' | 'start' | 'debug';
 export interface Output {
     (state: 'done'): void;
@@ -50,10 +56,11 @@ export declare const _portActions: readonly ["enable", "disable"];
 export interface PortOptions extends MaybeOutput {
     method: (typeof _portMethods)[number];
     action: (typeof _portActions)[number];
+    node?: string;
 }
 /**
  * This changes if Axium can use restricted ports (like 80 and 443) without root privileges.
  * Use of these ports is needed so the origin doesn't have a port.
  * If the origin has a port, passkeys do not work correctly with some password managers.
  */
-export declare function restrictedPorts(opt: PortOptions): void;
+export declare function restrictedPorts(opt: PortOptions): Promise<void>;

package/dist/io.js

@@ -1,5 +1,5 @@
 import { Logger } from 'logzen';
-import { execSync } from 'node:child_process';
+import { exec, execSync } from 'node:child_process';
 import * as fs from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path/posix';
@@ -44,6 +44,30 @@ export const output = {
     },
 };
 logger.attach(output);
+/**
+ * Run a system command with the fancy "Example... done."
+ * @internal
+ */
+export async function run(opts, message, command) {
+    let stderr;
+    try {
+        opts.output('start', message);
+        const { promise, resolve, reject } = Promise.withResolvers();
+        exec(command, opts, (err, stdout, _stderr) => {
+            stderr = _stderr.startsWith('ERROR:') ? _stderr.slice(6).trim() : _stderr;
+            if (err)
+                reject('[command]');
+            else
+                resolve(stdout);
+        });
+        const value = await promise;
+        opts.output('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)
@@ -51,17 +75,11 @@ export function exit(message, code = 1) {
     output.error(message);
     process.exit(code);
 }
-/** Convenience function for `example... [done. / error]` */
-export async function report(promise, message, success = 'done.') {
-    process.stdout.write(message + '... ');
-    try {
-        const result = await promise;
-        console.log(success);
-        return result;
-    }
-    catch (error) {
-        throw typeof error == 'object' && 'message' in error ? error.message : error;
-    }
+export function handleError(e) {
+    if (typeof e == 'number')
+        process.exit(e);
+    else
+        exit(e);
 }
 export function defaultOutput(state, message = '') {
     switch (state) {
@@ -104,7 +122,7 @@ export const _portActions = ['enable', 'disable'];
  * Use of these ports is needed so the origin doesn't have a port.
  * If the origin has a port, passkeys do not work correctly with some password managers.
  */
-export function restrictedPorts(opt) {
+export async function restrictedPorts(opt) {
     _fixOutput(opt);
     opt.output('start', 'Checking for root privileges');
     if (process.getuid?.() != 0)
@@ -120,33 +138,31 @@ export function restrictedPorts(opt) {
     opt.output('done');
     switch (opt.method) {
         case 'node-cap': {
-            opt.output('start', 'Finding setcap');
-            let setcap = execSync('command -v setcap', { encoding: 'utf-8' }).trim();
-            if (setcap)
-                opt.output('done');
-            else {
+            const setcap = await run(opt, 'Finding setcap', 'command -v setcap')
+                .then(e => e.trim())
+                .catch(() => {
                 opt.output('warn', 'not in path.');
                 opt.output('start', 'Checking for /usr/sbin/setcap');
                 fs.accessSync('/usr/sbin/setcap', fs.constants.X_OK);
-                setcap = '/usr/sbin/setcap';
                 opt.output('done');
-            }
+                return '/usr/sbin/setcap';
+            });
             opt.output('debug', 'Using setup at ' + setcap);
-            opt.output('start', 'Finding node');
-            let node = execSync('command -v node', { encoding: 'utf-8' }).trim();
-            if (node)
-                opt.output('done');
-            else {
+            let { node } = opt;
+            node ||= await run(opt, 'Finding node', 'command -v node')
+                .then(e => e.trim())
+                .catch(() => {
                 opt.output('warn', 'not in path.');
                 opt.output('start', 'Checking for /usr/bin/node');
                 fs.accessSync('/usr/bin/node', fs.constants.X_OK);
-                node = '/usr/bin/node';
                 opt.output('done');
-            }
-            opt.output('debug', 'Using node at ' + node);
-            opt.output('start', 'Setting ports capability');
-            execSync(`${setcap} cap_net_bind_service=${opt.action == 'enable' ? '+' : '-'}ep ${node}`, { encoding: 'utf-8' });
+                return '/usr/bin/node';
+            });
+            opt.output('start', 'Resolving real path for node');
+            node = fs.realpathSync(node);
             opt.output('done');
+            opt.output('debug', 'Using node at ' + node);
+            await run(opt, 'Setting ports capability', `${setcap} cap_net_bind_service=${opt.action == 'enable' ? '+' : '-'}ep ${node}`);
             break;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/server",
-	"version": "0.3.0",
+	"version": "0.3.2",
 	"author": "James Prevett <axium@jamespre.dev> (https://jamespre.dev)",
 	"funding": {
 		"type": "individual",

package/web/lib/account.css

@@ -0,0 +1,36 @@
+.account-section {
+	width: 50%;
+	padding-top: 4em;
+
+	> div:has(+ div) {
+		border-bottom: 1px solid #8888;
+	}
+}
+
+.account-section .account-item {
+	display: grid;
+	grid-template-columns: 10em 1fr 2em;
+	align-items: center;
+	width: 100%;
+	gap: 1em;
+	text-wrap: nowrap;
+	padding-bottom: 1em;
+
+	> :first-child {
+		margin: 0 5em 0 1em;
+		grid-column: 1;
+	}
+
+	> :nth-child(2) {
+		margin: 0;
+		grid-column: 2;
+	}
+
+	> :last-child:nth-child(3) {
+		margin: 0;
+		display: inline;
+		grid-column: 3;
+		font-size: 0.75em;
+		cursor: pointer;
+	}
+}

package/web/lib/styles.css

@@ -65,3 +65,8 @@ button:hover {
 	background-color: #733;
 	color: #ccc;
 }
+
+.subtle {
+	color: #bbbb;
+	font-size: 0.9em;
+}

package/web/routes/+page.svelte

@@ -2,6 +2,7 @@
 	import { getUserImage } from '@axium/core';
 	import Icon from '../lib/Icon.svelte';
 	import '../lib/styles.css';
+	import '../lib/account.css';
 	import type { PageData } from './$types.js';
 
 	const {
@@ -27,18 +28,18 @@
 	<img id="pfp" src={image} alt="User profile" />
 	<p id="greeting">Welcome, {user.name}</p>
 	<div class="account-section main">
-		<div>
-			<p>Name</p>
+		<div class="account-item">
+			<p class="subtle">Name</p>
 			<p>{user.name}</p>
-			<a href="{prefix}/name"><Icon id="chevron-right" /></a>
+			<a class="change" href="{prefix}/name"><Icon id="chevron-right" /></a>
 		</div>
-		<div>
-			<p>Email</p>
+		<div class="account-item">
+			<p class="subtle">Email</p>
 			<p>{user.email}</p>
-			<a href="{prefix}/email"><Icon id="chevron-right" /></a>
+			<a class="change" href="{prefix}/email"><Icon id="chevron-right" /></a>
 		</div>
-		<div>
-			<p>User ID <dfn title="This is your UUID."><Icon id="regular/circle-info" /></dfn></p>
+		<div class="account-item">
+			<p class="subtle">User ID <dfn title="This is your UUID."><Icon id="regular/circle-info" /></dfn></p>
 			<p>{user.id}</p>
 		</div>
 		<a id="signout" href="/auth/signout"><button>Sign out</button></a>
@@ -66,45 +67,6 @@
 		font-size: 2em;
 	}
 
-	:global(.account-section) {
-		width: 50%;
-		padding-top: 4em;
-
-		> div:has(+ div) {
-			border-bottom: 1px solid #8888;
-		}
-	}
-
-	:global(.account-section) > div {
-		display: grid;
-		grid-template-columns: 10em 1fr 2em;
-		align-items: center;
-		width: 100%;
-		gap: 1em;
-		text-wrap: nowrap;
-		padding-bottom: 1em;
-
-		> :first-child {
-			margin: 0 5em 0 1em;
-			color: #bbbb;
-			font-size: 0.9em;
-			grid-column: 1;
-		}
-
-		> :nth-child(2) {
-			margin: 0;
-			grid-column: 2;
-		}
-
-		> a:last-child {
-			margin: 0;
-			display: inline;
-			grid-column: 3;
-			font-size: 0.75em;
-			cursor: pointer;
-		}
-	}
-
 	#signout {
 		margin-top: 2em;
 	}