diff --git a/server/src/globals/ws.js b/server/src/globals/ws.js
index 24dd481e..3943c51e 100644
--- a/server/src/globals/ws.js
+++ b/server/src/globals/ws.js
@@ -12,6 +12,7 @@ httpServer.on('upgrade', (req, socket, head) => {
const target = path === '/rover/management' ? managementWSS : path === '/rover' ? roverWSS : null;
if (target) {
target.handleUpgrade(req, socket, head, (ws) => {
+ ws.peerAddress = req.socket.remoteAddress?.replace(/^::ffff:/, '') || null;
target.emit('connection', ws, req);
});
}
diff --git a/server/src/services/roverManager/rosterLifecycle.js b/server/src/services/roverManager/rosterLifecycle.js
index 3d24bedd..ca51e52c 100644
--- a/server/src/services/roverManager/rosterLifecycle.js
+++ b/server/src/services/roverManager/rosterLifecycle.js
@@ -221,6 +221,7 @@ function createRosterLifecycle(deps) {
id: record.id,
name: record.meta?.name || record.id,
description: record.meta?.description,
+ ipAddress: record.ws?.peerAddress || null,
color: record.meta?.color || null,
battery: record.meta?.battery,
batteryState: record.batteryState,
diff --git a/webui/src/components/AdminPanel/AdminPanelContent.jsx b/webui/src/components/AdminPanel/AdminPanelContent.jsx
index dd437d16..c1a64447 100644
--- a/webui/src/components/AdminPanel/AdminPanelContent.jsx
+++ b/webui/src/components/AdminPanel/AdminPanelContent.jsx
@@ -564,6 +564,7 @@ export default function AdminPanelContent() {
>
{updateStates[rover.id] ? 'Updating...' : 'Update'}
+ IP: {rover.ipAddress || 'Unavailable'}
{rover?.private?.enabled ? (