mirror of
https://github.com/snapotter-hq/SnapOtter.git
synced 2026-08-03 07:46:42 +02:00
refactor: unify feature install UI with global store, add healthcheck and GPU profile to compose
Replace FeatureInstallPrompt's local SSE/polling with useFeaturesStore so install progress, errors, and recovery are handled globally — works across navigation, logout/login, and partial downloads. Shows fun progress messages and ETA matching the settings page. Add compose healthcheck and optional GPU profile (--profile gpu).
This commit is contained in:
@@ -1,125 +1,88 @@
|
|||||||
import type { FeatureBundleState } from "@ashim/shared";
|
import type { FeatureBundleState } from "@ashim/shared";
|
||||||
import { AlertCircle, Download, Loader2, RotateCcw } from "lucide-react";
|
import { AlertCircle, Download, Loader2, RotateCcw } from "lucide-react";
|
||||||
import { useEffect, useRef, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { apiPost } from "@/lib/api";
|
|
||||||
import { useFeaturesStore } from "@/stores/features-store";
|
import { useFeaturesStore } from "@/stores/features-store";
|
||||||
|
|
||||||
|
const PROGRESS_MESSAGES = [
|
||||||
|
"Almost there... probably...",
|
||||||
|
"Good things take time...",
|
||||||
|
"Still faster than watching paint dry...",
|
||||||
|
"Your patience is truly inspiring...",
|
||||||
|
"Working harder than it looks...",
|
||||||
|
"This is the exciting part, trust me...",
|
||||||
|
"Doing important behind-the-scenes stuff...",
|
||||||
|
"If you're reading this, it's working...",
|
||||||
|
"Preparing something awesome...",
|
||||||
|
"Worth every second, pinky promise...",
|
||||||
|
"The suspense is part of the experience...",
|
||||||
|
"Teaching your computer new tricks...",
|
||||||
|
"Setting up your superpowers...",
|
||||||
|
"Your images will thank you later...",
|
||||||
|
"Loading... but make it fancy...",
|
||||||
|
"This would be a great time for coffee...",
|
||||||
|
"Rome wasn't built in a day either...",
|
||||||
|
"Shhh... genius at work...",
|
||||||
|
"Making your photos jealous of what's coming...",
|
||||||
|
"Assembling the dream team...",
|
||||||
|
"Unpacking awesomeness...",
|
||||||
|
"Almost done thinking about starting... just kidding...",
|
||||||
|
"Plot twist: this is actually doing something...",
|
||||||
|
"Warming up the creative engines...",
|
||||||
|
"Imagination loading...",
|
||||||
|
"Not a screensaver, we promise...",
|
||||||
|
"Great art takes time to install...",
|
||||||
|
"Your future self will thank you...",
|
||||||
|
"Grabbing some really smart files...",
|
||||||
|
"Hang tight, the best is yet to come...",
|
||||||
|
];
|
||||||
|
|
||||||
|
function formatTimeRemaining(ms: number): string {
|
||||||
|
if (ms < 60000) return "Less than a minute left";
|
||||||
|
const mins = Math.ceil(ms / 60000);
|
||||||
|
if (mins === 1) return "~1 minute left";
|
||||||
|
return `~${mins} minutes left`;
|
||||||
|
}
|
||||||
|
|
||||||
interface FeatureInstallPromptProps {
|
interface FeatureInstallPromptProps {
|
||||||
bundle: FeatureBundleState;
|
bundle: FeatureBundleState;
|
||||||
isAdmin: boolean;
|
isAdmin: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface ProgressState {
|
|
||||||
percent: number;
|
|
||||||
stage: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function FeatureInstallPrompt({ bundle, isAdmin }: FeatureInstallPromptProps) {
|
export function FeatureInstallPrompt({ bundle, isAdmin }: FeatureInstallPromptProps) {
|
||||||
const [installing, setInstalling] = useState(false);
|
const { installBundle, clearError, installing, errors, startTimes } = useFeaturesStore();
|
||||||
const [progress, setProgress] = useState<ProgressState | null>(null);
|
const progress = installing[bundle.id] ?? null;
|
||||||
const [error, setError] = useState<string | null>(null);
|
const error = errors[bundle.id] ?? null;
|
||||||
const eventSourceRef = useRef<EventSource | null>(null);
|
const isInstalling = !!progress;
|
||||||
const pollingRef = useRef<ReturnType<typeof setInterval> | null>(null);
|
const startTime = startTimes[bundle.id] ?? null;
|
||||||
const refresh = useFeaturesStore((s) => s.refresh);
|
|
||||||
|
const [messageIndex, setMessageIndex] = useState(() =>
|
||||||
|
Math.floor(Math.random() * PROGRESS_MESSAGES.length),
|
||||||
|
);
|
||||||
|
const [now, setNow] = useState(Date.now());
|
||||||
|
|
||||||
// If bundle is already installing on mount, show progress state immediately
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (bundle.status === "installing") {
|
if (!isInstalling) return;
|
||||||
setInstalling(true);
|
const interval = setInterval(() => {
|
||||||
setProgress(bundle.progress ?? { percent: 0, stage: "Installing..." });
|
setMessageIndex((prev) => (prev + 1) % PROGRESS_MESSAGES.length);
|
||||||
}
|
setNow(Date.now());
|
||||||
}, [bundle.status, bundle.progress]);
|
|
||||||
|
|
||||||
// Cleanup on unmount
|
|
||||||
useEffect(() => {
|
|
||||||
return () => {
|
|
||||||
eventSourceRef.current?.close();
|
|
||||||
if (pollingRef.current) clearInterval(pollingRef.current);
|
|
||||||
};
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
function startPollingFallback() {
|
|
||||||
if (pollingRef.current) return;
|
|
||||||
pollingRef.current = setInterval(async () => {
|
|
||||||
try {
|
|
||||||
await refresh();
|
|
||||||
const updated = useFeaturesStore.getState().bundles.find((b) => b.id === bundle.id);
|
|
||||||
if (!updated || updated.status !== "installing") {
|
|
||||||
if (pollingRef.current) clearInterval(pollingRef.current);
|
|
||||||
pollingRef.current = null;
|
|
||||||
setInstalling(false);
|
|
||||||
if (updated?.status === "error") {
|
|
||||||
setError(updated.error ?? "Installation failed");
|
|
||||||
} else {
|
|
||||||
setProgress(null);
|
|
||||||
}
|
|
||||||
} else if (updated.progress) {
|
|
||||||
setProgress(updated.progress);
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
// ignore polling errors
|
|
||||||
}
|
|
||||||
}, 3000);
|
}, 3000);
|
||||||
|
return () => clearInterval(interval);
|
||||||
|
}, [isInstalling]);
|
||||||
|
|
||||||
|
const eta = (() => {
|
||||||
|
if (!progress || !startTime || progress.percent <= 2) return null;
|
||||||
|
const elapsed = now - startTime;
|
||||||
|
const rate = progress.percent / elapsed;
|
||||||
|
if (rate <= 0) return null;
|
||||||
|
const remaining = (100 - progress.percent) / rate;
|
||||||
|
return formatTimeRemaining(remaining);
|
||||||
|
})();
|
||||||
|
|
||||||
|
function handleInstall() {
|
||||||
|
clearError(bundle.id);
|
||||||
|
installBundle(bundle.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
function listenToProgress(jobId: string) {
|
|
||||||
const es = new EventSource(`/api/v1/jobs/${jobId}/progress`);
|
|
||||||
eventSourceRef.current = es;
|
|
||||||
|
|
||||||
es.onmessage = (event) => {
|
|
||||||
try {
|
|
||||||
const data = JSON.parse(event.data) as {
|
|
||||||
phase: string;
|
|
||||||
percent: number;
|
|
||||||
stage: string;
|
|
||||||
error?: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
if (data.phase === "complete") {
|
|
||||||
es.close();
|
|
||||||
eventSourceRef.current = null;
|
|
||||||
setInstalling(false);
|
|
||||||
setProgress(null);
|
|
||||||
refresh();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (data.phase === "failed") {
|
|
||||||
es.close();
|
|
||||||
eventSourceRef.current = null;
|
|
||||||
setInstalling(false);
|
|
||||||
setError(data.error ?? "Installation failed");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setProgress({ percent: data.percent, stage: data.stage });
|
|
||||||
} catch {
|
|
||||||
// ignore malformed messages
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
es.onerror = () => {
|
|
||||||
es.close();
|
|
||||||
eventSourceRef.current = null;
|
|
||||||
startPollingFallback();
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
async function handleInstall() {
|
|
||||||
setInstalling(true);
|
|
||||||
setError(null);
|
|
||||||
setProgress({ percent: 0, stage: "Starting installation..." });
|
|
||||||
|
|
||||||
try {
|
|
||||||
const result = await apiPost<{ jobId: string }>(`/v1/admin/features/${bundle.id}/install`);
|
|
||||||
listenToProgress(result.jobId);
|
|
||||||
} catch (err) {
|
|
||||||
setInstalling(false);
|
|
||||||
setError(err instanceof Error ? err.message : "Failed to start installation");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Non-admin: show "not enabled" message
|
|
||||||
if (!isAdmin) {
|
if (!isAdmin) {
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col items-center justify-center h-full gap-4 text-center px-4">
|
<div className="flex flex-col items-center justify-center h-full gap-4 text-center px-4">
|
||||||
@@ -132,7 +95,6 @@ export function FeatureInstallPrompt({ bundle, isAdmin }: FeatureInstallPromptPr
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Admin: show install prompt
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col items-center justify-center h-full gap-6 text-center px-4">
|
<div className="flex flex-col items-center justify-center h-full gap-6 text-center px-4">
|
||||||
<Download className="h-16 w-16 text-muted-foreground" />
|
<Download className="h-16 w-16 text-muted-foreground" />
|
||||||
@@ -144,7 +106,6 @@ export function FeatureInstallPrompt({ bundle, isAdmin }: FeatureInstallPromptPr
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Error banner */}
|
|
||||||
{error && (
|
{error && (
|
||||||
<div className="flex items-center gap-2 bg-destructive/10 text-destructive rounded-lg px-4 py-3 max-w-md w-full">
|
<div className="flex items-center gap-2 bg-destructive/10 text-destructive rounded-lg px-4 py-3 max-w-md w-full">
|
||||||
<AlertCircle className="h-4 w-4 shrink-0" />
|
<AlertCircle className="h-4 w-4 shrink-0" />
|
||||||
@@ -160,29 +121,29 @@ export function FeatureInstallPrompt({ bundle, isAdmin }: FeatureInstallPromptPr
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Progress bar */}
|
{isInstalling && progress && (
|
||||||
{installing && progress && (
|
|
||||||
<div className="w-full max-w-md space-y-2">
|
<div className="w-full max-w-md space-y-2">
|
||||||
<div className="h-2 bg-muted rounded-full overflow-hidden">
|
<div className="h-2 bg-muted rounded-full overflow-hidden">
|
||||||
<div
|
<div
|
||||||
className="h-full bg-primary rounded-full transition-all duration-300"
|
className="h-full bg-primary rounded-full transition-all duration-500"
|
||||||
style={{ width: `${progress.percent}%` }}
|
style={{ width: `${progress.percent}%` }}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center justify-center gap-2 text-sm text-muted-foreground">
|
<div className="flex items-center justify-between">
|
||||||
<Loader2 className="h-4 w-4 animate-spin" />
|
<div className="flex items-center gap-2 text-sm text-muted-foreground min-w-0">
|
||||||
<span>{progress.stage}</span>
|
<Loader2 className="h-4 w-4 animate-spin shrink-0" />
|
||||||
|
<span className="italic truncate">{PROGRESS_MESSAGES[messageIndex]}</span>
|
||||||
|
</div>
|
||||||
|
{eta && <p className="text-xs text-muted-foreground shrink-0 ml-2">{eta}</p>}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Install button (hidden when installing or showing error) */}
|
{!isInstalling && !error && (
|
||||||
{!installing && !error && (
|
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={handleInstall}
|
onClick={handleInstall}
|
||||||
disabled={installing || bundle.status === "installing"}
|
className="px-6 py-2.5 bg-primary text-primary-foreground rounded-lg hover:bg-primary/90 font-medium"
|
||||||
className="px-6 py-2.5 bg-primary text-primary-foreground rounded-lg hover:bg-primary/90 disabled:opacity-50 font-medium"
|
|
||||||
>
|
>
|
||||||
Enable {bundle.name}
|
Enable {bundle.name}
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: ..
|
context: ..
|
||||||
dockerfile: docker/Dockerfile
|
dockerfile: docker/Dockerfile
|
||||||
image: ashimhq/ashim:latest
|
image: ashim:latest
|
||||||
container_name: ashim
|
container_name: ashim
|
||||||
ports:
|
ports:
|
||||||
- "1349:1349"
|
- "1349:1349"
|
||||||
@@ -15,12 +15,32 @@ services:
|
|||||||
- DEFAULT_USERNAME=admin
|
- DEFAULT_USERNAME=admin
|
||||||
- DEFAULT_PASSWORD=admin
|
- DEFAULT_PASSWORD=admin
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "curl", "-f", "http://localhost:1349/api/v1/health"]
|
||||||
|
interval: 30s
|
||||||
|
timeout: 5s
|
||||||
|
start_period: 60s
|
||||||
|
retries: 3
|
||||||
logging:
|
logging:
|
||||||
driver: json-file
|
driver: json-file
|
||||||
options:
|
options:
|
||||||
max-size: "10m"
|
max-size: "10m"
|
||||||
max-file: "3"
|
max-file: "3"
|
||||||
|
|
||||||
|
ashim-gpu:
|
||||||
|
extends:
|
||||||
|
service: ashim
|
||||||
|
container_name: ashim-gpu
|
||||||
|
profiles:
|
||||||
|
- gpu
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
reservations:
|
||||||
|
devices:
|
||||||
|
- driver: nvidia
|
||||||
|
count: all
|
||||||
|
capabilities: [gpu]
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
ashim-data:
|
ashim-data:
|
||||||
ashim-workspace:
|
ashim-workspace:
|
||||||
|
|||||||
Reference in New Issue
Block a user