Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/server/docker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ export async function dockerFetch(
body,
headers,
streaming || false,
streaming ? 300000 : 30000 // 5 min for streaming, 30s for normal requests
streaming ? 300000 : 120000 // 5 min for streaming, 2 min for normal requests
);
const elapsed = Date.now() - startTime;
// Only warn for slow requests, but skip /stats which is expected to be slow (5-10s)
Expand Down
28 changes: 25 additions & 3 deletions src/routes/api/git/stacks/[id]/deploy-stream/+server.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { json } from '@sveltejs/kit';
import type { RequestHandler } from './$types';
import { getGitStack } from '$lib/server/db';
import { deployGitStackWithProgress } from '$lib/server/git';
Expand Down Expand Up @@ -29,16 +28,39 @@ export const POST: RequestHandler = async ({ params, cookies }) => {
const stream = new ReadableStream({
async start(controller) {
const encoder = new TextEncoder();
let heartbeatInterval: Timer | null = null;
let controllerClosed = false;

const safeEnqueue = (data: string) => {
if (!controllerClosed) {
try {
controller.enqueue(encoder.encode(data));
} catch {
controllerClosed = true;
}
}
};

heartbeatInterval = setInterval(() => {
// Send heartbeat messages to keep connection alive (every 5s to prevent Traefik/proxy 10s idle timeout)
// These will be ignored on the client side since they don't start with 'data:'
safeEnqueue(': heartbeat\n\n');
}, 5000);

const sendEvent = (data: any) => {
controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n\n`));
safeEnqueue(`data: ${JSON.stringify(data)}\n\n`);
};

try {
await deployGitStackWithProgress(id, sendEvent);
} catch (error: any) {
sendEvent({ status: 'error', error: error.message || 'Unknown error' });
safeEnqueue(`data: ${JSON.stringify({ status: 'error', error: error.message || 'Unknown error' })}\n\n`);
} finally {
controllerClosed = true;
if(heartbeatInterval) {
clearInterval(heartbeatInterval);
heartbeatInterval = null;
}
controller.close();
}
}
Expand Down