@axium/server 0.34.0 → 0.34.2

package/README.md

@@ -1 +1,9 @@
 # Axium Server
+
+Axium Server is the main server application and framework for Axium.
+
+It includes:
+
+- The `axium` (server) CLI
+- The web UI/server and HTTP API
+- Lots of database stuff

package/dist/audit.js

@@ -20,8 +20,6 @@ export function styleSeverity(sev, align = false) {
     return styleText(severityFormat[sev], text.toUpperCase());
 }
 function output(event) {
-    if (event.severity > Severity[capitalize(config.audit.min_severity)])
-        return;
     console.error('[audit]', styleText('dim', io.prettyDate(event.timestamp)), styleSeverity(event.severity), event.name);
 }
 export async function audit_raw(event) {
@@ -29,6 +27,8 @@ export async function audit_raw(event) {
         io.warn('[audit] Ignoring raw event (disabled)');
         return;
     }
+    if (event.severity > Severity[capitalize(config.audit.min_severity)])
+        return;
     const result = await database.insertInto('audit_log').values(event).returningAll().executeTakeFirstOrThrow();
     output(result);
 }
@@ -48,6 +48,8 @@ export async function audit(eventName, userId, extra) {
         io.warn('Ignoring audit event with unknown event name: ' + eventName);
         return;
     }
+    if (cfg.severity > Severity[capitalize(config.audit.min_severity)])
+        return;
     try {
         if (cfg.extra)
             extra = cfg.extra.parse(extra);

package/dist/config.d.ts

@@ -9,8 +9,8 @@ export declare const Config: z.ZodObject<{
     audit: z.ZodOptional<z.ZodObject<{
         allow_raw: z.ZodOptional<z.ZodBoolean>;
         retention: z.ZodOptional<z.ZodNumber>;
-        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">>;
+        min_severity: z.ZodOptional<z.ZodLiteral<"emergency" | "alert" | "critical" | "error" | "warning" | "notice" | "info" | "debug">>;
+        auto_suspend: z.ZodOptional<z.ZodLiteral<"emergency" | "alert" | "critical" | "error" | "warning" | "notice" | "info" | "debug">>;
     }, z.core.$loose>>;
     auth: z.ZodOptional<z.ZodObject<{
         passkey_probation: z.ZodOptional<z.ZodNumber>;
@@ -86,8 +86,8 @@ export declare const ConfigFile: 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<"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">>;
+        min_severity: z.ZodOptional<z.ZodLiteral<"emergency" | "alert" | "critical" | "error" | "warning" | "notice" | "info" | "debug">>;
+        auto_suspend: z.ZodOptional<z.ZodLiteral<"emergency" | "alert" | "critical" | "error" | "warning" | "notice" | "info" | "debug">>;
     }, z.core.$loose>>>;
     auth: z.ZodOptional<z.ZodOptional<z.ZodObject<{
         passkey_probation: z.ZodOptional<z.ZodNumber>;

package/dist/config.js

@@ -1,15 +1,14 @@
+import { serverConfigs, toBaseName } from '@axium/core';
 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 { 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 const Config = z
     .looseObject({
     /** Whether /api/admin is enabled */
@@ -25,8 +24,9 @@ export const Config = z
         allow_raw: z.boolean(),
         /** How many days to keep events in the audit log */
         retention: z.number().min(0),
-        min_severity: z_audit_severity,
-        auto_suspend: z_audit_severity,
+        /** Minimum severity level. Less severe events will be ignored. */
+        min_severity: z.literal(audit_severity_levels),
+        auto_suspend: z.literal(audit_severity_levels),
     })
         .partial(),
     auth: z

package/dist/main.js

@@ -82,17 +82,30 @@ async function rlConfirm(question = 'Is this ok') {
         io.exit('Aborted.');
 }
 async function dbInitTables() {
-    const info = db.getUpgradeInfo();
-    const schema = db.getFullSchema({ exclude: Object.keys(info.current) });
-    const delta = db.computeDelta({ tables: {}, indexes: [] }, schema);
-    if (db.deltaIsEmpty(delta))
-        return;
-    for (const text of db.displayDelta(delta))
-        console.log(text);
-    await rlConfirm();
-    await db.applyDelta(delta);
-    Object.assign(info.current, schema.versions);
-    db.setUpgradeInfo(info);
+    const env_2 = { stack: [], error: void 0, hasError: false };
+    try {
+        const info = db.getUpgradeInfo();
+        const schema = db.getFullSchema({ exclude: Object.keys(info.current) });
+        const delta = db.computeDelta({ tables: {}, indexes: [] }, schema);
+        if (db.deltaIsEmpty(delta))
+            return;
+        for (const text of db.displayDelta(delta))
+            console.log(text);
+        await rlConfirm();
+        const _ = __addDisposableResource(env_2, db.connect(), true);
+        await db.applyDelta(delta);
+        Object.assign(info.current, schema.versions);
+        db.setUpgradeInfo(info);
+    }
+    catch (e_2) {
+        env_2.error = e_2;
+        env_2.hasError = true;
+    }
+    finally {
+        const result_1 = __disposeResources(env_2);
+        if (result_1)
+            await result_1;
+    }
 }
 function configReplacer(opt) {
     return (key, value) => {
@@ -265,7 +278,7 @@ try {
         .description('Check the structure of the database')
         .option('-s, --strict', 'Throw errors instead of emitting warnings for most column problems')
         .action(async (opt) => {
-        const env_2 = { stack: [], error: void 0, hasError: false };
+        const env_3 = { stack: [], error: void 0, hasError: false };
         try {
             await io.run('Checking for sudo', 'which sudo').catch(io.exit);
             await io.run('Checking for psql', 'which psql').catch(io.exit);
@@ -277,7 +290,7 @@ try {
             await db._sql(`SELECT 1 FROM pg_database WHERE datname = 'axium'`, 'Checking for database').then(throwUnlessRows).catch(io.exit);
             await db._sql(`SELECT 1 FROM pg_roles WHERE rolname = 'axium'`, 'Checking for user').then(throwUnlessRows).catch(io.exit);
             io.start('Connecting to database');
-            const _ = __addDisposableResource(env_2, db.connect(), true);
+            const _ = __addDisposableResource(env_3, db.connect(), true);
             io.done();
             io.start('Getting schema metadata');
             const schemas = await db.database.introspection.getSchemas().catch(io.exit);
@@ -316,14 +329,14 @@ try {
             else
                 io.warn(unchecked);
         }
-        catch (e_2) {
-            env_2.error = e_2;
-            env_2.hasError = true;
+        catch (e_3) {
+            env_3.error = e_3;
+            env_3.hasError = true;
         }
         finally {
-            const result_1 = __disposeResources(env_2);
-            if (result_1)
-                await result_1;
+            const result_2 = __disposeResources(env_3);
+            if (result_2)
+                await result_2;
         }
     });
     axiumDB
@@ -572,21 +585,21 @@ try {
         .addOption(opts.check)
         .argument('<plugin>', 'the plugin to initialize')
         .action(async (search) => {
-        const env_3 = { stack: [], error: void 0, hasError: false };
+        const env_4 = { stack: [], error: void 0, hasError: false };
         try {
             const plugin = _findPlugin(search);
             if (!plugin)
                 io.exit(`Can't find a plugin matching "${search}"`);
-            const _ = __addDisposableResource(env_3, db.connect(), true);
+            const _ = __addDisposableResource(env_4, db.connect(), true);
         }
-        catch (e_3) {
-            env_3.error = e_3;
-            env_3.hasError = true;
+        catch (e_4) {
+            env_4.error = e_4;
+            env_4.hasError = true;
         }
         finally {
-            const result_2 = __disposeResources(env_3);
-            if (result_2)
-                await result_2;
+            const result_3 = __disposeResources(env_4);
+            if (result_3)
+                await result_3;
         }
     });
     axiumApps = program.command('apps').description('Manage Axium apps').addOption(opts.global);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/server",
-	"version": "0.34.0",
+	"version": "0.34.2",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"funding": {
 		"type": "individual",

package/schemas/config.json

@@ -40,15 +40,7 @@
                         "warning",
                         "notice",
                         "info",
-                        "debug",
-                        "Emergency",
-                        "Alert",
-                        "Critical",
-                        "Error",
-                        "Warning",
-                        "Notice",
-                        "Info",
-                        "Debug"
+                        "debug"
                     ]
                 },
                 "auto_suspend": {
@@ -61,15 +53,7 @@
                         "warning",
                         "notice",
                         "info",
-                        "debug",
-                        "Emergency",
-                        "Alert",
-                        "Critical",
-                        "Error",
-                        "Warning",
-                        "Notice",
-                        "Info",
-                        "Debug"
+                        "debug"
                     ]
                 }
             },