@axium/core 0.13.0 → 0.14.0

package/dist/api.d.ts

@@ -5,8 +5,9 @@ import type { AccessControl, AccessMap } from './access.js';
 import type { App } from './apps.js';
 import type { AuditEvent, AuditFilter, Severity } from './audit.js';
 import type { NewSessionResponse, Session, Verification } from './auth.js';
+import type { PackageVersionInfo } from './packages.js';
 import type { Passkey, PasskeyAuthenticationResponse, PasskeyChangeable, PasskeyRegistration } from './passkeys.js';
-import type { PluginInternal, PluginVersionInfo } from './plugins.js';
+import type { PluginInternal } from './plugins.js';
 import type { RequestMethod } from './requests.js';
 import type { LogoutSessions, User, UserAuthOptions, UserChangeable, UserInternal, UserPublic, UserRegistration } from './user.js';
 export interface AdminSummary {
@@ -16,7 +17,7 @@ export interface AdminSummary {
     auditEvents: Record<keyof typeof Severity, number>;
     configFiles: number;
     plugins: number;
-    version: string;
+    versions: Record<'core' | 'server' | 'client', PackageVersionInfo>;
 }
 /**
  * Types for all API endpoints
@@ -25,12 +26,11 @@ export interface AdminSummary {
 export interface $API {
     metadata: {
         GET: {
-            version: string;
+            versions: PackageVersionInfo[];
             routes: Record<string, {
                 params: Record<string, string | null>;
                 methods: string[];
             }>;
-            plugins: Record<string, string>;
         };
     };
     apps: {
@@ -116,7 +116,7 @@ export interface $API {
         };
     };
     'admin/plugins': {
-        GET: (Omit<PluginInternal, '_hooks' | '_client'> & PluginVersionInfo)[];
+        GET: (Omit<PluginInternal, '_hooks' | '_client'> & PackageVersionInfo)[];
     };
     'admin/audit/events': {
         OPTIONS: {

package/dist/node/plugins.js

@@ -1,11 +1,11 @@
 import * as io from '@axium/core/node/io';
 import { Plugin, plugins } from '@axium/core/plugins';
 import * as fs from 'node:fs';
-import { dirname, join, resolve } from 'node:path/posix';
-import { fileURLToPath } from 'node:url';
+import { dirname, resolve } from 'node:path/posix';
 import { styleText } from 'node:util';
 import * as z from 'zod';
 import { apps } from '../apps.js';
+import { locatePackage } from '../packages.js';
 export function* pluginText(plugin) {
     yield styleText('whiteBright', plugin.name);
     yield `Version: ${plugin.version}`;
@@ -19,24 +19,9 @@ export function* pluginText(plugin) {
         yield `Hooks: ${plugin._client ? styleText(['dim', 'bold'], `(${Object.keys(plugin._client).length}) `) + Object.keys(plugin._client).join(', ') : plugin.client.hooks || styleText('dim', '(none)')}`;
     }
 }
-function _locatePlugin(specifier, loadedBy) {
-    if (specifier[0] == '/' || ['.', '..'].includes(specifier.split('/')[0])) {
-        const path = resolve(dirname(loadedBy), specifier);
-        const stats = fs.statSync(path);
-        if (stats.isFile())
-            return path;
-        if (!stats.isDirectory())
-            throw new Error('Can not resolve plugin path: ' + path);
-        return join(path, 'package.json');
-    }
-    let packageDir = dirname(fileURLToPath(import.meta.resolve(specifier)));
-    for (; !fs.existsSync(join(packageDir, 'package.json')); packageDir = dirname(packageDir))
-        ;
-    return join(packageDir, 'package.json');
-}
 export async function loadPlugin(mode, specifier, loadedBy, safeMode = false) {
     try {
-        const path = _locatePlugin(specifier, loadedBy);
+        const path = locatePackage(specifier, loadedBy);
         io.debug(`Loading plugin at ${path} (from ${loadedBy})`);
         let imported;
         try {

package/dist/packages.d.ts

@@ -0,0 +1,12 @@
+export declare function locatePackage(specifier: string, loadedBy: string): string;
+export interface PackageVersionInfo {
+    name: string;
+    version: string;
+    latest: string | null;
+}
+export declare function setPackageCacheTTL(seconds: number): void;
+/**
+ * @param name Package name
+ * @param version The current/installed version
+ */
+export declare function getVersionInfo(specifier: string, from?: string): Promise<PackageVersionInfo>;

package/dist/packages.js

@@ -0,0 +1,51 @@
+import * as fs from 'node:fs';
+import { dirname, join, resolve } from 'node:path/posix';
+import { fileURLToPath } from 'node:url';
+import { lt as ltVersion } from 'semver';
+import { warn } from './io.js';
+function isRelative(specifier) {
+    return specifier[0] == '/' || ['.', '..'].includes(specifier.split('/')[0]);
+}
+export function locatePackage(specifier, loadedBy) {
+    if (isRelative(specifier)) {
+        const path = resolve(dirname(loadedBy), specifier);
+        const stats = fs.statSync(path);
+        if (stats.isFile())
+            return path;
+        if (!stats.isDirectory())
+            throw new Error('Can not resolve package path: ' + path);
+        return join(path, 'package.json');
+    }
+    let packageDir = dirname(fileURLToPath(import.meta.resolve(specifier)));
+    for (; !fs.existsSync(join(packageDir, 'package.json')); packageDir = dirname(packageDir))
+        ;
+    return join(packageDir, 'package.json');
+}
+let cacheTTL = 1000 * 60 * 60;
+export function setPackageCacheTTL(seconds) {
+    cacheTTL = seconds * 1000;
+}
+const cache = new Map();
+/**
+ * @param name Package name
+ * @param version The current/installed version
+ */
+export async function getVersionInfo(specifier, from = import.meta.filename) {
+    const path = locatePackage(specifier, from);
+    const { version, name } = JSON.parse(fs.readFileSync(path, 'utf8'));
+    const info = { name, version, latest: null };
+    if (isRelative(specifier))
+        return info;
+    const cached = cache.get(specifier);
+    const useCache = cached && Date.now() - cached.timestamp < cacheTTL;
+    try {
+        const pkg = useCache ? cached.data : await fetch('https://registry.npmjs.org/' + specifier).then(res => res.json());
+        if (!useCache)
+            cache.set(specifier, { timestamp: Date.now(), data: pkg });
+        info.latest = pkg['dist-tags']?.latest || Object.keys(pkg.versions).sort((a, b) => (ltVersion(a, b) ? 1 : -1))[0];
+    }
+    catch (e) {
+        warn(`Failed to fetch version info for package ${name}: ${e instanceof Error ? e.message : String(e)}`);
+    }
+    return info;
+}

package/dist/plugins.d.ts

@@ -67,8 +67,4 @@ export interface ClientHooks {
     run(): void | Promise<void>;
 }
 export declare function runIntegrations(): Promise<void>;
-export interface PluginVersionInfo {
-    latest: string | null;
-}
-export declare function getVersionInfo(plugin: PluginInternal): Promise<PluginVersionInfo>;
 export {};

package/dist/plugins.js

@@ -1,8 +1,7 @@
 import * as z from 'zod';
-import { zAsyncFunction } from './schemas.js';
 import { App } from './apps.js';
-import { debug, info, warn } from './io.js';
-import { lt as ltVersion } from 'semver';
+import { debug, warn } from './io.js';
+import { zAsyncFunction } from './schemas.js';
 const PluginCommon = z.object({
     /** CLI mixin path */
     cli: z.string().optional(),
@@ -58,17 +57,3 @@ export async function runIntegrations() {
         }
     }
 }
-export async function getVersionInfo(plugin) {
-    if (!plugin.update_checks)
-        return { latest: null };
-    try {
-        const res = await fetch('https://registry.npmjs.org/' + plugin.name);
-        const pkg = await res.json();
-        const latest = pkg['dist-tags']?.latest || Object.keys(pkg.versions).sort((a, b) => (ltVersion(a, b) ? 1 : -1))[0];
-        return { latest };
-    }
-    catch (e) {
-        warn(`Failed to fetch version info for plugin ${plugin.name}: ${e instanceof Error ? e.message : String(e)}`);
-        return { latest: null };
-    }
-}

package/package.json

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