mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-20 15:43:13 +09:00
Move config command to lib/shared_commands
Move the definition and implementation of the config command to lib/shared_comhmands.js, this removes the need for lib config to depend on the fs module, which is not accessible in web build.
This commit is contained in:
1 parent
bd1414dd1c
commit
bcd1290301
5 files changed
+82
-81
No files matched your search
+2
-2
@@ -595,7 +595,7 @@ async function startControl() {
|
|||||||
type: "string",
|
type: "string",
|
||||||
})
|
})
|
||||||
.command("plugin", "Manage available plugins", libSharedCommands.pluginCommand)
|
.command("plugin", "Manage available plugins", libSharedCommands.pluginCommand)
|
||||||
.command("control-config", "Manage Control config", libConfig.configCommand)
|
.command("control-config", "Manage Control config", libSharedCommands.configCommand)
|
||||||
.wrap(yargs.terminalWidth())
|
.wrap(yargs.terminalWidth())
|
||||||
.help(false) // Disable help to avoid triggering it on the first parse.
|
.help(false) // Disable help to avoid triggering it on the first parse.
|
||||||
;
|
;
|
||||||
@@ -681,7 +681,7 @@ async function startControl() {
|
|||||||
|
|
||||||
// Handle the control-config command before trying to connect.
|
// Handle the control-config command before trying to connect.
|
||||||
if (args._[0] === "control-config") {
|
if (args._[0] === "control-config") {
|
||||||
await libConfig.handleConfigCommand(args, controlConfig, args.config);
|
await libSharedCommands.handleConfigCommand(args, controlConfig, args.config);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
// Core definitions for the configuration system
|
// Core definitions for the configuration system
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const fs = require("fs-extra");
|
|
||||||
|
|
||||||
const classes = require("./classes");
|
const classes = require("./classes");
|
||||||
|
|
||||||
|
|
||||||
@@ -379,77 +377,6 @@ function finalizeConfigs() {
|
|||||||
ControlConfig.finalize();
|
ControlConfig.finalize();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Yargs config command
|
|
||||||
*
|
|
||||||
* Can be passed to yargs.command to implement a config command. Use
|
|
||||||
* handleConfigCommand to do the requested action.
|
|
||||||
*
|
|
||||||
* @param {Object} yargs - yargs command builder.
|
|
||||||
* @memberof module:lib/config
|
|
||||||
*/
|
|
||||||
function configCommand(yargs) {
|
|
||||||
yargs
|
|
||||||
.command("set <field> [value]", "Set config field")
|
|
||||||
.command("show <field>", "Show value of the given config field")
|
|
||||||
.command("list", "List all configuration fields and their values")
|
|
||||||
.demandCommand(1, "You need to specify a command to run")
|
|
||||||
.help()
|
|
||||||
.strict()
|
|
||||||
;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle yargs command
|
|
||||||
*
|
|
||||||
* Handle the actions that are made available by configCommand.
|
|
||||||
*
|
|
||||||
* @param {Object} args - yargs args object.
|
|
||||||
* @param {module:lib/config.Config} instance - Config instance.
|
|
||||||
* @param {string} configPath - Path to configuration file.
|
|
||||||
* @memberof module:lib/config
|
|
||||||
*/
|
|
||||||
async function handleConfigCommand(args, instance, configPath) {
|
|
||||||
let command = args._[1];
|
|
||||||
|
|
||||||
if (command === "list") {
|
|
||||||
for (let GroupClass of instance.constructor.groups.values()) {
|
|
||||||
for (let def of GroupClass.definitions.values()) {
|
|
||||||
let value = instance.get(def.fullName);
|
|
||||||
console.log(`${def.fullName} ${JSON.stringify(value)}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (command === "show") {
|
|
||||||
try {
|
|
||||||
console.log(instance.get(args.field));
|
|
||||||
} catch (err) {
|
|
||||||
if (err instanceof classes.InvalidField) {
|
|
||||||
console.error(err.message);
|
|
||||||
} else {
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (command === "set") {
|
|
||||||
if (args.value === undefined) {
|
|
||||||
args.value = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
instance.set(args.field, args.value);
|
|
||||||
await fs.outputFile(configPath, JSON.stringify(instance.serialize(), null, 4));
|
|
||||||
} catch (err) {
|
|
||||||
if (err instanceof classes.InvalidField || err instanceof classes.InvalidValue) {
|
|
||||||
console.error(err.message);
|
|
||||||
} else {
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
MasterGroup,
|
MasterGroup,
|
||||||
SlaveGroup,
|
SlaveGroup,
|
||||||
@@ -464,6 +391,4 @@ module.exports = {
|
|||||||
|
|
||||||
registerPluginConfigGroups,
|
registerPluginConfigGroups,
|
||||||
finalizeConfigs,
|
finalizeConfigs,
|
||||||
configCommand,
|
|
||||||
handleConfigCommand,
|
|
||||||
};
|
};
|
||||||
@@ -6,6 +6,9 @@
|
|||||||
const fs = require("fs-extra");
|
const fs = require("fs-extra");
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
|
|
||||||
|
const libConfig = require("./config");
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Yargs plugin command
|
* Yargs plugin command
|
||||||
*
|
*
|
||||||
@@ -80,7 +83,80 @@ async function handlePluginCommand(args, pluginList, pluginListPath) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Yargs config command
|
||||||
|
*
|
||||||
|
* Can be passed to yargs.command to implement a config command. Use
|
||||||
|
* handleConfigCommand to do the requested action.
|
||||||
|
*
|
||||||
|
* @param {Object} yargs - yargs command builder.
|
||||||
|
*/
|
||||||
|
function configCommand(yargs) {
|
||||||
|
yargs
|
||||||
|
.command("set <field> [value]", "Set config field")
|
||||||
|
.command("show <field>", "Show value of the given config field")
|
||||||
|
.command("list", "List all configuration fields and their values")
|
||||||
|
.demandCommand(1, "You need to specify a command to run")
|
||||||
|
.help()
|
||||||
|
.strict()
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle yargs command
|
||||||
|
*
|
||||||
|
* Handle the actions that are made available by configCommand.
|
||||||
|
*
|
||||||
|
* @param {Object} args - yargs args object.
|
||||||
|
* @param {module:lib/config.Config} instance - Config instance.
|
||||||
|
* @param {string} configPath - Path to configuration file.
|
||||||
|
*/
|
||||||
|
async function handleConfigCommand(args, instance, configPath) {
|
||||||
|
let command = args._[1];
|
||||||
|
|
||||||
|
if (command === "list") {
|
||||||
|
for (let GroupClass of instance.constructor.groups.values()) {
|
||||||
|
for (let def of GroupClass.definitions.values()) {
|
||||||
|
let value = instance.get(def.fullName);
|
||||||
|
console.log(`${def.fullName} ${JSON.stringify(value)}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} else if (command === "show") {
|
||||||
|
try {
|
||||||
|
console.log(instance.get(args.field));
|
||||||
|
} catch (err) {
|
||||||
|
if (err instanceof libConfig.InvalidField) {
|
||||||
|
console.error(err.message);
|
||||||
|
} else {
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} else if (command === "set") {
|
||||||
|
if (args.value === undefined) {
|
||||||
|
args.value = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
instance.set(args.field, args.value);
|
||||||
|
await fs.outputFile(configPath, JSON.stringify(instance.serialize(), null, 4));
|
||||||
|
} catch (err) {
|
||||||
|
if (err instanceof libConfig.InvalidField || err instanceof libConfig.InvalidValue) {
|
||||||
|
console.error(err.message);
|
||||||
|
} else {
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
pluginCommand,
|
pluginCommand,
|
||||||
handlePluginCommand,
|
handlePluginCommand,
|
||||||
|
|
||||||
|
configCommand,
|
||||||
|
handleConfigCommand,
|
||||||
};
|
};
|
||||||
@@ -1574,7 +1574,7 @@ async function startServer() {
|
|||||||
type: "string",
|
type: "string",
|
||||||
})
|
})
|
||||||
.command("plugin", "Manage available plugins", libSharedCommands.pluginCommand)
|
.command("plugin", "Manage available plugins", libSharedCommands.pluginCommand)
|
||||||
.command("config", "Manage Master config", libConfig.configCommand)
|
.command("config", "Manage Master config", libSharedCommands.configCommand)
|
||||||
.command("bootstrap", "Bootstrap access to cluster", yargs => {
|
.command("bootstrap", "Bootstrap access to cluster", yargs => {
|
||||||
yargs
|
yargs
|
||||||
.command("create-admin <name>", "Create a cluster admin")
|
.command("create-admin <name>", "Create a cluster admin")
|
||||||
@@ -1641,7 +1641,7 @@ async function startServer() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (command === "config") {
|
if (command === "config") {
|
||||||
await libConfig.handleConfigCommand(args, masterConfig, masterConfigPath);
|
await libSharedCommands.handleConfigCommand(args, masterConfig, masterConfigPath);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
} else if (command === "bootstrap") {
|
} else if (command === "bootstrap") {
|
||||||
|
|||||||
@@ -1395,7 +1395,7 @@ async function startSlave() {
|
|||||||
type: "string",
|
type: "string",
|
||||||
})
|
})
|
||||||
.command("plugin", "Manage available plugins", libSharedCommands.pluginCommand)
|
.command("plugin", "Manage available plugins", libSharedCommands.pluginCommand)
|
||||||
.command("config", "Manage Slave config", libConfig.configCommand)
|
.command("config", "Manage Slave config", libSharedCommands.configCommand)
|
||||||
.command("run", "Run slave")
|
.command("run", "Run slave")
|
||||||
.demandCommand(1, "You need to specify a command to run")
|
.demandCommand(1, "You need to specify a command to run")
|
||||||
.strict()
|
.strict()
|
||||||
@@ -1440,7 +1440,7 @@ async function startSlave() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (command === "config") {
|
if (command === "config") {
|
||||||
await libConfig.handleConfigCommand(args, slaveConfig, args.config);
|
await libSharedCommands.handleConfigCommand(args, slaveConfig, args.config);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user