2.0.0 The end user update

.github/workflows/deployment.yml

@@ -16,16 +16,16 @@ jobs:
       docs: ${{ steps.filter.outputs.docs }}
     steps:
       - name: ⬇️ Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v7
         with:
-          node-version: 20
+          node-version: 24
 
       - name: 💾 Cache Node Modules
         id: node-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: node_modules
           key:
@@ -37,7 +37,7 @@ jobs:
         run: npm install
 
       - name: 🧭 Find Changes
-        uses: dorny/paths-filter@v3
+        uses: dorny/paths-filter@v4
         id: filter
         with:
           filters: |
@@ -69,16 +69,16 @@ jobs:
       cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
     steps:
       - name: ⬇️ Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v7
         with:
-          node-version: 20
+          node-version: 24
 
       - name: 💾 Cache Node Modules
         id: node-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: node_modules
           key:
@@ -98,24 +98,29 @@ jobs:
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-ts
       cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+    env:
+      DATABASE_URL: file:./prisma/data/db.db
     steps:
       - name: ⬇️ Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v7
         with:
-          node-version: 20
+          node-version: 24
 
       - name: 💾 Cache Node Modules
         id: node-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: node_modules
           key:
             node-modules-${{ hashFiles('package-lock.json',
             'prisma/schema.prisma') }}
 
+      - name: 📊 Generate Prisma
+        run: npx prisma generate
+
       - name: 🔎 Type check
         run: npm run typecheck
 
@@ -131,16 +136,16 @@ jobs:
       cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
     steps:
       - name: ⬇️ Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: ⎔ Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v7
         with:
-          node-version: 20
+          node-version: 24
 
       - name: 💾 Cache Node Modules
         id: node-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: node_modules
           key:
@@ -162,7 +167,7 @@ jobs:
       cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
     steps:
       - name: ⬇️ Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: ☁️ Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -174,7 +179,7 @@ jobs:
 
       # Setup cache
       - name: ⚡️ Cache Docker layers
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

.gitignore

@@ -8,6 +8,7 @@ prisma/*.db
 prisma/*.db-journal
 prisma/**/*.db
 prisma/**/*.db-journal
+prisma/generated
 
 
 public/sounds

Dockerfile

@@ -30,13 +30,15 @@ RUN npm prune --production
 FROM base AS build
 
 ENV NODE_ENV=production
+ENV DATABASE_URL=file:./prisma/data/db.db
 
 RUN mkdir /app
 WORKDIR /app
 
 COPY --from=deps /app/node_modules /app/node_modules
 
 ADD . .
+RUN npx prisma generate
 RUN npm run build
 
 # Go back to the `base` image and copy in the production deps and build

app/lib/constants.ts

@@ -1,4 +1,4 @@
-export const VERSION = '1.7.1'
+export const VERSION = '2.0.0'
 
 export const RequiredVersions = {
   controller: VERSION,

app/lib/i18n.server.ts

@@ -4,7 +4,7 @@ import {
   locales,
   type SupportedLocale,
   FALLBACK_LOCALE,
-  MessageKey
+  type MessageKey
 } from '~/locales'
 import {type Messages} from './i18n.shared'
 

app/lib/prisma.server.ts

@@ -1,11 +1,16 @@
-import {PrismaClient} from '@prisma/client'
+import {PrismaBetterSqlite3} from '@prisma/adapter-better-sqlite3'
+import {PrismaClient} from '../../prisma/generated/prisma/client'
 
 declare global {
   // This prevents us from making multiple connections to the db when the
   // require cache is cleared.
   var __prisma: PrismaClient | undefined
 }
 
-const prisma = global.__prisma ?? (global.__prisma = new PrismaClient())
+const connectionString = `${process.env.DATABASE_URL}`
+const adapter = new PrismaBetterSqlite3({url: connectionString})
+
+const prisma =
+  global.__prisma ?? (global.__prisma = new PrismaClient({adapter}))
 
 export const getPrisma = () => prisma

app/lib/sequence-builder.tsx

@@ -1,5 +1,5 @@
-import {useState, useEffect} from 'react'
-import {type Audio} from '@prisma/client'
+import {useState} from 'react'
+import {type AudioModel} from '../../prisma/generated/prisma/models'
 
 import CopyIcon from '@heroicons/react/24/outline/DocumentDuplicateIcon'
 import PasteIcon from '@heroicons/react/24/outline/ClipboardDocumentIcon'
@@ -15,7 +15,7 @@ export const SequenceBuilder = ({
   label,
   helperText
 }: {
-  sounds: Audio[]
+  sounds: AudioModel[]
   initialQueue: string[]
   name: string
   label: string
@@ -137,7 +137,7 @@ export const SequenceViewer = ({
   label
 }: {
   queue: string[]
-  sounds: Audio[]
+  sounds: AudioModel[]
   label: string
 }) => {
   const {t} = useTranslation()

app/lib/trigger-action.server.ts

@@ -1,11 +1,11 @@
-import {type Action} from '@prisma/client'
+import {type ActionModel} from '../../prisma/generated/prisma/models'
 
 import {broadcast} from './broadcast.server'
 import {toggleLockdown} from './lockdown.server'
 import {log} from './log.server'
 
 export const triggerAction = async (
-  action: Action,
+  action: ActionModel,
   zone: string | null | undefined,
   source: string,
   callbacks: {onMissingZone: (suppliedZone: string | null | undefined) => void}

app/root.tsx

@@ -7,11 +7,7 @@ import {
   useLoaderData,
   useRouteLoaderData
 } from '@remix-run/react'
-import {
-  json,
-  type LinksFunction,
-  type LoaderFunctionArgs
-} from '@remix-run/node'
+import {type LinksFunction, type LoaderFunctionArgs} from '@remix-run/node'
 import BellIcon from '@heroicons/react/24/outline/BellIcon'
 import BellAlertIcon from '@heroicons/react/24/outline/BellAlertIcon'
 import Square3StackIcon from '@heroicons/react/24/outline/Square3Stack3DIcon'

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

@@ -3,7 +3,7 @@ import {
   type MetaFunction,
   redirect
 } from '@remix-run/node'
-import {useLoaderData, Link, useNavigate} from '@remix-run/react'
+import {useLoaderData, useNavigate} from '@remix-run/react'
 
 import {getPrisma} from '~/lib/prisma.server'
 import {checkSession} from '~/lib/session'

app/routes/actions.add.tsx

@@ -4,7 +4,7 @@ import {
   type LoaderFunctionArgs,
   type MetaFunction
 } from '@remix-run/node'
-import {useLoaderData, useNavigate} from '@remix-run/react'
+import {useNavigate} from '@remix-run/react'
 import {invariant} from '@arcath/utils'
 
 import {getPrisma} from '~/lib/prisma.server'
@@ -71,7 +71,6 @@ export const action = async ({request}: ActionFunctionArgs) => {
 }
 
 const AddAction = () => {
-  const {sounds} = useLoaderData<typeof loader>()
   const navigate = useNavigate()
   const {t} = useTranslation()
 

app/routes/calendar.tsx

@@ -15,7 +15,7 @@ import {getPrisma} from '~/lib/prisma.server'
 import {useTranslation} from '~/lib/i18n'
 import {translate} from '~/lib/i18n.shared'
 import {getRootI18n} from '~/lib/i18n.meta'
-import {MessageKey} from '~/locales'
+import {type MessageKey} from '~/locales'
 
 export const meta: MetaFunction = ({matches}) => {
   const {messages} = getRootI18n(matches)

app/routes/control-point.trigger.tsx

@@ -41,7 +41,7 @@ export const action = async ({request}: ActionFunctionArgs) => {
   }
 
   await triggerAction(action, data.zone, 'Control Point', {
-    onMissingZone: zone => {
+    onMissingZone: () => {
       response = {result: 'error', message: 'Zone does not exist'}
     }
   })

app/routes/hook.$hook.tsx

@@ -28,7 +28,7 @@ export const action = async ({request, params}: ActionFunctionArgs) => {
   let response = {status: 'ok'}
 
   await triggerAction(webhook.action, zone, `Webhook: ${params.hook}`, {
-    onMissingZone: zone => {
+    onMissingZone: () => {
       response = {status: 'zone not found'}
     }
   })

app/routes/lockdown.tsx

@@ -62,11 +62,9 @@ export const action = async ({request}: ActionFunctionArgs) => {
 
   const lockdownRepeat = formData.get('lockdownRepeat') as string | undefined
   const lockdownEntrySequence = formData.get('lockdownEntrySequence') as
-    | string
-    | undefined
+    string | undefined
   const lockdownExitSequence = formData.get('lockdownExitSequence') as
-    | string
-    | undefined
+    string | undefined
   const lockdownRepeatRingerWire = !!(formData.get(
     'lockdownRepeatRingerWire'
   ) as string | undefined)

app/routes/log.tsx

@@ -13,7 +13,7 @@ import {getPrisma} from '~/lib/prisma.server'
 import {useTranslation} from '~/lib/i18n'
 import {translate} from '~/lib/i18n.shared'
 import {getRootI18n} from '~/lib/i18n.meta'
-import {MessageKey} from '~/locales'
+import {type MessageKey} from '~/locales'
 import {useLivePageData} from '~/lib/hooks/use-live-data'
 
 export const meta: MetaFunction = ({matches}) => {

app/routes/schedule.add.tsx

@@ -118,8 +118,6 @@ const AddSchedule = () => {
   const navigate = useNavigate()
   const [day, setDay] = useLocalStorage<string>('day', '_')
   const [zone, setZone] = useLocalStorage<string>('zone', zones[0].id)
-  const [sound, setSound] = useLocalStorage<string>('sound', sounds[0].id)
-  const [count, setCount] = useLocalStorage<string>('count', '1')
   const {t} = useTranslation()
 
   return (

app/routes/settings.tsx

@@ -4,7 +4,7 @@ import {
   type MetaFunction,
   redirect
 } from '@remix-run/node'
-import {Form, useLoaderData} from '@remix-run/react'
+import {useLoaderData} from '@remix-run/react'
 import {invariant} from '@arcath/utils'
 
 import {getSettings, setSetting} from '~/lib/settings.server'
@@ -67,13 +67,11 @@ export const action = async ({request}: ActionFunctionArgs) => {
   const password = formData.get('password') as string | undefined
   const checkPassword = formData.get('confirmPassword') as string | undefined
   const controlPointKey = (formData.get('controlPointKey') as
-    | string
-    | undefined)
+    string | undefined)
     ? (formData.get('controlPointKey') as string | undefined)
     : ''
   const controlPointDefaultZone = formData.get('controlPointDefaultZone') as
-    | string
-    | undefined
+    string | undefined
   const siteName = formData.get('siteName') as string | undefined
 
   invariant(enrollUrl)
@@ -163,7 +161,11 @@ const Settings = () => {
             defaultValue={controlPointDefaultZone}
           >
             {zones.map(({id, name}) => {
-              return <option value={id}>{name}</option>
+              return (
+                <option value={id} key={id}>
+                  {name}
+                </option>
+              )
             })}
           </select>
         </FormElement>

app/routes/sounder-api.get-day.tsx

@@ -1,5 +1,4 @@
 import {type ActionFunctionArgs} from '@remix-run/node'
-import {invariant} from '@arcath/utils'
 
 import {getPrisma} from '~/lib/prisma.server'
 

app/routes/sounder-api.trigger-action.tsx

@@ -45,7 +45,7 @@ export const action = async ({request}: ActionFunctionArgs) => {
   let status = 200
 
   await triggerAction(dbAction, zone, `Sounder: ${sounder.name}`, {
-    onMissingZone: zone => {
+    onMissingZone: () => {
       response = {result: 'error', error: 'Zone not found.'}
       status = 400
     }

docker-entrypoint.sh

@@ -13,7 +13,5 @@ if [ "$1" = 'osb-remix' ]; then
 
   npm run start
 elif [ "$1" = 'osb-worker' ]; then
-  npx prisma generate
-
   npm run start:worker
 fi

eslint.config.js

@@ -32,7 +32,8 @@ export const config = [
       '**/server-build/**',
       '**/dist/**',
       '**/coverage/**',
-      '.test.env'
+      '.test.env',
+      '**/generated/prisma/**'
     ]
   },
 
@@ -277,4 +278,4 @@ export const config = [
 ].filter(Boolean)
 
 // this is for backward compatibility
-export default config
+export default config