Merge fixes.
Ylian Saint-Hilaire committed
Jul 7, 2021 at 19:35 UTC
27ceb05e07f5ba59e96375d48f6d0f730347a720
1 file changed
+10
-14
meshuser.js
+10
-14
@@ -1510,19 +1510,15 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
1510
if (cmdargs.length == 0) break;
1511
const cmd = cmdargs[0].toLowerCase();
1512
cmdargs = parseArgs(cmdargs);
1513
- var cmdData = { result: '', command: command, cmdargs: cmdargs };
1513
1515
- try {
1516
- consoleCommands[cmd](cmdData);
1517
- } catch (e) {
1518
- if (consoleCommands[cmd] == null)
1519
- cmdData.result = 'Unknown command \"' + cmd + '\", type \"help\" for list of available commands.';
1520
- else
1521
- console.log(e);
1522
- }
1514
+ // Find the command in the lookup table and run it.
1515
+ var cmdData = serverUserCommand[cmd], r = '';;
1516
+ if (cmdData != null) {
1517
+ try { r = cmdData[0](cmdargs); } catch (ex) { r = '' + ex; }
1518
+ } else { r = 'Unknown command \"' + cmd + '\", type \"help\" for list of available commands.'; }
1519
1524
- if (cmdData.result != null && cmdData.result != '') {
1525
- try { ws.send(JSON.stringify({ action: 'serverconsole', value: cmdData.result, tag: command.tag })); } catch (ex) { } }
1520
+ // Send back the command result
1521
+ if (r != '') { try { ws.send(JSON.stringify({ action: 'serverconsole', value: r, tag: command.tag })); } catch (ex) { } }
1522
break;
1523
}
1524
case 'msg':
@@ -6142,7 +6138,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
6138
}
6139
}
6140
6145
- const serverUserCommand = {
6141
+ const serverUserCommands = {
6142
'acceleratorsstats': [serverUserCommandAcceleratorsStats, "Show data on work being offloaded to other CPU's"],
6143
'agentissues': [serverUserCommandAgentIssues, ""],
6144
'agentstats': [serverUserCommandAgentStats, ""],
@@ -6196,7 +6192,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
6192
6193
function serverUserCommandHelp(cmdargs) {
6194
var r, fin = '', f = '', availcommands = [];
6199
- for (var i in serverUserCommand) { availcommands.push(i); }
6195
+ for (var i in serverUserCommands) { availcommands.push(i); }
6196
availcommands = availcommands.sort();
6197
while (availcommands.length > 0) { if (f.length > 80) { fin += (f + ',\r\n'); f = ''; } f += (((f != '') ? ', ' : ' ') + availcommands.shift()); }
6198
if (f != '') { fin += f; }
@@ -6204,7 +6200,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
6200
r = 'Available commands: \r\n' + fin + '\r\nType help <command> for details.';
6201
} else {
6202
var cmd2 = cmdargs['_'][0].toLowerCase();
6207
- var cmddata = serverUserCommand[cmd2];
6203
+ var cmddata = serverUserCommands[cmd2];
6204
if (cmddata) { if (cmddata[1] == '') { r = "No help available for this command."; } else { r = cmddata[1]; } } else { r = "This command does not exist."; }
6205
}
6206
return r;