snowspeeder/pi-web
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: keep terminal pty size in sync

Browse Source
This commit is contained in:
Federico Jaramillo Martinez
2026-05-13 23:09:29 +02:00
parent 7386a9bf08
commit a807569018
10 changed files with 317 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/terminalProxyRoutes.ts
+5 -15
View File
@@ -1,9 +1,10 @@
import type { FastifyInstance, FastifyReply } from "fastify";
import { WebSocket, type RawData } from "ws";
import type { ProjectService } from "./projects/projectService.js";
import { SessionDaemonClient } from "./sessiond/sessionDaemonClient.js";
import { resolveWorkspaceContext } from "./workspaces/workspaceContext.js";
import type { WorkspaceService } from "./workspaces/workspaceService.js";
import { terminalSizeQuery } from "./terminals/terminalSize.js";
import { bridgeSockets } from "./webSocketBridge.js";
export function registerTerminalProxyRoutes(app: FastifyInstance, projects: ProjectService, workspaces: WorkspaceService, daemon = new SessionDaemonClient()): void {
app.get<{ Params: { projectId: string; workspaceId: string } }>("/api/projects/:projectId/workspaces/:workspaceId/terminals", async (request, reply) => {
@@ -36,10 +37,11 @@ export function registerTerminalProxyRoutes(app: FastifyInstance, projects: Proj
}
});
app.get<{ Params: { projectId: string; workspaceId: string; terminalId: string } }>("/api/projects/:projectId/workspaces/:workspaceId/terminals/:terminalId/socket", { websocket: true }, async (socket, request) => {
app.get<{ Params: { projectId: string; workspaceId: string; terminalId: string }; Querystring: { cols?: string; rows?: string } }>("/api/projects/:projectId/workspaces/:workspaceId/terminals/:terminalId/socket", { websocket: true }, async (socket, request) => {
try {
await resolveWorkspaceContext(projects, workspaces, request.params.projectId, request.params.workspaceId);
bridgeSockets(socket, daemon.connectWebSocket(`/terminals/${request.params.terminalId}/socket`));
const sizeQuery = terminalSizeQuery(request.query.cols, request.query.rows);
bridgeSockets(socket, daemon.connectWebSocket(`/terminals/${request.params.terminalId}/socket${sizeQuery}`));
} catch (error) {
socket.send(JSON.stringify({ type: "error", message: error instanceof Error ? error.message : String(error) }));
socket.close();
@@ -60,15 +62,3 @@ function requestFailed(reply: FastifyReply, error: unknown): void {
reply.code(400).send({ error: error instanceof Error ? error.message : String(error) });
}
function bridgeSockets(client: WebSocket, upstream: WebSocket): void {
client.on("message", (data) => { sendIfOpen(upstream, data); });
upstream.on("message", (data) => { sendIfOpen(client, data); });
client.on("close", () => { upstream.close(); });
upstream.on("close", () => { client.close(); });
upstream.on("error", () => { client.close(); });
client.on("error", () => { upstream.close(); });
}
function sendIfOpen(socket: WebSocket, data: RawData): void {
if (socket.readyState === WebSocket.OPEN) socket.send(data);
}