feat: matchedAlbum.webUrl from subsonic settings; remove stream proxy routes

server/src/app.ts

@@ -14,7 +14,6 @@ import { registerSettingsRoutes } from './routes/settingsRoutes.js'
 import { registerLookupRoutes } from './routes/lookupRoutes.js'
 import { registerCollectionRoutes } from './routes/collectionRoutes.js'
 import { registerLibraryRoutes } from './routes/libraryRoutes.js'
-import { registerStreamRoutes } from './routes/streamRoutes.js'
 import { registerLoanRoutes } from './routes/loanRoutes.js'
 import { registerStatsRoutes } from './routes/statsRoutes.js'
 import { registerDataRoutes } from './routes/dataRoutes.js'
@@ -56,7 +55,6 @@ export async function buildApp(opts: AppOptions): Promise<FastifyInstance> {
   await registerLookupRoutes(app)
   await registerCollectionRoutes(app)
   await registerLibraryRoutes(app)
-  await registerStreamRoutes(app)
   await registerLoanRoutes(app)
   await registerStatsRoutes(app)
   await registerDataRoutes(app)

server/src/routes/collectionRoutes.ts

@@ -4,6 +4,7 @@ import { cacheArtwork } from '../artwork.js'
 import { resolveRipStatus, resolveRipStatusBatch, findMatchedAlbum, type RipStatus } from '../ripstatus.js'
 import { requireAuth } from './authRoutes.js'
 import { discogsClientFor, discogsErrorStatus } from './lookupRoutes.js'
+import { getSettings } from './settingsRoutes.js'
 
 interface ItemRow {
   id: number
@@ -182,9 +183,15 @@ export async function registerCollectionRoutes(app: FastifyInstance): Promise<vo
     const loan = db
       .prepare('SELECT id, borrower, lent_at FROM loans WHERE item_id = ? AND returned_at IS NULL')
       .get(row.id) as { id: number; borrower: string; lent_at: string } | undefined
+    const matched = findMatchedAlbum(db, request.user!.id, row.id)
+    const settings = getSettings(db, request.user!.id)
+    const webUrl =
+      matched && settings.subsonic_url
+        ? `${settings.subsonic_url.replace(/\/+$/, '')}/app/#/album/${matched.subsonicId}`
+        : null
     return {
       ...rowToItem(db, row),
-      matchedAlbum: findMatchedAlbum(db, request.user!.id, row.id),
+      matchedAlbum: matched ? { ...matched, webUrl } : null,
       loan: loan ? { id: loan.id, borrower: loan.borrower, lentAt: loan.lent_at } : null,
     }
   })

server/src/routes/streamRoutes.ts

@@ -1,65 +0,0 @@
-import { FastifyInstance } from 'fastify'
-import { SubsonicClient, SubsonicError } from '../subsonic.js'
-import { requireAuth } from './authRoutes.js'
-import { getSettings, subsonicConfigComplete } from './settingsRoutes.js'
-
-function clientFor(request: any): SubsonicClient | null {
-  const s = getSettings(request.server.db, request.user.id)
-  if (!subsonicConfigComplete(s)) return null
-  return new SubsonicClient({
-    url: s.subsonic_url as string,
-    username: s.subsonic_username as string,
-    password: s.subsonic_password as string,
-    fetchImpl: request.server.fetchImpl,
-  })
-}
-
-export async function registerStreamRoutes(app: FastifyInstance): Promise<void> {
-  app.get('/api/stream/:songId', { preHandler: [requireAuth] }, async (request, reply) => {
-    const client = clientFor(request)
-    if (!client) return reply.code(409).send({ error: 'no_subsonic_config' })
-    const songId = (request.params as { songId: string }).songId
-    const range = request.headers.range
-    let upstream: Response
-    try {
-      upstream = await request.server.fetchImpl(client.url('stream', { id: songId }), {
-        headers: range ? { Range: range } : {},
-      })
-    } catch {
-      return reply.code(502).send({ error: 'stream_unavailable' })
-    }
-    if (!upstream.ok && upstream.status !== 206) {
-      return reply.code(502).send({ error: 'stream_unavailable' })
-    }
-    const headers: Record<string, string> = {}
-    for (const h of ['content-type', 'content-length', 'content-range', 'accept-ranges']) {
-      const v = upstream.headers.get(h)
-      if (v) headers[h] = v
-    }
-    if (!upstream.headers.get('accept-ranges')) headers['accept-ranges'] = 'bytes'
-    return reply.code(upstream.status).headers(headers).send(upstream.body)
-  })
-
-  app.get('/api/album/:subsonicId/tracks', { preHandler: [requireAuth] }, async (request, reply) => {
-    const client = clientFor(request)
-    if (!client) return reply.code(409).send({ error: 'no_subsonic_config' })
-    try {
-      const album = await client.getAlbum((request.params as { subsonicId: string }).subsonicId)
-      return album
-    } catch (err) {
-      if (err instanceof SubsonicError) return reply.code(502).send({ error: 'subsonic_error', detail: err.message })
-      return reply.code(502).send({ error: 'subsonic_unreachable' })
-    }
-  })
-
-  app.post('/api/album/:subsonicId/played', { preHandler: [requireAuth] }, async (request, reply) => {
-    const subsonicId = (request.params as { subsonicId: string }).subsonicId
-    const info = request.server.db
-      .prepare(
-        'UPDATE digital_albums SET last_played_at = ? WHERE user_id = ? AND subsonic_id = ?'
-      )
-      .run(new Date().toISOString(), request.user!.id, subsonicId)
-    if (info.changes === 0) return reply.code(404).send({ error: 'not_found' })
-    return { ok: true }
-  })
-}