fix: use singleton IndexedDB connection to prevent blocking

Replaced open/close-per-operation pattern with a single persistent
connection held for the app lifetime. This prevents the DB upgrade
(v1→v2) from being blocked by lingering connections, and eliminates
transaction contention.

Also added onblocked handler that surfaces a clear error instead of
hanging indefinitely.
This commit is contained in:
2026-08-01 18:52:12 +08:00
parent a7697fd4a1
commit 97e294f1d6
3 changed files with 75 additions and 87 deletions
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -5,7 +5,7 @@
<link rel="icon" href="/favicon.ico"> <link rel="icon" href="/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>MJPEG Stream Viewer</title> <title>MJPEG Stream Viewer</title>
<script type="module" crossorigin src="/assets/index-CW6NDYF0.js"></script> <script type="module" crossorigin src="/assets/index-B6qcBY8r.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-BTgh_FTp.css"> <link rel="stylesheet" crossorigin href="/assets/index-BTgh_FTp.css">
</head> </head>
<body> <body>
+73 -85
View File
@@ -1,15 +1,12 @@
/** /**
* IndexedDB wrapper for storing MJPEG recordings. * IndexedDB wrapper — singleton connection, never closed during app lifetime.
* *
* All frames are packed into a single Blob (binary format) so that * All frames packed into a single Blob per recording to avoid
* IndexedDB writes one object per recording — fast and reliable. * multi-blob transaction issues.
* *
* Binary format inside `data` Blob: * Binary format inside `data`:
* [4 bytes BE: uint32 frameCount] * [4B BE uint32 frameCount]
* For each frame: * Per frame: [4B BE uint32 timestamp] [4B BE uint32 jpegLen] [JPEG bytes]
* [4 bytes BE: uint32 timestamp (ms)]
* [4 bytes BE: uint32 jpegDataLength]
* [jpegDataLength bytes: JPEG]
*/ */
export interface Frame { export interface Frame {
@@ -23,7 +20,6 @@ export interface Recording {
createdAt: Date createdAt: Date
duration: number duration: number
frameCount: number frameCount: number
/** Packed binary: all frames + timing in a single Blob */
data: Blob data: Blob
} }
@@ -31,113 +27,114 @@ const DB_NAME = 'mjpeg-viewer'
const DB_VERSION = 2 const DB_VERSION = 2
const STORE_NAME = 'recordings' const STORE_NAME = 'recordings'
// ---- Singleton connection ----
let db: IDBDatabase | null = null
let dbPromise: Promise<IDBDatabase> | null = null
function getDB(): Promise<IDBDatabase> {
if (db) return Promise.resolve(db)
if (dbPromise) return dbPromise
dbPromise = new Promise((resolve, reject) => {
const request = indexedDB.open(DB_NAME, DB_VERSION)
request.onupgradeneeded = () => {
const d = request.result
if (d.objectStoreNames.contains(STORE_NAME)) {
d.deleteObjectStore(STORE_NAME)
}
d.createObjectStore(STORE_NAME, { keyPath: 'id' })
}
request.onsuccess = () => {
db = request.result
// If connection is lost (browser closes it), reset
db.onclose = () => {
db = null
dbPromise = null
}
resolve(db)
}
request.onerror = () => {
dbPromise = null
reject(request.error)
}
request.onblocked = () => {
// A previous connection is still open — this shouldn't happen
// with singleton pattern, but if it does, reject to trigger retry
dbPromise = null
reject(new Error('Database blocked by another connection'))
}
})
return dbPromise
}
// ---- Binary pack / unpack ---- // ---- Binary pack / unpack ----
export function packFrames(frames: { timestamp: number; blob: Blob }[]): Blob { export function packFrames(frames: { timestamp: number; blob: Blob }[]): Blob {
const headerSize = 4 // frameCount const headerSize = 4 + frames.length * 8
let totalSize = headerSize const header = new ArrayBuffer(headerSize)
const parts: ArrayBuffer[] = [] const view = new DataView(header)
const countBuf = new ArrayBuffer(4)
new DataView(countBuf).setUint32(0, frames.length)
totalSize += countBuf.byteLength
for (const f of frames) {
const tsBuf = new ArrayBuffer(4)
new DataView(tsBuf).setUint32(0, f.timestamp)
const lenBuf = new ArrayBuffer(4)
new DataView(lenBuf).setUint32(0, f.blob.size)
parts.push(tsBuf, lenBuf)
totalSize += 8 + f.blob.size
}
// Build header + index, then append blob data
const headerAndIndex = new ArrayBuffer(totalSize)
const view = new DataView(headerAndIndex)
view.setUint32(0, frames.length) view.setUint32(0, frames.length)
let offset = 4 let offset = 4
const parts: BlobPart[] = [header]
for (const f of frames) { for (const f of frames) {
view.setUint32(offset, f.timestamp) view.setUint32(offset, f.timestamp)
view.setUint32(offset + 4, f.blob.size) view.setUint32(offset + 4, f.blob.size)
offset += 8 offset += 8
parts.push(f.blob)
} }
return new Blob(parts, { type: 'application/octet-stream' })
// Now build the final blob: header/index + all JPEG data
const allParts: BlobPart[] = [headerAndIndex]
for (const f of frames) {
allParts.push(f.blob)
}
return new Blob(allParts, { type: 'application/octet-stream' })
} }
export async function unpackFrames(data: Blob): Promise<Frame[]> { export async function unpackFrames(data: Blob): Promise<Frame[]> {
const buf = await data.arrayBuffer() const buf = await data.arrayBuffer()
const view = new DataView(buf) const view = new DataView(buf)
const frameCount = view.getUint32(0) const frameCount = view.getUint32(0)
let offset = 4
const frames: Frame[] = [] const frames: Frame[] = []
let offset = 4
for (let i = 0; i < frameCount; i++) { for (let i = 0; i < frameCount; i++) {
const timestamp = view.getUint32(offset) const timestamp = view.getUint32(offset)
const jpegLen = view.getUint32(offset + 4) const jpegLen = view.getUint32(offset + 4)
offset += 8 offset += 8
const jpegData = buf.slice(offset, offset + jpegLen)
frames.push({ frames.push({
timestamp, timestamp,
blob: new Blob([jpegData], { type: 'image/jpeg' }), blob: new Blob([buf.slice(offset, offset + jpegLen)], { type: 'image/jpeg' }),
}) })
offset += jpegLen offset += jpegLen
} }
return frames return frames
} }
// ---- IndexedDB ---- // ---- CRUD ----
function openDB(): Promise<IDBDatabase> {
return new Promise((resolve, reject) => {
const request = indexedDB.open(DB_NAME, DB_VERSION)
request.onupgradeneeded = () => {
const db = request.result
if (db.objectStoreNames.contains(STORE_NAME)) {
db.deleteObjectStore(STORE_NAME)
}
db.createObjectStore(STORE_NAME, { keyPath: 'id' })
}
request.onsuccess = () => resolve(request.result)
request.onerror = () => reject(request.error)
})
}
export async function saveRecording(recording: Recording): Promise<void> { export async function saveRecording(recording: Recording): Promise<void> {
const db = await openDB() const d = await getDB()
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const tx = db.transaction(STORE_NAME, 'readwrite') const tx = d.transaction(STORE_NAME, 'readwrite')
const store = tx.objectStore(STORE_NAME) const store = tx.objectStore(STORE_NAME)
store.put({ store.put({
...recording, ...recording,
createdAt: recording.createdAt.toISOString(), createdAt: recording.createdAt.toISOString(),
}) })
tx.oncomplete = () => { tx.oncomplete = () => resolve()
db.close() tx.onerror = () => reject(tx.error)
resolve() tx.onabort = () => reject(new Error('Transaction aborted'))
}
tx.onerror = () => {
db.close()
reject(tx.error)
}
}) })
} }
export async function getAllRecordings(): Promise<Recording[]> { export async function getAllRecordings(): Promise<Recording[]> {
const db = await openDB() const d = await getDB()
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const tx = db.transaction(STORE_NAME, 'readonly') const tx = d.transaction(STORE_NAME, 'readonly')
const store = tx.objectStore(STORE_NAME) const store = tx.objectStore(STORE_NAME)
const request = store.getAll() const request = store.getAll()
request.onsuccess = () => { request.onsuccess = () => {
db.close()
const results = (request.result || []).map((r: any) => ({ const results = (request.result || []).map((r: any) => ({
...r, ...r,
createdAt: new Date(r.createdAt), createdAt: new Date(r.createdAt),
@@ -145,26 +142,17 @@ export async function getAllRecordings(): Promise<Recording[]> {
results.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime()) results.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime())
resolve(results) resolve(results)
} }
request.onerror = () => { request.onerror = () => reject(request.error)
db.close()
reject(request.error)
}
}) })
} }
export async function deleteRecording(id: string): Promise<void> { export async function deleteRecording(id: string): Promise<void> {
const db = await openDB() const d = await getDB()
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const tx = db.transaction(STORE_NAME, 'readwrite') const tx = d.transaction(STORE_NAME, 'readwrite')
const store = tx.objectStore(STORE_NAME) const store = tx.objectStore(STORE_NAME)
store.delete(id) store.delete(id)
tx.oncomplete = () => { tx.oncomplete = () => resolve()
db.close() tx.onerror = () => reject(tx.error)
resolve()
}
tx.onerror = () => {
db.close()
reject(tx.error)
}
}) })
} }