boos/BoosAPI
2
0
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: enable multi tenant comfy workspace

Browse Source
This commit is contained in:
boos
2026-05-22 00:44:57 +08:00
parent 5ef3f8aea8
commit 7c6364a160
3 changed files with 106 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/comfyui_pool.rs
+10 -2
View File
@@ -189,7 +189,11 @@ impl ComfyUIPool {
/// handle. Idempotent.
pub async fn get_or_start(&self, user_id: i64) -> PoolResult<PoolEntry> {
// Fast path: already ready.
if let Some(entry) = self.containers.read().await.get(&user_id).cloned() {
let existing = {
let map = self.containers.read().await;
map.get(&user_id).cloned()
};
if let Some(entry) = existing {
if entry.state == ContainerState::Ready {
self.touch_inner(user_id).await;
return Ok(entry);
@@ -206,7 +210,11 @@ impl ComfyUIPool {
let _g = lock.lock().await;
// Re-check after acquiring the lock; another task may have done the work.
if let Some(entry) = self.containers.read().await.get(&user_id).cloned() {
let existing = {
let map = self.containers.read().await;
map.get(&user_id).cloned()
};
if let Some(entry) = existing {
if entry.state == ContainerState::Ready {
self.touch_inner(user_id).await;
return Ok(entry);
src/web/pages/ComfyUI.tsx
+85 -29
View File
@@ -6,6 +6,8 @@ export default function ComfyUI() {
const [isDark, setIsDark] = React.useState(true);
const [iframeSrc, setIframeSrc] = React.useState('');
const [starting, setStarting] = React.useState(true);
const [message, setMessage] = React.useState('正在启动 ComfyUI...');
const [error, setError] = React.useState('');
const location = useLocation();
const audience = location.pathname.startsWith('/user/') ? 'user' : 'admin';
const token = getSessionToken(audience, localStorage);
@@ -22,10 +24,48 @@ export default function ComfyUI() {
React.useEffect(() => {
let cancelled = false;
const encodedToken = token ? encodeURIComponent(token) : '';
const requestTimeoutMs = 35_000;
const fetchWithTimeout = async (input: RequestInfo | URL, init?: RequestInit) => {
const controller = new AbortController();
const timer = window.setTimeout(() => controller.abort(), requestTimeoutMs);
try {
return await fetch(input, { ...init, signal: controller.signal });
} finally {
window.clearTimeout(timer);
}
};
const resolveIframeFromPayload = (payload: any) => {
const comfyui = payload?.comfyui || payload || {};
const mode = String(comfyui?.mode || '').toLowerCase();
const status = String(comfyui?.status || '').toLowerCase();
const lastError = String(comfyui?.lastError || comfyui?.last_error || '').trim();
if (mode === 'container') {
if (status === 'running') return `/comfy/?token=${encodedToken}`;
if (status === 'unhealthy' || status === 'failed') {
throw new Error(lastError || 'ComfyUI 容器启动失败');
}
return '';
}
if (status && status !== 'disabled') {
return '/api/comfyui/proxy/';
}
if (lastError) {
throw new Error(lastError);
}
return '';
};
if (!token) {
setIframeSrc('');
setStarting(false);
setMessage('登录状态已过期，请重新登录。');
setError('');
return () => {
cancelled = true;
};
@@ -33,51 +73,60 @@ export default function ComfyUI() {
setStarting(true);
setIframeSrc('');
setError('');
setMessage('正在启动 ComfyUI...');
const start = async () => {
try {
const response = await fetch('/api/video-agent/start', {
const response = await fetchWithTimeout('/api/video-agent/start', {
method: 'POST',
headers: { Authorization: `Bearer ${token}` },
});
if (!cancelled && response.ok) {
const payload = await response.json().catch(() => null);
const mode = String(payload?.comfyui?.mode || '').toLowerCase();
const status = String(payload?.comfyui?.status || '').toLowerCase();
const usesContainerProxy = mode === 'container';
if (usesContainerProxy) {
setIframeSrc(`/comfy/?token=${encodedToken}`);
return;
if (!cancelled) {
if (!response.ok) {
throw new Error(`启动接口返回 ${response.status}`);
}
if (status !== 'disabled') {
setIframeSrc('/api/comfyui/proxy/');
const payload = await response.json().catch(() => null);
const nextSrc = resolveIframeFromPayload(payload);
if (nextSrc) {
setIframeSrc(nextSrc);
return;
}
}
} catch {
// Fall through to the legacy embedded ComfyUI proxy.
} catch (e: any) {
if (!cancelled) {
setMessage('ComfyUI 启动较慢，正在检查状态...');
if (e?.name !== 'AbortError') setError(e?.message || '启动请求失败');
}
}
try {
const response = await fetch('/api/video-agent/status', {
headers: { Authorization: `Bearer ${token}` },
});
if (!cancelled && response.ok) {
const payload = await response.json().catch(() => null);
const mode = String(payload?.mode || payload?.comfyui?.mode || '').toLowerCase();
if (mode === 'container') {
setIframeSrc(`/comfy/?token=${encodedToken}`);
return;
const deadline = Date.now() + 120_000;
while (!cancelled && Date.now() < deadline) {
try {
const response = await fetchWithTimeout('/api/video-agent/status', {
headers: { Authorization: `Bearer ${token}` },
});
if (response.ok) {
const payload = await response.json().catch(() => null);
const nextSrc = resolveIframeFromPayload(payload);
if (nextSrc) {
setIframeSrc(nextSrc);
return;
}
setMessage('ComfyUI 仍在启动，等待容器就绪...');
} else {
setError(`状态接口返回 ${response.status}`);
}
} catch (e: any) {
setError(e?.name === 'AbortError' ? '状态检查超时' : (e?.message || '状态检查失败'));
}
} catch {
// Fall through to the legacy embedded ComfyUI proxy.
await new Promise((resolve) => window.setTimeout(resolve, 2000));
}
if (!cancelled) {
setIframeSrc('/api/comfyui/proxy/');
setStarting(false);
setMessage('ComfyUI 启动超时');
setError((current) => current || '请检查 /api/video-agent/status、Docker 容器日志和 4000 后端进程。');
}
};
@@ -118,8 +167,15 @@ export default function ComfyUI() {
placeItems: 'center',
color: 'var(--color-text-muted)',
fontSize: 14,
textAlign: 'center',
gap: 8,
}}>
{starting ? '正在启动 ComfyUI...' : '登录状态已过期，请重新登录。'}
<div>{starting ? message : message}</div>
{error && (
<div style={{ color: '#ef4444', fontSize: 12, maxWidth: 520 }}>
{error}
</div>
)}
</div>
)}
</div>