@axium/client 0.32.1 → 0.33.0

package/dist/cli/config.d.ts

@@ -1,3 +1,4 @@
+import { type PluginLoadOptions } from '@axium/core/node/plugins';
 export declare const configDir: string;
 export declare const axcConfigPath: string;
 export declare function session(): {
@@ -22,5 +23,12 @@ export declare function session(): {
     };
     name?: string | null | undefined;
 };
-export declare function loadConfig(safe: boolean): Promise<void>;
+export interface LoadConfigOptions {
+    plugins?: PluginLoadOptions;
+}
+/**
+ *
+ * @param safe whether to run code from plugins
+ */
+export declare function loadConfig(options?: LoadConfigOptions): Promise<void>;
 export declare function saveConfig(): void;

package/dist/cli/config.js

@@ -18,7 +18,11 @@ export function session() {
         io.exit('No session data available.', 3);
     return cache.meta.data.session;
 }
-export async function loadConfig(safe) {
+/**
+ *
+ * @param safe whether to run code from plugins
+ */
+export async function loadConfig(options = {}) {
     try {
         Object.assign(config, io.readJSON(axcConfigPath, ClientConfig));
         if (config.server)
@@ -26,7 +30,7 @@ export async function loadConfig(safe) {
         if (config.token)
             setToken(config.token);
         for (const plugin of config.plugins ?? [])
-            await loadPlugin('client', plugin, axcConfigPath, safe);
+            await loadPlugin('client', plugin, axcConfigPath, options.plugins);
     }
     catch (e) {
         io.warn('Failed to load config: ' + io.errorText(e));

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #! /usr/bin/env node
 import { formatBytes } from '@axium/core';
-import { loadPlugin, outputDaemonStatus, pluginText } from '@axium/core/node';
+import { createPluginCommand, outputDaemonStatus } from '@axium/core/node';
 import { _findPlugin, plugins } from '@axium/core/plugins';
 import { CommanderError, program } from 'commander';
 import * as io from 'ioium/node';
@@ -20,11 +20,11 @@ const debug = z.stringbool().default(false).parse(process.env.DEBUG?.toLowerCase
 if (debug)
     io._setDebugOutput(true);
 useUserAgent(clientUA);
-await loadConfig(safe);
+await loadConfig({ plugins: { safe } });
 cache.load();
 process.on('SIGHUP', () => {
     io.info('Reloading configuration due to SIGHUP.');
-    void loadConfig(safe);
+    void loadConfig({ plugins: { safe } });
 });
 program
     .version($pkg.version)
@@ -74,7 +74,19 @@ program
     if (opt.socket && config.token)
         await connectSocket({ rejectUnauthorized: !opt.insecure });
 });
-const axcPlugin = program.command('plugin').alias('plugins').description('Manage plugins');
+const axcPlugin = createPluginCommand('client', program, {
+    safe,
+    loadedBy: () => axcConfigPath,
+    enabled: config.plugins,
+    enable(spec) {
+        config.plugins.push(spec);
+        saveConfig();
+    },
+    disable(spec) {
+        config.plugins = config.plugins.filter(p => p !== spec);
+        saveConfig();
+    },
+});
 axcPlugin
     .command('run')
     .description('Run a plugin')
@@ -83,71 +95,6 @@ axcPlugin
     const plugin = _findPlugin(search);
     await plugin._client?.run?.();
 });
-axcPlugin
-    .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(plugins.keys().toArray().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 : '');
-    }
-});
-axcPlugin
-    .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);
-});
-axcPlugin
-    .command('add')
-    .description('Add a plugin')
-    .option('-k, --keep-going', 'continue adding plugins even if one fails')
-    .argument('<spec...>', 'the plugin specifier (e.g. a package name) to add')
-    .action(async (specs, { keepGoing }) => {
-    for (const spec of specs) {
-        try {
-            if (config.plugins.includes(spec))
-                throw `Plugin "${spec}" is already added.`;
-            const plugin = await loadPlugin('client', spec, axcConfigPath, safe);
-            if (!plugin)
-                throw `Failed to load a client plugin from "${spec}".`;
-            config.plugins.push(spec);
-            saveConfig();
-            console.log('Added plugin:', plugin.name, styleText('dim', 'v' + plugin.version));
-        }
-        catch (e) {
-            if (keepGoing)
-                io.error(e);
-            else
-                io.exit(e);
-        }
-    }
-});
-axcPlugin
-    .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();
-});
 const axcCache = program.command('cache').description('Manage the local cache');
 axcCache
     .command('info')

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/client",
-	"version": "0.32.1",
+	"version": "0.33.0",
 	"author": "James Prevett <jp@jamespre.dev>",
 	"funding": {
 		"type": "individual",
@@ -49,7 +49,7 @@
 		"build": "tsc"
 	},
 	"peerDependencies": {
-		"@axium/core": ">=0.33.0",
+		"@axium/core": ">=0.34.0",
 		"ioium": "^1.0.2",
 		"semver": "^7.7.4",
 		"svelte": "^5.36.0",