Added meshid and group name to meshctrl.js listdevice json. #2933
Ylian Saint-Hilaire committed
Jul 27, 2021 at 10:47 UTC
51a0b3c137010c0cc66e1ff3f04e2c58da550531
1 file changed
+11
-2
meshctrl.js
+11
-2
@@ -1872,7 +1872,7 @@ function serverConnect() {
1872
if ((data.result != null) && (data.result != 'ok')) {
1873
console.log(data.result);
1874
} else {
1875
- // Filder devices based on device id.
1875
+ // Filter devices based on device id.
1876
if (args.filterid) {
1877
var filteridSplit = args.filterid.split(','), filters = [];
1878
for (var i in filteridSplit) {
@@ -1914,7 +1914,16 @@ function serverConnect() {
1914
} else if (args.json) {
1915
// Return all devices in JSON format
1916
var nodes = [];
1917
- for (var i in data.nodes) { var devicesInMesh = data.nodes[i]; for (var j in devicesInMesh) { nodes.push(devicesInMesh[j]); } }
1917
+
1918
+ for (var i in data.nodes) {
1919
+ const devicesInMesh = data.nodes[i];
1920
+ for (var j in devicesInMesh) {
1921
+ devicesInMesh[j].meshid = i; // Add device group id
1922
+ if (settings.xmeshes && settings.xmeshes[i] && settings.xmeshes[i].name) { devicesInMesh[j].groupname = settings.xmeshes[i].name; } // Add device group name
1923
+ nodes.push(devicesInMesh[j]);
1924
+ }
1925
+ }
1926
+
1927
console.log(JSON.stringify(nodes, ' ', 2));
1928
} else {
1929
// Display the list of nodes in text format