Open a booking in NewBook to send it to a check-in tablet.
`; - return; - } - - contentEl.innerHTML = ` -Booking #${bookingId}
- - - - `; - - const deviceSelect = document.getElementById('device'); - const sendBtn = document.getElementById('send'); - const msgEl = document.getElementById('msg'); + // Two independent sections: tablet status + reset is always shown (not + // gated on a booking being open) so reception can clear a stuck-busy + // tablet from the terminal without needing to be on a booking page at all. + contentEl.innerHTML = ``; + const tabletsEl = document.getElementById('tabletsSection'); + const bookingEl = document.getElementById('bookingSection'); let devices = []; try { @@ -57,54 +48,155 @@ async function main() { if (!res.ok) throw new Error((await res.json().catch(() => ({}))).error || `HTTP ${res.status}`); devices = await res.json(); } catch (err) { - deviceSelect.innerHTML = ''; - setMsg(msgEl, `Could not reach tablet-checkin: ${err.message}`, 'error'); + tabletsEl.innerHTML = `Could not reach tablet-checkin: ${escapeHtml(err.message)}
`; return; } + renderTablets(tabletsEl, devices, baseUrl, apiKey); + + if (!bookingId) { + bookingEl.innerHTML = `Open a booking in NewBook to send it to a check-in tablet.
`; + return; + } + + renderBooking(bookingEl, bookingId, devices, defaultDeviceId, baseUrl, apiKey); +} + +function renderTablets(el, devices, baseUrl, apiKey) { if (!devices.length) { - deviceSelect.innerHTML = ''; + el.innerHTML = `No tablets registered yet
`; return; } - deviceSelect.innerHTML = devices.map(d => - `` - ).join(''); - // Pre-select this machine's configured default tablet — still just a - // starting point, staff can pick a different one from the dropdown. + el.innerHTML = ` +Tablets
+Booking #${bookingId}
+Booking #${bookingId}
No tablets registered yet
`; + return; + } + + el.innerHTML = ` +Booking #${bookingId}
+ ${note ? `${escapeHtml(note)}
` : ''} + + + + `; + + const deviceSelect = document.getElementById('device'); + const sendBtn = document.getElementById('send'); + const msgEl = document.getElementById('msg'); // Setting .value to a disabled (busy) option is a no-op in every browser // that matters here, so a busy default just falls through to whatever the // browser's own first-enabled-option default would have been anyway. if (defaultDeviceId) deviceSelect.value = defaultDeviceId; - sendBtn.disabled = false; sendBtn.addEventListener('click', async () => { sendBtn.disabled = true; setMsg(msgEl, 'Sending…', 'warn'); - try { - const res = await fetch(`${baseUrl}/api/staff/push`, { - method: 'POST', - headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${apiKey}` }, - body: JSON.stringify({ booking_id: bookingId, device_id: deviceSelect.value }), - }); - const body = await res.json().catch(() => ({})); - if (res.status === 409) { - setMsg(msgEl, body.error || 'That tablet is busy with another guest right now.', 'warn'); - } else if (!res.ok) { - throw new Error(body.error || `HTTP ${res.status}`); - } else { - setMsg(msgEl, 'Sent — the tablet should navigate now.', 'ok'); - } - } catch (err) { - setMsg(msgEl, `Failed: ${err.message}`, 'error'); - } finally { - sendBtn.disabled = false; + const result = await sendPush(bookingId, deviceSelect.value, baseUrl, apiKey); + if (result.ok) { + setMsg(msgEl, 'Sent — the tablet should navigate now.', 'ok'); + } else if (result.status === 409) { + setMsg(msgEl, result.error || 'That tablet is busy with another guest right now.', 'warn'); + } else { + setMsg(msgEl, `Failed: ${result.error}`, 'error'); } + sendBtn.disabled = false; }); } +async function sendPush(bookingId, deviceId, baseUrl, apiKey) { + try { + const res = await fetch(`${baseUrl}/api/staff/push`, { + method: 'POST', + headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${apiKey}` }, + body: JSON.stringify({ booking_id: bookingId, device_id: deviceId }), + }); + const body = await res.json().catch(() => ({})); + if (!res.ok) return { ok: false, status: res.status, error: body.error || `HTTP ${res.status}` }; + return { ok: true }; + } catch (err) { + return { ok: false, status: 0, error: err.message }; + } +} + function setMsg(el, text, kind) { el.textContent = text; el.className = `msg ${kind}`; diff --git a/backend/src/lib/push.js b/backend/src/lib/push.js index 4a75189..ea5198f 100644 --- a/backend/src/lib/push.js +++ b/backend/src/lib/push.js @@ -1,6 +1,6 @@ import { randomBytes } from 'crypto' import { pool } from '../db.js' -import { pushNavigate } from './device-stream.js' +import { pushNavigate, pushIdle } from './device-stream.js' const SESSION_TTL_MINUTES = 30 @@ -67,3 +67,21 @@ export async function pushBookingToDevice(deviceId, bookingId) { const delivered = pushNavigate(deviceId, token) return { ok: true, token, delivered } } + +// Shared by routes/devices.js's own reset route (kiosk/admin auth, the +// tablet's own "cancel" button + the Devices admin page) and routes/staff.js +// (terminal-key auth, the extension popup's "Reset Tablet" action) — same +// "clear any open session, flip back to idle" logic regardless of who's +// allowed to trigger it. +export async function resetDevice(deviceId) { + const { rows } = await pool.query('SELECT * FROM devices WHERE device_id = $1', [deviceId]) + if (!rows.length) return { ok: false, status: 404, error: 'Device not found' } + + await pool.query( + `UPDATE checkin_sessions SET used_at = now() WHERE device_id = $1 AND used_at IS NULL`, + [deviceId] + ) + await pool.query(`UPDATE devices SET status = 'idle' WHERE device_id = $1`, [deviceId]) + pushIdle(deviceId) + return { ok: true } +} diff --git a/backend/src/routes/devices.js b/backend/src/routes/devices.js index f6a1ade..b3ab9f5 100644 --- a/backend/src/routes/devices.js +++ b/backend/src/routes/devices.js @@ -1,8 +1,8 @@ import { randomUUID } from 'crypto' import { requireAuth, requireCap, hasCap } from '../auth.js' import { pool } from '../db.js' -import { addStream, removeStream, pushIdle } from '../lib/device-stream.js' -import { pushBookingToDevice } from '../lib/push.js' +import { addStream, removeStream } from '../lib/device-stream.js' +import { pushBookingToDevice, resetDevice } from '../lib/push.js' // 'checkin' is a deliberately unofficial capability slug — it is never seeded // into app_capabilities (see seed-app.js, which only defines push/admin/ @@ -92,16 +92,8 @@ export async function deviceRoutes(app) { } }, }, async (req, reply) => { - const deviceId = req.params.id - const { rows } = await pool.query('SELECT * FROM devices WHERE device_id = $1', [deviceId]) - if (!rows.length) return reply.status(404).send({ error: 'Device not found' }) - - await pool.query( - `UPDATE checkin_sessions SET used_at = now() WHERE device_id = $1 AND used_at IS NULL`, - [deviceId] - ) - await pool.query(`UPDATE devices SET status = 'idle' WHERE device_id = $1`, [deviceId]) - pushIdle(deviceId) + const result = await resetDevice(req.params.id) + if (!result.ok) return reply.status(result.status).send({ error: result.error }) return { ok: true } }) diff --git a/backend/src/routes/staff.js b/backend/src/routes/staff.js index dae2d7e..1610a98 100644 --- a/backend/src/routes/staff.js +++ b/backend/src/routes/staff.js @@ -1,6 +1,6 @@ import { requireTerminalAuth } from '../auth.js' import { pool } from '../db.js' -import { pushBookingToDevice } from '../lib/push.js' +import { pushBookingToDevice, resetDevice } from '../lib/push.js' // The standalone Chrome extension's calls — terminal-key authenticated (NOT // a staff JWT/cookie), see auth.js's requireTerminalAuth and project_checkin's @@ -26,4 +26,14 @@ export async function staffRoutes(app) { if (!result.ok) return reply.status(result.status).send({ error: result.error }) return { ok: true, delivered: result.delivered } }) + + // POST /api/staff/devices/:id/reset — same safety-net reset the tablet's + // own cancel button and the Devices admin page already have, surfaced to + // the extension so reception can clear a stuck-busy tablet from the + // terminal without walking over to the admin panel or the tablet itself. + app.post('/api/staff/devices/:id/reset', { preHandler: requireTerminalAuth }, async (req, reply) => { + const result = await resetDevice(req.params.id) + if (!result.ok) return reply.status(result.status).send({ error: result.error }) + return { ok: true } + }) }