',
'
',
diff --git a/src/web/bootstrap.js b/src/web/bootstrap.js
index 39084b9..3ed2f1e 100644
--- a/src/web/bootstrap.js
+++ b/src/web/bootstrap.js
@@ -22,8 +22,8 @@ function createWebBootstrap(options) {
const dashboardWs = new WebSocketServer({ noServer: true });
const dashboardClients = new Set();
- const playerSnapshotCache = new Map();
- const playerSnapshotSockets = new Map();
+ const playerSnapshotCache = options && options.playerSnapshotCache ? options.playerSnapshotCache : new Map();
+ const playerSnapshotSockets = options && options.playerSnapshotSockets ? options.playerSnapshotSockets : new Map();
let dashboardRefreshInFlight = null;
let broadcastDashboardState = null;
function getPlayerSnapshotSocketUrl(slug) {
@@ -44,6 +44,10 @@ function createWebBootstrap(options) {
}
function ensurePlayerSnapshotSubscription(slug) {
+ if (options && typeof options.ensurePlayerSnapshotSubscription === 'function' && options.ensurePlayerSnapshotSubscription !== ensurePlayerSnapshotSubscription) {
+ return options.ensurePlayerSnapshotSubscription(slug);
+ }
+
const key = String(slug || '').trim();
if (!key || playerSnapshotSockets.has(key)) {
return;
@@ -130,12 +134,44 @@ function createWebBootstrap(options) {
const collectUploadPathsFromDirectory = uploadSyncService.collectUploadPathsFromDirectory;
const syncPlaylistUploadsOnChange = uploadSyncService.syncPlaylistUploadsOnChange;
const runMediaSyncTask = uploadSyncService.runMediaSyncTask;
+ let lastDashboardState = null;
+
+ function getFallbackDashboardState() {
+ return lastDashboardState || {
+ playlists: [],
+ screens: [],
+ clients: [],
+ kioskPlayers: [],
+ slides: [],
+ playerServiceConnected: false,
+ connectedPlayersCount: 0,
+ connectedClientsCount: 0
+ };
+ }
+
+ async function resolveDashboardState() {
+ try {
+ const state = await buildDashboardState();
+ lastDashboardState = state;
+ return state;
+ } catch (error) {
+ if (lastDashboardState) {
+ console.error(error);
+ return lastDashboardState;
+ }
+
+ throw error;
+ }
+ }
async function sendDashboardStateToSocket(socket) {
if (!socket || socket.readyState !== WebSocket.OPEN) {
return;
}
- const state = await buildDashboardState();
+ const state = await resolveDashboardState().catch(function (error) {
+ console.error(error);
+ return getFallbackDashboardState();
+ });
socket.send(JSON.stringify({ type: 'dashboard-state', state: state }));
}
@@ -145,7 +181,10 @@ function createWebBootstrap(options) {
}
dashboardRefreshInFlight = (async function () {
- const state = await buildDashboardState();
+ const state = await resolveDashboardState().catch(function (error) {
+ console.error(error);
+ return getFallbackDashboardState();
+ });
const payload = JSON.stringify({ type: 'dashboard-state', state: state });
for (const socket of dashboardClients) {
if (socket && socket.readyState === WebSocket.OPEN) {
diff --git a/src/web/lib/dashboard-state.js b/src/web/lib/dashboard-state.js
index c4f52d0..1852de5 100644
--- a/src/web/lib/dashboard-state.js
+++ b/src/web/lib/dashboard-state.js
@@ -120,7 +120,11 @@ function createDashboardStateService(options) {
? await common.fetchPlayerRegistrations(pool)
: [];
screensData.forEach(function (screen) {
- ensurePlayerSnapshotSubscription(screen.slug);
+ try {
+ ensurePlayerSnapshotSubscription(screen.slug);
+ } catch (_error) {
+ // Keep building dashboard state when one player snapshot subscription fails.
+ }
});
const [onboardingRows] = await pool.query(
diff --git a/src/web/lib/media/upload-sync.js b/src/web/lib/media/upload-sync.js
index 4449e06..66077dd 100644
--- a/src/web/lib/media/upload-sync.js
+++ b/src/web/lib/media/upload-sync.js
@@ -40,6 +40,14 @@ function normalizePlayerRowBaseUrl(player) {
return normalizeBaseUrl(player && player.internal_base_url);
}
+function isRecentPlayerRegistration(player, staleSeconds) {
+ const lastSeenAt = player && player.last_seen_at;
+ const lastSeenAtValue = lastSeenAt instanceof Date ? lastSeenAt.getTime() : new Date(lastSeenAt).getTime();
+ const cutoffTime = Date.now() - Math.max(30, Number(staleSeconds || 60)) * 1000;
+
+ return Number.isFinite(lastSeenAtValue) && lastSeenAtValue >= cutoffTime;
+}
+
function createUploadSyncService(options) {
const pool = options && options.pool;
const common = options && options.common;
@@ -68,7 +76,11 @@ function createUploadSyncService(options) {
async function getPlayerInternalBaseUrl() {
const metadata = await getPlayerTaskMetadata();
- return metadata && metadata.playerInternalBaseUrl ? metadata.playerInternalBaseUrl : null;
+ if (!metadata || metadata.playerActive === false) {
+ return null;
+ }
+
+ return metadata.playerInternalBaseUrl ? metadata.playerInternalBaseUrl : null;
}
async function getPlayerTaskMetadata() {
@@ -85,26 +97,45 @@ function createUploadSyncService(options) {
if (pool && typeof fetchPlayerRegistrations === 'function') {
const configuredPlayerIdentifier = getConfiguredPlayerIdentifier();
const players = await fetchPlayerRegistrations(pool);
- const exactPlayer = Array.isArray(players)
- ? players.find(function (player) {
- return String(player && player.identifier || '').trim() === configuredPlayerIdentifier;
- })
- : null;
const registeredPlayers = Array.isArray(players) ? players : [];
- const preferredPlayer = registeredPlayers.find(function (player) {
+ const recentPlayers = registeredPlayers.filter(function (player) {
+ return isRecentPlayerRegistration(player, 60);
+ });
+ const preferredPlayer = recentPlayers.find(function (player) {
const internalBaseUrl = normalizePlayerRowBaseUrl(player);
return internalBaseUrl && !isLocalLikeBaseUrl(internalBaseUrl);
- }) || exactPlayer || registeredPlayers[0] || null;
- const resolvedInternalBaseUrl = normalizePlayerRowBaseUrl(preferredPlayer);
- const resolvedPublicBaseUrl = normalizeBaseUrl(preferredPlayer && preferredPlayer.public_base_url);
- const resolvedIdentifier = String(preferredPlayer && preferredPlayer.identifier || '').trim();
- if (resolvedInternalBaseUrl || resolvedPublicBaseUrl || resolvedIdentifier) {
+ }) || recentPlayers.find(function (player) {
+ return String(player && player.identifier || '').trim() === configuredPlayerIdentifier;
+ }) || recentPlayers[0] || null;
+ if (preferredPlayer) {
+ const resolvedInternalBaseUrl = normalizePlayerRowBaseUrl(preferredPlayer);
+ const resolvedPublicBaseUrl = normalizeBaseUrl(preferredPlayer && preferredPlayer.public_base_url);
+ const resolvedIdentifier = String(preferredPlayer && preferredPlayer.identifier || '').trim();
playerInternalBaseUrl = resolvedInternalBaseUrl || null;
playerTaskMetadata = {
playerIdentifier: resolvedIdentifier || null,
playerPublicBaseUrl: resolvedPublicBaseUrl || null,
playerInternalBaseUrl: resolvedInternalBaseUrl || null,
- playerLabel: resolvedIdentifier || resolvedPublicBaseUrl || resolvedInternalBaseUrl || null
+ playerLabel: resolvedIdentifier || resolvedPublicBaseUrl || resolvedInternalBaseUrl || null,
+ playerActive: true
+ };
+ return playerTaskMetadata;
+ }
+
+ if (registeredPlayers.length) {
+ const stalePlayer = registeredPlayers.find(function (player) {
+ return String(player && player.identifier || '').trim() === configuredPlayerIdentifier;
+ }) || registeredPlayers[0] || null;
+ const staleInternalBaseUrl = normalizePlayerRowBaseUrl(stalePlayer);
+ const stalePublicBaseUrl = normalizeBaseUrl(stalePlayer && stalePlayer.public_base_url);
+ const staleIdentifier = String(stalePlayer && stalePlayer.identifier || '').trim();
+ playerInternalBaseUrl = staleInternalBaseUrl || null;
+ playerTaskMetadata = {
+ playerIdentifier: staleIdentifier || null,
+ playerPublicBaseUrl: stalePublicBaseUrl || null,
+ playerInternalBaseUrl: staleInternalBaseUrl || null,
+ playerLabel: staleIdentifier || stalePublicBaseUrl || staleInternalBaseUrl || null,
+ playerActive: false
};
return playerTaskMetadata;
}
@@ -117,7 +148,8 @@ function createUploadSyncService(options) {
playerIdentifier: getConfiguredPlayerIdentifier() || null,
playerPublicBaseUrl: null,
playerInternalBaseUrl: playerInternalBaseUrl,
- playerLabel: getConfiguredPlayerIdentifier() || playerInternalBaseUrl || null
+ playerLabel: getConfiguredPlayerIdentifier() || playerInternalBaseUrl || null,
+ playerActive: true
};
return playerTaskMetadata;
})().then(function (metadata) {
@@ -377,6 +409,10 @@ function createUploadSyncService(options) {
return code === 'ENOTFOUND' || code === 'ECONNREFUSED' || code === 'EAI_AGAIN' || code === 'ETIMEDOUT';
}
+ function isPlayerUnavailableResponse(response) {
+ return Boolean(response) && Number(response.status) === 503;
+ }
+
function queuePlayerUploadSync(operation) {
if (!operation || !operation.uploadPath) {
return;
@@ -404,13 +440,13 @@ function createUploadSyncService(options) {
}, 5000);
}
- async function pushUploadFileToPlayer(uploadPath, localUploadDir) {
+ async function pushUploadFileToPlayer(uploadPath, localUploadDir, resolvedPlayerInternalBaseUrl) {
if (!uploadPath || !shouldMirrorUploads(localUploadDir)) {
return false;
}
- const resolvedPlayerInternalBaseUrl = await getPlayerInternalBaseUrl();
- if (!resolvedPlayerInternalBaseUrl) {
+ const targetBaseUrl = String(resolvedPlayerInternalBaseUrl || '').trim() || await getPlayerInternalBaseUrl();
+ if (!targetBaseUrl) {
return false;
}
@@ -435,7 +471,7 @@ function createUploadSyncService(options) {
pathname: `/api/media/${encodeURIComponent(relativePath)}`,
body: fileBuffer
});
- const response = await fetch(`${resolvedPlayerInternalBaseUrl}/api/media/${encodeURIComponent(relativePath)}`, {
+ const response = await fetch(`${targetBaseUrl}/api/media/${encodeURIComponent(relativePath)}`, {
method: 'PUT',
headers: {
'Content-Type': 'application/octet-stream',
@@ -444,7 +480,9 @@ function createUploadSyncService(options) {
body: fileBuffer
});
if (!response.ok) {
- console.warn('Unable to sync upload to player:', relativePath, response.status, response.statusText);
+ if (!isPlayerUnavailableResponse(response)) {
+ console.warn('Unable to sync upload to player:', relativePath, response.status, response.statusText);
+ }
return false;
}
return true;
@@ -456,13 +494,13 @@ function createUploadSyncService(options) {
}
}
- async function removeUploadFileFromPlayer(uploadPath, localUploadDir) {
+ async function removeUploadFileFromPlayer(uploadPath, localUploadDir, resolvedPlayerInternalBaseUrl) {
if (!uploadPath || !shouldMirrorUploads(localUploadDir)) {
return false;
}
- const resolvedPlayerInternalBaseUrl = await getPlayerInternalBaseUrl();
- if (!resolvedPlayerInternalBaseUrl) {
+ const targetBaseUrl = String(resolvedPlayerInternalBaseUrl || '').trim() || await getPlayerInternalBaseUrl();
+ if (!targetBaseUrl) {
return false;
}
@@ -475,7 +513,7 @@ function createUploadSyncService(options) {
method: 'DELETE',
pathname: `/api/media/${encodeURIComponent(relativePath)}`
});
- const response = await fetch(`${resolvedPlayerInternalBaseUrl}/api/media/${encodeURIComponent(relativePath)}`, {
+ const response = await fetch(`${targetBaseUrl}/api/media/${encodeURIComponent(relativePath)}`, {
method: 'DELETE',
headers: {
Accept: 'application/json',
@@ -483,7 +521,9 @@ function createUploadSyncService(options) {
}
});
if (!response.ok && response.status !== 404) {
- console.warn('Unable to remove upload from player:', relativePath, response.status, response.statusText);
+ if (!isPlayerUnavailableResponse(response)) {
+ console.warn('Unable to remove upload from player:', relativePath, response.status, response.statusText);
+ }
return false;
}
return true;
@@ -500,9 +540,10 @@ function createUploadSyncService(options) {
return;
}
+ const resolvedPlayerInternalBaseUrl = await getPlayerInternalBaseUrl();
const uniqueRefs = Array.from(new Set((uploadRefs || []).map(normalizeUploadReference).filter(Boolean)));
for (let i = 0; i < uniqueRefs.length; i += 1) {
- const success = await pushUploadFileToPlayer(uniqueRefs[i], localUploadDir);
+ const success = await pushUploadFileToPlayer(uniqueRefs[i], localUploadDir, resolvedPlayerInternalBaseUrl);
if (!success) {
queuePlayerUploadSync({
type: 'put',
@@ -683,15 +724,23 @@ function createUploadSyncService(options) {
const playerMetadata = pendingEntries.length && pendingEntries[0] && pendingEntries[0].metadata
? pendingEntries[0].metadata
: await getPlayerTaskMetadata();
+ if (playerMetadata && playerMetadata.playerActive === false) {
+ pendingPlayerUploadSyncs.clear();
+ pendingPlayerUploadSyncRetryLogAt = 0;
+ return;
+ }
+ const resolvedPlayerInternalBaseUrl = playerMetadata && playerMetadata.playerInternalBaseUrl
+ ? playerMetadata.playerInternalBaseUrl
+ : await getPlayerInternalBaseUrl();
let successCount = 0;
let failureCount = 0;
for (let i = 0; i < pendingEntries.length; i += 1) {
const operation = pendingEntries[i];
let success = false;
if (operation.type === 'delete') {
- success = await removeUploadFileFromPlayer(operation.uploadPath, operation.uploadDir);
+ success = await removeUploadFileFromPlayer(operation.uploadPath, operation.uploadDir, resolvedPlayerInternalBaseUrl);
} else {
- success = await pushUploadFileToPlayer(operation.uploadPath, operation.uploadDir);
+ success = await pushUploadFileToPlayer(operation.uploadPath, operation.uploadDir, resolvedPlayerInternalBaseUrl);
}
if (success) {
successCount += 1;
diff --git a/src/web/lib/player-actions.js b/src/web/lib/player-actions.js
index 2b74f21..a990ff9 100644
--- a/src/web/lib/player-actions.js
+++ b/src/web/lib/player-actions.js
@@ -25,6 +25,29 @@ function normalizeBaseUrl(value) {
return String(value || '').trim().replace(/\/$/, '');
}
+function isRecentPlayerRegistration(player, staleSeconds) {
+ const lastSeenAt = player && player.last_seen_at;
+ const lastSeenAtValue = lastSeenAt instanceof Date ? lastSeenAt.getTime() : new Date(lastSeenAt).getTime();
+ const cutoffTime = Date.now() - Math.max(30, Number(staleSeconds || 60)) * 1000;
+
+ return Number.isFinite(lastSeenAtValue) && lastSeenAtValue >= cutoffTime;
+}
+
+async function fetchRecentPlayerRegistrations(pool) {
+ if (!pool || typeof fetchPlayerRegistrations !== 'function') {
+ return [];
+ }
+
+ try {
+ const players = await fetchPlayerRegistrations(pool);
+ return (Array.isArray(players) ? players : []).filter(function (player) {
+ return isRecentPlayerRegistration(player, 60);
+ });
+ } catch (_error) {
+ return [];
+ }
+}
+
function createPlayerActionService(options) {
const pool = options && options.pool;
const configuredPlayerInternalBaseUrl = String(options && options.playerInternalBaseUrl || '').replace(/\/$/, '');
@@ -57,10 +80,10 @@ function createPlayerActionService(options) {
})
: null;
const registeredPlayers = Array.isArray(players) ? players : [];
- const preferredPlayer = registeredPlayers.find(function (player) {
+ const preferredPlayer = exactPlayer || registeredPlayers.find(function (player) {
const internalBaseUrl = normalizeBaseUrl(player && player.internal_base_url);
return internalBaseUrl && !isLocalLikeBaseUrl(internalBaseUrl);
- }) || exactPlayer || registeredPlayers[0] || null;
+ }) || registeredPlayers[0] || null;
const resolvedBaseUrl = normalizeBaseUrl(preferredPlayer && preferredPlayer.internal_base_url);
if (resolvedBaseUrl) {
playerInternalBaseUrl = resolvedBaseUrl;
@@ -87,24 +110,26 @@ function createPlayerActionService(options) {
return playerInternalBaseUrlPromise;
}
- async function forwardPlayerCommand(slug, commandOrPayload, connectionId) {
+ async function forwardPlayerCommandToBaseUrl(baseUrl, slug, commandOrPayload, connectionId) {
+ const targetBaseUrl = normalizeBaseUrl(baseUrl);
+ if (!targetBaseUrl) {
+ throw new Error('Unable to resolve the player internal base URL.');
+ }
+
const payload = typeof commandOrPayload === 'object' && commandOrPayload !== null
? Object.assign({}, commandOrPayload)
: { command: commandOrPayload };
if (connectionId) {
payload.connectionId = connectionId;
}
+
const authHeaders = createRequestAuthHeaders({
method: 'POST',
pathname: `/api/screens/${encodeURIComponent(slug)}/commands`,
body: payload
});
- const resolvedPlayerInternalBaseUrl = await getPlayerInternalBaseUrl();
- if (!resolvedPlayerInternalBaseUrl) {
- throw new Error('Unable to resolve the player internal base URL.');
- }
- const response = await fetch(`${resolvedPlayerInternalBaseUrl}/api/screens/${encodeURIComponent(slug)}/commands`, {
+ const response = await fetch(`${targetBaseUrl}/api/screens/${encodeURIComponent(slug)}/commands`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
@@ -126,6 +151,11 @@ function createPlayerActionService(options) {
});
}
+ async function forwardPlayerCommand(slug, commandOrPayload, connectionId) {
+ const resolvedPlayerInternalBaseUrl = await getPlayerInternalBaseUrl();
+ return forwardPlayerCommandToBaseUrl(resolvedPlayerInternalBaseUrl, slug, commandOrPayload, connectionId);
+ }
+
async function forwardAnnouncementRefresh(slug) {
const authHeaders = createRequestAuthHeaders({
method: 'POST',
@@ -164,29 +194,66 @@ function createPlayerActionService(options) {
method: 'GET',
pathname: `/api/screens/${encodeURIComponent(slug)}/connections`
});
- const resolvedPlayerInternalBaseUrl = await getPlayerInternalBaseUrl();
- if (!resolvedPlayerInternalBaseUrl) {
+ const recentPlayers = await fetchRecentPlayerRegistrations(pool);
+ const targetBaseUrls = Array.from(new Set((recentPlayers.length ? recentPlayers : []).map(function (player) {
+ return normalizeBaseUrl(player && player.public_base_url);
+ }).filter(Boolean)));
+
+ if (!targetBaseUrls.length) {
+ const resolvedPlayerInternalBaseUrl = await getPlayerInternalBaseUrl();
+ if (resolvedPlayerInternalBaseUrl) {
+ targetBaseUrls.push(resolvedPlayerInternalBaseUrl);
+ }
+ }
+
+ if (!targetBaseUrls.length) {
throw new Error('Unable to resolve the player internal base URL.');
}
- const response = await fetch(`${resolvedPlayerInternalBaseUrl}/api/screens/${encodeURIComponent(slug)}/connections`, {
- method: 'GET',
- headers: {
- Accept: 'application/json',
- ...authHeaders
+ const results = await Promise.all(targetBaseUrls.map(async function (baseUrl) {
+ const response = await fetch(`${baseUrl}/api/screens/${encodeURIComponent(slug)}/connections`, {
+ method: 'GET',
+ headers: {
+ Accept: 'application/json',
+ ...authHeaders
+ }
+ });
+
+ if (!response.ok) {
+ return null;
+ }
+
+ return response.json().catch(function () {
+ return null;
+ });
+ }));
+
+ const mergedConnections = [];
+ let screen = null;
+ let degraded = false;
+ results.forEach(function (result) {
+ if (!result) {
+ degraded = true;
+ return;
+ }
+ if (!screen && result.screen) {
+ screen = result.screen;
+ }
+ if (Array.isArray(result.connections)) {
+ mergedConnections.push.apply(mergedConnections, result.connections);
+ }
+ if (result.degraded) {
+ degraded = true;
}
});
- if (!response.ok) {
- const errorText = await response.text().catch(function () { return ''; });
- const error = new Error(errorText || `Unable to load screen connections for ${slug}.`);
- error.statusCode = response.status;
- throw error;
- }
-
- return response.json().catch(function () {
- return { connections: [] };
- });
+ return {
+ screen: screen,
+ screenSlug: slug,
+ count: mergedConnections.length,
+ connections: mergedConnections,
+ degraded: degraded
+ };
}
async function getScreenDeleteBlockMessage(pool, screen, getScreenConnections) {
@@ -234,6 +301,7 @@ function createPlayerActionService(options) {
forwardPlayerCommand: forwardPlayerCommand,
forwardAnnouncementRefresh: forwardAnnouncementRefresh,
getScreenConnections: getScreenConnections,
+ forwardPlayerCommandToBaseUrl: forwardPlayerCommandToBaseUrl,
getScreenDeleteBlockMessage: getScreenDeleteBlockMessage,
getSlideDeleteBlockMessage: getSlideDeleteBlockMessage,
getTemplateDeleteBlockMessage: getTemplateDeleteBlockMessage,
diff --git a/src/web/public/css/theme-custom.css b/src/web/public/css/theme-custom.css
index e74f3ed..5ad675c 100644
--- a/src/web/public/css/theme-custom.css
+++ b/src/web/public/css/theme-custom.css
@@ -694,7 +694,8 @@
.table-pagination-page .app-content {
height: 100%;
- overflow: hidden;
+ overflow-x: hidden;
+ overflow-y: auto;
}
.table-pagination-page .app-content .container-fluid {
@@ -730,7 +731,7 @@
display: flex;
flex: 0 1 auto;
flex-direction: column;
- min-height: 0;
+ min-height: var(--table-pagination-card-min-height, 0);
max-height: var(--table-pagination-card-max-height, var(--background-tasks-task-card-max-height, calc(100dvh - 12rem)));
overflow: hidden;
}
diff --git a/src/web/public/js/dashboard/dashboard-page.js b/src/web/public/js/dashboard/dashboard-page.js
index 0eb9fcb..9eb6e4b 100644
--- a/src/web/public/js/dashboard/dashboard-page.js
+++ b/src/web/public/js/dashboard/dashboard-page.js
@@ -6,10 +6,170 @@
var getClientDisplayName = webUiHelpers.getClientDisplayName;
var setButtonVariant = webUiHelpers.setButtonVariant;
var normalizeDisplayIp = webUiHelpers.normalizeDisplayIp;
+ var LIST_PAGE_SIZE = 25;
var latestDashboardState = null;
var ALL_SCREENS_SLUG = '__all__';
var ALL_SCREENS_LABEL = 'All screens';
+ function getClientSearchInput() {
+ var table = document.getElementById('dashboard-clients-table');
+ var container = table && typeof table.closest === 'function'
+ ? (table.closest('[data-table-search-container]') || table.closest('.card') || null)
+ : null;
+
+ return container && container.querySelector ? container.querySelector('[data-table-search]') : document.querySelector('[data-table-search]');
+ }
+
+ function getClientListQueryState() {
+ var searchParams = new URLSearchParams(String(window.location && window.location.search || ''));
+ var searchInput = getClientSearchInput();
+ var searchValue = searchInput ? String(searchInput.value || '').trim() : String(searchParams.get('search') || '').trim();
+
+ return {
+ search: searchValue,
+ sort: String(searchParams.get('sort') || '').trim(),
+ direction: String(searchParams.get('direction') || '').trim().toLowerCase() === 'desc' ? 'desc' : 'asc',
+ page: Math.max(1, Math.floor(Number(searchParams.get('page') || 1) || 1))
+ };
+ }
+
+ function isClientSearchLoading() {
+ return Boolean(document.querySelector('[data-table-search-loading="true"]'));
+ }
+
+ function getComparableClientSortValue(rawValue) {
+ var value = String(rawValue || '').trim();
+
+ if (!value) {
+ return { type: 'empty', value: '' };
+ }
+
+ var numericValue = Number(value.replace(/,/g, ''));
+ if (!Number.isNaN(numericValue)) {
+ return { type: 'number', value: numericValue };
+ }
+
+ var dateValue = Date.parse(value);
+ if (!Number.isNaN(dateValue)) {
+ return { type: 'date', value: dateValue };
+ }
+
+ return { type: 'string', value: value.toLowerCase() };
+ }
+
+ function compareClientSortValues(leftValue, rightValue) {
+ var left = getComparableClientSortValue(leftValue);
+ var right = getComparableClientSortValue(rightValue);
+
+ if (left.type === 'empty' && right.type === 'empty') {
+ return 0;
+ }
+ if (left.type === 'empty') {
+ return 1;
+ }
+ if (right.type === 'empty') {
+ return -1;
+ }
+ if (left.type === right.type) {
+ if (left.value < right.value) {
+ return -1;
+ }
+ if (left.value > right.value) {
+ return 1;
+ }
+ return 0;
+ }
+
+ return String(left.value).localeCompare(String(right.value), undefined, { numeric: true, sensitivity: 'base' });
+ }
+
+ function createClientSearchMatcher(searchTerm) {
+ var query = String(searchTerm || '').trim().toLowerCase();
+
+ if (!query) {
+ return function () {
+ return true;
+ };
+ }
+
+ return function (client) {
+ var searchableValues = [
+ client && client.name,
+ client && client.client_name,
+ client && client.clientId,
+ client && client.deviceId,
+ client && client.slug,
+ client && client.screen_slug,
+ client && client.screen_name,
+ client && client.ipAddress,
+ client && client.clientIp,
+ client && client.status,
+ client && client.currentSlideTitle
+ ];
+
+ return searchableValues.map(function (value) {
+ return String(value || '').trim().toLowerCase();
+ }).join(' ').indexOf(query) !== -1;
+ };
+ }
+
+ function sortClientsForTable(clients, sortKey, sortDirection) {
+ var normalizedSortKey = String(sortKey || '').trim();
+ var normalizedDirection = String(sortDirection || '').trim().toLowerCase() === 'desc' ? 'desc' : 'asc';
+ var accessors = {
+ client: function (client) { return String(client && (getClientDisplayName(client) || client.client_name || client.name || client.clientId) || '').trim(); },
+ screen: function (client) { return String(client && (client.screen_name || client.screen_slug) || '').trim(); },
+ slide: function (client) { return String(client && client.currentSlideTitle || '').trim(); },
+ ip: function (client) { return String(client && client.clientIp || '').trim(); },
+ viewport: function (client) {
+ var viewport = client && client.viewport;
+ if (!viewport || !viewport.width || !viewport.height) {
+ return '';
+ }
+ return String(Number(viewport.width) || 0) + 'x' + String(Number(viewport.height) || 0);
+ },
+ connected: function (client) { return String(client && (client.connectedAt || client.lastSeenAt) || '').trim(); }
+ };
+
+ function compareValues(leftValue, rightValue) {
+ return compareClientSortValues(leftValue, rightValue);
+ }
+
+ var sortKeys = accessors[normalizedSortKey]
+ ? [normalizedSortKey]
+ : ['client'];
+
+ if (sortKeys[0] === 'client') {
+ sortKeys.push('ip');
+ } else if (sortKeys[0] === 'ip') {
+ sortKeys.push('client');
+ }
+
+ return (Array.isArray(clients) ? clients.slice() : []).sort(function (leftClient, rightClient) {
+ for (var index = 0; index < sortKeys.length; index += 1) {
+ var sortKeyName = sortKeys[index];
+ var comparison = compareValues(accessors[sortKeyName](leftClient), accessors[sortKeyName](rightClient));
+
+ if (comparison !== 0) {
+ return index === 0 && normalizedDirection === 'desc' ? comparison * -1 : comparison;
+ }
+ }
+
+ return 0;
+ });
+ }
+
+ function getVisibleClients(state) {
+ var query = getClientListQueryState();
+ var clients = Array.isArray(state && state.clients) ? state.clients.slice() : [];
+ var searchMatcher = createClientSearchMatcher(query.search);
+
+ clients = clients.filter(searchMatcher);
+ clients = sortClientsForTable(clients, query.sort, query.direction);
+
+ return clients.slice((query.page - 1) * LIST_PAGE_SIZE, ((query.page - 1) * LIST_PAGE_SIZE) + LIST_PAGE_SIZE);
+ }
+
function getClientMoveModalElements() {
return {
modal: document.getElementById('client-move-screen-modal'),
@@ -17,7 +177,8 @@
targetSelect: document.getElementById('client-move-screen-target'),
connectionInput: document.querySelector('[data-client-move-connection-id]'),
deviceInput: document.querySelector('[data-client-move-device-id]'),
- clientNameInput: document.querySelector('[data-client-move-client-name]')
+ clientNameInput: document.querySelector('[data-client-move-client-name]'),
+ playerBaseUrlInput: document.querySelector('[data-client-move-player-base-url]')
};
}
@@ -50,6 +211,7 @@
var currentScreenSlug = String(row.getAttribute('data-client-screen-slug') || '').trim();
var connectionId = String(row.getAttribute('data-client-key') || '').trim();
var deviceId = String(row.getAttribute('data-client-device-id') || '').trim();
+ var playerBaseUrl = String(row.getAttribute('data-client-player-base-url') || '').trim();
var clientNameCell = row.querySelector('td[data-label="Client"] > div');
var clientName = String(clientNameCell && clientNameCell.textContent || '').trim();
var options = Array.prototype.slice.call(elements.targetSelect.options || []);
@@ -71,6 +233,9 @@
if (elements.clientNameInput) {
elements.clientNameInput.value = clientName;
}
+ if (elements.playerBaseUrlInput) {
+ elements.playerBaseUrlInput.value = playerBaseUrl;
+ }
elements.targetSelect.value = '';
if (elements.form.querySelector('button[type="submit"]')) {
elements.form.querySelector('button[type="submit"]').disabled = false;
@@ -91,12 +256,12 @@
return [
'',
- ' ![Onboarding QR code]()
',
+ ' 
',
'
',
' ',
' Preparing onboarding link...
',
' ',
- '',
+ '',
'',
- '',
- '',
- '',
- '',
+ '',
+ '',
+ '',
+ '',
'
'
].join('');
}
@@ -128,6 +293,10 @@
if (connectionInput) {
connectionInput.value = client.id || '';
}
+ var playerBaseUrlInput = pauseForm.querySelector('input[name="playerBaseUrl"]');
+ if (playerBaseUrlInput) {
+ playerBaseUrlInput.value = client.player_url || '';
+ }
pauseForm.action = '/clients/' + encodeURIComponent(client.screen_slug) + '/commands';
}
@@ -143,6 +312,10 @@
if (reloadInput) {
reloadInput.value = client.id || '';
}
+ var reloadPlayerBaseUrlInput = reloadForm.querySelector('input[name="playerBaseUrl"]');
+ if (reloadPlayerBaseUrlInput) {
+ reloadPlayerBaseUrlInput.value = client.player_url || '';
+ }
reloadForm.action = '/clients/' + encodeURIComponent(client.screen_slug) + '/commands';
reloadForm.setAttribute('data-confirm-message', 'Reloading will restart the player page. Continue?');
}
@@ -175,6 +348,10 @@
if (blackoutConnectionInput) {
blackoutConnectionInput.value = client.id || '';
}
+ var blackoutPlayerBaseUrlInput = blackoutForm.querySelector('input[name="playerBaseUrl"]');
+ if (blackoutPlayerBaseUrlInput) {
+ blackoutPlayerBaseUrlInput.value = client.player_url || '';
+ }
blackoutForm.action = '/clients/' + encodeURIComponent(client.screen_slug) + '/commands';
}
@@ -196,6 +373,10 @@
if (previousConnectionInput) {
previousConnectionInput.value = client.id || '';
}
+ var previousPlayerBaseUrlInput = previousForm.querySelector('input[name="playerBaseUrl"]');
+ if (previousPlayerBaseUrlInput) {
+ previousPlayerBaseUrlInput.value = client.player_url || '';
+ }
previousForm.action = '/clients/' + encodeURIComponent(client.screen_slug) + '/commands';
}
@@ -217,6 +398,10 @@
if (nextConnectionInput) {
nextConnectionInput.value = client.id || '';
}
+ var nextPlayerBaseUrlInput = nextForm.querySelector('input[name="playerBaseUrl"]');
+ if (nextPlayerBaseUrlInput) {
+ nextPlayerBaseUrlInput.value = client.player_url || '';
+ }
nextForm.action = '/clients/' + encodeURIComponent(client.screen_slug) + '/commands';
}
}
@@ -255,7 +440,7 @@
var actionCell = hasActionsColumn ? '' + clientName + '
' + screenName + '
' + escapeHtml(client.connectedAtLabel || formatDashboardDate(client.connectedAt) || client.connectedAt) + '
' + (client.lastSeenAt ? '' + escapeHtml(client.lastSeenAtLabel || formatDashboardDate(client.lastSeenAt) || client.lastSeenAt) + '
' : '') : 'Unknown';
+ var clientIpValue = normalizeDisplayIp(client.clientIp);
+ var clientIp = clientIpValue ? escapeHtml(clientIpValue) : 'Unknown';
+ var viewport = client.viewport && client.viewport.width && client.viewport.height ? escapeHtml(client.viewport.width + 'x' + client.viewport.height) : 'Unknown';
+ var clientNameValue = getClientDisplayName(client);
+ var clientName = clientNameValue ? escapeHtml(clientNameValue) : 'Unknown';
+ var screenName = client.screen_name ? escapeHtml(client.screen_name) : 'Unknown';
+ var currentSlide = client.currentSlideTitle ? escapeHtml(client.currentSlideTitle) : 'No slide currently showing';
+
+ row.setAttribute('data-client-key', escapeHtml(getClientRowKey(client)));
+ row.setAttribute('data-client-id', escapeHtml(client.clientId || ''));
+ row.setAttribute('data-client-device-id', escapeHtml(client.deviceId || ''));
+ row.setAttribute('data-client-screen-slug', escapeHtml(client.screen_slug || ''));
+ row.setAttribute('data-client-player-base-url', escapeHtml(client.player_url || ''));
+
+ setCellHtml(row.cells[0], '' + clientName + '
');
+ setCellHtml(row.cells[1], '' + screenName + '
');
+ setCellHtml(row.cells[2], currentSlide);
+ setCellHtml(row.cells[3], clientIp);
+ setCellHtml(row.cells[4], viewport);
+ setCellHtml(row.cells[5], connectedAt);
+
+ syncClientActionCell(row, client, hasActionsColumn);
+ }
+
+ function createClientRowFromTemplate(client, hasActionsColumn) {
+ var template = document.createElement('tbody');
+ template.innerHTML = renderClientRow(client, hasActionsColumn);
+ return template.firstElementChild || null;
+ }
+
+ function setCellHtml(cell, html) {
+ if (!cell || String(cell.innerHTML || '') === String(html || '')) {
+ return false;
+ }
+
+ cell.innerHTML = html;
+ return true;
+ }
+
function renderScreenTile(screen) {
var clientCount = Number(screen.player_connection_count || 0);
var connectionLabel = clientCount ? clientCount + ' live' : 'No clients';
@@ -327,76 +557,76 @@
}
}
- function updateClientTable(state) {
+ function updateClientTable(state, forceRender) {
var tbody = document.getElementById('dashboard-clients-table-body');
if (!tbody || !Array.isArray(state.clients)) {
return;
}
+ if (!forceRender && isClientSearchLoading()) {
+ return;
+ }
var table = document.getElementById('dashboard-clients-table');
var hasActionsColumn = Boolean(table && String(table.getAttribute('data-has-actions-column') || '').toLowerCase() === 'true');
- if (!state.clients.length) {
+ var visibleClients = getVisibleClients(state);
+
+ var canPatchRows = typeof tbody.querySelectorAll === 'function'
+ && typeof tbody.insertBefore === 'function'
+ && typeof tbody.removeChild === 'function'
+ && typeof document.createElement === 'function';
+
+ if (!visibleClients.length) {
tbody.innerHTML = '' + escapeHtml(client.connectedAtLabel || formatDashboardDate(client.connectedAt) || client.connectedAt) + '
' + (client.lastSeenAt ? '' + escapeHtml(client.lastSeenAtLabel || formatDashboardDate(client.lastSeenAt) || client.lastSeenAt) + '
' : '') : 'Unknown';
- var clientIpValue = normalizeDisplayIp(client.clientIp);
- var clientIp = clientIpValue ? escapeHtml(clientIpValue) : 'Unknown';
- var viewport = client.viewport && client.viewport.width && client.viewport.height ? escapeHtml(client.viewport.width + 'x' + client.viewport.height) : 'Unknown';
- var clientNameValue = getClientDisplayName(client);
- var clientName = clientNameValue ? escapeHtml(clientNameValue) : 'Unknown';
- var screenName = client.screen_name ? escapeHtml(client.screen_name) : 'Unknown';
- var currentSlide = client.currentSlideTitle ? escapeHtml(client.currentSlideTitle) : 'No slide currently showing';
-
- row.cells[0].innerHTML = '' + clientName + '
';
- row.cells[1].innerHTML = '' + screenName + '
';
- row.cells[2].innerHTML = currentSlide;
- row.cells[3].innerHTML = clientIp;
- row.cells[4].innerHTML = viewport;
- row.cells[5].innerHTML = connectedAt;
- syncClientActionCell(row, client, hasActionsColumn);
- }
-
+ nextRows.forEach(function (row, index) {
var referenceNode = tbody.children[index] || null;
if (referenceNode !== row) {
tbody.insertBefore(row, referenceNode);
}
});
- while (tbody.children.length > state.clients.length) {
+ while (tbody.children.length > nextRows.length) {
tbody.removeChild(tbody.lastElementChild);
}
}
+ function refreshClientTableFromLatestState() {
+ if (!latestDashboardState) {
+ return;
+ }
+
+ updateClientTable(latestDashboardState, true);
+ }
+
function updateKioskLauncherModal(state) {
var modal = document.getElementById('dashboard-kiosk-launcher-modal');
if (!modal) {
@@ -674,6 +904,7 @@
return;
}
latestDashboardState = state;
+ window.webLatestDashboardState = latestDashboardState;
updateStats(state);
updateScreenGrid(state);
updateScreenCommandControls(state);
@@ -895,6 +1126,7 @@
}
window.webHandleDashboardState = handleDashboardState;
+ window.webRefreshClientTableFromLatestState = refreshClientTableFromLatestState;
initClientRenameHandler();
initClientMoveHandler();
diff --git a/src/web/public/js/regions/type/time-date.js b/src/web/public/js/regions/type/time-date.js
index c0219bd..dd936b0 100644
--- a/src/web/public/js/regions/type/time-date.js
+++ b/src/web/public/js/regions/type/time-date.js
@@ -313,6 +313,7 @@
'' +
'
' +
'Available placeholders
' +
'' + renderPlaceholderChips() + '
' +
+ 'Placeholder values support transforms, for example
' +
'{{title.upper()}}, {{title.title()}}, or {{title.lower()}}.