nterminal 1.2.79 → 1.2.80

package/dist/server/routes/webSocketRelay.js

@@ -8,6 +8,31 @@ const defaultMaxPendingBytes = 4 * 1024 * 1024;
 const backpressureHighWaterBytes = 4 * 1024 * 1024;
 const backpressureLowWaterBytes = 1 * 1024 * 1024;
 const backpressurePollMs = 50;
+const backpressureDeadlineMs = 30_000;
+const upstreamOpenDeadlineMs = 30_000;
+const closeGraceMs = 5_000;
+export const outboundWebSocketMaxPayloadBytes = 32 * 1024 * 1024;
+export function pauseWebSocketDuringSetup(socket) {
+    let paused = false;
+    let resumed = false;
+    try {
+        socket.pause();
+        paused = true;
+    }
+    catch {
+        // A socket can disappear between the upgrade callback and setup. The
+        // caller's readyState/authentication checks still reject it.
+    }
+    return () => {
+        if (resumed) {
+            return;
+        }
+        resumed = true;
+        if (paused) {
+            resumeSocketQuietly(socket);
+        }
+    };
+}
 export function relayWebSocketPair(clientSocket, upstreamSocket, options = {}) {
     const maxPendingMessages = options.maxPendingMessages ?? defaultMaxPendingMessages;
     const maxPendingBytes = options.maxPendingBytes ?? defaultMaxPendingBytes;
@@ -15,13 +40,28 @@ export function relayWebSocketPair(clientSocket, upstreamSocket, options = {}) {
     const pendingFromClient = [];
     let pendingBytes = 0;
     let closed = false;
+    let unsubscribeInvalidation = () => undefined;
+    let upstreamOpenDeadline = null;
     const backpressureTimers = new Map();
+    const discardPendingClientMessages = () => {
+        pendingFromClient.length = 0;
+        pendingBytes = 0;
+    };
     const closeBoth = (code, reason) => {
         if (closed)
             return;
         closed = true;
-        for (const timer of backpressureTimers.values()) {
-            clearInterval(timer);
+        unsubscribeInvalidation();
+        unsubscribeInvalidation = () => undefined;
+        if (upstreamOpenDeadline) {
+            clearTimeout(upstreamOpenDeadline);
+            upstreamOpenDeadline = null;
+        }
+        discardPendingClientMessages();
+        for (const [source, timers] of backpressureTimers) {
+            clearInterval(timers.poll);
+            clearTimeout(timers.deadline);
+            resumeSocketQuietly(source);
         }
         backpressureTimers.clear();
         safeCloseWebSocket(clientSocket, code, reason);
@@ -34,22 +74,80 @@ export function relayWebSocketPair(clientSocket, upstreamSocket, options = {}) {
         if (!pauseSocketQuietly(source)) {
             return;
         }
-        const timer = setInterval(() => {
+        const clearBackpressure = () => {
+            const timers = backpressureTimers.get(source);
+            if (!timers) {
+                return;
+            }
+            clearInterval(timers.poll);
+            clearTimeout(timers.deadline);
+            backpressureTimers.delete(source);
+        };
+        const releaseBackpressure = () => {
+            clearBackpressure();
+            resumeSocketQuietly(source);
+        };
+        const poll = setInterval(() => {
             if (closed) {
                 return;
             }
             if (destination.bufferedAmount > backpressureLowWaterBytes && destination.readyState === WebSocket.OPEN) {
                 return;
             }
-            clearInterval(timer);
-            backpressureTimers.delete(source);
-            resumeSocketQuietly(source);
+            releaseBackpressure();
         }, backpressurePollMs);
-        timer.unref?.();
-        backpressureTimers.set(source, timer);
+        const deadline = setTimeout(() => {
+            if (closed || !backpressureTimers.has(source)) {
+                return;
+            }
+            if (destination.bufferedAmount <= backpressureLowWaterBytes || destination.readyState !== WebSocket.OPEN) {
+                releaseBackpressure();
+                return;
+            }
+            closeBoth(1013, 'websocket relay backpressure timeout');
+        }, backpressureDeadlineMs);
+        poll.unref?.();
+        deadline.unref?.();
+        backpressureTimers.set(source, { poll, deadline });
+    };
+    const ensureClientActive = () => {
+        if (closed) {
+            return false;
+        }
+        try {
+            if (options.isClientActive?.() !== false) {
+                return true;
+            }
+        }
+        catch {
+            // Authentication checks fail closed.
+        }
+        closeBoth(1008, 'authentication no longer valid');
+        return false;
     };
+    const removeInvalidationListener = options.onClientInvalidated?.((code, reason) => {
+        closeBoth(code, reason);
+    });
+    if (removeInvalidationListener) {
+        if (closed) {
+            removeInvalidationListener();
+        }
+        else {
+            unsubscribeInvalidation = removeInvalidationListener;
+        }
+    }
     upstreamSocket.on('open', () => {
+        if (upstreamOpenDeadline) {
+            clearTimeout(upstreamOpenDeadline);
+            upstreamOpenDeadline = null;
+        }
+        if (!ensureClientActive()) {
+            return;
+        }
         while (pendingFromClient.length > 0 && upstreamSocket.readyState === WebSocket.OPEN) {
+            if (!ensureClientActive()) {
+                return;
+            }
             const entry = pendingFromClient.shift();
             if (!entry) {
                 continue;
@@ -60,6 +158,14 @@ export function relayWebSocketPair(clientSocket, upstreamSocket, options = {}) {
         applyBackpressure(clientSocket, upstreamSocket);
     });
     clientSocket.on('message', (data, isBinary) => {
+        if (!ensureClientActive()) {
+            return;
+        }
+        const bytes = rawDataByteLength(data);
+        if (options.maxClientMessageBytes !== undefined && bytes > options.maxClientMessageBytes) {
+            closeBoth(1009, 'websocket message too large');
+            return;
+        }
         options.onClientMessage?.();
         if (upstreamSocket.readyState === WebSocket.OPEN) {
             sendOrClose(upstreamSocket, data, isBinary, closeBoth);
@@ -69,7 +175,6 @@ export function relayWebSocketPair(clientSocket, upstreamSocket, options = {}) {
         if (upstreamSocket.readyState !== WebSocket.CONNECTING) {
             return;
         }
-        const bytes = rawDataByteLength(data);
         if (pendingFromClient.length >= maxPendingMessages) {
             closeBoth(options.pendingMessageOverflowCode ?? 1013, pendingOverflowReason);
             return;
@@ -82,16 +187,48 @@ export function relayWebSocketPair(clientSocket, upstreamSocket, options = {}) {
         pendingBytes += bytes;
     });
     upstreamSocket.on('message', (data, isBinary) => {
+        if (!ensureClientActive()) {
+            return;
+        }
+        const bytes = rawDataByteLength(data);
+        if (options.maxUpstreamMessageBytes !== undefined && bytes > options.maxUpstreamMessageBytes) {
+            closeBoth(1009, 'upstream websocket message too large');
+            return;
+        }
         options.onUpstreamMessage?.();
         if (clientSocket.readyState === WebSocket.OPEN) {
             sendOrClose(clientSocket, data, isBinary, closeBoth);
             applyBackpressure(upstreamSocket, clientSocket);
         }
     });
-    upstreamSocket.on('error', () => closeBoth(1011, 'upstream websocket error'));
+    upstreamSocket.on('unexpected-response', (_request, response) => {
+        response.resume();
+        const mapped = options.mapUpstreamUnexpectedResponse?.(response.statusCode ?? 0);
+        closeBoth(mapped?.code ?? 1011, mapped?.reason ?? 'upstream websocket rejected');
+    });
+    upstreamSocket.on('error', (error) => {
+        if (isWebSocketPayloadTooLargeError(error)) {
+            closeBoth(1009, 'upstream websocket message too large');
+            return;
+        }
+        closeBoth(1011, 'upstream websocket error');
+    });
     clientSocket.on('error', () => closeBoth(1011, 'client websocket error'));
-    upstreamSocket.on('close', (code, reason) => closeBoth(code, reason));
+    upstreamSocket.on('close', (code, reason) => {
+        const reasonText = safeCloseReasonText(reason);
+        const mapped = options.mapUpstreamClose?.(code, reasonText);
+        closeBoth(mapped?.code ?? code, mapped?.reason ?? reason);
+    });
     clientSocket.on('close', (code, reason) => closeBoth(code, reason));
+    if (upstreamSocket.readyState === WebSocket.CONNECTING) {
+        upstreamOpenDeadline = setTimeout(() => {
+            upstreamOpenDeadline = null;
+            if (!closed && upstreamSocket.readyState === WebSocket.CONNECTING) {
+                closeBoth(1013, 'upstream websocket connection timeout');
+            }
+        }, upstreamOpenDeadlineMs);
+        upstreamOpenDeadline.unref?.();
+    }
 }
 function pauseSocketQuietly(socket) {
     try {
@@ -127,21 +264,42 @@ function rawDataByteLength(data) {
     }
     return data.byteLength;
 }
+function isWebSocketPayloadTooLargeError(error) {
+    return error.code === 'WS_ERR_UNSUPPORTED_MESSAGE_LENGTH';
+}
 function safeCloseWebSocket(socket, code, reason) {
-    if (socket.readyState !== WebSocket.OPEN && socket.readyState !== WebSocket.CONNECTING) {
+    if (socket.readyState === WebSocket.CLOSED) {
         return;
     }
-    try {
-        socket.close(safeCloseCode(code), safeCloseReason(reason));
-    }
-    catch {
+    if (socket.readyState === WebSocket.OPEN || socket.readyState === WebSocket.CONNECTING) {
         try {
-            socket.terminate();
+            socket.close(safeCloseCode(code), safeCloseReason(reason));
         }
         catch {
-            // Nothing useful remains to do if terminate itself fails.
+            try {
+                socket.terminate();
+            }
+            catch {
+                // Nothing useful remains to do if terminate itself fails.
+            }
+            return;
         }
     }
+    if (socket.readyState === WebSocket.CLOSED) {
+        return;
+    }
+    const forceClose = setTimeout(() => {
+        if (socket.readyState !== WebSocket.CLOSED) {
+            try {
+                socket.terminate();
+            }
+            catch {
+                // The peer completed shutdown between the readyState check and terminate.
+            }
+        }
+    }, closeGraceMs);
+    forceClose.unref?.();
+    socket.once('close', () => clearTimeout(forceClose));
 }
 function safeCloseCode(code) {
     if (code !== undefined &&
@@ -171,4 +329,16 @@ function safeCloseReason(reason) {
     }
     return undefined;
 }
+function safeCloseReasonText(reason) {
+    if (typeof reason === 'string') {
+        return reason;
+    }
+    if (Buffer.isBuffer(reason)) {
+        return reason.toString('utf8');
+    }
+    if (Array.isArray(reason)) {
+        return Buffer.concat(reason).toString('utf8');
+    }
+    return Buffer.from(reason).toString('utf8');
+}
 //# sourceMappingURL=webSocketRelay.js.map

package/dist/server/routes/webSocketRelay.js.map

@@ -1 +1 @@
-{"version":3,"file":"webSocketRelay.js","sourceRoot":"","sources":["../../../src/server/routes/webSocketRelay.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webSocketRelay.js","sourceRoot":"","sources":["../../../src/server/routes/webSocketRelay.ts"],"names":[],"mappings":"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"}

package/dist/server/routes/webSocketUpgradeAuth.d.ts

@@ -0,0 +1,5 @@
+import type { FastifyReply, FastifyRequest } from 'fastify';
+import type { AuthService } from '../auth/authService.js';
+import { type AppConfig } from '../config.js';
+export declare function isWebSocketUpgrade(request: FastifyRequest): boolean;
+export declare function preValidateBrowserWebSocketUpgrade(config: AppConfig, authService: AuthService, request: FastifyRequest, reply: FastifyReply): Promise<void | FastifyReply>;

package/dist/server/routes/webSocketUpgradeAuth.js

@@ -0,0 +1,21 @@
+import { isAllowedOrigin } from '../config.js';
+import { authenticateTerminalRequest } from './terminalRoutes.js';
+export function isWebSocketUpgrade(request) {
+    return request.headers.upgrade?.toLowerCase() === 'websocket';
+}
+export async function preValidateBrowserWebSocketUpgrade(config, authService, request, reply) {
+    if (!isWebSocketUpgrade(request)) {
+        return;
+    }
+    if (!request.headers.origin) {
+        return reply.code(403).send({ error: 'origin_required' });
+    }
+    if (!isAllowedOrigin(config, request.headers.origin)) {
+        return reply.code(403).send({ error: 'origin_not_allowed' });
+    }
+    const auth = await authenticateTerminalRequest(authService, request, reply);
+    if (!auth) {
+        return reply;
+    }
+}
+//# sourceMappingURL=webSocketUpgradeAuth.js.map

package/dist/server/routes/webSocketUpgradeAuth.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webSocketUpgradeAuth.js","sourceRoot":"","sources":["../../../src/server/routes/webSocketUpgradeAuth.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAkB,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAElE,MAAM,UAAU,kBAAkB,CAAC,OAAuB;IACxD,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,WAAW,CAAC;AAChE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kCAAkC,CACtD,MAAiB,EACjB,WAAwB,EACxB,OAAuB,EACvB,KAAmB;IAEnB,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;QACjC,OAAO;IACT,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAC5D,CAAC;IACD,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACrD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC,CAAC;IAC/D,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,2BAA2B,CAAC,WAAW,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC5E,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}

package/dist/server/system/stats.d.ts

@@ -1,2 +1,2 @@
 import type { SystemStatsResponse } from '../../shared/protocol.js';
-export declare function collectSystemStats(diskPath?: string): SystemStatsResponse;
+export declare function collectSystemStats(diskPath?: string): Promise<SystemStatsResponse>;

package/dist/server/system/stats.js

@@ -1,6 +1,8 @@
-import fs from 'node:fs';
+import { readFile, statfs } from 'node:fs/promises';
 import os from 'node:os';
+import { KeyedSingleFlight } from '../terminal/asyncCommand.js';
 let previousSample = null;
+const statsInflight = new KeyedSingleFlight();
 function takeCpuSample() {
     let idle = 0;
     let total = 0;
@@ -12,6 +14,9 @@ function takeCpuSample() {
     return { idle, total };
 }
 export function collectSystemStats(diskPath = process.cwd()) {
+    return statsInflight.run(diskPath, () => collectSystemStatsUncached(diskPath));
+}
+async function collectSystemStatsUncached(diskPath) {
     const sample = takeCpuSample();
     let cpuPercent = null;
     if (previousSample !== null) {
@@ -27,8 +32,7 @@ export function collectSystemStats(diskPath = process.cwd()) {
     const freeBytes = os.freemem();
     const usedBytes = Math.max(0, totalBytes - freeBytes);
     const memoryPercent = totalBytes > 0 ? Math.round((usedBytes / totalBytes) * 1000) / 10 : 0;
-    const disk = readDiskUsage(diskPath);
-    const swap = readSwapUsage();
+    const [disk, swap] = await Promise.all([readDiskUsage(diskPath), readSwapUsage()]);
     return {
         cpuPercent,
         memoryPercent,
@@ -43,9 +47,9 @@ export function collectSystemStats(diskPath = process.cwd()) {
         cores: os.cpus().length
     };
 }
-function readDiskUsage(diskPath) {
+async function readDiskUsage(diskPath) {
     try {
-        const stats = fs.statfsSync(diskPath);
+        const stats = await statfs(diskPath);
         const totalBytes = stats.blocks * stats.bsize;
         const availableBytes = stats.bavail * stats.bsize;
         const usedBytes = Math.max(0, totalBytes - availableBytes);
@@ -55,10 +59,10 @@ function readDiskUsage(diskPath) {
         return null;
     }
 }
-function readSwapUsage() {
+async function readSwapUsage() {
     let raw;
     try {
-        raw = fs.readFileSync('/proc/meminfo', 'utf8');
+        raw = await readFile('/proc/meminfo', 'utf8');
     }
     catch {
         return null;

package/dist/server/system/stats.js.map

@@ -1 +1 @@
-{"version":3,"file":"stats.js","sourceRoot":"","sources":["../../../src/server/system/stats.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stats.js","sourceRoot":"","sources":["../../../src/server/system/stats.ts"],"names":[],"mappings":"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"}

package/dist/server/terminal/PtyAdapter.d.ts

@@ -15,6 +15,10 @@ export interface PtyProcess {
 export interface Disposable {
     dispose(): void;
 }
+export type MaybePromise<T> = T | Promise<T>;
+export declare class PtySessionUnavailableError extends Error {
+    constructor(sessionId: string);
+}
 export interface PtySpawnOptions {
     sessionId: string;
     shell: string;
@@ -32,10 +36,19 @@ export interface PtyHistoryCapture {
     startLine: number;
     endLine: number;
     hasMore: boolean;
+    invalidated?: boolean;
+    snapshotHistorySize?: number;
+    snapshotHistoryLimit?: number;
+    snapshotHistoryToken?: string;
+    snapshotPaneWidth?: number;
     output: string[];
 }
 export interface PtyHistoryCaptureOptions {
     beforeLine?: number;
+    snapshotHistorySize?: number;
+    snapshotHistoryLimit?: number;
+    snapshotHistoryToken?: string;
+    snapshotPaneWidth?: number;
     limit: number;
 }
 export interface PtyTranscriptSource {
@@ -46,16 +59,20 @@ export interface PtyTranscriptSource {
 export interface PtyAdapter {
     spawn(options: PtySpawnOptions & {
         title?: string;
+    }): MaybePromise<PtyProcess>;
+    attachExisting?(options: PtySpawnOptions & {
+        title?: string;
     }): PtyProcess;
-    listExisting?(): PersistedSession[];
-    destroySession?(sessionId: string): boolean;
-    setSessionTitle?(sessionId: string, title: string): void;
-    pollSessions?(): Promise<Map<string, {
+    listExisting?(): MaybePromise<PersistedSession[]>;
+    destroySession?(sessionId: string): MaybePromise<boolean>;
+    setSessionTitle?(sessionId: string, title: string): MaybePromise<void>;
+    pollSessions?(): MaybePromise<Map<string, {
         currentCommand: string;
         busy: boolean;
     }>>;
-    captureHistory?(sessionId: string, options: PtyHistoryCaptureOptions): PtyHistoryCapture | null;
-    resolveTranscriptSource?(sessionId: string): PtyTranscriptSource | null;
-    scrollbackScroll?(sessionId: string, lines: number): boolean;
-    cancelScrollbackMode?(sessionId: string): boolean;
+    captureHistory?(sessionId: string, options: PtyHistoryCaptureOptions): MaybePromise<PtyHistoryCapture | null>;
+    resolveTranscriptSource?(sessionId: string): MaybePromise<PtyTranscriptSource | null>;
+    scrollbackScroll?(sessionId: string, lines: number): MaybePromise<boolean>;
+    cancelScrollbackMode?(sessionId: string): MaybePromise<boolean>;
 }
+export declare function normalizeTerminalTitle(raw: string): string;

package/dist/server/terminal/PtyAdapter.js

@@ -1,2 +1,13 @@
-export {};
+export class PtySessionUnavailableError extends Error {
+    constructor(sessionId) {
+        super(`persistent terminal session ${sessionId} is unavailable`);
+        this.name = 'PtySessionUnavailableError';
+    }
+}
+// Keep the persisted tmux window name and the in-memory/UI title identical.
+// Terminal titles are single-line labels, not terminal output.
+export function normalizeTerminalTitle(raw) {
+    const collapsed = raw.replace(/[\u0000-\u001f\u007f]+/g, ' ').trim();
+    return collapsed.slice(0, 80) || 'Terminal';
+}
 //# sourceMappingURL=PtyAdapter.js.map

package/dist/server/terminal/PtyAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"PtyAdapter.js","sourceRoot":"","sources":["../../../src/server/terminal/PtyAdapter.ts"],"names":[],"mappings":""}
+{"version":3,"file":"PtyAdapter.js","sourceRoot":"","sources":["../../../src/server/terminal/PtyAdapter.ts"],"names":[],"mappings":"AA6BA,MAAM,OAAO,0BAA2B,SAAQ,KAAK;IACnD,YAAY,SAAiB;QAC3B,KAAK,CAAC,+BAA+B,SAAS,iBAAiB,CAAC,CAAC;QACjE,IAAI,CAAC,IAAI,GAAG,4BAA4B,CAAC;IAC3C,CAAC;CACF;AAgHD,4EAA4E;AAC5E,+DAA+D;AAC/D,MAAM,UAAU,sBAAsB,CAAC,GAAW;IAChD,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,yBAAyB,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACrE,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC;AAC9C,CAAC"}