Add player control-plane and dashboard updates

src/web/routes/signage/clients/routes.js

@@ -6,7 +6,7 @@ module.exports = function registerClientsRoutes(app, deps) {
   const pages = deps.pages;
   const buildDashboardState = deps.buildDashboardState;
   const { buildPagination } = require('../../../lib/pagination');
-  const { sortRows, createSearchMatcher } = require('../../../lib/list-query');
+  const { compareSortValues, createSearchMatcher, getComparableSortValue } = require('../../../lib/list-query');
   const requirePermission = deps.requirePermission;
 
   const LIST_PAGE_SIZE = 25;
@@ -29,13 +29,32 @@ module.exports = function registerClientsRoutes(app, deps) {
       connected: function (client) { return String(client && (client.connectedAt || client.lastSeenAt) || '').trim(); }
     };
 
-    if (!accessors[normalizedSortKey]) {
-      return Array.isArray(clients) ? clients.slice() : [];
+    function compareValues(leftValue, rightValue) {
+      return compareSortValues(getComparableSortValue(leftValue), getComparableSortValue(rightValue));
     }
 
-    return sortRows(clients, function (client) {
-      return accessors[normalizedSortKey](client);
-    }, normalizedDirection);
+    const 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 (let index = 0; index < sortKeys.length; index += 1) {
+        const sortKeyName = sortKeys[index];
+        const comparison = compareValues(accessors[sortKeyName](leftClient), accessors[sortKeyName](rightClient));
+
+        if (comparison !== 0) {
+          return index === 0 && normalizedDirection === 'desc' ? comparison * -1 : comparison;
+        }
+      }
+
+      return 0;
+    });
   }
 
   app.get('/clients', requirePermission('clients.read'), async function (req, res, next) {

src/web/routes/signage/playlists/form-view-model.js

@@ -142,11 +142,14 @@ function getVideoDurationSeconds(slide) {
       return null;
     }
 
-    const videoRegion = Object.keys(parsed).map((key) => parsed[key]).find((region) => {
+    const videoRegions = Object.keys(parsed).map((key) => parsed[key]).filter((region) => {
       return region && typeof region === 'object' && String(region.type || '').trim().toLowerCase() === 'video' && Number(region.duration_seconds || 0) > 0;
     });
 
-    const duration = Math.round(Number(videoRegion && videoRegion.duration_seconds || 0) * 1000) / 1000;
+    const duration = videoRegions.reduce((longest, region) => {
+      const regionDuration = Math.round(Number(region.duration_seconds || 0) * 1000) / 1000;
+      return regionDuration > longest ? regionDuration : longest;
+    }, 0);
     return Number.isFinite(duration) && duration > 0 ? duration : null;
   } catch (_error) {
     return null;

src/web/routes/signage/screens/routes.js

@@ -12,6 +12,14 @@ module.exports = function registerScreensRoutes(app, deps) {
   const { buildPagination } = require('../../../lib/pagination');
   const requirePermission = deps.requirePermission;
 
+  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;
+  }
+
   const LIST_PAGE_SIZE = 25;
   const batTemplatePath = require.resolve('#root/scripts/pulse-signage-kiosk.bat');
   const shTemplatePath = require.resolve('#root/scripts/pulse-signage-kiosk.sh');
@@ -87,13 +95,18 @@ module.exports = function registerScreensRoutes(app, deps) {
       ? await common.fetchPlayerRegistrations(pool)
       : [];
 
-    return (Array.isArray(playerRegistrations) ? playerRegistrations : []).map(function (player) {
+    return (Array.isArray(playerRegistrations) ? playerRegistrations : []).filter(function (player) {
+      return isRecentPlayerRegistration(player, 60);
+    }).map(function (player) {
       const baseUrl = String(player && player.public_base_url || '').trim().replace(/\/$/, '');
       const playerUrl = screenPlayerUrl(screen && screen.slug ? screen.slug : '', baseUrl);
-      return Object.assign({}, player, {
+      return {
+        identifier: String(player && player.identifier || '').trim(),
         public_base_url: baseUrl || null,
         player_url: playerUrl || null
-      });
+      };
+    }).sort(function (left, right) {
+      return String(left && left.identifier || '').localeCompare(String(right && right.identifier || ''), undefined, { sensitivity: 'base', numeric: true });
     });
   }