@axium/server 0.28.5 → 0.29.0

package/dist/acl.d.ts

@@ -21,7 +21,7 @@ export type Result<TB extends TableName> = AccessControlInternal & PermissionsFo
 export type WithACL<TB extends TargetName> = kysely.Selectable<db.Schema[TB]> & {
     userId: string;
     acl: Result<`acl.${TB}`>[];
-} & Record<string, any>;
+};
 export interface ACLSelectionOptions {
     /** If specified, files by user UUID */
     user?: Pick<UserInternal, 'id' | 'roles' | 'tags'>;

package/dist/api/admin.js

@@ -1,9 +1,9 @@
 import { AuditFilter, Severity } from '@axium/core';
+import { getVersionInfo } from '@axium/core/packages';
 import { plugins } from '@axium/core/plugins';
 import { jsonArrayFrom, jsonObjectFrom } from 'kysely/helpers/postgres';
 import { omit } from 'utilium';
 import * as z from 'zod';
-import pkg from '../../package.json' with { type: 'json' };
 import { audit, events, getEvents } from '../audit.js';
 import { requireSession } from '../auth.js';
 import { config } from '../config.js';
@@ -30,7 +30,11 @@ addRoute({
             auditEvents,
             configFiles: config.files.size,
             plugins: plugins.size,
-            version: pkg.version,
+            versions: {
+                server: await getVersionInfo('@axium/server'),
+                core: await getVersionInfo('@axium/core'),
+                client: await getVersionInfo('@axium/client'),
+            },
         };
     },
 });
@@ -38,7 +42,9 @@ addRoute({
     path: '/api/admin/plugins',
     async GET(req) {
         await assertAdmin(this, req);
-        return Array.from(plugins.values()).map(p => omit(p, '_hooks'));
+        return await Array.fromAsync(plugins
+            .values()
+            .map(async (p) => Object.assign(omit(p, '_hooks', '_client'), p.update_checks ? await getVersionInfo(p.specifier, p.loadedBy) : { latest: null })));
     },
 });
 addRoute({

package/dist/api/metadata.js

@@ -1,9 +1,8 @@
 import { apps } from '@axium/core';
-import { plugins } from '@axium/core/plugins';
 import { requestMethods } from '@axium/core/requests';
-import pkg from '../../package.json' with { type: 'json' };
 import { requireSession } from '../auth.js';
 import { config } from '../config.js';
+import { getAllVersions } from '../io.js';
 import { error } from '../requests.js';
 import { addRoute, routes } from '../routes.js';
 addRoute({
@@ -15,7 +14,7 @@ addRoute({
                 error(403, 'User is not an administrator');
         }
         return {
-            version: pkg.version,
+            versions: await getAllVersions(),
             routes: Object.fromEntries(routes
                 .entries()
                 .filter(([path]) => path.startsWith('/api/'))
@@ -26,7 +25,6 @@ addRoute({
                     methods: requestMethods.filter(m => m in route),
                 },
             ])),
-            plugins: Object.fromEntries(plugins.values().map(plugin => [plugin.name, plugin.version])),
         };
     },
 });

package/dist/auth.js

@@ -120,6 +120,7 @@ export async function checkAuthForItem(request, itemType, itemId, permissions) {
         error(401, 'Missing token');
     const session = await getSessionAndUser(token).catch(() => null);
     const { userId, user } = session ?? {};
+    // Note: we need to do casting because of TS limitations with generics
     const item = await db
         .selectFrom(itemType)
         .selectAll()

package/dist/io.d.ts

@@ -1,3 +1,4 @@
+import { type PackageVersionInfo } from '@axium/core/packages';
 import { Logger } from 'logzen';
 export declare const systemDir = "/etc/axium";
 export declare const dirs: string[];
@@ -23,3 +24,4 @@ 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>;
+export declare function getAllVersions(): Promise<PackageVersionInfo[]>;

package/dist/io.js

@@ -1,4 +1,6 @@
 import * as io from '@axium/core/node/io';
+import { getVersionInfo } from '@axium/core/packages';
+import { plugins } from '@axium/core/plugins';
 import { Logger } from 'logzen';
 import * as fs from 'node:fs';
 import { dirname, join, resolve } from 'node:path/posix';
@@ -77,3 +79,11 @@ export async function restrictedPorts(opt) {
         }
     }
 }
+export async function getAllVersions() {
+    return await Array.fromAsync([
+        ...plugins.values().map(p => getVersionInfo(p.specifier, p.loadedBy)),
+        getVersionInfo('@axium/server'),
+        getVersionInfo('@axium/core'),
+        getVersionInfo('@axium/client'),
+    ]);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/server",
-	"version": "0.28.5",
+	"version": "0.29.0",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"funding": {
 		"type": "individual",
@@ -48,7 +48,7 @@
 	},
 	"peerDependencies": {
 		"@axium/client": ">=0.9.5",
-		"@axium/core": ">=0.12.0",
+		"@axium/core": ">=0.14.0",
 		"kysely": "^0.28.0",
 		"utilium": "^2.3.8",
 		"zod": "^4.0.5"

package/routes/admin/+page.svelte

@@ -1,5 +1,7 @@
 <script>
+	import { Version } from '@axium/client/components';
 	import { Severity } from '@axium/core';
+	import { capitalize } from 'utilium';
 
 	const { data } = $props();
 </script>
@@ -10,7 +12,10 @@
 
 <h2>Administration</h2>
 
-<p>Axium Server <span class="version">{data.version}</span></p>
+{#each ['server', 'core', 'client'] as name}
+	{@const info = data.versions[name]}
+	<p>Axium {capitalize(name)} <Version v={info.version} latest={info.latest} /></p>
+{/each}
 
 <h3><a href="/admin/users">Users</a></h3>
 

package/routes/admin/plugins/+page.svelte

@@ -1,4 +1,6 @@
 <script lang="ts">
+	import { Version } from '@axium/client/components';
+
 	const { data } = $props();
 </script>
 
@@ -10,7 +12,7 @@
 
 {#each data.plugins as plugin}
 	<div class="plugin">
-		<h3>{plugin.name}<span class="version">{plugin.version}</span></h3>
+		<h3>{plugin.name}<Version v={plugin.version} latest={plugin.latest} /></h3>
 		<p>
 			<strong>Loaded from</strong>
 			{#if plugin.path.endsWith('/package.json')}
@@ -18,9 +20,9 @@
 			{:else}
 				<span class="path">{plugin.path}</span>
 			{/if}
-			{#if plugin._loadedBy}
+			{#if plugin.loadedBy}
 				by
-				<a class="path" href="/admin/config#{plugin._loadedBy}">{plugin._loadedBy}</a>
+				<a class="path" href="/admin/config#{plugin.loadedBy}">{plugin.loadedBy}</a>
 			{/if}
 		</p>
 		<p><strong>Author:</strong> {plugin.author}</p>