${t('device.info.wifi')}
diff --git a/server/db/database.js b/server/db/database.js
index f0b4dde..3db48e2 100644
--- a/server/db/database.js
+++ b/server/db/database.js
@@ -388,6 +388,16 @@ const migrations = [
// dual-stack panel genuinely has both and an operator may need either — collapsing them would
// make the field mean "whichever we happened to enumerate first".
"ALTER TABLE device_telemetry ADD COLUMN local_ip6 TEXT",
+ // What is physically PLUGGED IN, read from the display's EDID, and the mode actually being
+ // driven. A signage operator's first question about a dark screen is which panel it is and
+ // whether the player is outputting at all — the dashboard could say neither, and
+ // screen_width/height are what the PAGE thinks it has, not what the hardware negotiated.
+ //
+ // Per-telemetry-row rather than on `devices` because a display can be swapped, unplugged or
+ // renegotiated without the player re-registering, and because a dual-output player registers ONE
+ // ROW PER OUTPUT (see output_index) — each row must carry its own screen, not the box's first.
+ "ALTER TABLE device_telemetry ADD COLUMN attached_display TEXT",
+ "ALTER TABLE device_telemetry ADD COLUMN video_mode TEXT",
// Panel temperature in Celsius. REAL because the sensor reports fractions, and nullable because
// only some hardware exposes one — Android and the browser players send nothing and must keep
// reading as "no sensor" rather than "0 degrees", which is why every read site treats null as
diff --git a/server/routes/devices.js b/server/routes/devices.js
index 4367d70..7a1c703 100644
--- a/server/routes/devices.js
+++ b/server/routes/devices.js
@@ -23,7 +23,7 @@ router.get('/', (req, res) => {
const devices = db.prepare(`
SELECT d.*,
t.battery_level, t.battery_charging, t.storage_free_mb, t.storage_total_mb,
- t.ram_free_mb, t.ram_total_mb, t.wifi_ssid, t.wifi_rssi, t.uptime_seconds, t.local_ip, t.local_ip6,
+ t.ram_free_mb, t.ram_total_mb, t.wifi_ssid, t.wifi_rssi, t.uptime_seconds, t.local_ip, t.local_ip6, t.attached_display, t.video_mode,
t.cpu_usage,
s.filepath as screenshot_path, s.captured_at as screenshot_at,
u.email as owner_email, u.name as owner_name
diff --git a/server/test/brightsign-bridge.test.js b/server/test/brightsign-bridge.test.js
index 73126e5..157f241 100644
--- a/server/test/brightsign-bridge.test.js
+++ b/server/test/brightsign-bridge.test.js
@@ -22,7 +22,7 @@ const path = require('node:path');
const SRC = fs.readFileSync(path.join(__dirname, '..', '..', 'brightsign', 'st-bridge.js'), 'utf8');
/** Load the bridge into a fake window. `mods` present => pretend we are on a BrightSign. */
-function load({ search = '', mods = null, ua = 'Mozilla/5.0 Chrome/150', seed = {}, storageEstimate = null, temperature = null, os = null, fs = null } = {}) {
+function load({ search = '', mods = null, ua = 'Mozilla/5.0 Chrome/150', seed = {}, storageEstimate = null, temperature = null, os = null, fs = null, edid = null, activeMode = null } = {}) {
const posted = [];
const registryStore = new Map(Object.entries(seed));
const cec = { sent: [] };
@@ -70,6 +70,23 @@ function load({ search = '', mods = null, ua = 'Mozilla/5.0 Chrome/150', seed =
// Not an @brightsign module, so it is answered before the platform ones.
if (name === 'os') { if (!os) throw new Error("Cannot find module 'os'"); return os; }
if (name === 'fs') { if (!fs) throw new Error("Cannot find module 'fs'"); return fs; }
+ // The attached panel's EDID, per OUTPUT. `edid` maps an output name to a monitor name;
+ // anything not in it behaves like a real player asked for an output it does not have —
+ // "hdmi2" throws from the constructor, "HDMI-2" rejects. Both observed on an XT245.
+ if (name === '@brightsign/videooutput') {
+ if (!edid) throw new Error('no videooutput');
+ return function (outputName) {
+ if (!(outputName in edid)) {
+ if (/^hdmi\d/.test(outputName)) throw new Error('no such output');
+ return { getEdidIdentity: () => Promise.reject(new Error('Output not connected')) };
+ }
+ return { getEdidIdentity: () => Promise.resolve({ monitorName: edid[outputName] }) };
+ };
+ }
+ if (name === '@brightsign/videomodeconfiguration') {
+ if (!activeMode) throw new Error('no videomodeconfiguration');
+ return function () { return { getActiveMode: () => Promise.resolve(activeMode) }; };
+ }
if (name === '@brightsign/messageport') {
return function () {
return {
@@ -557,3 +574,69 @@ test('a firmware without statfs degrades instead of throwing', () => {
assert.doesNotThrow(() => api.refreshTelemetry());
assert.equal(api.telemetrySnapshot().local_ip, '192.168.1.46', 'and the rest still reports');
});
+
+// ---------------------------------------------------------------------------------------------
+// Which screen is plugged in, and what the output is driving.
+//
+// screen_width/height are what the PAGE believes it has — the widget's own geometry. They say
+// nothing about the panel. Our XT245 drives a CX101 at 1920x1200@60 while the page reports its own
+// canvas, so an operator asking "which display is that and is it even outputting?" had no answer.
+//
+// The output is chosen by SCREEN NUMBER because a dual-output player registers one device row per
+// output (?screen=N → output_index), and each row must report its own panel.
+
+const flush = () => new Promise((r) => setTimeout(r, 0));
+
+test('the attached display is read from EDID', async () => {
+ const { api } = load({ mods: true, os: OS_STUB, edid: { 'HDMI-1': 'CX101' } });
+ api.refreshTelemetry();
+ await flush();
+ assert.equal(api.telemetrySnapshot().attached_display, 'CX101');
+});
+
+test('MULTI-SCREEN: each output reports its OWN panel, not the box\'s first', async () => {
+ // The bug this prevents: a player driving a lobby TV and a menu board showing the lobby TV twice.
+ const wiring = { edid: { 'HDMI-1': 'Lobby-55', 'HDMI-2': 'MenuBoard-32' } };
+ const one = load({ mods: true, os: OS_STUB, search: '?screen=1', ...wiring });
+ const two = load({ mods: true, os: OS_STUB, search: '?screen=2', ...wiring });
+ one.api.refreshTelemetry();
+ two.api.refreshTelemetry();
+ await flush();
+ assert.equal(one.api.telemetrySnapshot().attached_display, 'Lobby-55');
+ assert.equal(two.api.telemetrySnapshot().attached_display, 'MenuBoard-32');
+});
+
+test('a single-output player reports nothing rather than inventing a second screen', async () => {
+ // Verified on hardware: "hdmi2" throws from the constructor and "HDMI-2" rejects.
+ const { api } = load({ mods: true, os: OS_STUB, search: '?screen=2', edid: { 'HDMI-1': 'CX101' } });
+ assert.doesNotThrow(() => api.refreshTelemetry());
+ await flush();
+ assert.equal(api.telemetrySnapshot().attached_display, undefined);
+});
+
+test('screen 1 also accepts the lowercase name the vendor cookbook uses', async () => {
+ const { api } = load({ mods: true, os: OS_STUB, edid: { hdmi: 'CX101' } });
+ api.refreshTelemetry();
+ await flush();
+ assert.equal(api.telemetrySnapshot().attached_display, 'CX101');
+});
+
+test('the active mode is reported as WxH@Hz, the way an installer says it', async () => {
+ const { api } = load({
+ mods: true, os: OS_STUB,
+ activeMode: { graphicsPlaneWidth: 1920, graphicsPlaneHeight: 1200, frequency: 60 },
+ });
+ api.refreshTelemetry();
+ await flush();
+ assert.equal(api.telemetrySnapshot().video_mode, '1920x1200@60');
+});
+
+test('a firmware with neither module degrades quietly', async () => {
+ const { api } = load({ mods: true, os: OS_STUB });
+ assert.doesNotThrow(() => api.refreshTelemetry());
+ await flush();
+ const t = api.telemetrySnapshot();
+ assert.equal(t.attached_display, undefined);
+ assert.equal(t.video_mode, undefined);
+ assert.equal(t.local_ip, '192.168.1.46', 'and everything else still reports');
+});
diff --git a/server/test/device-controls-hidden.test.js b/server/test/device-controls-hidden.test.js
index fb7593d..f469e24 100644
--- a/server/test/device-controls-hidden.test.js
+++ b/server/test/device-controls-hidden.test.js
@@ -238,3 +238,16 @@ test('a browser tab gains nothing — it measures none of this', () => {
assert.equal(has(html, 'telRam'), false);
assert.equal(has(html, 'telCpu'), false);
});
+
+test('the attached display and video mode get cards when reported', () => {
+ const html = renderWith(BS_WITH_DATA, { ...REAL_TELEMETRY, attached_display: 'CX101', video_mode: '1920x1200@60' });
+ assert.ok(has(html, 'telDisplay'), 'the panel EDID card');
+ assert.ok(has(html, 'telVideoMode'), 'the negotiated mode card');
+ assert.ok(html.includes('CX101'), 'and the monitor name itself');
+});
+
+test('a player that cannot read its output grows no empty rows', () => {
+ const html = renderWith(BS_WITH_DATA, REAL_TELEMETRY);
+ assert.equal(has(html, 'telDisplay'), false);
+ assert.equal(has(html, 'telVideoMode'), false);
+});
diff --git a/server/ws/deviceSocket.js b/server/ws/deviceSocket.js
index 702df65..22a47de 100644
--- a/server/ws/deviceSocket.js
+++ b/server/ws/deviceSocket.js
@@ -1202,8 +1202,9 @@ module.exports = function setupDeviceSocket(io) {
if (telemetry && deviceExists(device_id)) {
db.prepare(`
INSERT INTO device_telemetry (device_id, battery_level, battery_charging, storage_free_mb, storage_total_mb,
- ram_free_mb, ram_total_mb, cpu_usage, wifi_ssid, wifi_rssi, uptime_seconds, local_ip, local_ip6, temperature_c)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+ ram_free_mb, ram_total_mb, cpu_usage, wifi_ssid, wifi_rssi, uptime_seconds, local_ip, local_ip6, temperature_c,
+ attached_display, video_mode)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
`).run(
device_id,
telemetry.battery_level ?? null,
@@ -1225,7 +1226,12 @@ module.exports = function setupDeviceSocket(io) {
// Only a finite number is a reading. A panel with no sensor sends nothing, and NaN or
// Infinity from a flaky one must land as "no reading" rather than poisoning the column.
typeof telemetry.temperature_c === 'number' && Number.isFinite(telemetry.temperature_c)
- ? telemetry.temperature_c : null
+ ? telemetry.temperature_c : null,
+ // Free text from the panel's EDID and the mode the output is driving. Trimmed and
+ // bounded like the address fields above: this is a string the DISPLAY chose, not one
+ // we control, and a monitor with a silly name must not be able to grow the row.
+ typeof telemetry.attached_display === 'string' ? telemetry.attached_display.trim().slice(0, 64) || null : null,
+ typeof telemetry.video_mode === 'string' ? telemetry.video_mode.trim().slice(0, 32) || null : null
);
pruneTelemetry(device_id);