nterminal 1.2.75 → 1.2.77

package/dist/server/agent/outboundAgentClient.js

@@ -0,0 +1,237 @@
+import net from 'node:net';
+import WebSocket from 'ws';
+import { agentLinkProtocolVersion, parseAgentLinkJson, parseMainAgentLinkMessage } from '../../shared/agentLinkProtocol.js';
+import { getVersionInfo } from '../update/packageUpdate.js';
+import { relaySocketAndWebSocket } from './socketWebSocketRelay.js';
+const maxStreams = 128;
+const reconnectMaxMs = 30_000;
+const heartbeatMs = 20_000;
+const localConnectTimeoutMs = 5_000;
+const webSocketHandshakeTimeoutMs = 10_000;
+const maxControlMessageBytes = 16 * 1024;
+export class OutboundAgentClient {
+    config;
+    logger;
+    control = null;
+    reconnectTimer = null;
+    reconnectAttempt = 0;
+    stopped = true;
+    constructor(config, logger) {
+        this.config = config;
+        this.logger = logger;
+    }
+    start() {
+        if (!this.stopped)
+            return;
+        this.stopped = false;
+        this.connect();
+    }
+    dispose() {
+        this.stopped = true;
+        if (this.reconnectTimer) {
+            clearTimeout(this.reconnectTimer);
+            this.reconnectTimer = null;
+        }
+        if (this.control)
+            this.closeControl(this.control);
+    }
+    connect() {
+        if (this.stopped || this.control || !this.config.mainUrl || !this.config.agentId || !this.config.agentToken)
+            return;
+        const socket = new WebSocket(agentLinkUrl(this.config.mainUrl, this.config.agentId, 'control'), {
+            headers: { Authorization: `Bearer ${this.config.agentToken}` },
+            handshakeTimeout: webSocketHandshakeTimeoutMs,
+            maxPayload: maxControlMessageBytes
+        });
+        const control = { socket, ready: false, streams: new Map(), heartbeat: null, alive: true };
+        this.control = control;
+        socket.on('open', () => {
+            const hello = {
+                type: 'hello',
+                protocolVersion: agentLinkProtocolVersion,
+                packageVersion: getVersionInfo().runningVersion
+            };
+            try {
+                socket.send(JSON.stringify(hello));
+            }
+            catch {
+                socket.terminate();
+                return;
+            }
+            control.heartbeat = setInterval(() => {
+                if (socket.readyState !== WebSocket.OPEN)
+                    return;
+                if (!control.alive) {
+                    socket.terminate();
+                    return;
+                }
+                control.alive = false;
+                try {
+                    socket.ping();
+                }
+                catch {
+                    socket.terminate();
+                }
+            }, heartbeatMs);
+            control.heartbeat.unref?.();
+        });
+        socket.on('pong', () => { control.alive = true; });
+        socket.on('message', (raw, isBinary) => {
+            if (isBinary) {
+                socket.close(1003, 'text control messages required');
+                return;
+            }
+            if (rawDataByteLength(raw) > maxControlMessageBytes) {
+                socket.close(1009, 'control message too large');
+                return;
+            }
+            const message = parseMainAgentLinkMessage(parseAgentLinkJson(raw.toString()));
+            if (!message) {
+                socket.close(1008, 'invalid control message');
+                return;
+            }
+            if (message.type === 'ready') {
+                if (control.ready) {
+                    socket.close(1008, 'duplicate ready');
+                    return;
+                }
+                control.ready = true;
+                this.reconnectAttempt = 0;
+                this.logger?.info({ agentId: this.config.agentId }, 'outbound agent link connected');
+                return;
+            }
+            if (!control.ready) {
+                socket.close(1008, 'stream requested before ready');
+                return;
+            }
+            this.openDataStream(control, message.streamId, message.ticket);
+        });
+        socket.on('error', (error) => {
+            this.logger?.warn({ error: error.message }, 'outbound agent link error');
+        });
+        socket.on('close', () => {
+            this.closeControl(control);
+            this.scheduleReconnect();
+        });
+    }
+    openDataStream(control, streamId, ticket) {
+        if (control !== this.control || control.streams.has(streamId))
+            return;
+        if (control.streams.size >= maxStreams) {
+            this.sendStreamFailed(control, streamId, 'capacity_exceeded');
+            return;
+        }
+        const localSocket = net.connect({ host: '127.0.0.1', port: this.config.port });
+        localSocket.pause();
+        localSocket.setTimeout(localConnectTimeoutMs, () => localSocket.destroy(new Error('local connect timeout')));
+        const stream = { localSocket, dataSocket: null, relay: null };
+        control.streams.set(streamId, stream);
+        const close = () => {
+            if (control.streams.get(streamId) !== stream)
+                return;
+            control.streams.delete(streamId);
+            stream.relay?.dispose();
+            stream.localSocket.destroy();
+            if (stream.dataSocket?.readyState === WebSocket.OPEN || stream.dataSocket?.readyState === WebSocket.CONNECTING) {
+                try {
+                    stream.dataSocket.close();
+                }
+                catch {
+                    stream.dataSocket.terminate();
+                }
+            }
+        };
+        localSocket.once('error', () => {
+            if (!stream.relay)
+                this.sendStreamFailed(control, streamId, 'local_unreachable');
+            close();
+        });
+        localSocket.once('close', close);
+        localSocket.once('connect', () => {
+            localSocket.setTimeout(0);
+            if (control !== this.control || control.socket.readyState !== WebSocket.OPEN) {
+                close();
+                return;
+            }
+            const dataSocket = new WebSocket(agentLinkUrl(this.config.mainUrl, this.config.agentId, `streams/${encodeURIComponent(streamId)}`), {
+                headers: { Authorization: `Bearer ${ticket}` },
+                handshakeTimeout: webSocketHandshakeTimeoutMs
+            });
+            stream.dataSocket = dataSocket;
+            dataSocket.once('open', () => {
+                if (control !== this.control) {
+                    close();
+                    return;
+                }
+                stream.relay = relaySocketAndWebSocket(localSocket, dataSocket);
+            });
+            dataSocket.once('error', () => {
+                if (!stream.relay)
+                    this.sendStreamFailed(control, streamId, 'data_link_failed');
+                close();
+            });
+            dataSocket.once('close', close);
+        });
+    }
+    sendStreamFailed(control, streamId, reason) {
+        if (control.socket.readyState !== WebSocket.OPEN)
+            return;
+        const message = { type: 'stream_failed', streamId, reason };
+        try {
+            control.socket.send(JSON.stringify(message));
+        }
+        catch {
+            control.socket.terminate();
+        }
+    }
+    closeControl(control) {
+        if (control.heartbeat)
+            clearInterval(control.heartbeat);
+        control.heartbeat = null;
+        for (const stream of control.streams.values()) {
+            stream.relay?.dispose();
+            stream.localSocket.destroy();
+            if (stream.dataSocket?.readyState === WebSocket.OPEN || stream.dataSocket?.readyState === WebSocket.CONNECTING) {
+                try {
+                    stream.dataSocket.close();
+                }
+                catch {
+                    stream.dataSocket.terminate();
+                }
+            }
+        }
+        control.streams.clear();
+        if (control.socket.readyState === WebSocket.OPEN || control.socket.readyState === WebSocket.CONNECTING) {
+            try {
+                control.socket.close(1000, 'agent link stopped');
+            }
+            catch {
+                control.socket.terminate();
+            }
+        }
+        if (this.control === control)
+            this.control = null;
+    }
+    scheduleReconnect() {
+        if (this.stopped || this.reconnectTimer)
+            return;
+        const base = Math.min(reconnectMaxMs, 1_000 * 2 ** Math.min(5, this.reconnectAttempt++));
+        const delay = Math.max(250, Math.round(base * (0.8 + Math.random() * 0.4)));
+        this.reconnectTimer = setTimeout(() => {
+            this.reconnectTimer = null;
+            this.connect();
+        }, delay);
+        this.reconnectTimer.unref?.();
+    }
+}
+function agentLinkUrl(mainUrl, agentId, suffix) {
+    const url = new URL(`/api/agent-links/${encodeURIComponent(agentId)}/${suffix}`, mainUrl);
+    url.protocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
+    return url.toString();
+}
+function rawDataByteLength(raw) {
+    if (Array.isArray(raw))
+        return raw.reduce((total, chunk) => total + chunk.byteLength, 0);
+    return raw.byteLength;
+}
+//# sourceMappingURL=outboundAgentClient.js.map

package/dist/server/agent/outboundAgentClient.js.map

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

package/dist/server/agent/outboundAgentRegistry.d.ts

@@ -0,0 +1,25 @@
+import WebSocket from 'ws';
+import type { StoredAgent } from '../storage/fileStore.js';
+export interface ResolvedAgent extends Omit<StoredAgent, 'url'> {
+    url: string;
+}
+export interface OutboundAgentStatus {
+    connected: boolean;
+    connectedAt: string | null;
+    packageVersion: string | null;
+}
+export declare class OutboundAgentRegistry {
+    private readonly connections;
+    attachControl(agentId: string, socket: WebSocket, packageVersion: string): Promise<string>;
+    detachControl(agentId: string, connectionId: string): void;
+    failStream(agentId: string, connectionId: string, streamId: string): void;
+    validateDataStreamTicket(agentId: string, streamId: string, ticket: string | null): boolean;
+    attachDataStream(agentId: string, streamId: string, ticket: string, webSocket: WebSocket): boolean;
+    resolve(agent: StoredAgent): ResolvedAgent | null;
+    status(agentId: string): OutboundAgentStatus;
+    disconnect(agentId: string): void;
+    dispose(): void;
+    private openStream;
+    private closeConnection;
+}
+export declare function safeTokenEqual(left: string | null, right: string): boolean;

package/dist/server/agent/outboundAgentRegistry.js

@@ -0,0 +1,190 @@
+import { randomBytes, randomUUID, timingSafeEqual } from 'node:crypto';
+import net from 'node:net';
+import WebSocket from 'ws';
+import { relaySocketAndWebSocket } from './socketWebSocketRelay.js';
+const maxStreamsPerAgent = 128;
+const streamAttachTimeoutMs = 10_000;
+export class OutboundAgentRegistry {
+    connections = new Map();
+    async attachControl(agentId, socket, packageVersion) {
+        const listener = net.createServer({ pauseOnConnect: true });
+        const endpoint = await listenLoopback(listener);
+        const connection = {
+            agentId,
+            connectionId: randomUUID(),
+            control: socket,
+            listener,
+            endpoint,
+            connectedAt: new Date().toISOString(),
+            packageVersion,
+            pending: new Map(),
+            sockets: new Set(),
+            relays: new Set(),
+            closed: false
+        };
+        listener.on('connection', (localSocket) => this.openStream(connection, localSocket));
+        listener.on('error', () => this.closeConnection(connection, 'loopback listener failed'));
+        const previous = this.connections.get(agentId);
+        this.connections.set(agentId, connection);
+        if (previous)
+            this.closeConnection(previous, 'replaced by a newer connection');
+        return connection.connectionId;
+    }
+    detachControl(agentId, connectionId) {
+        const connection = this.connections.get(agentId);
+        if (!connection || connection.connectionId !== connectionId)
+            return;
+        this.closeConnection(connection, 'control connection closed');
+    }
+    failStream(agentId, connectionId, streamId) {
+        const connection = this.connections.get(agentId);
+        if (!connection || connection.connectionId !== connectionId)
+            return;
+        const pending = connection.pending.get(streamId);
+        if (!pending)
+            return;
+        connection.pending.delete(streamId);
+        clearTimeout(pending.timeout);
+        pending.socket.destroy();
+    }
+    validateDataStreamTicket(agentId, streamId, ticket) {
+        const connection = this.connections.get(agentId);
+        const pending = connection?.pending.get(streamId);
+        return Boolean(connection && pending && safeTokenEqual(ticket, pending.ticket));
+    }
+    attachDataStream(agentId, streamId, ticket, webSocket) {
+        const connection = this.connections.get(agentId);
+        const pending = connection?.pending.get(streamId);
+        if (!connection || !pending || !safeTokenEqual(pending.ticket, ticket))
+            return false;
+        connection.pending.delete(streamId);
+        clearTimeout(pending.timeout);
+        const relay = relaySocketAndWebSocket(pending.socket, webSocket);
+        connection.relays.add(relay);
+        pending.socket.once('close', () => connection.relays.delete(relay));
+        return true;
+    }
+    resolve(agent) {
+        if (agent.transport === 'direct') {
+            return agent.url ? { ...agent, url: agent.url } : null;
+        }
+        const connection = this.connections.get(agent.id);
+        return connection && !connection.closed ? { ...agent, url: connection.endpoint } : null;
+    }
+    status(agentId) {
+        const connection = this.connections.get(agentId);
+        return connection && !connection.closed
+            ? { connected: true, connectedAt: connection.connectedAt, packageVersion: connection.packageVersion }
+            : { connected: false, connectedAt: null, packageVersion: null };
+    }
+    disconnect(agentId) {
+        const connection = this.connections.get(agentId);
+        if (connection)
+            this.closeConnection(connection, 'agent removed');
+    }
+    dispose() {
+        for (const connection of [...this.connections.values()]) {
+            this.closeConnection(connection, 'server shutting down');
+        }
+    }
+    openStream(connection, localSocket) {
+        // A caller can reset the loopback connection before the secondary attaches
+        // its data link. Handle that socket error immediately instead of allowing an
+        // unhandled EventEmitter error to terminate the main process.
+        localSocket.on('error', () => localSocket.destroy());
+        if (connection.closed || this.connections.get(connection.agentId) !== connection) {
+            localSocket.destroy();
+            return;
+        }
+        if (connection.sockets.size >= maxStreamsPerAgent) {
+            localSocket.destroy();
+            return;
+        }
+        localSocket.pause();
+        connection.sockets.add(localSocket);
+        const streamId = randomUUID();
+        const ticket = randomBytes(32).toString('base64url');
+        const timeout = setTimeout(() => {
+            connection.pending.delete(streamId);
+            localSocket.destroy();
+        }, streamAttachTimeoutMs);
+        timeout.unref?.();
+        connection.pending.set(streamId, { socket: localSocket, ticket, timeout });
+        localSocket.once('close', () => {
+            connection.sockets.delete(localSocket);
+            const pending = connection.pending.get(streamId);
+            if (pending?.socket === localSocket) {
+                connection.pending.delete(streamId);
+                clearTimeout(pending.timeout);
+            }
+        });
+        const message = { type: 'open_stream', streamId, ticket };
+        try {
+            if (connection.control.readyState !== WebSocket.OPEN)
+                throw new Error('control link closed');
+            connection.control.send(JSON.stringify(message));
+        }
+        catch {
+            connection.pending.delete(streamId);
+            clearTimeout(timeout);
+            localSocket.destroy();
+        }
+    }
+    closeConnection(connection, reason) {
+        if (connection.closed)
+            return;
+        connection.closed = true;
+        if (this.connections.get(connection.agentId) === connection) {
+            this.connections.delete(connection.agentId);
+        }
+        connection.listener.close();
+        for (const pending of connection.pending.values()) {
+            clearTimeout(pending.timeout);
+            pending.socket.destroy();
+        }
+        connection.pending.clear();
+        for (const relay of connection.relays)
+            relay.dispose();
+        connection.relays.clear();
+        for (const socket of connection.sockets)
+            socket.destroy();
+        connection.sockets.clear();
+        if (connection.control.readyState === WebSocket.OPEN || connection.control.readyState === WebSocket.CONNECTING) {
+            try {
+                connection.control.close(1012, reason.slice(0, 123));
+            }
+            catch {
+                connection.control.terminate();
+            }
+        }
+    }
+}
+function listenLoopback(server) {
+    return new Promise((resolve, reject) => {
+        const onError = (error) => {
+            server.off('listening', onListening);
+            reject(error);
+        };
+        const onListening = () => {
+            server.off('error', onError);
+            const address = server.address();
+            if (!address || typeof address === 'string') {
+                server.close();
+                reject(new Error('outbound agent listener did not receive a TCP port'));
+                return;
+            }
+            resolve(`http://127.0.0.1:${address.port}`);
+        };
+        server.once('error', onError);
+        server.once('listening', onListening);
+        server.listen(0, '127.0.0.1');
+    });
+}
+export function safeTokenEqual(left, right) {
+    if (!left)
+        return false;
+    const leftBuffer = Buffer.from(left);
+    const rightBuffer = Buffer.from(right);
+    return leftBuffer.length === rightBuffer.length && timingSafeEqual(leftBuffer, rightBuffer);
+}
+//# sourceMappingURL=outboundAgentRegistry.js.map

package/dist/server/agent/outboundAgentRegistry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"outboundAgentRegistry.js","sourceRoot":"","sources":["../../../src/server/agent/outboundAgentRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,GAAiC,MAAM,UAAU,CAAC;AACzD,OAAO,SAAS,MAAM,IAAI,CAAC;AAG3B,OAAO,EAAE,uBAAuB,EAA6B,MAAM,2BAA2B,CAAC;AAgC/F,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAC/B,MAAM,qBAAqB,GAAG,MAAM,CAAC;AAErC,MAAM,OAAO,qBAAqB;IACf,WAAW,GAAG,IAAI,GAAG,EAA4B,CAAC;IAEnE,KAAK,CAAC,aAAa,CAAC,OAAe,EAAE,MAAiB,EAAE,cAAsB;QAC5E,MAAM,QAAQ,GAAG,GAAG,CAAC,YAAY,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC,CAAC;QAChD,MAAM,UAAU,GAAqB;YACnC,OAAO;YACP,YAAY,EAAE,UAAU,EAAE;YAC1B,OAAO,EAAE,MAAM;YACf,QAAQ;YACR,QAAQ;YACR,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACrC,cAAc;YACd,OAAO,EAAE,IAAI,GAAG,EAAE;YAClB,OAAO,EAAE,IAAI,GAAG,EAAE;YAClB,MAAM,EAAE,IAAI,GAAG,EAAE;YACjB,MAAM,EAAE,KAAK;SACd,CAAC;QAEF,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,0BAA0B,CAAC,CAAC,CAAC;QAEzF,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC1C,IAAI,QAAQ;YAAE,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,gCAAgC,CAAC,CAAC;QAC/E,OAAO,UAAU,CAAC,YAAY,CAAC;IACjC,CAAC;IAED,aAAa,CAAC,OAAe,EAAE,YAAoB;QACjD,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,YAAY,KAAK,YAAY;YAAE,OAAO;QACpE,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,2BAA2B,CAAC,CAAC;IAChE,CAAC;IAED,UAAU,CAAC,OAAe,EAAE,YAAoB,EAAE,QAAgB;QAChE,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,YAAY,KAAK,YAAY;YAAE,OAAO;QACpE,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACpC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,wBAAwB,CAAC,OAAe,EAAE,QAAgB,EAAE,MAAqB;QAC/E,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,OAAO,GAAG,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClD,OAAO,OAAO,CAAC,UAAU,IAAI,OAAO,IAAI,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAClF,CAAC;IAED,gBAAgB,CAAC,OAAe,EAAE,QAAgB,EAAE,MAAc,EAAE,SAAoB;QACtF,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,OAAO,GAAG,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,UAAU,IAAI,CAAC,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;QAErF,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACpC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9B,MAAM,KAAK,GAAG,uBAAuB,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACjE,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC7B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACpE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CAAC,KAAkB;QACxB,IAAI,KAAK,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;YACjC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACzD,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAClD,OAAO,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1F,CAAC;IAED,MAAM,CAAC,OAAe;QACpB,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjD,OAAO,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM;YACrC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,CAAC,WAAW,EAAE,cAAc,EAAE,UAAU,CAAC,cAAc,EAAE;YACrG,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;IACpE,CAAC;IAED,UAAU,CAAC,OAAe;QACxB,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,UAAU;YAAE,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;IACpE,CAAC;IAED,OAAO;QACL,KAAK,MAAM,UAAU,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,sBAAsB,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;IAEO,UAAU,CAAC,UAA4B,EAAE,WAAmB;QAClE,2EAA2E;QAC3E,6EAA6E;QAC7E,8DAA8D;QAC9D,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QACrD,IAAI,UAAU,CAAC,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;YACjF,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QACD,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,IAAI,kBAAkB,EAAE,CAAC;YAClD,WAAW,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QAED,WAAW,CAAC,KAAK,EAAE,CAAC;QACpB,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACpC,MAAM,QAAQ,GAAG,UAAU,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACrD,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC9B,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACpC,WAAW,CAAC,OAAO,EAAE,CAAC;QACxB,CAAC,EAAE,qBAAqB,CAAC,CAAC;QAC1B,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;QAClB,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;QAC3E,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;YAC7B,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YACvC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACjD,IAAI,OAAO,EAAE,MAAM,KAAK,WAAW,EAAE,CAAC;gBACpC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACpC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAChC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAA+B,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;QACtF,IAAI,CAAC;YACH,IAAI,UAAU,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;YAC7F,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QACnD,CAAC;QAAC,MAAM,CAAC;YACP,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACpC,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,WAAW,CAAC,OAAO,EAAE,CAAC;QACxB,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,UAA4B,EAAE,MAAc;QAClE,IAAI,UAAU,CAAC,MAAM;YAAE,OAAO;QAC9B,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC;QACzB,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;YAC5D,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC9C,CAAC;QACD,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAC5B,KAAK,MAAM,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YAClD,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC9B,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC;QACD,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAC3B,KAAK,MAAM,KAAK,IAAI,UAAU,CAAC,MAAM;YAAE,KAAK,CAAC,OAAO,EAAE,CAAC;QACvD,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC1B,KAAK,MAAM,MAAM,IAAI,UAAU,CAAC,OAAO;YAAE,MAAM,CAAC,OAAO,EAAE,CAAC;QAC1D,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAC3B,IAAI,UAAU,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,UAAU,EAAE,CAAC;YAC/G,IAAI,CAAC;gBACH,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;YACvD,CAAC;YAAC,MAAM,CAAC;gBACP,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;YACjC,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,SAAS,cAAc,CAAC,MAAc;IACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,CAAC,KAAY,EAAE,EAAE;YAC/B,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;YACrC,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC;QACF,MAAM,WAAW,GAAG,GAAG,EAAE;YACvB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC7B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;YACjC,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAC5C,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC,CAAC;gBACxE,OAAO;YACT,CAAC;YACD,OAAO,CAAC,oBAAoB,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QACtC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAmB,EAAE,KAAa;IAC/D,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IACxB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvC,OAAO,UAAU,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,IAAI,eAAe,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;AAC9F,CAAC"}

package/dist/server/agent/socketWebSocketRelay.d.ts

@@ -0,0 +1,6 @@
+import type { Socket } from 'node:net';
+import WebSocket from 'ws';
+export interface SocketWebSocketRelay {
+    dispose(): void;
+}
+export declare function relaySocketAndWebSocket(socket: Socket, webSocket: WebSocket): SocketWebSocketRelay;

package/dist/server/agent/socketWebSocketRelay.js

@@ -0,0 +1,107 @@
+import WebSocket from 'ws';
+const highWaterBytes = 4 * 1024 * 1024;
+const lowWaterBytes = 1 * 1024 * 1024;
+const drainPollMs = 50;
+export function relaySocketAndWebSocket(socket, webSocket) {
+    let closed = false;
+    let socketPausedForWebSocket = false;
+    let webSocketPausedForSocket = false;
+    let drainTimer = null;
+    const stopDrainTimer = () => {
+        if (!drainTimer)
+            return;
+        clearInterval(drainTimer);
+        drainTimer = null;
+    };
+    const dispose = () => {
+        if (closed)
+            return;
+        closed = true;
+        stopDrainTimer();
+        socket.destroy();
+        if (webSocket.readyState === WebSocket.OPEN || webSocket.readyState === WebSocket.CONNECTING) {
+            try {
+                webSocket.close(1000, 'stream closed');
+            }
+            catch {
+                webSocket.terminate();
+            }
+        }
+    };
+    const watchWebSocketDrain = () => {
+        if (drainTimer || closed)
+            return;
+        drainTimer = setInterval(() => {
+            if (closed)
+                return;
+            if (webSocket.readyState !== WebSocket.OPEN) {
+                dispose();
+                return;
+            }
+            if (webSocket.bufferedAmount > lowWaterBytes)
+                return;
+            stopDrainTimer();
+            if (socketPausedForWebSocket) {
+                socketPausedForWebSocket = false;
+                socket.resume();
+            }
+        }, drainPollMs);
+        drainTimer.unref?.();
+    };
+    socket.on('data', (chunk) => {
+        if (closed || webSocket.readyState !== WebSocket.OPEN) {
+            dispose();
+            return;
+        }
+        try {
+            webSocket.send(chunk, { binary: true });
+        }
+        catch {
+            dispose();
+            return;
+        }
+        if (webSocket.bufferedAmount > highWaterBytes && !socketPausedForWebSocket) {
+            socketPausedForWebSocket = true;
+            socket.pause();
+            watchWebSocketDrain();
+        }
+    });
+    webSocket.on('message', (data, isBinary) => {
+        if (closed)
+            return;
+        if (!isBinary) {
+            try {
+                webSocket.close(1003, 'binary stream required');
+            }
+            finally {
+                dispose();
+            }
+            return;
+        }
+        const buffer = rawDataBuffer(data);
+        if (!socket.write(buffer) && !webSocketPausedForSocket) {
+            webSocketPausedForSocket = true;
+            webSocket.pause();
+        }
+    });
+    socket.on('drain', () => {
+        if (!webSocketPausedForSocket || closed)
+            return;
+        webSocketPausedForSocket = false;
+        webSocket.resume();
+    });
+    socket.on('error', dispose);
+    socket.on('close', dispose);
+    webSocket.on('error', dispose);
+    webSocket.on('close', dispose);
+    socket.resume();
+    return { dispose };
+}
+function rawDataBuffer(data) {
+    if (Buffer.isBuffer(data))
+        return data;
+    if (Array.isArray(data))
+        return Buffer.concat(data);
+    return Buffer.from(data);
+}
+//# sourceMappingURL=socketWebSocketRelay.js.map

package/dist/server/agent/socketWebSocketRelay.js.map

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

package/dist/server/auth/authService.js

@@ -98,9 +98,12 @@ export class AuthService {
         const ip = normalizeIp(ctx.ip);
         await this.store.update((current) => {
             const devices = this.pruneDevices(current.trustedDevices).filter((d) => d.id !== device.record.id);
+            const nextDevices = [...devices, device.record];
+            const nextDeviceIds = new Set(nextDevices.map((candidate) => candidate.id));
             return {
                 ...current,
-                trustedDevices: [...devices, device.record],
+                trustedDevices: nextDevices,
+                pushSubscriptions: current.pushSubscriptions.filter((subscription) => nextDeviceIds.has(subscription.trustedDeviceId)),
                 ipWhitelist: this.maybeAddIp(current.ipWhitelist, ip, ctx.rememberNetwork)
             };
         }, { flush: 'immediate' });