Add client types and some cleanup

daffl · daffl · commit 6e0308a6656d · 2026-04-08T08:34:03.000-07:00
diff --git a/api/src/app.ts b/api/src/app.ts
@@ -1,4 +1,5 @@
 import { feathers } from 'feathers'
+import type { ClientServices } from 'feathers/client'
 import type { HookContext as FeathersHookContext, Application as FeathersApplication } from 'feathers'
 import { MessageService } from './services/messages.js'
 import { SseService } from './services/sse.js'
@@ -16,6 +17,8 @@ export type HookContext = FeathersHookContext<Application>
 
 const app: Application = feathers<Services, Configuration>()
 
+export type Client = FeathersApplication<ClientServices<Services, unknown>>
+
 app.use('sse', new SseService())
 app.use('messages', new MessageService())
 
diff --git a/api/src/services/messages.ts b/api/src/services/messages.ts
@@ -13,6 +13,10 @@ export type Message = {
   user: string
 }
 
+export type MessageParams = Params & {
+  user: TalonAuthUser
+}
+
 const db = new DatabaseSync('chat.sqlite')
 
 db.exec(`
@@ -26,14 +30,14 @@ db.exec(`
 
 @hooks([authenticate])
 export class MessageService {
-  async find(params: Params) {
+  async find(params: MessageParams) {
     const limit = params.query?.$limit ?? 25
     const data = db.prepare('SELECT * FROM messages ORDER BY createdAt DESC LIMIT ?').all(limit) as Message[]
 
     return { limit, data }
   }
 
-  async get(id: string, _params: Params) {
+  async get(id: string, _params: MessageParams) {
     const message = db.prepare('SELECT * FROM messages WHERE id = ?').get(id) as Message | undefined
 
     if (!message) {
@@ -43,24 +47,14 @@ export class MessageService {
     return message
   }
 
-  async create(data: Pick<Message, 'text'>, params: Params & {
-    user: TalonAuthUser
-   }) {
+  async create(data: Pick<Message, 'text'>, params: MessageParams) {
     const createdAt = new Date().toISOString()
     const result = db.prepare('INSERT INTO messages (text, createdAt, user) VALUES (?, ?, ?)').run(
       data.text,
       createdAt,
       params.user.email!
     )
 
-    return this.get(result.lastInsertRowid, params)
-  }
-
-  async remove(id: string, _params: Params) {
-    const message = await this.get(id, _params)
-
-    db.prepare('DELETE FROM messages WHERE id = ?').run(id)
-
-    return message
+    return this.get(`${result.lastInsertRowid}`, params)
   }
 }
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
@@ -1,10 +1,9 @@
 import { feathers } from 'feathers'
 import { fetchClient } from 'feathers/client'
 import { getLoginElement } from 'talon-auth'
+import type { Client } from '../../api/src/app.js'
 
-// Initialize our Feathers client application through Socket.io
-// with hooks and authentication.
-const client = feathers()
+const client: Client = feathers()
 
 client.configure(fetchClient(window.fetch.bind(window), {
   baseUrl: 'http://localhost:3030',
@@ -14,10 +13,11 @@ client.configure(fetchClient(window.fetch.bind(window), {
 client.hooks([
   async (context, next) => {
     const login = await getLoginElement()
-    const header = await login?.getHeader()
+    const authorization = await login?.getHeader()
+
     context.params.headers = {
       ...context.params.headers,
-      authorization: header
+      authorization
     }
     return next()
   }
@@ -132,8 +132,6 @@ addEventListener('#send-message', 'submit', async (ev) => {
 client.service('messages').on('created', addMessage)
 
 const init = async () => {
-  document.getElementById('app').innerHTML = chatTemplate()
-
   await client.setup()
 
   // Find the latest 25 messages. They will come with the newest first
@@ -143,6 +141,8 @@ const init = async () => {
     }
   })
 
+  document.getElementById('app').innerHTML = chatTemplate()
+
   // We want to show the newest message last
   for (const message of messages.data.reverse()) {
     await addMessage(message)
