sjs/vibetunnel
1
0
Fork 0
mirror of https://github.com/samsonjs/vibetunnel.git synced 2026-04-18 13:25:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix terminal spawn fallback for socket connection failures

Browse source 
- Move spawn_terminal logic after remote forwarding to properly handle remotes
- Add spawn_terminal parameter to remote forwarding requests
- Handle ECONNREFUSED when socket exists but no listener is active
- Gracefully fall back to normal PTY spawn in all failure cases

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Mario Zechner 2025-06-21 22:02:27 +02:00
parent f0fd625243
commit 212be407a2
1 changed files with 48 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
web/src/server/routes/sessions.ts
View file

@ -128,42 +128,6 @@ export function createSessionRoutes(config: SessionRoutesConfig): Router {
return res.status(400).json({ error: 'Command array is required' });
}
// If spawn_terminal is true, use the spawn-terminal logic
if (spawn_terminal) {
try {
// Generate session ID
const sessionId = generateSessionId();
const sessionName = name || `session_${Date.now()}`;
// Request Mac app to spawn terminal
console.log(`Requesting terminal spawn with command: ${JSON.stringify(command)}`);
const spawnResult = await requestTerminalSpawn({
sessionId,
sessionName,
command,
workingDir: resolvePath(workingDir, process.cwd()),
});
if (!spawnResult.success) {
throw new Error(spawnResult.error || 'Failed to spawn terminal');
}
// Wait a bit for the session to be created
await new Promise((resolve) => setTimeout(resolve, 500));
// Return the session ID - client will poll for the session to appear
res.json({ sessionId, message: 'Terminal spawn requested' });
return;
} catch (error) {
console.error('Error spawning terminal:', error);
res.status(500).json({
error: 'Failed to spawn terminal',
details: error instanceof Error ? error.message : 'Unknown error',
});
return;
}
}
try {
// If remoteId is specified and we're in HQ mode, forward to remote
if (remoteId && isHQMode && remoteRegistry) {
@ -185,6 +149,7 @@ export function createSessionRoutes(config: SessionRoutesConfig): Router {
command,
workingDir,
name,
spawn_terminal,
// Don't forward remoteId to avoid recursion
}),
signal: AbortSignal.timeout(10000), // 10 second timeout
@ -206,6 +171,53 @@ export function createSessionRoutes(config: SessionRoutesConfig): Router {
return;
}
// If spawn_terminal is true and socket exists, use the spawn-terminal logic
const socketPath = '/tmp/vibetunnel-terminal.sock';
if (spawn_terminal && fs.existsSync(socketPath)) {
try {
// Generate session ID
const sessionId = generateSessionId();
const sessionName = name || `session_${Date.now()}`;
// Request Mac app to spawn terminal
console.log(`Requesting terminal spawn with command: ${JSON.stringify(command)}`);
const spawnResult = await requestTerminalSpawn({
sessionId,
sessionName,
command,
workingDir: resolvePath(workingDir, process.cwd()),
});
if (!spawnResult.success) {
if (spawnResult.error?.includes('ECONNREFUSED')) {
console.log(
'Terminal spawn requested but socket not available, falling back to normal spawn'
);
} else {
throw new Error(spawnResult.error || 'Failed to spawn terminal');
}
} else {
// Wait a bit for the session to be created
await new Promise((resolve) => setTimeout(resolve, 500));
// Return the session ID - client will poll for the session to appear
res.json({ sessionId, message: 'Terminal spawn requested' });
return;
}
} catch (error) {
console.error('Error spawning terminal:', error);
res.status(500).json({
error: 'Failed to spawn terminal',
details: error instanceof Error ? error.message : 'Unknown error',
});
return;
}
} else if (spawn_terminal && !fs.existsSync(socketPath)) {
console.log(
'Terminal spawn requested but socket not available, falling back to normal spawn'
);
}
// Create local session
const sessionName =
name || `session_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;