diff --git a/package/secubox/luci-app-tor-shield/htdocs/luci-static/resources/tor-shield/api.js b/package/secubox/luci-app-tor-shield/htdocs/luci-static/resources/tor-shield/api.js index be2fe776..db0c26e5 100644 --- a/package/secubox/luci-app-tor-shield/htdocs/luci-static/resources/tor-shield/api.js +++ b/package/secubox/luci-app-tor-shield/htdocs/luci-static/resources/tor-shield/api.js @@ -203,9 +203,13 @@ return baseclass.extend({ callCircuits(), callBandwidth() ]).then(function(results) { + // Handle RPC expect unwrapping - results[1] may be array or object + var circuitsData = results[1] || []; + var circuits = Array.isArray(circuitsData) ? circuitsData : (circuitsData.circuits || []); + return { status: results[0] || {}, - circuits: (results[1] || {}).circuits || [], + circuits: circuits, bandwidth: results[2] || {} }; });