commit 5d3390bbe9b8e8775c1cef6d6582931c322f94b8 · dunkirk.sh/thistle

+78 -1

src/index.ts

···

       23
        
       	type TranscriptionUpdate,

     

       24
        
       	WhisperServiceManager,

     

       25
        
       } from "./lib/transcription";

     

       26
       -
       import { getTranscript } from "./lib/transcript-storage";

     

       27
        
       import indexHTML from "./pages/index.html";

     

       28
        
       import settingsHTML from "./pages/settings.html";

     

       29
        
       import transcribeHTML from "./pages/transcribe.html";

     
···

       518
        
       			GET: async () => {

     

       519
        
       				const isHealthy = await whisperService.checkHealth();

     

       520
        
       				return Response.json({ available: isHealthy });

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       521
        
       			},

     

       522
        
       		},

     

       523
        
       		"/api/transcriptions": {

···

       23
        
       	type TranscriptionUpdate,

     

       24
        
       	WhisperServiceManager,

     

       25
        
       } from "./lib/transcription";

     

       26
       +
       import { getTranscript, getTranscriptVTT } from "./lib/transcript-storage";

     

       27
        
       import indexHTML from "./pages/index.html";

     

       28
        
       import settingsHTML from "./pages/settings.html";

     

       29
        
       import transcribeHTML from "./pages/transcribe.html";

     
···

       518
        
       			GET: async () => {

     

       519
        
       				const isHealthy = await whisperService.checkHealth();

     

       520
        
       				return Response.json({ available: isHealthy });

     

       521
       +
       			},

     

       522
       +
       		},

     

       523
       +
       		"/api/transcriptions/:id": {

     

       524
       +
       			GET: async (req) => {

     

       525
       +
       				try {

     

       526
       +
       					const user = requireAuth(req);

     

       527
       +
       					const transcriptionId = req.params.id;

     

       528
       +
       

     

       529
       +
       					// Verify ownership

     

       530
       +
       					const transcription = db

     

       531
       +
       						.query<

     

       532
       +
       							{

     

       533
       +
       								id: string;

     

       534
       +
       								user_id: number;

     

       535
       +
       								status: string;

     

       536
       +
       								original_filename: string;

     

       537
       +
       							},

     

       538
       +
       							[string]

     

       539
       +
       						>(

     

       540
       +
       							"SELECT id, user_id, status, original_filename FROM transcriptions WHERE id = ?",

     

       541
       +
       						)

     

       542
       +
       						.get(transcriptionId);

     

       543
       +
       

     

       544
       +
       					if (!transcription || transcription.user_id !== user.id) {

     

       545
       +
       						return Response.json(

     

       546
       +
       							{ error: "Transcription not found" },

     

       547
       +
       							{ status: 404 },

     

       548
       +
       						);

     

       549
       +
       					}

     

       550
       +
       

     

       551
       +
       					if (transcription.status !== "completed") {

     

       552
       +
       						return Response.json(

     

       553
       +
       							{ error: "Transcription not completed yet" },

     

       554
       +
       							{ status: 400 },

     

       555
       +
       						);

     

       556
       +
       					}

     

       557
       +
       

     

       558
       +
       					// Get format from query parameter

     

       559
       +
       					const url = new URL(req.url);

     

       560
       +
       					const format = url.searchParams.get("format");

     

       561
       +
       

     

       562
       +
       					// Return WebVTT format if requested

     

       563
       +
       					if (format === "vtt") {

     

       564
       +
       						const vttContent = await getTranscriptVTT(transcriptionId);

     

       565
       +
       

     

       566
       +
       						if (!vttContent) {

     

       567
       +
       							return Response.json(

     

       568
       +
       								{ error: "VTT transcript not available" },

     

       569
       +
       								{ status: 404 },

     

       570
       +
       							);

     

       571
       +
       						}

     

       572
       +
       

     

       573
       +
       						return new Response(vttContent, {

     

       574
       +
       							headers: {

     

       575
       +
       								"Content-Type": "text/vtt",

     

       576
       +
       								"Content-Disposition": `attachment; filename="${transcription.original_filename}.vtt"`,

     

       577
       +
       							},

     

       578
       +
       						});

     

       579
       +
       					}

     

       580
       +
       

     

       581
       +
       					// Default: return plain text transcript from file

     

       582
       +
       					const transcript = await getTranscript(transcriptionId);

     

       583
       +
       					if (!transcript) {

     

       584
       +
       						return Response.json(

     

       585
       +
       							{ error: "Transcript not available" },

     

       586
       +
       							{ status: 404 },

     

       587
       +
       						);

     

       588
       +
       					}

     

       589
       +
       

     

       590
       +
       					return new Response(transcript, {

     

       591
       +
       						headers: {

     

       592
       +
       							"Content-Type": "text/plain",

     

       593
       +
       						},

     

       594
       +
       					});

     

       595
       +
       				} catch (error) {

     

       596
       +
       					return handleError(error);

     

       597
       +
       				}

     

       598
        
       			},

     

       599
        
       		},

     

       600
        
       		"/api/transcriptions": {

+17

src/lib/transcript-storage.test.ts

···

       2
        
       import {

     

       3
        
       	deleteTranscript,

     

       4
        
       	getTranscript,

     

       0
        
       
     

       5
        
       	hasTranscript,

     

       6
        
       	saveTranscript,

     

       0
        
       
     

       7
        
       } from "./transcript-storage";

     

       8
        
       

     

       9
        
       test("transcript storage", async () => {

     
···

       91
        
       	}

     

       92
        
       });

     

       93
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       2
        
       import {

     

       3
        
       	deleteTranscript,

     

       4
        
       	getTranscript,

     

       5
       +
       	getTranscriptVTT,

     

       6
        
       	hasTranscript,

     

       7
        
       	saveTranscript,

     

       8
       +
       	saveTranscriptVTT,

     

       9
        
       } from "./transcript-storage";

     

       10
        
       

     

       11
        
       test("transcript storage", async () => {

     
···

       93
        
       	}

     

       94
        
       });

     

       95
        
       

     

       96
       +
       test("VTT transcript storage", async () => {

     

       97
       +
       	const testId = "test-vtt-123";

     

       98
       +
       	const vttContent = "WEBVTT\n\n00:00:00.000 --> 00:00:02.500\nHello world\n\n";

     

       99
       +
       

     

       100
       +
       	// Save VTT

     

       101
       +
       	await saveTranscriptVTT(testId, vttContent);

     

       102
       +
       

     

       103
       +
       	// Read VTT

     

       104
       +
       	const retrieved = await getTranscriptVTT(testId);

     

       105
       +
       	expect(retrieved).toBe(vttContent);

     

       106
       +
       

     

       107
       +
       	// Clean up

     

       108
       +
       	await deleteTranscript(testId);

     

       109
       +
       });

     

       110
       +

+27

src/lib/transcript-storage.ts

···

       73
        
       	const filePath = `${TRANSCRIPTS_DIR}/${safeId}.txt`;

     

       74
        
       	return await Bun.file(filePath).exists();

     

       75
        
       }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       73
        
       	const filePath = `${TRANSCRIPTS_DIR}/${safeId}.txt`;

     

       74
        
       	return await Bun.file(filePath).exists();

     

       75
        
       }

     

       76
       +
       

     

       77
       +
       /**

     

       78
       +
        * Write WebVTT transcript to file system

     

       79
       +
        */

     

       80
       +
       export async function saveTranscriptVTT(

     

       81
       +
       	transcriptionId: string,

     

       82
       +
       	vttContent: string,

     

       83
       +
       ): Promise<void> {

     

       84
       +
       	const safeId = validateTranscriptionId(transcriptionId);

     

       85
       +
       	const filePath = `${TRANSCRIPTS_DIR}/${safeId}.vtt`;

     

       86
       +
       	await Bun.write(filePath, vttContent);

     

       87
       +
       }

     

       88
       +
       

     

       89
       +
       /**

     

       90
       +
        * Read WebVTT transcript from file system

     

       91
       +
        */

     

       92
       +
       export async function getTranscriptVTT(

     

       93
       +
       	transcriptionId: string,

     

       94
       +
       ): Promise<string | null> {

     

       95
       +
       	const safeId = validateTranscriptionId(transcriptionId);

     

       96
       +
       	const filePath = `${TRANSCRIPTS_DIR}/${safeId}.vtt`;

     

       97
       +
       	try {

     

       98
       +
       		return await Bun.file(filePath).text();

     

       99
       +
       	} catch {

     

       100
       +
       		return null;

     

       101
       +
       	}

     

       102
       +
       }

+41 -1

src/lib/transcription.ts

···

       1
        
       import type { Database } from "bun:sqlite";

     

       2
        
       import { createEventSource } from "eventsource-client";

     

       3
        
       import { ErrorCode } from "./errors";

     

       4
       -
       import { saveTranscript } from "./transcript-storage";

     

       5
        
       

     

       6
        
       // Constants

     

       7
        
       export const MAX_FILE_SIZE = 100 * 1024 * 1024; // 100MB

     
···

       301
        
       				await saveTranscript(transcriptionId, transcript);

     

       302
        
       			}

     

       303
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       304
        
       			this.updateTranscription(transcriptionId, {

     

       305
        
       				status: "completed",

     

       306
        
       				progress: 100,

     
···

       518
        
       				// Save transcript to file

     

       519
        
       				if (transcript) {

     

       520
        
       					await saveTranscript(transcriptionId, transcript);

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       521
        
       				}

     

       522
        
       

     

       523
        
       				this.updateTranscription(transcriptionId, {

···

       1
        
       import type { Database } from "bun:sqlite";

     

       2
        
       import { createEventSource } from "eventsource-client";

     

       3
        
       import { ErrorCode } from "./errors";

     

       4
       +
       import { saveTranscript, saveTranscriptVTT } from "./transcript-storage";

     

       5
        
       

     

       6
        
       // Constants

     

       7
        
       export const MAX_FILE_SIZE = 100 * 1024 * 1024; // 100MB

     
···

       301
        
       				await saveTranscript(transcriptionId, transcript);

     

       302
        
       			}

     

       303
        
       

     

       304
       +
       			// Fetch and save VTT file from Murmur

     

       305
       +
       			const whisperJobId = this.db

     

       306
       +
       				.query<{ whisper_job_id: string }, [string]>(

     

       307
       +
       					"SELECT whisper_job_id FROM transcriptions WHERE id = ?",

     

       308
       +
       				)

     

       309
       +
       				.get(transcriptionId)?.whisper_job_id;

     

       310
       +
       

     

       311
       +
       			if (whisperJobId) {

     

       312
       +
       				try {

     

       313
       +
       					const vttResponse = await fetch(

     

       314
       +
       						`${this.serviceUrl}/transcribe/${whisperJobId}?format=vtt`,

     

       315
       +
       					);

     

       316
       +
       					if (vttResponse.ok) {

     

       317
       +
       						const vttContent = await vttResponse.text();

     

       318
       +
       						await saveTranscriptVTT(transcriptionId, vttContent);

     

       319
       +
       					}

     

       320
       +
       				} catch (error) {

     

       321
       +
       					console.warn(

     

       322
       +
       						`[Transcription] Failed to fetch VTT for ${transcriptionId}:`,

     

       323
       +
       						error,

     

       324
       +
       					);

     

       325
       +
       				}

     

       326
       +
       			}

     

       327
       +
       

     

       328
        
       			this.updateTranscription(transcriptionId, {

     

       329
        
       				status: "completed",

     

       330
        
       				progress: 100,

     
···

       542
        
       				// Save transcript to file

     

       543
        
       				if (transcript) {

     

       544
        
       					await saveTranscript(transcriptionId, transcript);

     

       545
       +
       				}

     

       546
       +
       

     

       547
       +
       				// Fetch and save VTT file

     

       548
       +
       				try {

     

       549
       +
       					const vttResponse = await fetch(

     

       550
       +
       						`${this.serviceUrl}/transcribe/${whisperJob.id}?format=vtt`,

     

       551
       +
       					);

     

       552
       +
       					if (vttResponse.ok) {

     

       553
       +
       						const vttContent = await vttResponse.text();

     

       554
       +
       						await saveTranscriptVTT(transcriptionId, vttContent);

     

       555
       +
       					}

     

       556
       +
       				} catch (error) {

     

       557
       +
       					console.warn(

     

       558
       +
       						`[Sync] Failed to fetch VTT for ${transcriptionId}:`,

     

       559
       +
       						error,

     

       560
       +
       					);

     

       561
        
       				}

     

       562
        
       

     

       563
        
       				this.updateTranscription(transcriptionId, {