improve db

test/e2e/global-setup.js

@@ -42,25 +42,42 @@ function ensureDevCerts() {
 }
 
 async function globalSetup() {
-  // Ensure dev certificates exist
   ensureDevCerts()
 
-  // Create test admin user if it doesn't exist
-  const { get, run } = await getDb()
-  const existingUser = await get('SELECT id FROM users WHERE identifier = ?', [TEST_ADMIN.identifier])
+  let retries = 3
+  let lastError = null
+  while (retries > 0) {
+    try {
+      const { get, run } = await getDb()
+      const existingUser = await get('SELECT id FROM users WHERE identifier = ?', [TEST_ADMIN.identifier])
 
-  if (!existingUser) {
-    const id = crypto.randomUUID()
-    const now = new Date().toISOString()
-    await run(
-      'INSERT INTO users (id, identifier, password_hash, role, created_at, auth_provider, oidc_issuer, oidc_sub) VALUES (?, ?, ?, ?, ?, ?, ?, ?)',
-      [id, TEST_ADMIN.identifier, hashPassword(TEST_ADMIN.password), TEST_ADMIN.role, now, 'local', null, null],
-    )
-    console.log(`[test] Created test admin user: ${TEST_ADMIN.identifier}`)
-  }
-  else {
-    console.log(`[test] Test admin user already exists: ${TEST_ADMIN.identifier}`)
+      if (!existingUser) {
+        const id = crypto.randomUUID()
+        const now = new Date().toISOString()
+        await run(
+          'INSERT INTO users (id, identifier, password_hash, role, created_at, auth_provider, oidc_issuer, oidc_sub) VALUES (?, ?, ?, ?, ?, ?, ?, ?)',
+          [id, TEST_ADMIN.identifier, hashPassword(TEST_ADMIN.password), TEST_ADMIN.role, now, 'local', null, null],
+        )
+        console.log(`[test] Created test admin user: ${TEST_ADMIN.identifier}`)
+      }
+      else {
+        console.log(`[test] Test admin user already exists: ${TEST_ADMIN.identifier}`)
+      }
+      return
+    }
+    catch (error) {
+      lastError = error
+      if (error.message?.includes('SQLITE_BUSY') || error.message?.includes('database is locked')) {
+        retries--
+        if (retries > 0) {
+          await new Promise(resolve => setTimeout(resolve, 100 * (4 - retries)))
+          continue
+        }
+      }
+      throw error
+    }
   }
+  throw lastError
 }
 
 export default globalSetup

test/nuxt/KestrelMap.spec.js

@@ -10,24 +10,24 @@ vi.mock('leaflet.offline', () => ({ tileLayerOffline: null, savetiles: null }))
 describe('KestrelMap', () => {
   it('renders map container', async () => {
     const wrapper = await mountSuspended(KestrelMap, {
-      props: { feeds: [] },
+      props: { devices: [] },
     })
     expect(wrapper.find('[data-testid="kestrel-map"]').exists()).toBe(true)
   })
 
-  it('accepts feeds prop', async () => {
-    const feeds = [
+  it('accepts devices prop', async () => {
+    const devices = [
       { id: '1', name: 'A', lat: 37.7, lng: -122.4, streamUrl: '', sourceType: 'mjpeg' },
     ]
     const wrapper = await mountSuspended(KestrelMap, {
-      props: { feeds },
+      props: { devices },
     })
-    expect(wrapper.props('feeds')).toEqual(feeds)
+    expect(wrapper.props('devices')).toEqual(devices)
   })
 
   it('has select emit', async () => {
     const wrapper = await mountSuspended(KestrelMap, {
-      props: { feeds: [] },
+      props: { devices: [] },
     })
     wrapper.vm.$emit('select', { id: 'x', name: 'X', lat: 0, lng: 0 })
     expect(wrapper.emitted('select')).toHaveLength(1)
@@ -67,7 +67,7 @@ describe('KestrelMap', () => {
   it('accepts pois and canEditPois props', async () => {
     const wrapper = await mountSuspended(KestrelMap, {
       props: {
-        feeds: [],
+        devices: [],
         pois: [{ id: 'p1', lat: 37.7, lng: -122.4, label: 'P', icon_type: 'pin' }],
         canEditPois: false,
       },

test/nuxt/api.spec.js

@@ -1,14 +0,0 @@
-import { describe, it, expect } from 'vitest'
-import { getValidFeeds } from '../../server/utils/feedUtils.js'
-
-describe('API contract', () => {
-  it('getValidFeeds returns array suitable for API response', () => {
-    const raw = [
-      { id: '1', name: 'A', lat: 1, lng: 2 },
-      { id: '2', name: 'B', lat: 3, lng: 4 },
-    ]
-    const out = getValidFeeds(raw)
-    expect(Array.isArray(out)).toBe(true)
-    expect(out).toHaveLength(2)
-  })
-})

test/unit/feedUtils.spec.js

@@ -1,119 +0,0 @@
-import { describe, it, expect } from 'vitest'
-import { isValidFeed, getValidFeeds, sanitizeStreamUrl, sanitizeFeedForResponse } from '../../server/utils/feedUtils.js'
-
-describe('feedUtils', () => {
-  describe('isValidFeed', () => {
-    it('returns true for valid feed', () => {
-      expect(isValidFeed({
-        id: '1',
-        name: 'Cam',
-        lat: 37.7,
-        lng: -122.4,
-      })).toBe(true)
-    })
-
-    it('returns false for null', () => {
-      expect(isValidFeed(null)).toBe(false)
-    })
-
-    it('returns false for missing id', () => {
-      expect(isValidFeed({ name: 'x', lat: 0, lng: 0 })).toBe(false)
-    })
-
-    it('returns false for wrong lat type', () => {
-      expect(isValidFeed({ id: '1', name: 'x', lat: '37', lng: -122 })).toBe(false)
-    })
-  })
-
-  describe('getValidFeeds', () => {
-    it('returns only valid feeds', () => {
-      const list = [
-        { id: 'a', name: 'A', lat: 1, lng: 2 },
-        null,
-        { id: 'b', name: 'B', lat: 3, lng: 4 },
-      ]
-      expect(getValidFeeds(list)).toHaveLength(2)
-    })
-
-    it('returns empty array for non-array', () => {
-      expect(getValidFeeds(null)).toEqual([])
-      expect(getValidFeeds({})).toEqual([])
-    })
-  })
-
-  describe('sanitizeStreamUrl', () => {
-    it('allows http and https', () => {
-      expect(sanitizeStreamUrl('https://example.com/stream')).toBe('https://example.com/stream')
-      expect(sanitizeStreamUrl('http://example.com/stream')).toBe('http://example.com/stream')
-    })
-
-    it('returns empty for javascript:, data:, and other schemes', () => {
-      expect(sanitizeStreamUrl('javascript:alert(1)')).toBe('')
-      expect(sanitizeStreamUrl('data:text/html,<script>')).toBe('')
-      expect(sanitizeStreamUrl('file:///etc/passwd')).toBe('')
-    })
-
-    it('returns empty for non-strings or empty', () => {
-      expect(sanitizeStreamUrl('')).toBe('')
-      expect(sanitizeStreamUrl('   ')).toBe('')
-      expect(sanitizeStreamUrl(null)).toBe('')
-      expect(sanitizeStreamUrl(123)).toBe('')
-    })
-  })
-
-  describe('sanitizeFeedForResponse', () => {
-    it('returns safe shape with sanitized streamUrl and sourceType', () => {
-      const feed = {
-        id: 'f1',
-        name: 'Cam',
-        lat: 37,
-        lng: -122,
-        streamUrl: 'https://safe.com/s',
-        sourceType: 'mjpeg',
-      }
-      const out = sanitizeFeedForResponse(feed)
-      expect(out).toEqual({
-        id: 'f1',
-        name: 'Cam',
-        lat: 37,
-        lng: -122,
-        streamUrl: 'https://safe.com/s',
-        sourceType: 'mjpeg',
-      })
-    })
-
-    it('strips dangerous streamUrl and normalizes sourceType', () => {
-      const feed = {
-        id: 'f2',
-        name: 'Bad',
-        lat: 0,
-        lng: 0,
-        streamUrl: 'javascript:alert(1)',
-        sourceType: 'hls',
-      }
-      const out = sanitizeFeedForResponse(feed)
-      expect(out.streamUrl).toBe('')
-      expect(out.sourceType).toBe('hls')
-    })
-
-    it('includes description only when string', () => {
-      const withDesc = sanitizeFeedForResponse({
-        id: 'a',
-        name: 'n',
-        lat: 0,
-        lng: 0,
-        description: 'A camera',
-      })
-      expect(withDesc.description).toBe('A camera')
-
-      const noDesc = sanitizeFeedForResponse({
-        id: 'b',
-        name: 'n',
-        lat: 0,
-        lng: 0,
-        description: 123,
-      })
-      expect(noDesc).not.toHaveProperty('description')
-    })
-  })
-})

test/unit/migrateFeedsToDevices.spec.js

@@ -1,32 +0,0 @@
-import { describe, it, expect, beforeEach, afterEach } from 'vitest'
-import { getDb, setDbPathForTest } from '../../server/utils/db.js'
-import { migrateFeedsToDevices } from '../../server/utils/migrateFeedsToDevices.js'
-
-describe('migrateFeedsToDevices', () => {
-  beforeEach(() => {
-    setDbPathForTest(':memory:')
-  })
-
-  afterEach(() => {
-    setDbPathForTest(null)
-  })
-
-  it('runs without error when devices table is empty', async () => {
-    const db = await getDb()
-    await expect(migrateFeedsToDevices()).resolves.toBeUndefined()
-    const rows = await db.all('SELECT id FROM devices')
-    expect(rows.length).toBeGreaterThanOrEqual(0)
-  })
-
-  it('is no-op when devices already has rows', async () => {
-    const db = await getDb()
-    await db.run(
-      'INSERT INTO devices (id, name, device_type, vendor, lat, lng, stream_url, source_type, config) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)',
-      ['existing', 'Existing', 'feed', null, 0, 0, '', 'mjpeg', null],
-    )
-    await migrateFeedsToDevices()
-    const rows = await db.all('SELECT id FROM devices')
-    expect(rows).toHaveLength(1)
-    expect(rows[0].id).toBe('existing')
-  })
-})