Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: add JSON parsing and structured log display functionality (#1463)
Sayfullah Eida8b0fc15324f
diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 07eb90753..5f236ee73 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -147,6 +147,8 @@"common_loading_label": "Loading - {label}","common_create": "Create","common_logs": "Logs",+ "common_json": "JSON",+ "common_raw": "Raw","common_select_locale": "Select locale","common_show": "Show","common_registry": "Registry",diff --git a/frontend/src/lib/components/arcane-button/variants.ts b/frontend/src/lib/components/arcane-button/variants.tsindex 66e369ff3..d4c52f578 100644--- a/frontend/src/lib/components/arcane-button/variants.ts+++ b/frontend/src/lib/components/arcane-button/variants.ts@@ -20,7 +20,8 @@ import {type IconType,LoginIcon,OpenIdIcon,- RedeployIcon+ RedeployIcon,+ CodeIcon} from '$lib/icons';export const arcaneButtonVariants = tv({@@ -192,6 +193,12 @@ export const actionConfigs = {tone: 'ghost',loadingLabel: m.common_action_fetching_logs()},+ json: {+ defaultLabel: m.common_json(),+ IconComponent: CodeIcon,+ tone: 'outline',+ loadingLabel: m.common_processing()+ },cancel: {defaultLabel: m.common_cancel(),IconComponent: CloseIcon,diff --git a/frontend/src/lib/components/logs/log-controls.svelte b/frontend/src/lib/components/logs/log-controls.svelteindex 1bdcbeff2..e832fa4b3 100644--- a/frontend/src/lib/components/logs/log-controls.svelte+++ b/frontend/src/lib/components/logs/log-controls.svelte@@ -3,12 +3,12 @@import * as Select from '$lib/components/ui/select';import { m } from '$lib/paraglide/messages';import { PersistedState } from 'runed';- import { RefreshIcon } from '$lib/icons';let {autoScroll = $bindable(),tailLines = $bindable(100),autoStartLogs = $bindable(false),+ showParsedJson = $bindable(false),isStreaming = false,disabled = false,onStart,@@ -19,6 +19,7 @@autoScroll: boolean;tailLines?: number;autoStartLogs?: boolean;+ showParsedJson?: boolean;isStreaming?: boolean;disabled?: boolean;onStart?: () => void;@@ -38,6 +39,7 @@const persistedTailLines = new PersistedState('arcane_log_tail_lines', '100');const persistedAutoStart = new PersistedState('arcane_log_auto_start', 'false');+ const persistedJsonParsing = new PersistedState('arcane_log_json_parsing', 'false');let selectedTail = $state<string>(persistedTailLines.current);@@ -58,6 +60,14 @@persistedAutoStart.current = autoStartLogs ? 'true' : 'false';});+ $effect(() => {+ showParsedJson = persistedJsonParsing.current === 'true';+ });++ $effect(() => {+ persistedJsonParsing.current = showParsedJson ? 'true' : 'false';+ });+const selectedLabel = $derived(tailOptions.find((o) => o.value === selectedTail)?.label ?? m.log_tail_100_lines());</script>@@ -107,5 +117,13 @@title={m.common_refresh()}showLabel={false}/>+ <ArcaneButton+ action="json"+ tone={showParsedJson ? 'outline-primary' : 'outline'}+ size="sm"+ class="text-xs font-medium"+ customLabel={showParsedJson ? m.common_raw() : m.common_json()}+ onclick={() => (showParsedJson = !showParsedJson)}+ /></div></div>diff --git a/frontend/src/lib/components/logs/log-viewer.svelte b/frontend/src/lib/components/logs/log-viewer.svelteindex 40946284d..a74bd6721 100644--- a/frontend/src/lib/components/logs/log-viewer.svelte+++ b/frontend/src/lib/components/logs/log-viewer.svelte@@ -6,6 +6,7 @@import { cn } from '$lib/utils';import { ansiToHtml } from '$lib/utils/ansi';import { onDestroy } from 'svelte';+ import StructuredLogEntry from './structured-log-entry.svelte';interface LogEntry {id: number;@@ -14,6 +15,8 @@message: string;service?: string;containerId?: string;+ parsedJson?: any;+ isJson?: boolean;}interface Props {@@ -30,6 +33,7 @@onToggleAutoScroll?: () => void;onStart?: () => void;onStop?: () => void;+ showParsedJson?: boolean;}let {@@ -45,7 +49,8 @@onClear,onToggleAutoScroll,onStart,- onStop+ onStop,+ showParsedJson = $bindable(false)}: Props = $props();let logs: LogEntry[] = $state([]);@@ -269,13 +274,17 @@function addLogEntry(logData: { level: string; message: string; timestamp?: string; service?: string; containerId?: string }) {const timestamp = logData.timestamp || new Date().toISOString();+ const { isJson, parsed } = tryParseJson(logData.message);+pending.push({id: seq++,timestamp,level: logData.level as LogEntry['level'],message: logData.message,service: logData.service,- containerId: logData.containerId+ containerId: logData.containerId,+ isJson,+ parsedJson: parsed});scheduleFlush();}@@ -335,6 +344,19 @@return colors[Math.abs(hash) % colors.length];}+ function tryParseJson(message: string) : {isJson: boolean; parsed?: any } {+ const trimmed = message.trim();+ if (!trimmed.startsWith('{') && !trimmed.startsWith('[')) {+ return { isJson: false };+ }+ try {+ const parsed = JSON.parse(trimmed);+ return { isJson: true, parsed };+ } catch {+ return {isJson: false};+ }+ }+$effect(() => {const key = streamKey();if (!key) {@@ -409,7 +431,11 @@</span></div><div class="text-sm break-words whitespace-pre-wrap text-gray-300">- {@html ansiToHtml(log.message)}+ {#if log.isJson && showParsedJson && typeof log.parsedJson === 'object' && log.parsedJson !== null}+ <StructuredLogEntry data={log.parsedJson} rawJson={log.message} showTimestamp={showTimestamps} />+ {:else}+ {@html ansiToHtml(log.message)}+ {/if}</div></div>@@ -429,7 +455,11 @@{log.level.toUpperCase()}</span><span class="flex-1 break-words whitespace-pre-wrap text-gray-300">- {@html ansiToHtml(log.message)}+ {#if log.isJson && showParsedJson && typeof log.parsedJson === 'object' && log.parsedJson !== null}+ <StructuredLogEntry data={log.parsedJson} rawJson={log.message} showTimestamp={showTimestamps} />+ {:else}+ {@html ansiToHtml(log.message)}+ {/if}</span></div>{/each}diff --git a/frontend/src/lib/components/logs/structured-log-entry.svelte b/frontend/src/lib/components/logs/structured-log-entry.sveltenew file mode 100644index 000000000..beedb3d2e--- /dev/null+++ b/frontend/src/lib/components/logs/structured-log-entry.svelte@@ -0,0 +1,255 @@+<script lang="ts">+ import { CopyIcon, CheckIcon } from '$lib/icons';++ interface Props {+ data: Record<string, unknown>;+ rawJson?: string;+ showTimestamp?: boolean;+ }++ let { data, rawJson, showTimestamp = false }: Props = $props();++ let showDetails = $state(false);+ let copied = $state(false);++ // Common field names used by various structured logging frameworks+ // Supports: Rust (tracing, slog), Go (zap, zerolog, logrus), Node (pino, winston, bunyan),+ // Python (structlog), Java (Log4j2), .NET (Serilog), and more+ const LEVEL_KEYS = ['level', 'severity', 'log.level', 'loglevel', 'lvl', 'levelname', 'priority'];+ const MESSAGE_KEYS = ['message', 'msg', 'text', 'body', 'event', 'log', 'content'];+ const TIMESTAMP_KEYS = ['timestamp', 'time', 'ts', '@timestamp', 'datetime', 'date', 'created', 'time_local'];+ const TARGET_KEYS = ['target', 'logger', 'name', 'source', 'component', 'module', 'log.logger', 'logger_name', 'category'];+ const ERROR_KEYS = ['error', 'err', 'exception', 'stack', 'stacktrace', 'error.message'];+ const TRACE_KEYS = ['trace_id', 'traceId', 'correlation_id', 'correlationId', 'request_id', 'requestId', 'spanId', 'span_id'];++ // Nested message location (e.g., tracing-subscriber in Rust uses fields.message)+ const NESTED_MESSAGE_PATHS = [+ ['fields', 'message'],+ ['fields', 'msg'],+ ['data', 'message']+ ];++ function findValue(obj: Record<string, unknown>, keys: string[]): unknown {+ for (const key of keys) {+ if (key in obj) return obj[key];+ // Handle dot notation keys like 'log.level'+ if (key.includes('.')) {+ const parts = key.split('.');+ let current: unknown = obj;+ for (const part of parts) {+ if (current && typeof current === 'object' && part in (current as Record<string, unknown>)) {+ current = (current as Record<string, unknown>)[part];+ } else {+ current = undefined;+ break;+ }+ }+ if (current !== undefined) return current;+ }+ }+ return undefined;+ }++ function findNestedMessage(obj: Record<string, unknown>): string | undefined {+ for (const path of NESTED_MESSAGE_PATHS) {+ let current: unknown = obj;+ for (const key of path) {+ if (current && typeof current === 'object' && key in (current as Record<string, unknown>)) {+ current = (current as Record<string, unknown>)[key];+ } else {+ current = undefined;+ break;+ }+ }+ if (typeof current === 'string') return current;+ }+ return undefined;+ }++ function normalizeLevelValue(level: unknown): string | undefined {+ if (typeof level === 'string') return level;+ if (typeof level === 'number') {+ // Syslog levels: 0=emerg, 1=alert, 2=crit, 3=error, 4=warn, 5=notice, 6=info, 7=debug+ const syslogMap: Record<number, string> = {+ 0: 'fatal',+ 1: 'fatal',+ 2: 'fatal',+ 3: 'error',+ 4: 'warn',+ 5: 'info',+ 6: 'info',+ 7: 'debug'+ };+ return syslogMap[level] ?? 'info';+ }+ return undefined;+ }++ function normalizeTimestamp(ts: unknown): string | undefined {+ if (typeof ts === 'string') return ts;+ if (typeof ts === 'number') {+ // Handle Unix timestamps (seconds or milliseconds)+ const timestamp = ts > 1e12 ? ts : ts * 1000; // Convert to ms if in seconds+ return new Date(timestamp).toISOString();+ }+ return undefined;+ }++ function extractFields(obj: Record<string, unknown>) {+ const rawLevel = findValue(obj, LEVEL_KEYS);+ let message = findValue(obj, MESSAGE_KEYS);++ // Try nested paths if no top-level message found+ if (!message) {+ message = findNestedMessage(obj);+ }++ // Fallback: use 'event' field if no message found+ if (!message && obj.event) {+ message = String(obj.event);+ }++ const rawTimestamp = findValue(obj, TIMESTAMP_KEYS);+ const target = findValue(obj, TARGET_KEYS);+ const error = findValue(obj, ERROR_KEYS);+ const traceId = findValue(obj, TRACE_KEYS);++ return {+ level: normalizeLevelValue(rawLevel),+ message: typeof message === 'string' ? message : undefined,+ timestamp: normalizeTimestamp(rawTimestamp),+ target: typeof target === 'string' ? target : undefined,+ error: error !== undefined ? error : undefined,+ traceId: typeof traceId === 'string' ? traceId : undefined,+ hasStructure: !!(rawLevel || message || rawTimestamp || target)+ };+ }++ function getLevelColor(level: string | undefined): string {+ if (!level) return 'text-gray-400';+ const l = level.toLowerCase();+ if (l === 'error' || l === 'err' || l === 'fatal' || l === 'critical' || l === 'panic' || l === 'emergency') return 'text-red-400';+ if (l === 'warn' || l === 'warning' || l === 'alert') return 'text-yellow-400';+ if (l === 'info' || l === 'information' || l === 'notice') return 'text-green-400';+ if (l === 'debug' || l === 'dbg') return 'text-blue-400';+ if (l === 'trace' || l === 'verbose' || l === 'finest') return 'text-purple-400';+ return 'text-gray-400';+ }++ function getLevelBgColor(level: string | undefined): string {+ if (!level) return 'bg-gray-800';+ const l = level.toLowerCase();+ if (l === 'error' || l === 'err' || l === 'fatal' || l === 'critical' || l === 'panic' || l === 'emergency') return 'bg-red-900/30';+ if (l === 'warn' || l === 'warning' || l === 'alert') return 'bg-yellow-900/30';+ if (l === 'info' || l === 'information' || l === 'notice') return 'bg-green-900/30';+ if (l === 'debug' || l === 'dbg') return 'bg-blue-900/30';+ if (l === 'trace' || l === 'verbose' || l === 'finest') return 'bg-purple-900/30';+ return 'bg-gray-800';+ }++ function formatTimestamp(ts: string | undefined): string {+ if (!ts) return '';+ try {+ const date = new Date(ts);+ if (isNaN(date.getTime())) return ts;+ return date.toLocaleTimeString('en-US', {+ hour12: false,+ hour: '2-digit',+ minute: '2-digit',+ second: '2-digit',+ fractionalSecondDigits: 3+ });+ } catch {+ return ts;+ }+ }++ const extracted = $derived(extractFields(data));+ const formattedTime = $derived(formatTimestamp(extracted.timestamp));+ const levelDisplay = $derived(extracted.level?.toUpperCase() ?? 'LOG');+ const jsonString = $derived(rawJson ?? JSON.stringify(data, null, 2));++ // For unstructured JSON, create a compact string representation+ const compactJson = $derived(JSON.stringify(data));++ async function copyToClipboard() {+ try {+ await navigator.clipboard.writeText(jsonString);+ copied = true;+ setTimeout(() => {+ copied = false;+ }, 2000);+ } catch (err) {+ console.error('Failed to copy to clipboard:', err);+ }+ }+</script>++<div class="structured-log-entry">+ <!-- Main log line with extracted fields -->+ <div class="flex items-start gap-2">+ <!-- Level badge -->+ <span+ class="shrink-0 rounded px-1.5 py-0.5 text-xs font-semibold {getLevelColor(extracted.level)} {getLevelBgColor(extracted.level)}"+ >+ {levelDisplay}+ </span>++ <!-- Timestamp (if available and enabled) -->+ {#if showTimestamp && formattedTime}+ <span class="shrink-0 text-xs text-gray-500" title={extracted.timestamp}>+ {formattedTime}+ </span>+ {/if}++ <!-- Target/Logger name -->+ {#if extracted.target}+ <span class="shrink-0 text-xs text-cyan-400 font-medium" title={extracted.target}>+ [{extracted.target}]+ </span>+ {/if}++ <!-- Message -->+ <span class="flex-1 text-gray-200">+ {#if extracted.message}+ {extracted.message}+ {:else if !extracted.hasStructure}+ <!-- For unstructured JSON, display as compact string -->+ <span class="text-gray-300">{compactJson}</span>+ {:else}+ <span class="text-gray-500 italic">No message field</span>+ {/if}+ </span>++ <!-- Copy to clipboard button -->+ <button+ type="button"+ onclick={copyToClipboard}+ class="shrink-0 rounded p-1 text-gray-500 hover:text-gray-200 hover:bg-gray-700 transition-colors"+ title={copied ? 'Copied!' : 'Copy JSON'}+ >+ {#if copied}+ <CheckIcon class="size-3.5 text-green-400" />+ {:else}+ <CopyIcon class="size-3.5" />+ {/if}+ </button>++ <!-- Details toggle button - always show to expand full JSON -->+ <button+ type="button"+ onclick={() => (showDetails = !showDetails)}+ class="shrink-0 rounded px-1.5 py-0.5 text-xs text-gray-400 hover:text-gray-200 hover:bg-gray-700 transition-colors"+ title={showDetails ? 'Hide JSON' : 'Show full JSON'}+ >+ {showDetails ? '▼' : '▶'}+ </button>+ </div>++ <!-- Collapsible full JSON section -->+ {#if showDetails}+ <div class="mt-1 ml-4 pl-2 border-l border-gray-700">+ <pre class="text-xs text-gray-300 whitespace-pre-wrap break-all">{JSON.stringify(data, null, 2)}</pre>+ </div>+ {/if}+</div>diff --git a/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte b/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelteindex 0c4d56be4..90a328fbb 100644--- a/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte+++ b/frontend/src/routes/(app)/containers/components/ContainerLogsPanel.svelte@@ -25,6 +25,7 @@let viewer = $state<LogViewer>();let autoStartLogs = $state(false);let hasAutoStarted = $state(false);+ let showParsedJson = $state(false);function handleStart() {viewer?.startLogStream();@@ -93,6 +94,7 @@<LogControlsbind:autoScrollbind:autoStartLogs+ bind:showParsedJson{isStreaming}disabled={!containerId}onStart={handleStart}@@ -109,6 +111,7 @@bind:autoScrolltype="container"{containerId}+ {showParsedJson}maxLines={500}showTimestamps={true}height="calc(100vh - 320px)"diff --git a/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte b/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelteindex 02f40212d..43828aa7b 100644--- a/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte+++ b/frontend/src/routes/(app)/projects/components/ProjectLogsPanel.svelte@@ -18,6 +18,7 @@let tailLines = $state(100);let autoStartLogs = $state(false);let hasAutoStarted = $state(false);+ let showParsedJson = $state(false);function handleStart() {isStreaming = true;@@ -73,6 +74,7 @@bind:autoScrollbind:tailLinesbind:autoStartLogs+ bind:showParsedJson{isStreaming}disabled={!projectId}onStart={handleStart}@@ -88,6 +90,7 @@bind:autoScroll{projectId}{tailLines}+ {showParsedJson}type="project"maxLines={500}showTimestamps={true}