Skip to content
Merged
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
44 changes: 41 additions & 3 deletions app/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,17 @@ export default function App() {

useEffect(() => {
let cancelled = false;
let url = BROWSER_SIDECAR;

(async () => {
let url = await resolveSidecarUrl();
url = await resolveSidecarUrl();
setApiBaseUrl(url);
for (let i = 0; i < 60 && !cancelled; i++) {
try {
await api.health();
if (!cancelled) setReady(true);
return;
} catch {
// Sidecar may still be binding, or Tauri may have moved to an ephemeral port.
if (isTauriShell() && i > 0 && i % 4 === 0) {
const next = await invokeSidecarUrl();
if (next && next !== url) {
Expand All @@ -69,15 +70,52 @@ export default function App() {
}
}
if (!cancelled) {
setMessage("Sidecar unavailable — UI will retry in background");
setMessage("Sidecar unavailable — retrying in background");
setReady(true);
}
})();

return () => {
cancelled = true;
};
}, []);

// After forced ready, keep probing so a late sidecar still attaches.
useEffect(() => {
if (!ready) return;
let cancelled = false;
let url = BROWSER_SIDECAR;

const tick = async () => {
if (cancelled) return;
try {
if (isTauriShell()) {
const next = await invokeSidecarUrl();
if (next && next !== url) {
url = next;
setApiBaseUrl(url);
}
}
await api.health();
await queryClient.invalidateQueries({ queryKey: ["status"] });
} catch {
/* keep looping */
}
};

void (async () => {
url = await resolveSidecarUrl();
setApiBaseUrl(url);
})();

const id = window.setInterval(() => void tick(), 8000);
void tick();
return () => {
cancelled = true;
window.clearInterval(id);
};
}, [ready]);

if (!ready) {
return (
<Provider background="base" locale="en-US">
Expand Down
14 changes: 9 additions & 5 deletions app/src/components/StatusDock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,11 @@ export function StatusDock() {
navigate({ to: "/containers" });
};

const dockerTip = dockerOk
? "Open Docker dashboard"
: status.data?.docker.error || "Docker unreachable — start the Docker engine";
const dockerTip = statusDown
? "Sidecar status unavailable"
: dockerOk
? "Open Docker dashboard"
: status.data?.docker.error || "Docker unreachable — start the engine, then retry from Settings";

const k8sTip = k8sOk
? `Open Kubernetes · ${status.data?.kubernetes.version || "cluster"}`
Expand Down Expand Up @@ -211,11 +213,13 @@ export function StatusDock() {
<RuntimeChip
label="Docker"
ok={dockerOk && !statusDown}
// Sidecar up + engine down is soft (monotone); sidecar down is hard red.
warn={!statusDown && !dockerOk}
detail={statusDown || !dockerOk ? "offline" : "engine"}
tip={statusDown ? "Sidecar status unavailable" : dockerTip}
tip={dockerTip}
onClick={() => {
setMode("docker");
navigate({ to: "/" });
navigate({ to: statusDown || !dockerOk ? "/settings" : "/" });
}}
/>
<RuntimeChip
Expand Down
48 changes: 48 additions & 0 deletions app/src/hooks/useDockerReconnect.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { useQueryClient } from "@tanstack/react-query";
import { useState } from "react";
import { api } from "@/lib/api";
import { toast } from "@/components/Toaster";

/** Rebuild attach client + invalidate docker-facing queries. */
export function useDockerReconnect() {
const qc = useQueryClient();
const [pending, setPending] = useState(false);

const reconnect = async () => {
setPending(true);
try {
const res = await api.reconnectDocker();
await Promise.all([
qc.invalidateQueries({ queryKey: ["status"] }),
qc.invalidateQueries({ queryKey: ["docker-dashboard"] }),
qc.invalidateQueries({ queryKey: ["docker-info"] }),
qc.invalidateQueries({ queryKey: ["docker-contexts"] }),
qc.invalidateQueries({ queryKey: ["containers"] }),
qc.invalidateQueries({ queryKey: ["images"] }),
qc.invalidateQueries({ queryKey: ["volumes"] }),
qc.invalidateQueries({ queryKey: ["networks"] }),
qc.invalidateQueries({ queryKey: ["compose-projects"] }),
qc.invalidateQueries({ queryKey: ["builders"] }),
qc.invalidateQueries({ queryKey: ["system-df"] }),
]);
if (res.connected) {
toast.success("Docker connected", {
description: res.activeContext || res.host || "attach",
});
} else {
toast.error("Still offline", {
description: res.error || "Start the Docker engine, then retry",
});
}
return res;
} catch (e: any) {
toast.error("Reconnect failed", { description: e?.message || String(e) });
await qc.invalidateQueries({ queryKey: ["status"] });
return null;
} finally {
setPending(false);
}
};

return { reconnect, pending };
}
13 changes: 12 additions & 1 deletion app/src/lib/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ async function request<T>(path: string, init?: RequestInit): Promise<T> {
export const api = {
health: () => request<{ ok: boolean }>("/health"),
status: () => request<StatusResponse>("/api/status"),
/** Rebuild the Docker SDK client (attach recovery without context switch). */
reconnectDocker: () =>
request<{ ok: boolean; connected: boolean; error?: string; activeContext?: string; host?: string }>(
"/api/docker/reconnect",
{ method: "POST" },
),

dockerDashboard: () => request<Record<string, number>>("/api/docker/dashboard"),
dockerInfo: () => request<any>("/api/docker/info"),
Expand Down Expand Up @@ -326,7 +332,12 @@ export const api = {
};

export type StatusResponse = {
docker: { connected: boolean; error?: string };
docker: {
connected: boolean;
error?: string;
activeContext?: string;
host?: string;
};
kubernetes: { connected: boolean; version?: string; error?: string };
firecracker: { available: boolean };
};
Expand Down
94 changes: 77 additions & 17 deletions app/src/routes/BuildsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,21 @@ import { Field } from "@/components/spectrum/Field";
import { StatusBadge } from "@/components/spectrum/StatusBadge";
import { Tip } from "@/components/spectrum/Tip";
import { toast } from "@/components/Toaster";
import { useDockerReconnect } from "@/hooks/useDockerReconnect";
import { useUIStore } from "@/stores/uiStore";

export function BuildsPage() {
const qc = useQueryClient();
const openRunSheet = useUIStore((s) => s.openRunSheet);
const { reconnect, pending: reconnecting } = useDockerReconnect();

const builders = useQuery({ queryKey: ["builders"], queryFn: api.builders, retry: false });
const status = useQuery({ queryKey: ["status"], queryFn: api.status });
const builders = useQuery({
queryKey: ["builders"],
queryFn: api.builders,
retry: false,
enabled: !!status.data?.docker.connected,
});

const [context, setContext] = useState(".");
const [dockerfile, setDockerfile] = useState("Dockerfile");
Expand All @@ -28,6 +36,10 @@ export function BuildsPage() {
const [searching, setSearching] = useState(false);
const [results, setResults] = useState<Awaited<ReturnType<typeof api.registrySearch>>>([]);
const [pulling, setPulling] = useState<string | null>(null);
const [pullLog, setPullLog] = useState("");
const [pullSheetOpen, setPullSheetOpen] = useState(false);

const dockerOk = !!status.data?.docker.connected;

const runBuild = async () => {
setBuilding(true);
Expand Down Expand Up @@ -69,11 +81,17 @@ export function BuildsPage() {

const pullRef = async (ref: string) => {
setPulling(ref);
setPullLog("");
setPullSheetOpen(true);
try {
await api.pullImageStream(ref, () => {});
await api.pullImageStream(ref, (chunk) => {
setPullLog((prev) => (prev + chunk).slice(-200_000));
});
setPullLog((p) => p + "\nPull complete.\n");
await qc.invalidateQueries({ queryKey: ["images"] });
toast.success("Pulled", { description: ref });
} catch (e: any) {
setPullLog((p) => p + `\n${e?.message || "pull failed"}\n`);
toast.error("Pull failed", { description: e?.message });
} finally {
setPulling(null);
Expand All @@ -84,23 +102,48 @@ export function BuildsPage() {

return (
<PageShell title="Builds" description="Build images, list builders, and search Docker Hub.">
{!dockerOk && status.isSuccess ? (
<div
className={style({
display: "flex",
flexWrap: "wrap",
alignItems: "center",
justifyContent: "space-between",
gap: 12,
marginBottom: 24,
paddingX: 16,
paddingY: 12,
borderRadius: "xl",
backgroundColor: "gray-100",
})}
>
<div className={style({ minWidth: 0 })}>
<Text styles={style({ font: "body", fontWeight: "medium" })}>Docker is offline</Text>
<Text styles={style({ font: "body-xs", color: "neutral-subdued", display: "block", marginTop: 2 })}>
{status.data?.docker.error || "Attach an engine to build or search."}
</Text>
</div>
<Button size="S" variant="accent" isPending={reconnecting} onPress={() => void reconnect()}>
Retry connection
</Button>
</div>
) : null}

<div className={style({ display: "flex", flexDirection: "column", gap: 32, minWidth: 0 })}>
<section className={style({ display: "flex", flexDirection: "column", gap: 12, minWidth: 0 })}>
<Text styles={style({ font: "title-sm", margin: 0 })}>Builders</Text>
{builders.isLoading ? (
{!dockerOk ? (
<Text styles={style({ font: "body-sm", color: "neutral-subdued" })}>
Connect Docker to list buildx builders.
</Text>
) : builders.isLoading ? (
<Text styles={style({ font: "body-sm", color: "neutral-subdued" })}>Loading builders…</Text>
) : builderList.length === 0 ? (
<Text styles={style({ font: "body-sm", color: "neutral-subdued" })}>
No builders — docker buildx ls returned nothing, or the engine is offline.
No builders — docker buildx ls returned nothing.
</Text>
) : (
<div
className={style({
display: "flex",
flexWrap: "wrap",
gap: 8,
})}
>
<div className={style({ display: "flex", flexWrap: "wrap", gap: 8 })}>
{builderList.map((b) => (
<div
key={b.name}
Expand Down Expand Up @@ -165,8 +208,9 @@ export function BuildsPage() {
</div>
<div>
<Button
variant="accent"
onPress={() => void runBuild()}
isDisabled={building || !context.trim()}
isDisabled={building || !context.trim() || !dockerOk}
isPending={building}
>
{building ? "Building…" : "Build"}
Expand All @@ -189,7 +233,7 @@ export function BuildsPage() {
<Button
variant="secondary"
onPress={() => void runSearch()}
isDisabled={searching || !searchQ.trim()}
isDisabled={searching || !searchQ.trim() || !dockerOk}
isPending={searching}
>
Search
Expand All @@ -208,10 +252,11 @@ export function BuildsPage() {
display: "flex",
alignItems: "center",
gap: 12,
paddingX: 12,
paddingY: 8,
borderBottomWidth: 1,
borderStyle: "solid",
borderColor: "gray-200",
borderRadius: "lg",
backgroundColor: "gray-100",
minWidth: 0,
})}
>
<div className={style({ flexGrow: 1, minWidth: 0 })}>
Expand Down Expand Up @@ -250,7 +295,7 @@ export function BuildsPage() {
size="S"
variant="secondary"
onPress={() => void pullRef(r.name)}
isDisabled={pulling === r.name}
isDisabled={pulling === r.name || !dockerOk}
isPending={pulling === r.name}
>
Pull
Expand Down Expand Up @@ -288,6 +333,21 @@ export function BuildsPage() {
>
<TerminalBlock copyValue={buildLog}>{buildLog || "Waiting for buildkit…"}</TerminalBlock>
</GlassSheet>

<GlassSheet
open={pullSheetOpen}
onOpenChange={setPullSheetOpen}
title={pulling ? `Pulling ${pulling}` : "Pull output"}
description="Live progress from the Docker engine"
mono
footer={
<Button variant="secondary" fillStyle="outline" onPress={() => setPullSheetOpen(false)}>
Close
</Button>
}
>
<TerminalBlock copyValue={pullLog}>{pullLog || "Waiting for layers…"}</TerminalBlock>
</GlassSheet>
</PageShell>
);
}
Loading
Loading