Bump version to 1.4.1 and tighten client handling

src/web/routes/admin-manage.js

@@ -15,6 +15,7 @@ module.exports = function registerAdminManageRoutes(app, deps) {
   const notifyPlayerScreens = deps.notifyPlayerScreens;
   const broadcastDashboardState = deps.broadcastDashboardState;
   const getScreenDeleteBlockMessage = deps.getScreenDeleteBlockMessage;
+  const getScreenConnections = deps.getScreenConnections;
   const getPlaylistDeleteBlockMessage = deps.getPlaylistDeleteBlockMessage;
   const forwardPlayerCommand = deps.forwardPlayerCommand;
   const PLAYER_PUBLIC_BASE_URL = deps.playerPublicBaseUrl;
@@ -529,7 +530,7 @@ module.exports = function registerAdminManageRoutes(app, deps) {
       if (!screen) {
         return res.status(404).send('Screen not found');
       }
-      const blockMessage = await getScreenDeleteBlockMessage(pool, screen);
+      const blockMessage = await getScreenDeleteBlockMessage(pool, screen, getScreenConnections);
       if (blockMessage) {
         return res.redirect('/admin/screens?message=' + encodeURIComponent(blockMessage));
       }

src/web/routes/admin-screen-commands.js

@@ -1,6 +1,8 @@
 module.exports = function registerAdminScreenCommandRoutes(app, deps) {
   const pool = deps.pool;
   const forwardPlayerCommand = deps.forwardPlayerCommand;
+  const getScreenConnections = deps.getScreenConnections;
+  const isClientNameAvailable = deps.isClientNameAvailable;
 
   app.post('/admin/screens/:slug/commands', async function (req, res, next) {
     try {
@@ -23,6 +25,106 @@ module.exports = function registerAdminScreenCommandRoutes(app, deps) {
         return res.status(404).json({ error: 'Screen not found' });
       }
 
+      if (command === 'setclientname') {
+        const deviceId = String((req.body && (req.body.deviceId || req.body.clientId)) || req.query.deviceId || req.query.clientId || '').trim();
+        const clientName = String((req.body && req.body.clientName) || req.query.clientName || '').trim();
+        if (!deviceId) {
+          return res.status(400).json({ error: 'Device ID is required' });
+        }
+        if (!clientName) {
+          return res.status(400).json({ error: 'Client name is required' });
+        }
+
+        const [currentRows] = await pool.query(
+          `SELECT client_name
+           FROM player_onboarding_devices
+           WHERE device_id = ?
+           LIMIT 1`,
+          [deviceId]
+        );
+        const onboardingRow = currentRows[0] || null;
+        const currentName = String(onboardingRow && onboardingRow.client_name ? onboardingRow.client_name : '').trim();
+        if (currentName && currentName.toLowerCase() === clientName.toLowerCase()) {
+          return res.json({
+            screen: screenRows[0],
+            screenSlug: slug,
+            command: command,
+            connectionId: connectionId || null,
+            deviceId: deviceId,
+            clientName: currentName,
+            ok: true,
+            unchanged: true
+          });
+        }
+        let liveConnections = [];
+        try {
+          const [screenSlugs] = await pool.query('SELECT slug FROM screens ORDER BY slug ASC');
+          const liveResults = await Promise.all((screenSlugs || []).map(async function (row) {
+            const screenSlug = String(row && row.slug ? row.slug : '').trim();
+            if (!screenSlug || typeof getScreenConnections !== 'function') {
+              return [];
+            }
+            try {
+              const liveResponse = await getScreenConnections(screenSlug);
+              return Array.isArray(liveResponse && liveResponse.connections) ? liveResponse.connections : [];
+            } catch (_error) {
+              return [];
+            }
+          }));
+          liveConnections = liveResults.flat();
+        } catch (_error) {
+          liveConnections = [];
+        }
+
+        const available = typeof isClientNameAvailable === 'function'
+          ? await isClientNameAvailable(pool, clientName, deviceId, liveConnections)
+          : true;
+        if (!available) {
+          return res.status(409).json({ error: 'Client name already exists.' });
+        }
+
+        if (!onboardingRow) {
+          await forwardPlayerCommand(slug, {
+            command: command,
+            clientName: clientName,
+            clientId: connectionId || deviceId || null,
+            deviceId: deviceId || null
+          }, connectionId || deviceId || undefined);
+
+          return res.json({
+            screen: screenRows[0],
+            screenSlug: slug,
+            command: command,
+            connectionId: connectionId || null,
+            deviceId: deviceId,
+            clientName: clientName,
+            ok: true,
+            liveOnly: true
+          });
+        }
+
+        const [updateResult] = await pool.query(
+          `UPDATE player_onboarding_devices pod
+           JOIN screens s ON s.id = pod.screen_id
+           SET pod.client_name = ?, pod.modified_at = CURRENT_TIMESTAMP
+           WHERE s.slug = ? AND pod.device_id = ?`,
+          [clientName, slug, deviceId]
+        );
+        if (!updateResult.affectedRows) {
+          return res.status(404).json({ error: 'Client not found' });
+        }
+
+        return res.json({
+          screen: screenRows[0],
+          screenSlug: slug,
+          command: command,
+          connectionId: connectionId || null,
+          deviceId: deviceId,
+          clientName: clientName,
+          ok: true
+        });
+      }
+
       const commandPayload = req.body && typeof req.body === 'object' && !Array.isArray(req.body)
         ? Object.assign({}, req.body, { command: command })
         : { command: command };