All checks were successful
Build & Push Docker Image / build-and-push (push) Successful in 48s
- Add cancelJob() to whisper.ts: sends DELETE /jobs/:id to the whisper server (best-effort, errors silently ignored) - DELETE /api/jobs/[id] now calls cancelJob() when cancelling an active job that has a whisperJobId, stopping GPU use immediately - Webhook handler guards against locally-cancelled jobs: returns ok early so whisper's late completion cannot overwrite cancelled status or send a phantom 'Transcript ready' notification - Replace blind sleep(Retry-After + 1s) in submitJob() with waitForModelReady(): subscribes to /model/events SSE and proceeds as soon as state:ready arrives; falls back to the Retry-After timeout if SSE is unreachable or closes without model_ready - Refactor retry tests to use URL-aware makeJobFetch() helper; add 7 new tests (3 SSE-triggered retry, 3 cancelJob, 1 webhook cancelled-guard) — 144/144 passing Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
195 lines
5.8 KiB
TypeScript
195 lines
5.8 KiB
TypeScript
import type { ModelStatus } from '$lib/types.js';
|
|
|
|
function whisperUrl() {
|
|
return process.env.WHISPER_URL ?? 'http://localhost:8080';
|
|
}
|
|
|
|
/** Get the current model state from whisper-rtx2080. */
|
|
export async function getModelStatus(): Promise<ModelStatus> {
|
|
const { default: fetch } = await import('node-fetch');
|
|
const res = await fetch(`${whisperUrl()}/model/status`, {
|
|
signal: AbortSignal.timeout(5000)
|
|
});
|
|
if (!res.ok) throw new Error(`/model/status returned ${res.status}`);
|
|
return res.json() as Promise<ModelStatus>;
|
|
}
|
|
|
|
/**
|
|
* Wait for the whisper model to become ready.
|
|
*
|
|
* Subscribes to /model/events SSE and resolves as soon as a payload with
|
|
* state:"ready" arrives. Falls back to a plain timeout (`timeoutMs`) if the
|
|
* SSE connection fails or closes without that event, so the retry loop can
|
|
* try again without hanging indefinitely.
|
|
*/
|
|
async function waitForModelReady(timeoutMs: number): Promise<void> {
|
|
const { default: fetch } = await import('node-fetch');
|
|
const ac = new AbortController();
|
|
return new Promise((resolve) => {
|
|
let done = false;
|
|
const finish = () => {
|
|
if (!done) {
|
|
done = true;
|
|
ac.abort();
|
|
resolve();
|
|
}
|
|
};
|
|
|
|
const timer = setTimeout(finish, timeoutMs);
|
|
|
|
fetch(`${whisperUrl()}/model/events`, { signal: ac.signal as AbortSignal })
|
|
.then(async (res) => {
|
|
if (!res.body) {
|
|
clearTimeout(timer);
|
|
return finish();
|
|
}
|
|
let buf = '';
|
|
for await (const chunk of res.body) {
|
|
if (ac.signal.aborted) break;
|
|
buf += chunk.toString();
|
|
const lines = buf.split('\n');
|
|
buf = lines.pop() ?? '';
|
|
for (const line of lines) {
|
|
if (!line.startsWith('data:')) continue;
|
|
try {
|
|
const payload = JSON.parse(line.slice(5).trim());
|
|
if (payload.state === 'ready') {
|
|
clearTimeout(timer);
|
|
finish();
|
|
return;
|
|
}
|
|
} catch { /* ignore parse errors */ }
|
|
}
|
|
}
|
|
// Stream ended without model_ready → proceed to retry immediately
|
|
clearTimeout(timer);
|
|
finish();
|
|
})
|
|
.catch(() => {
|
|
// SSE unreachable — fallback timer will fire eventually
|
|
});
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Submit an audio file to whisper-rtx2080. Returns the whisper job id.
|
|
*
|
|
* Handles 503 (model not ready) transparently: retries after subscribing to
|
|
* /model/events SSE — proceeds as soon as state:"ready" arrives, or after the
|
|
* Retry-After timeout elapses (whichever comes first).
|
|
* Calls `onModelWaiting` on each 503 so the caller can surface the wait to the user.
|
|
*/
|
|
export async function submitJob(
|
|
wavPath: string,
|
|
webhookUrl: string,
|
|
language?: string,
|
|
onModelWaiting?: (state: string, retryAfterSecs: number) => void,
|
|
maxAttempts = 20
|
|
): Promise<string> {
|
|
const FormData = (await import('form-data')).default;
|
|
const { createReadStream } = await import('fs');
|
|
const { default: fetch } = await import('node-fetch');
|
|
|
|
const form = new FormData();
|
|
form.append('audio', createReadStream(wavPath));
|
|
form.append('task', 'transcribe');
|
|
form.append('webhook_url', webhookUrl);
|
|
if (language) form.append('language', language);
|
|
|
|
for (let attempt = 1; attempt <= maxAttempts; attempt++) {
|
|
const res = await fetch(`${whisperUrl()}/jobs`, {
|
|
method: 'POST',
|
|
body: form,
|
|
headers: form.getHeaders()
|
|
});
|
|
|
|
if (res.status === 202) {
|
|
const json = (await res.json()) as { job_id: string };
|
|
return json.job_id;
|
|
}
|
|
|
|
if (res.status === 503) {
|
|
const body = (await res.json().catch(() => ({}))) as {
|
|
state?: string;
|
|
retry_after_secs?: number;
|
|
};
|
|
const state = body.state ?? 'unloaded';
|
|
const waitSecs = body.retry_after_secs ?? parseInt(res.headers.get('Retry-After') ?? '15');
|
|
onModelWaiting?.(state, waitSecs);
|
|
await waitForModelReady((waitSecs + 1) * 1000);
|
|
continue;
|
|
}
|
|
|
|
const text = await res.text();
|
|
throw new Error(`whisper /jobs returned ${res.status}: ${text}`);
|
|
}
|
|
|
|
throw new Error(`Whisper model did not become ready after ${maxAttempts} attempts`);
|
|
}
|
|
|
|
/**
|
|
* Cancel a queued or running job on the whisper server (best-effort).
|
|
* Errors are silently ignored — local job status is already set to cancelled.
|
|
*/
|
|
export async function cancelJob(whisperJobId: string): Promise<void> {
|
|
try {
|
|
const { default: fetch } = await import('node-fetch');
|
|
await fetch(`${whisperUrl()}/jobs/${whisperJobId}`, {
|
|
method: 'DELETE',
|
|
signal: AbortSignal.timeout(5000)
|
|
});
|
|
} catch { /* best-effort */ }
|
|
}
|
|
|
|
/** Open an SSE stream from whisper and call onProgress/onDone callbacks. */
|
|
export async function streamJob(
|
|
whisperJobId: string,
|
|
onProgress: (percent: number, chunk: number, total: number) => void,
|
|
onDone: () => void,
|
|
onError: (msg: string) => void
|
|
): Promise<void> {
|
|
const { default: fetch } = await import('node-fetch');
|
|
const res = await fetch(`${whisperUrl()}/jobs/${whisperJobId}/stream`);
|
|
if (!res.ok || !res.body) throw new Error(`SSE stream returned ${res.status}`);
|
|
|
|
let buf = '';
|
|
for await (const chunk of res.body) {
|
|
buf += chunk.toString();
|
|
const lines = buf.split('\n');
|
|
buf = lines.pop() ?? '';
|
|
|
|
let eventType = '';
|
|
let dataLine = '';
|
|
for (const line of lines) {
|
|
if (line.startsWith('event:')) eventType = line.slice(6).trim();
|
|
else if (line.startsWith('data:')) dataLine = line.slice(5).trim();
|
|
}
|
|
|
|
if (!dataLine) continue;
|
|
|
|
try {
|
|
const payload = JSON.parse(dataLine);
|
|
if (payload.type === 'progress') {
|
|
onProgress(payload.percent ?? 0, payload.chunk ?? 0, payload.total ?? 0);
|
|
} else if (payload.type === 'done') {
|
|
onDone();
|
|
return;
|
|
} else if (payload.type === 'error') {
|
|
onError(payload.message ?? 'unknown error');
|
|
return;
|
|
}
|
|
} catch { /* ignore parse errors */ }
|
|
}
|
|
}
|
|
|
|
/** Check if the whisper server is healthy. */
|
|
export async function checkHealth(): Promise<boolean> {
|
|
try {
|
|
const { default: fetch } = await import('node-fetch');
|
|
const res = await fetch(`${whisperUrl()}/health`, { signal: AbortSignal.timeout(3000) });
|
|
return res.ok;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|