@ottocode/server 0.1.265 → 0.1.267

package/src/routes/terminals/service.ts

@@ -0,0 +1,326 @@
+import type { Context } from 'hono';
+import { streamSSE } from 'hono/streaming';
+import type { TerminalManager } from '@ottocode/sdk';
+import { logger } from '@ottocode/sdk';
+
+export function listTerminals(terminalManager: TerminalManager) {
+	const terminals = terminalManager.list();
+	return {
+		terminals: terminals.map((terminal) => terminal.toJSON()),
+		count: terminals.length,
+	};
+}
+
+export async function createTerminal(
+	c: Context,
+	terminalManager: TerminalManager,
+) {
+	try {
+		const body = await c.req.json();
+		const { command, args, purpose, cwd, title } = body;
+
+		if (!command || !purpose) {
+			return c.json({ error: 'command and purpose are required' }, 400);
+		}
+
+		let resolvedCommand = command;
+		if (command === 'bash' || command === 'sh' || command === 'shell') {
+			resolvedCommand =
+				process.platform === 'win32'
+					? process.env.COMSPEC || 'cmd.exe'
+					: process.env.SHELL || '/bin/bash';
+		}
+		const resolvedCwd = cwd || process.cwd();
+
+		const terminal = terminalManager.create({
+			command: resolvedCommand,
+			args: args || [],
+			purpose,
+			cwd: resolvedCwd,
+			createdBy: 'user',
+			title,
+		});
+
+		return c.json({
+			terminalId: terminal.id,
+			pid: terminal.pid,
+			purpose: terminal.purpose,
+			command: terminal.command,
+		});
+	} catch (error) {
+		logger.error('Error creating terminal', error);
+		const message = error instanceof Error ? error.message : String(error);
+		return c.json({ error: message }, 500);
+	}
+}
+
+export function getTerminal(c: Context, terminalManager: TerminalManager) {
+	const id = c.req.param('id');
+	const terminal = terminalManager.get(id);
+
+	if (!terminal) {
+		return c.json({ error: 'Terminal not found' }, 404);
+	}
+
+	return c.json({ terminal: terminal.toJSON() });
+}
+
+export function createTerminalWebSocketHandler(
+	terminalManager: TerminalManager,
+	id: string,
+) {
+	let onData: ((data: string) => void) | null = null;
+	let onExit: ((exitCode: number) => void) | null = null;
+
+	return {
+		onOpen(
+			_event: unknown,
+			ws: {
+				send: (data: string) => void;
+				close: (code?: number, reason?: string) => void;
+			},
+		) {
+			const terminal = terminalManager.get(id);
+			if (!terminal) {
+				ws.close(4004, 'Terminal not found');
+				return;
+			}
+
+			const history = terminal.read();
+			for (const chunk of history) {
+				ws.send(chunk);
+			}
+
+			onData = (data: string) => {
+				try {
+					ws.send(data);
+				} catch {
+					// ws may be closed
+				}
+			};
+
+			onExit = (exitCode: number) => {
+				try {
+					ws.send(JSON.stringify({ type: 'exit', exitCode }));
+					ws.close(1000, 'Process exited');
+				} catch {
+					// ws may already be closed
+				}
+			};
+
+			terminal.onData(onData);
+			terminal.onExit(onExit);
+
+			if (terminal.status === 'exited') {
+				onExit(terminal.exitCode ?? 0);
+			}
+		},
+		onMessage(event: { data: unknown }, _ws: unknown) {
+			const terminal = terminalManager.get(id);
+			if (!terminal) return;
+
+			const raw = event.data;
+			const message =
+				typeof raw === 'string'
+					? raw
+					: raw instanceof ArrayBuffer
+						? new TextDecoder().decode(raw)
+						: String(raw);
+
+			if (message.startsWith('{')) {
+				try {
+					const msg = JSON.parse(message);
+					if (msg.type === 'resize' && msg.cols > 0 && msg.rows > 0) {
+						terminal.resize(msg.cols, msg.rows);
+						return;
+					}
+				} catch {
+					// not JSON, treat as input
+				}
+			}
+
+			terminal.write(message);
+		},
+		onClose() {
+			const terminal = terminalManager.get(id);
+			if (terminal) {
+				if (onData) terminal.removeDataListener(onData);
+				if (onExit) terminal.removeExitListener(onExit);
+			}
+			onData = null;
+			onExit = null;
+		},
+		onError() {
+			const terminal = terminalManager.get(id);
+			if (terminal) {
+				if (onData) terminal.removeDataListener(onData);
+				if (onExit) terminal.removeExitListener(onExit);
+			}
+			onData = null;
+			onExit = null;
+		},
+	};
+}
+
+export async function handleTerminalOutput(
+	c: Context,
+	terminalManager: TerminalManager,
+) {
+	const id = c.req.param('id');
+	const terminal = terminalManager.get(id);
+
+	if (!terminal) {
+		return c.json({ error: 'Terminal not found' }, 404);
+	}
+
+	const activeTerminal = terminal;
+
+	return streamSSE(c, async (stream) => {
+		const skipHistory = c.req.query('skipHistory') === 'true';
+		if (!skipHistory) {
+			const history = activeTerminal.read();
+			for (const line of history) {
+				await stream.write(
+					`data: ${JSON.stringify({ type: 'data', line })}\n\n`,
+				);
+			}
+		}
+
+		const sendEvent = async (payload: Record<string, unknown>) => {
+			try {
+				await stream.write(`data: ${JSON.stringify(payload)}\n\n`);
+			} catch (error) {
+				logger.error('SSE error writing event', error, { id });
+			}
+		};
+
+		const onData = (line: string) => {
+			void sendEvent({ type: 'data', line });
+		};
+
+		let resolveStream: (() => void) | null = null;
+		let finished = false;
+
+		const hb = setInterval(async () => {
+			try {
+				await stream.write(`: hb ${Date.now()}\n\n`);
+			} catch {
+				clearInterval(hb);
+			}
+		}, 15000);
+
+		function cleanup() {
+			activeTerminal.removeDataListener(onData);
+			activeTerminal.removeExitListener(onExit);
+			c.req.raw.signal.removeEventListener('abort', onAbort);
+			clearInterval(hb);
+		}
+
+		function finish() {
+			if (finished) {
+				return;
+			}
+			finished = true;
+			cleanup();
+			resolveStream?.();
+		}
+
+		async function onExit(exitCode: number) {
+			try {
+				await sendEvent({ type: 'exit', exitCode });
+			} finally {
+				stream.close();
+				finish();
+			}
+		}
+
+		function onAbort() {
+			stream.close();
+			finish();
+		}
+
+		terminal.onData(onData);
+		terminal.onExit(onExit);
+
+		c.req.raw.signal.addEventListener('abort', onAbort, { once: true });
+
+		const waitForClose = new Promise<void>((resolve) => {
+			resolveStream = resolve;
+		});
+
+		if (terminal.status === 'exited') {
+			void onExit(terminal.exitCode ?? 0);
+		}
+
+		await waitForClose;
+	});
+}
+
+export async function sendTerminalInput(
+	c: Context,
+	terminalManager: TerminalManager,
+) {
+	const id = c.req.param('id');
+	const terminal = terminalManager.get(id);
+
+	if (!terminal) {
+		return c.json({ error: 'Terminal not found' }, 404);
+	}
+
+	try {
+		const body = await c.req.json();
+		const { input } = body;
+
+		if (!input) {
+			return c.json({ error: 'input is required' }, 400);
+		}
+
+		terminal.write(input);
+		return c.json({ success: true });
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		return c.json({ error: message }, 500);
+	}
+}
+
+export async function killTerminal(
+	c: Context,
+	terminalManager: TerminalManager,
+) {
+	const id = c.req.param('id');
+
+	try {
+		await terminalManager.kill(id);
+		return c.json({ success: true });
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		return c.json({ error: message }, 500);
+	}
+}
+
+export async function resizeTerminal(
+	c: Context,
+	terminalManager: TerminalManager,
+) {
+	const id = c.req.param('id');
+	const terminal = terminalManager.get(id);
+
+	if (!terminal) {
+		return c.json({ error: 'Terminal not found' }, 404);
+	}
+
+	try {
+		const body = await c.req.json();
+		const { cols, rows } = body;
+
+		if (!cols || !rows || cols < 1 || rows < 1) {
+			return c.json({ error: 'valid cols and rows are required' }, 400);
+		}
+
+		terminal.resize(cols, rows);
+		return c.json({ success: true });
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		return c.json({ error: message }, 500);
+	}
+}

package/src/routes/terminals.ts

@@ -1,10 +1,17 @@
-import type { Context } from 'hono';
 import type { Hono } from 'hono';
-import { streamSSE } from 'hono/streaming';
 import type { TerminalManager } from '@ottocode/sdk';
-import { logger } from '@ottocode/sdk';
 import { upgradeWebSocket } from '../ws.ts';
 import { openApiRoute } from '../openapi/route.ts';
+import {
+	createTerminal,
+	createTerminalWebSocketHandler,
+	getTerminal,
+	handleTerminalOutput,
+	killTerminal,
+	listTerminals,
+	resizeTerminal,
+	sendTerminalInput,
+} from './terminals/service.ts';
 
 export function registerTerminalsRoutes(
 	app: Hono,
@@ -42,13 +49,7 @@ export function registerTerminalsRoutes(
 				},
 			},
 		},
-		async (c) => {
-			const terminals = terminalManager.list();
-			return c.json({
-				terminals: terminals.map((t) => t.toJSON()),
-				count: terminals.length,
-			});
-		},
+		(c) => c.json(listTerminals(terminalManager)),
 	);
 
 	openApiRoute(
@@ -122,45 +123,7 @@ export function registerTerminalsRoutes(
 				},
 			},
 		},
-		async (c) => {
-			try {
-				const body = await c.req.json();
-				const { command, args, purpose, cwd, title } = body;
-
-				if (!command || !purpose) {
-					return c.json({ error: 'command and purpose are required' }, 400);
-				}
-
-				let resolvedCommand = command;
-				if (command === 'bash' || command === 'sh' || command === 'shell') {
-					resolvedCommand =
-						process.platform === 'win32'
-							? process.env.COMSPEC || 'cmd.exe'
-							: process.env.SHELL || '/bin/bash';
-				}
-				const resolvedCwd = cwd || process.cwd();
-
-				const terminal = terminalManager.create({
-					command: resolvedCommand,
-					args: args || [],
-					purpose,
-					cwd: resolvedCwd,
-					createdBy: 'user',
-					title,
-				});
-
-				return c.json({
-					terminalId: terminal.id,
-					pid: terminal.pid,
-					purpose: terminal.purpose,
-					command: terminal.command,
-				});
-			} catch (error) {
-				logger.error('Error creating terminal', error);
-				const message = error instanceof Error ? error.message : String(error);
-				return c.json({ error: message }, 500);
-			}
-		},
+		(c) => createTerminal(c, terminalManager),
 	);
 
 	openApiRoute(
@@ -202,16 +165,7 @@ export function registerTerminalsRoutes(
 				},
 			},
 		},
-		async (c) => {
-			const id = c.req.param('id');
-			const terminal = terminalManager.get(id);
-
-			if (!terminal) {
-				return c.json({ error: 'Terminal not found' }, 404);
-			}
-
-			return c.json({ terminal: terminal.toJSON() });
-		},
+		(c) => getTerminal(c, terminalManager),
 	);
 
 	openApiRoute(
@@ -238,186 +192,10 @@ export function registerTerminalsRoutes(
 		},
 		upgradeWebSocket((c) => {
 			const id = c.req.param('id');
-
-			let onData: ((data: string) => void) | null = null;
-			let onExit: ((exitCode: number) => void) | null = null;
-
-			return {
-				onOpen(_event, ws) {
-					const terminal = terminalManager.get(id);
-					if (!terminal) {
-						ws.close(4004, 'Terminal not found');
-						return;
-					}
-
-					const history = terminal.read();
-					for (const chunk of history) {
-						ws.send(chunk);
-					}
-
-					onData = (data: string) => {
-						try {
-							ws.send(data);
-						} catch {
-							// ws may be closed
-						}
-					};
-
-					onExit = (exitCode: number) => {
-						try {
-							ws.send(JSON.stringify({ type: 'exit', exitCode }));
-							ws.close(1000, 'Process exited');
-						} catch {
-							// ws may already be closed
-						}
-					};
-
-					terminal.onData(onData);
-					terminal.onExit(onExit);
-
-					if (terminal.status === 'exited') {
-						onExit(terminal.exitCode ?? 0);
-					}
-				},
-				onMessage(event, _ws) {
-					const terminal = terminalManager.get(id);
-					if (!terminal) return;
-
-					const raw = event.data;
-					const message =
-						typeof raw === 'string'
-							? raw
-							: raw instanceof ArrayBuffer
-								? new TextDecoder().decode(raw)
-								: String(raw);
-
-					if (message.startsWith('{')) {
-						try {
-							const msg = JSON.parse(message);
-							if (msg.type === 'resize' && msg.cols > 0 && msg.rows > 0) {
-								terminal.resize(msg.cols, msg.rows);
-								return;
-							}
-						} catch {
-							// not JSON, treat as input
-						}
-					}
-
-					terminal.write(message);
-				},
-				onClose() {
-					const terminal = terminalManager.get(id);
-					if (terminal) {
-						if (onData) terminal.removeDataListener(onData);
-						if (onExit) terminal.removeExitListener(onExit);
-					}
-					onData = null;
-					onExit = null;
-				},
-				onError() {
-					const terminal = terminalManager.get(id);
-					if (terminal) {
-						if (onData) terminal.removeDataListener(onData);
-						if (onExit) terminal.removeExitListener(onExit);
-					}
-					onData = null;
-					onExit = null;
-				},
-			};
+			return createTerminalWebSocketHandler(terminalManager, id);
 		}),
 	);
 
-	const handleTerminalOutput = async (c: Context) => {
-		const id = c.req.param('id');
-		const terminal = terminalManager.get(id);
-
-		if (!terminal) {
-			return c.json({ error: 'Terminal not found' }, 404);
-		}
-
-		const activeTerminal = terminal;
-
-		return streamSSE(c, async (stream) => {
-			const skipHistory = c.req.query('skipHistory') === 'true';
-			if (!skipHistory) {
-				const history = activeTerminal.read();
-				for (const line of history) {
-					await stream.write(
-						`data: ${JSON.stringify({ type: 'data', line })}\n\n`,
-					);
-				}
-			}
-
-			const sendEvent = async (payload: Record<string, unknown>) => {
-				try {
-					await stream.write(`data: ${JSON.stringify(payload)}\n\n`);
-				} catch (error) {
-					logger.error('SSE error writing event', error, { id });
-				}
-			};
-
-			const onData = (line: string) => {
-				void sendEvent({ type: 'data', line });
-			};
-
-			let resolveStream: (() => void) | null = null;
-			let finished = false;
-
-			const hb = setInterval(async () => {
-				try {
-					await stream.write(`: hb ${Date.now()}\n\n`);
-				} catch {
-					clearInterval(hb);
-				}
-			}, 15000);
-
-			function cleanup() {
-				activeTerminal.removeDataListener(onData);
-				activeTerminal.removeExitListener(onExit);
-				c.req.raw.signal.removeEventListener('abort', onAbort);
-				clearInterval(hb);
-			}
-
-			function finish() {
-				if (finished) {
-					return;
-				}
-				finished = true;
-				cleanup();
-				resolveStream?.();
-			}
-
-			async function onExit(exitCode: number) {
-				try {
-					await sendEvent({ type: 'exit', exitCode });
-				} finally {
-					stream.close();
-					finish();
-				}
-			}
-
-			function onAbort() {
-				stream.close();
-				finish();
-			}
-
-			terminal.onData(onData);
-			terminal.onExit(onExit);
-
-			c.req.raw.signal.addEventListener('abort', onAbort, { once: true });
-
-			const waitForClose = new Promise<void>((resolve) => {
-				resolveStream = resolve;
-			});
-
-			if (terminal.status === 'exited') {
-				void onExit(terminal.exitCode ?? 0);
-			}
-
-			await waitForClose;
-		});
-	};
-
 	openApiRoute(
 		app,
 		{
@@ -449,7 +227,7 @@ export function registerTerminalsRoutes(
 				},
 			},
 		},
-		handleTerminalOutput,
+		(c) => handleTerminalOutput(c, terminalManager),
 	);
 	openApiRoute(
 		app,
@@ -478,7 +256,7 @@ export function registerTerminalsRoutes(
 				},
 			},
 		},
-		handleTerminalOutput,
+		(c) => handleTerminalOutput(c, terminalManager),
 	);
 
 	openApiRoute(
@@ -534,29 +312,7 @@ export function registerTerminalsRoutes(
 				},
 			},
 		},
-		async (c) => {
-			const id = c.req.param('id');
-			const terminal = terminalManager.get(id);
-
-			if (!terminal) {
-				return c.json({ error: 'Terminal not found' }, 404);
-			}
-
-			try {
-				const body = await c.req.json();
-				const { input } = body;
-
-				if (!input) {
-					return c.json({ error: 'input is required' }, 400);
-				}
-
-				terminal.write(input);
-				return c.json({ success: true });
-			} catch (error) {
-				const message = error instanceof Error ? error.message : String(error);
-				return c.json({ error: message }, 500);
-			}
-		},
+		(c) => sendTerminalInput(c, terminalManager),
 	);
 
 	openApiRoute(
@@ -595,17 +351,7 @@ export function registerTerminalsRoutes(
 				},
 			},
 		},
-		async (c) => {
-			const id = c.req.param('id');
-
-			try {
-				await terminalManager.kill(id);
-				return c.json({ success: true });
-			} catch (error) {
-				const message = error instanceof Error ? error.message : String(error);
-				return c.json({ error: message }, 500);
-			}
-		},
+		(c) => killTerminal(c, terminalManager),
 	);
 
 	openApiRoute(
@@ -656,28 +402,6 @@ export function registerTerminalsRoutes(
 				'404': { description: 'Terminal not found' },
 			},
 		},
-		async (c) => {
-			const id = c.req.param('id');
-			const terminal = terminalManager.get(id);
-
-			if (!terminal) {
-				return c.json({ error: 'Terminal not found' }, 404);
-			}
-
-			try {
-				const body = await c.req.json();
-				const { cols, rows } = body;
-
-				if (!cols || !rows || cols < 1 || rows < 1) {
-					return c.json({ error: 'valid cols and rows are required' }, 400);
-				}
-
-				terminal.resize(cols, rows);
-				return c.json({ success: true });
-			} catch (error) {
-				const message = error instanceof Error ? error.message : String(error);
-				return c.json({ error: message }, 500);
-			}
-		},
+		(c) => resizeTerminal(c, terminalManager),
 	);
 }