Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: container logs not streaming from server (#138)
Kyle Mendelle5d990332e44
diff --git a/.vscode/settings.json b/.vscode/settings.jsonindex 9ce92eb05..52f69945b 100644--- a/.vscode/settings.json+++ b/.vscode/settings.json@@ -3,6 +3,7 @@"*": false,"plaintext": false,"markdown": false,- "scminput": false+ "scminput": false,+ "typescript": true}}diff --git a/src/routes/api/containers/[id]/logs/stream/+server.ts b/src/routes/api/containers/[id]/logs/stream/+server.tsnew file mode 100644index 000000000..506e5bc7e--- /dev/null+++ b/src/routes/api/containers/[id]/logs/stream/+server.ts@@ -0,0 +1,74 @@+import { getDockerClient } from '$lib/services/docker/core';+import { error } from '@sveltejs/kit';+import type { RequestHandler } from './$types';++export const GET: RequestHandler = async ({ params }) => {+ const { id } = params;+ const docker = getDockerClient();++ try {+ const container = docker.getContainer(id);++ // Check if container exists+ const containerInfo = await container.inspect();+ const hasTty = containerInfo.Config.Tty === true;++ // Create a stream for Server-Sent Events (SSE)+ const encoder = new TextEncoder();+ const stream = new ReadableStream({+ async start(controller) {+ try {+ // Get log stream from Docker+ const logStream = await container.logs({+ follow: true, // Follow logs (stream)+ stdout: true, // Get stdout stream+ stderr: true, // Get stderr stream+ timestamps: false, // Don't include timestamps (we'll format in frontend)+ tail: 300 // Start with most recent logs+ });++ // Handle data chunks+ logStream.on('data', (chunk) => {+ let log;+ // Remove Docker header (first 8 bytes)+ if (!hasTty) {+ // Remove Docker header (first 8 bytes)+ log = chunk.slice(8).toString('utf8');+ } else {+ // For TTY-enabled containers, use the chunk as-is+ log = chunk.toString('utf8');+ }++ // Format as SSE message+ controller.enqueue(encoder.encode(`data: ${log}\n\n`));+ });++ // Handle end of stream+ logStream.on('end', () => {+ controller.close();+ });++ // Handle errors+ logStream.on('error', (err) => {+ console.error('Log stream error:', err);+ controller.error(err);+ });+ } catch (err) {+ console.error('Error setting up log stream:', err);+ controller.error(err);+ }+ }+ });++ return new Response(stream, {+ headers: {+ 'Content-Type': 'text/event-stream',+ 'Cache-Control': 'no-cache',+ Connection: 'keep-alive'+ }+ });+ } catch (err) {+ console.error('Error streaming container logs:', err);+ throw error(500, 'Failed to stream container logs');+ }+};diff --git a/src/routes/containers/[id]/+page.svelte b/src/routes/containers/[id]/+page.svelteindex 76db2f4e6..88ac71080 100644--- a/src/routes/containers/[id]/+page.svelte+++ b/src/routes/containers/[id]/+page.svelte@@ -12,6 +12,7 @@import type { ContainerInspectInfo } from 'dockerode';import StatusBadge from '$lib/components/badges/status-badge.svelte';import * as Tabs from '$lib/components/ui/tabs/index.js';+ import { onDestroy } from 'svelte';let { data }: { data: PageData } = $props();let { container, logs, stats } = $derived(data);@@ -23,8 +24,75 @@let isRefreshing = $state(false);let formattedLogHtml = $derived(logs ? logs.split('\n').map(formatLogLine).join('<br />') : '');let logsContainer = $state<HTMLDivElement | undefined>(undefined);+ let activeTab = $state('overview');+ let autoScrollLogs = $state(true);++ let logEventSource: EventSource | null = $state(null);++ function scrollLogsToBottom() {+ if (logsContainer) {+ logsContainer.scrollTop = logsContainer.scrollHeight;+ }+ }++ $effect(() => {+ if (logsContainer && logs && activeTab === 'logs' && autoScrollLogs) {+ scrollLogsToBottom();+ }+ });++ $effect(() => {+ if (activeTab === 'logs') {+ startLogStream();++ setTimeout(scrollLogsToBottom, 100);+ } else if (logEventSource) {+ closeLogStream();+ }+ });++ function startLogStream() {+ if (logEventSource || !container?.id) return;++ try {+ const url = `/api/containers/${container.id}/logs/stream`;++ const eventSource = new EventSource(url);++ logEventSource = eventSource;++ eventSource.onmessage = (event) => {+ if (event.data) {+ logs = (logs || '') + event.data;+ formattedLogHtml = logs.split('\n').map(formatLogLine).join('<br />');++ if (autoScrollLogs) {+ scrollLogsToBottom();+ }+ }+ };++ eventSource.onerror = (error) => {+ console.error('EventSource error:', error);+ eventSource.close();+ logEventSource = null;+ };+ } catch (error) {+ console.error('Failed to connect to log stream:', error);+ }+ }++ function closeLogStream() {+ if (logEventSource) {+ logEventSource.close();+ logEventSource = null;+ }+ }++ onDestroy(() => {+ closeLogStream();+ });- // --- Stats Calculation ---const calculateCPUPercent = (statsData: Docker.ContainerStats | null): number => {if (!statsData || !statsData.cpu_stats || !statsData.precpu_stats) {return 0;@@ -93,8 +161,6 @@isRefreshing = false;}, 500);}-- let activeTab = $state('overview');</script><div class="space-y-6 pb-8">@@ -530,15 +596,35 @@<Card.Title class="text-lg font-semibold">Container Logs</Card.Title><Card.Description>Recent output from the container</Card.Description></div>- <Button variant="outline" size="sm" onclick={refreshData} disabled={isRefreshing}>- <RefreshCw class={`h-4 w-4 mr-2 ${isRefreshing ? 'animate-spin' : ''}`} />- Refresh Logs- </Button>+ <div class="flex items-center gap-2">+ <div class="flex items-center">+ <input type="checkbox" id="auto-scroll" class="mr-2" checked={autoScrollLogs} onchange={(e) => (autoScrollLogs = e.currentTarget.checked)} />+ <label for="auto-scroll" class="text-xs">Auto-scroll</label>+ </div>+ <Button variant="outline" size="sm" onclick={refreshData} disabled={isRefreshing}>+ <RefreshCw class={`h-4 w-4 mr-2 ${isRefreshing ? 'animate-spin' : ''}`} />+ Refresh Logs+ </Button>+ </div></div></Card.Header><Card.Content>- <div class="bg-muted/50 text-foreground p-4 rounded-md font-mono text-xs h-[500px] overflow-auto whitespace-pre-wrap border" bind:this={logsContainer} id="logs-container" style="word-break: break-all;">+ <div+ class="bg-muted/50 text-foreground p-4 rounded-md font-mono text-xs h-[500px] overflow-auto whitespace-pre-wrap border"+ bind:this={logsContainer}+ id="logs-container"+ style="word-break: break-all;"+ onscroll={() => {+ // Detect if user manually scrolled up+ if (logsContainer) {+ const atBottom = logsContainer.scrollHeight - logsContainer.scrollTop <= logsContainer.clientHeight + 50;+ if (!atBottom && autoScrollLogs) {+ autoScrollLogs = false;+ }+ }+ }}+ >{#if formattedLogHtml}{@html formattedLogHtml}{:else}