feat: release 1.6.0 (#22)

* chore: update deps

* feat: re-implement action to broadcast using sequence builder (#23)

* feat: re-implement action to broadcast using sequence builder

* feat: use db seed to take the single audio id and convert it to a sequence

* docs: note that relation can be removed in future version

* Feat/contact point configuration (#24)

* feat: config for control point

* feat: trigger actions with control point

* fix: don't send sounders sounds that don't have files

* feat: allow sounders to confirm enrollment

* feat: bump to node 24

* feat: bump version number

* docs: update license to 2026

* feat: allow buttons to enroll the same as sounders, ready for docker button

* feat: display tts and worker status on the dashboard

* fix: use translated strings

Author: Arcath

Dockerfile

@@ -1,5 +1,5 @@
 # Start with the node debian image
-FROM node:22-bullseye-slim AS base
+FROM node:24-bullseye-slim AS base
 
 # Install openssl for Prisma
 RUN apt-get update && apt-get install openssl -y

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Open School Bell
+Copyright (c) 2025 - 2026 Open School Bell
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

app/lib/constants.ts

@@ -1,4 +1,4 @@
-export const VERSION = '1.5.0'
+export const VERSION = '1.6.0'
 
 export const RequiredVersions = {
   controller: VERSION,

app/lib/sequence-builder.tsx

@@ -130,3 +130,49 @@ export const SequenceBuilder = ({
     </div>
   )
 }
+
+export const SequenceViewer = ({
+  queue,
+  sounds,
+  label
+}: {
+  queue: string[]
+  sounds: Audio[]
+  label: string
+}) => {
+  const {t} = useTranslation()
+
+  let duration = 0
+
+  return (
+    <div className="grid grid-cols-4 gap-4">
+      <span className="font-semibold col-span-4">{label}</span>
+      <div className="col-span-3 row-span-2">
+        {queue.map((queuedId, i) => {
+          const sound = sounds.filter(({id}) => {
+            return id === queuedId
+          })[0]
+
+          duration += sound.duration
+
+          return (
+            <div
+              key={`${sound.id}-${i}`}
+              className="border-b border-b-stone-100 mb-2 pb-2 grid grid-cols-5"
+            >
+              <p className="col-span-4">{sound.name}</p>
+              <p className="col-span-4 text-sm text-gray-400">
+                {getSecondsAsTime(sound.duration)}
+              </p>
+            </div>
+          )
+        })}
+        <div>
+          {t('broadcast.builder.totalDuration', {
+            duration: getSecondsAsTime(duration)
+          })}
+        </div>
+      </div>
+    </div>
+  )
+}

app/lib/settings.server.ts

@@ -12,6 +12,9 @@ type SettingKey =
   | 'password'
   | 'ttsSpeed'
   | 'enrollUrl'
+  | 'controlPointKey'
+  | 'ttsLastSeen'
+  | 'workerLastSeen'
 
 export const DEFAULT_SETTINGS: {[setting in SettingKey]: string} = {
   lockdownEntrySound: '',
@@ -23,7 +26,10 @@ export const DEFAULT_SETTINGS: {[setting in SettingKey]: string} = {
   lockdownRepetitions: '4',
   password: 'bell',
   ttsSpeed: '1',
-  enrollUrl: 'http://controller:3000'
+  enrollUrl: 'http://controller:3000',
+  controlPointKey: '',
+  ttsLastSeen: '"1970-01-01T23:00:00.000Z"',
+  workerLastSeen: '"1970-01-01T23:00:00.000Z"'
 }
 
 export const getSetting = async (setting: SettingKey) => {

app/lib/trigger-action.server.ts

@@ -0,0 +1,21 @@
+import {type Action} from '@prisma/client'
+
+import {broadcast} from './broadcast.server'
+import {toggleLockdown} from './lockdown.server'
+
+export const triggerAction = async (action: Action, zone: string) => {
+  switch (action.action) {
+    case 'broadcast':
+      if (!zone || typeof zone !== 'string' || zone.trim() === '') {
+        return Response.json({error: 'missing zone'}, {status: 400})
+      }
+
+      await broadcast(zone, action.data)
+      break
+    case 'lockdown':
+      await toggleLockdown()
+      break
+    default:
+      break
+  }
+}

app/locales/en.ts

@@ -19,6 +19,9 @@ export const en = {
   'nav.logout': 'Logout',
   'dashboard.pageTitle': 'Open School Bell',
   'dashboard.devices': 'Sounders',
+  'dashboard.services': 'Services',
+  'dashboard.services.background': 'Background Worker',
+  'dashboard.services.tts': 'Text-To-Speech Engine',
   'dashboard.table.name': 'Name',
   'dashboard.table.status': 'Status',
   'dashboard.table.lastSeen': 'Last Seen',
@@ -53,9 +56,14 @@ export const en = {
     'An emoji to use as the action icon. Note that emoji render differently on the RPi screen.',
   'actions.form.type.label': 'Type',
   'actions.form.type.helper':
-    'Broadcast runs a broadcast to the supplied zone. Lockdown toggles a system wide lockdown.',
+    'Broadcast runs a broadcast to the supplied zone, you can build the broadcaast once the action has been created. Lockdown toggles a system wide lockdown.',
+  'actions.form.sequence.label': 'Sequence',
+  'actions.form.sequence.helper': 'Build your broadcast sequence.',
   'actions.form.sound.label': 'Sound',
   'actions.form.sound.helper': 'Which sound should be used when broadcasting?',
+  'actions.form.pin.label': 'Control Point Pin',
+  'actions.form.pin.helper':
+    'The PIN used to trigger this action from the control point interface.',
   'button.cancel': 'Cancel',
   'button.add': 'Add',
   'button.save': 'Save',
@@ -64,8 +72,10 @@ export const en = {
   'actions.detail.icon': 'Icon',
   'actions.detail.type': 'Type',
   'actions.detail.sound': 'Sound:',
+  'actions.detail.pin': 'Control Pin',
   'actions.edit.metaTitle': 'Edit {{name}}',
   'actions.edit.pageTitle': 'Edit {{name}}',
+  'actions.detail.sequence.label': 'Sequence',
   'backup.pageTitle': 'Backups',
   'backup.create': 'Create Backup',
   'broadcast.pageTitle': 'Broadcast',
@@ -203,6 +213,9 @@ export const en = {
   'settings.ttsSpeed.label': 'Text-to-speech speed',
   'settings.ttsSpeed.helper':
     'Speed factor for text-to-speech generation. Default is 1; lower is faster.',
+  'settings.controlPointKey.label': 'Control Point Key',
+  'settings.controlPointKey.helper':
+    'The key used by the Control Point App to communicate with the controller.',
   'settings.password.label': 'Change password',
   'settings.password.helper':
     'Leave fields empty to keep the current password.',

app/routes/_index.tsx

@@ -10,7 +10,7 @@ import {enUS, pl} from 'date-fns/locale'
 import {getPrisma} from '~/lib/prisma.server'
 import {checkSession} from '~/lib/session'
 import {pageTitle} from '~/lib/utils'
-import {getSetting} from '~/lib/settings.server'
+import {getSettings} from '~/lib/settings.server'
 import {Page} from '~/lib/ui'
 import {useTranslation} from '~/lib/i18n'
 import {translate} from '~/lib/i18n.shared'
@@ -31,9 +31,13 @@ export const loader = async ({request}: LoaderFunctionArgs) => {
   const buttons = await prisma.actionButton.findMany({orderBy: {name: 'asc'}})
   const logs = await prisma.log.findMany({orderBy: {time: 'desc'}, take: 10})
 
-  const lockdownMode = await getSetting('lockdownMode')
+  const {lockdownMode, workerLastSeen, ttsLastSeen} = await getSettings([
+    'lockdownMode',
+    'workerLastSeen',
+    'ttsLastSeen'
+  ])
 
-  return {sounders, lockdownMode, buttons, logs}
+  return {sounders, lockdownMode, buttons, logs, workerLastSeen, ttsLastSeen}
 }
 
 export const meta: MetaFunction = ({matches}) => {
@@ -42,7 +46,8 @@ export const meta: MetaFunction = ({matches}) => {
 }
 
 export default function Index() {
-  const {sounders, lockdownMode, buttons, logs} = useLoaderData<typeof loader>()
+  const {sounders, lockdownMode, buttons, logs, workerLastSeen, ttsLastSeen} =
+    useLoaderData<typeof loader>()
   const {t, locale} = useTranslation()
   const dateLocale = locale === 'pl' ? pl : enUS
   useLivePageData()
@@ -185,6 +190,52 @@ export default function Index() {
             </tbody>
           </table>
         </div>
+        <div className="box">
+          <h2>{t('dashboard.services')}</h2>
+          <table className="box-table">
+            <thead>
+              <tr>
+                <th className="p-2">{t('dashboard.table.name')}</th>
+                <th className="p-2">{t('dashboard.table.status')}</th>
+                <th className="p-2">{t('dashboard.table.lastSeen')}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>{t('dashboard.services.background')}</td>
+                <td className="text-center">
+                  {new Date().getTime() / 1000 -
+                    new Date(JSON.parse(workerLastSeen)).getTime() / 1000 <
+                  65
+                    ? '🟢'
+                    : '🔴'}
+                </td>
+                <td>
+                  {formatDistance(JSON.parse(workerLastSeen), new Date(), {
+                    addSuffix: true,
+                    locale: dateLocale
+                  })}
+                </td>
+              </tr>
+              <tr>
+                <td>{t('dashboard.services.tts')}</td>
+                <td className="text-center">
+                  {new Date().getTime() / 1000 -
+                    new Date(JSON.parse(ttsLastSeen)).getTime() / 1000 <
+                  65
+                    ? '🟢'
+                    : '🔴'}
+                </td>
+                <td>
+                  {formatDistance(JSON.parse(ttsLastSeen), new Date(), {
+                    addSuffix: true,
+                    locale: dateLocale
+                  })}
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
       </div>
     </Page>
   )

app/routes/actions.$action._index.tsx

@@ -12,6 +12,7 @@ import {Page, Actions} from '~/lib/ui'
 import {useTranslation} from '~/lib/i18n'
 import {translate} from '~/lib/i18n.shared'
 import {getRootI18n} from '~/lib/i18n.meta'
+import {SequenceViewer} from '~/lib/sequence-builder'
 
 export const meta: MetaFunction = ({matches}) => {
   const {messages} = getRootI18n(matches)
@@ -28,15 +29,16 @@ export const loader = async ({request, params}: LoaderFunctionArgs) => {
   const prisma = getPrisma()
 
   const action = await prisma.action.findFirstOrThrow({
-    where: {id: params.action},
-    include: {audio: true}
+    where: {id: params.action}
   })
 
-  return {action}
+  const sounds = await prisma.audio.findMany({orderBy: {name: 'asc'}})
+
+  return {action, sounds}
 }
 
 const Action = () => {
-  const {action} = useLoaderData<typeof loader>()
+  const {action, sounds} = useLoaderData<typeof loader>()
   const navigate = useNavigate()
   const {t} = useTranslation()
   const typeLabels: Record<string, string> = {
@@ -55,10 +57,14 @@ const Action = () => {
           {typeLabels[action.action] ?? action.action}
         </p>
         <p>
-          {t('actions.detail.sound')}{' '}
-          <Link to={`/sounds/${action.audioId}`}>{action.audio!.name}</Link>
+          {t('actions.detail.pin')}: {action.controlPin}
         </p>
       </div>
+      <SequenceViewer
+        sounds={sounds}
+        label={t('actions.detail.sequence.label')}
+        queue={action.data === '' ? [] : JSON.parse(action.data)}
+      />
       <Actions
         actions={[
           {

app/routes/actions.$action.edit.tsx

@@ -14,6 +14,7 @@ import {Page, FormElement, Actions} from '~/lib/ui'
 import {useTranslation} from '~/lib/i18n'
 import {translate} from '~/lib/i18n.shared'
 import {getRootI18n} from '~/lib/i18n.meta'
+import {SequenceBuilder} from '~/lib/sequence-builder'
 
 export const meta: MetaFunction<typeof loader> = ({matches, data}) => {
   const {messages} = getRootI18n(matches)
@@ -61,16 +62,20 @@ export const action = async ({params, request}: ActionFunctionArgs) => {
   const name = formData.get('name') as string | undefined
   const icon = formData.get('icon') as string | undefined
   const action = formData.get('action') as string | undefined
-  const sound = formData.get('sound') as string | undefined
+  const data = formData.get('data') as string | undefined
+  const controlPin = (formData.get('controlPin') as string | undefined)
+    ? (formData.get('controlPin') as string | undefined)
+    : ''
 
   invariant(name)
   invariant(icon)
   invariant(action)
-  invariant(sound)
+  invariant(data)
+  invariant(controlPin)
 
   await prisma.action.update({
     where: {id: params.action},
-    data: {name, icon, action, audioId: sound}
+    data: {name, icon, action, data, controlPin}
   })
 
   return redirect(`/actions/${params.action}`)
@@ -104,6 +109,16 @@ const AddAction = () => {
             defaultValue={action.icon}
           />
         </FormElement>
+        <FormElement
+          label={t('actions.form.pin.label')}
+          helperText={t('actions.form.pin.helper')}
+        >
+          <input
+            name="controlPin"
+            className={INPUT_CLASSES}
+            defaultValue={action.controlPin}
+          />
+        </FormElement>
         <FormElement
           label={t('actions.form.type.label')}
           helperText={t('actions.form.type.helper')}
@@ -117,24 +132,13 @@ const AddAction = () => {
             <option value="lockdown">{t('actions.types.lockdown')}</option>
           </select>
         </FormElement>
-        <FormElement
-          label={t('actions.form.sound.label')}
-          helperText={t('actions.form.sound.helper')}
-        >
-          <select
-            name="sound"
-            className={INPUT_CLASSES}
-            defaultValue={action.audioId!}
-          >
-            {sounds.map(({id, name}) => {
-              return (
-                <option key={id} value={id}>
-                  {name}
-                </option>
-              )
-            })}
-          </select>
-        </FormElement>
+        <SequenceBuilder
+          sounds={sounds}
+          initialQueue={action.data === '' ? [] : JSON.parse(action.data)}
+          name="data"
+          label={t('actions.form.sequence.label')}
+          helperText={t('actions.form.sequence.helper')}
+        />
         <Actions
           actions={[
             {