@axium/server 0.33.0 → 0.33.2

package/dist/api/admin.js

@@ -1,4 +1,4 @@
-import { AuditFilter, Severity } from '@axium/core';
+import { AuditFilter, Severity, UserAdminChange } from '@axium/core';
 import { errorText, writeJSON } from '@axium/core/node/io';
 import { getVersionInfo } from '@axium/core/node/packages';
 import { _findPlugin, plugins, PluginUpdate, serverConfigs } from '@axium/core/plugins';
@@ -87,6 +87,13 @@ addRoute({
         const users = await db.selectFrom('users').selectAll().execute();
         return users;
     },
+    async PATCH(req) {
+        await assertAdmin(this, req);
+        const userChange = await parseBody(req, UserAdminChange);
+        const userId = userChange.id;
+        delete userChange.id;
+        return await db.updateTable('users').set(userChange).where('id', '=', userId).returningAll().executeTakeFirstOrThrow();
+    },
     async PUT(req) {
         await assertAdmin(this, req);
         const { name, email } = await parseBody(req, z.object({ name: z.string(), email: z.email() }));

package/dist/config.d.ts

@@ -21,7 +21,7 @@ export declare const Config: 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>;
@@ -97,7 +97,7 @@ export declare const ConfigFile: 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>;

package/dist/config.js

@@ -43,7 +43,7 @@ export const Config = 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(),

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/main.js

@@ -57,6 +57,8 @@ import { formatDateRange } from '@axium/core/format';
 import { io, outputDaemonStatus, pluginText } from '@axium/core/node';
 import { _findPlugin, plugins, runIntegrations } from '@axium/core/plugins';
 import { Argument, Option, program } from 'commander';
+import { allLogLevels } from 'logzen';
+import { createWriteStream } from 'node:fs';
 import { access } from 'node:fs/promises';
 import { join, resolve } from 'node:path/posix';
 import { createInterface } from 'node:readline/promises';
@@ -66,9 +68,9 @@ 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, ConfigFile, saveConfigTo } from './config.js';
+import config, { ConfigFile, configFiles, reloadConfigs, saveConfigTo } from './config.js';
 import * as db from './database.js';
-import { _portActions, _portMethods, restrictedPorts } from './io.js';
+import { _portActions, _portMethods, dirs, logger, restrictedPorts } from './io.js';
 import { linkRoutes, listRouteLinks, unlinkRoutes, writePluginHooks } from './linking.js';
 import { serve } from './serve.js';
 async function rlConfirm(question = 'Is this ok') {
@@ -104,6 +106,10 @@ try {
         input: process.stdin,
         output: process.stdout,
     }), false);
+    process.on('SIGHUP', () => {
+        io.info('Reloading configuration due to SIGHUP.');
+        void reloadConfigs();
+    });
     // Need these before Command is set up (e.g. for CLI integrations)
     ({
         safe,
@@ -626,6 +632,7 @@ try {
         if (updatedRoles || updatedTags || changeSuspend) {
             user = await db.database
                 .updateTable('users')
+                .where('id', '=', user.id)
                 .set({ roles, tags, isSuspended: !changeSuspend ? user.isSuspended : (opt.suspend ?? !opt.unsuspend) })
                 .returningAll()
                 .executeTakeFirstOrThrow()
@@ -757,6 +764,11 @@ try {
             ssl_key: opt.ssl ? join(opt.ssl, 'key.pem') : config.web.ssl_key,
             build: opt.build ? resolve(opt.build) : config.web.build,
         });
+        logger.attach(createWriteStream(join(dirs.at(-1), 'server.log')), { output: allLogLevels });
+        db.connect();
+        await db.clean({});
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        process.on('beforeExit', () => db.database.destroy());
         server.listen(opt.port, () => {
             console.log('Server is listening on port ' + opt.port);
         });

package/dist/serve.js

@@ -1,12 +1,8 @@
 import { apps } from '@axium/core';
-import { _debugOutput, debug, warn, info } from '@axium/core/node/io';
+import { _debugOutput, debug, warn } 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 { dirs, logger } from '@axium/server/io';
-import { allLogLevels } from 'logzen';
-import { createWriteStream, readFileSync } from 'node:fs';
+import { readFileSync } from 'node:fs';
 import { createServer, ServerResponse } from 'node:http';
 import { createServer as createSecureServer } from 'node:https';
 import { join } from 'node:path/posix';
@@ -175,15 +171,4 @@ export async function serve(opt) {
 /**
  * Perform initial setup for when the server is serving web pages.
  */
-export async function init() {
-    logger.attach(createWriteStream(join(dirs.at(-1), 'server.log')), { output: allLogLevels });
-    await loadDefaultConfigs();
-    connect();
-    await clean({});
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    process.on('beforeExit', () => database.destroy());
-    process.on('SIGHUP', () => {
-        info('Reloading configuration due to SIGHUP.');
-        void reloadConfigs();
-    });
-}
+export async function init() { }

package/package.json

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

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

@@ -1,15 +1,21 @@
 <script lang="ts">
-	import { ClipboardCopy, FormDialog, Icon, SessionList, ZodForm } from '@axium/client/components';
+	import { ClipboardCopy, FormDialog, Icon, SessionList, ZodForm, ZodInput } 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 { preferenceLabels, Preferences, User } from '@axium/core';
 	import { formatDateRange } from '@axium/core/format';
 
 	const { data } = $props();
-	const { user, session } = data;
+	let user = $state(data.user);
+	const { session } = data;
 
 	let sessions = $state(user.sessions);
+
+	async function updateValue(val: User) {
+		const result = await fetchAPI('PATCH', 'admin/users', val);
+		Object.assign(user, result);
+	}
 </script>
 
 <svelte:head>
@@ -68,7 +74,12 @@
 		{:else}
 			<p>No</p>
 		{/if}
-		<button>{user.isSuspended ? 'Unsuspend' : 'Suspend'}</button>
+		<button
+			onclick={async () => {
+				const { isSuspended } = await fetchAPI('PATCH', 'admin/users', { isSuspended: !user.isSuspended, id: user.id });
+				user.isSuspended = isSuspended;
+			}}>{user.isSuspended ? 'Unsuspend' : 'Suspend'}</button
+		>
 	</div>
 	<div class="item info">
 		<p>Profile Image</p>
@@ -82,11 +93,11 @@
 	</div>
 	<div class="item info">
 		<p>Roles</p>
-		<p>{user.roles.join(', ')}</p>
+		<ZodInput bind:rootValue={user} path="roles" schema={User.shape.roles} {updateValue} noLabel />
 	</div>
 	<div class="item info">
 		<p>Tags</p>
-		<p>{user.tags.join(', ')}</p>
+		<ZodInput bind:rootValue={user} path="tags" schema={User.shape.tags} {updateValue} noLabel />
 	</div>
 
 	<button class="inline-button icon-text danger" command="show-modal" commandfor="delete-user">

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": {},