From 1b7c63beaff7efdc123dd27765d171a5bf282bc2 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 30 Apr 2025 11:03:39 +0200 Subject: [PATCH] unetd: cli: allow skipping pretty printing of status data Makes it more useful for services built around the CLI API Signed-off-by: Felix Fietkau --- package/network/services/unetd/files/unet.uc | 25 ++++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/package/network/services/unetd/files/unet.uc b/package/network/services/unetd/files/unet.uc index 1b7d021829d..01ff05c3b16 100644 --- a/package/network/services/unetd/files/unet.uc +++ b/package/network/services/unetd/files/unet.uc @@ -1296,18 +1296,23 @@ const Unet = { for (let name, host in status.peers) { let cur = []; - data[`Host '${name}'`] = cur; - push(cur, [ "State", host.connected ? "connected" : "disconnected" ]); - if (!host.connected) - continue; + let key = name; + if (model.cb.opt_pretty_print) { + data[`Host '${name}'`] = cur; + push(cur, [ "State", host.connected ? "connected" : "disconnected" ]); + if (!host.connected) + continue; - if (host.endpoint) - push(cur, [ "IP address", host.endpoint ]); + if (host.endpoint) + push(cur, [ "IP address", host.endpoint ]); - push(cur, [ "Idle time", time_format(host.idle) ]); - push(cur, [ "Sent bytes", host.tx_bytes ]); - push(cur, [ "Received bytes", host.rx_bytes ]); - push(cur, [ "Last handshake", time_format(host.last_handshake_sec) + " ago" ]); + push(cur, [ "Idle time", time_format(host.idle) ]); + push(cur, [ "Sent bytes", host.tx_bytes ]); + push(cur, [ "Received bytes", host.rx_bytes ]); + push(cur, [ "Last handshake", time_format(host.last_handshake_sec) + " ago" ]); + } else { + data[name] = host; + } } return ctx.multi_table("Status of network " + name, data); }