@axium/client 0.23.5 → 0.23.6

package/dist/cli/config.js

@@ -42,14 +42,13 @@ export const _dayMs = 24 * 3600_000;
 export async function updateCache(force) {
     if (!force && config.cache && config.cache.fetched + _dayMs > Date.now())
         return;
-    io.start('Fetching metadata');
-    const [session, apps] = await Promise.all([getCurrentSession(), fetchAPI('GET', 'apps')]).catch(io.exit);
+    const [session, apps] = await io.track('Fetching metadata', Promise.all([getCurrentSession(), fetchAPI('GET', 'apps')]));
+    config.cache = { fetched: Date.now(), session, apps };
     try {
-        config.cache = { fetched: Date.now(), session, apps };
-        saveConfig();
-        io.done();
+        io.writeJSON(axcConfig, config);
     }
-    catch {
+    catch (e) {
+        io.error(e);
         return;
     }
 }

package/dist/cli/index.js

@@ -52,10 +52,11 @@ var __disposeResources = (this && this.__disposeResources) || (function (Suppres
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 });
 import { outputDaemonStatus, pluginText } from '@axium/core/node';
-import * as io from 'ioium/node';
 import { _findPlugin, plugins } from '@axium/core/plugins';
-import { program } from 'commander';
+import { CommanderError, program } from 'commander';
+import * as io from 'ioium/node';
 import { createServer } from 'node:http';
+import * as os from 'node:os';
 import { createInterface } from 'node:readline/promises';
 import { styleText } from 'node:util';
 import * as z from 'zod';
@@ -64,50 +65,48 @@ import { config, resolveServerURL } from '../config.js';
 import { prefix, setPrefix, setToken, useUserAgent } from '../requests.js';
 import { getCurrentSession, logout } from '../user.js';
 import { loadConfig, saveConfig, updateCache } from './config.js';
-import { capitalize } from 'utilium';
 const safe = z.stringbool().default(false).parse(process.env.SAFE?.toLowerCase()) || process.argv.includes('--safe');
 const debug = z.stringbool().default(false).parse(process.env.DEBUG?.toLowerCase()) || process.argv.includes('--debug');
 if (debug)
     io._setDebugOutput(true);
-const clientUA = `Axium Client/${$pkg.version} (${capitalize(process.platform)}; ${process.arch})`;
+const clientUA = `Axium Client/${$pkg.version} (${os.type()}; ${process.arch})`;
 useUserAgent(clientUA);
 await loadConfig(safe);
 process.on('SIGHUP', () => {
     io.info('Reloading configuration due to SIGHUP.');
     void loadConfig(safe);
 });
-var rl, axiumPlugin;
-const env_1 = { stack: [], error: void 0, hasError: false };
-try {
-    rl = __addDisposableResource(env_1, createInterface({
-        input: process.stdin,
-        output: process.stdout,
-    }), false);
-    rl.on('SIGINT', () => io.exit('Aborted.', 7));
-    program
-        .version($pkg.version)
-        .name('axium-client')
-        .alias('axc')
-        .description('Axium client CLI')
-        .configureHelp({ showGlobalOptions: true })
-        .option('--debug', 'override debug mode')
-        .option('--no-debug', 'override debug mode')
-        .option('--refresh-session', 'Force a refresh of session and user metadata from server', false)
-        .option('--cache-only', 'Run entirely from local cache, even if it is expired.', false)
-        .option('--safe', 'do not execute code from plugins', false)
-        .hook('preAction', async (axc, action) => {
-        const opt = axc.optsWithGlobals();
-        if (!config.token)
-            return;
-        if (!opt.cacheOnly && action.name() != 'login')
-            await updateCache(opt.refreshSession);
-    });
-    program.on('option:debug', () => io._setDebugOutput(true));
-    program
-        .command('login')
-        .description('Log in to your account on an Axium server')
-        .argument('[server]', 'Axium server URL')
-        .action(async (url) => {
+program
+    .version($pkg.version)
+    .name('axium-client')
+    .alias('axc')
+    .description('Axium client CLI')
+    .configureHelp({ showGlobalOptions: true })
+    .option('--debug', 'override debug mode')
+    .option('--no-debug', 'override debug mode')
+    .option('--refresh-session', 'Force a refresh of session and user metadata from server', false)
+    .option('--cache-only', 'Run entirely from local cache, even if it is expired.', false)
+    .option('--safe', 'do not execute code from plugins', false)
+    .hook('preAction', async (axc, action) => {
+    const opt = axc.optsWithGlobals();
+    if (!config.token)
+        return;
+    if (!opt.cacheOnly && action.name() != 'login')
+        await updateCache(opt.refreshSession);
+});
+program.on('option:debug', () => io._setDebugOutput(true));
+program
+    .command('login')
+    .description('Log in to your account on an Axium server')
+    .argument('[server]', 'Axium server URL')
+    .action(async (url) => {
+    const env_1 = { stack: [], error: void 0, hasError: false };
+    try {
+        const rl = __addDisposableResource(env_1, createInterface({
+            input: process.stdin,
+            output: process.stdout,
+        }), false);
+        rl.on('SIGINT', () => io.exit('Aborted.', 7));
         if (prefix[0] != '/')
             url ||= prefix;
         url ||= await rl.question('Axium server URL: ');
@@ -159,93 +158,105 @@ try {
         const { token } = await sessionReady.promise.catch(e => io.exit('Failed to obtain session: ' + e, 6));
         setToken(token);
         server.close();
-        io.start('Verifying session');
-        const session = await getCurrentSession().catch(e => io.exit(e.message, 6));
-        io.done();
+        const session = await io.track('Verifying session', getCurrentSession().catch(e => io.exit(e.message, 6)));
         io.debug('Session UUID: ' + session.id);
         console.log(`Welcome ${session.user.name}! Your session is valid until ${session.expires.toLocaleDateString()}.`);
         config.token = token;
         config.server = url;
         saveConfig();
         await updateCache(true);
-    });
-    program.command('logout').action(async () => {
-        if (!config.token)
-            io.exit('Not logged in.', 4);
-        if (!config.cache)
-            io.exit('No session data available.', 3);
-        await logout(config.cache.session.userId, config.cache.session.id);
-    });
-    program.command('status').action(() => {
-        if (!config.token)
-            return console.log('Not logged in.');
-        if (!config.cache)
-            return console.log('No session data available.');
-        console.log('Logged in to', new URL(prefix).host);
-        console.log(styleText('whiteBright', 'Session ID:'), config.cache.session.id);
-        const { user } = config.cache.session;
-        console.log(styleText('whiteBright', 'User:'), user.name, `<${user.email}>`, styleText('dim', `(${user.id})`));
-        outputDaemonStatus('axium-client');
-    });
-    program
-        .command('run')
-        .argument('[plugin]', 'The plugin to run')
-        .action(async (name) => {
-        if (name) {
-            const plugin = _findPlugin(name);
-            await plugin._client?.run();
-            return;
-        }
-        for (const plugin of plugins.values())
-            await plugin._client?.run();
-    });
-    axiumPlugin = program.command('plugin').alias('plugins').description('Manage plugins');
-    axiumPlugin
-        .command('list')
-        .alias('ls')
-        .description('List loaded plugins')
-        .option('-l, --long', 'use the long listing format')
-        .option('--no-versions', 'do not show plugin versions')
-        .action(opt => {
-        if (!plugins.size) {
-            console.log('No plugins loaded.');
-            return;
-        }
-        if (!opt.long) {
-            console.log(Array.from(plugins.keys()).join(', '));
-            return;
-        }
-        console.log(styleText('whiteBright', plugins.size + ' plugin(s) loaded:'));
-        for (const plugin of plugins.values()) {
-            console.log(plugin.name, opt.versions ? plugin.version : '');
-        }
-    });
-    axiumPlugin
-        .command('info')
-        .description('Get information about a plugin')
-        .argument('<plugin>', 'the plugin to get information about')
-        .action((search) => {
-        const plugin = _findPlugin(search);
-        for (const line of pluginText(plugin))
-            console.log(line);
-    });
-    axiumPlugin
-        .command('remove')
-        .alias('rm')
-        .description('Remove a plugin')
-        .argument('<plugin>', 'the plugin to remove')
-        .action((search) => {
-        const plugin = _findPlugin(search);
-        config.plugins = config.plugins.filter(p => p !== plugin.specifier);
-        plugins.delete(plugin.name);
-        saveConfig();
-    });
+    }
+    catch (e_1) {
+        env_1.error = e_1;
+        env_1.hasError = true;
+    }
+    finally {
+        __disposeResources(env_1);
+    }
+});
+program.command('logout').action(async () => {
+    if (!config.token)
+        io.exit('Not logged in.', 4);
+    if (!config.cache)
+        io.exit('No session data available.', 3);
+    await logout(config.cache.session.userId, config.cache.session.id);
+});
+program.command('status').action(() => {
+    if (!config.token)
+        return console.log('Not logged in.');
+    if (!config.cache)
+        return console.log('No session data available.');
+    const { session } = config.cache;
+    console.log('Logged in to', new URL(prefix).host);
+    console.log(styleText('whiteBright', 'Session:'), 'valid until', session.expires.toLocaleDateString(), styleText('dim', `(${session.id})`));
+    const { user } = session;
+    console.log(styleText('whiteBright', 'User:'), user.name, `<${user.email}>`, styleText('dim', `(${user.id})`));
+    outputDaemonStatus('axium-client');
+});
+program
+    .command('run')
+    .argument('[plugin]', 'The plugin to run')
+    .action(async (name) => {
+    if (name) {
+        const plugin = _findPlugin(name);
+        await plugin._client?.run();
+        return;
+    }
+    for (const plugin of plugins.values())
+        await plugin._client?.run();
+});
+const axiumPlugin = program.command('plugin').alias('plugins').description('Manage plugins');
+axiumPlugin
+    .command('list')
+    .alias('ls')
+    .description('List loaded plugins')
+    .option('-l, --long', 'use the long listing format')
+    .option('--no-versions', 'do not show plugin versions')
+    .action(opt => {
+    if (!plugins.size) {
+        console.log('No plugins loaded.');
+        return;
+    }
+    if (!opt.long) {
+        console.log(Array.from(plugins.keys()).join(', '));
+        return;
+    }
+    console.log(styleText('whiteBright', plugins.size + ' plugin(s) loaded:'));
+    for (const plugin of plugins.values()) {
+        console.log(plugin.name, opt.versions ? plugin.version : '');
+    }
+});
+axiumPlugin
+    .command('info')
+    .description('Get information about a plugin')
+    .argument('<plugin>', 'the plugin to get information about')
+    .action((search) => {
+    const plugin = _findPlugin(search);
+    for (const line of pluginText(plugin))
+        console.log(line);
+});
+axiumPlugin
+    .command('remove')
+    .alias('rm')
+    .description('Remove a plugin')
+    .argument('<plugin>', 'the plugin to remove')
+    .action((search) => {
+    const plugin = _findPlugin(search);
+    config.plugins = config.plugins.filter(p => p !== plugin.specifier);
+    plugins.delete(plugin.name);
+    saveConfig();
+});
+try {
     await program.parseAsync();
 }
-catch (e_1) {
-    env_1.error = e_1;
-    env_1.hasError = true;
-}
-finally {
-    __disposeResources(env_1);
+catch (e) {
+    if (e && e instanceof CommanderError) {
+        process.exit(1);
+    }
+    else {
+        if (typeof e == 'number')
+            process.exit(e);
+        io.done(true);
+        io.exit(e);
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/client",
-	"version": "0.23.5",
+	"version": "0.23.6",
 	"author": "James Prevett <jp@jamespre.dev>",
 	"funding": {
 		"type": "individual",
@@ -46,7 +46,7 @@
 	},
 	"peerDependencies": {
 		"@axium/core": ">=0.27.1",
-		"ioium": "^1.0.0",
+		"ioium": "^1.0.2",
 		"semver": "^7.7.4",
 		"svelte": "^5.36.0",
 		"utilium": "^3.0.0",