Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

fix(upgradeFallback): capture baseline bytesWritten using prependListener (#12069)

Adam Eivy6887e584cc58
diff --git a/server/lib/upgradeFallback.js b/server/lib/upgradeFallback.js
index 876c6a4334..0a0da31a6e 100644
--- a/server/lib/upgradeFallback.js
+++ b/server/lib/upgradeFallback.js
@@ -51,6 +51,7 @@ export function installUpgradeFallback(server, { timeoutMs = DEFAULT_UPGRADE_TIM
const onUpgrade = (_req, socket) => {
if (socket.portosUpgradeClaimed) return;
+ const initialBytes = socket.bytesWritten;
let timer = null;
const cleanup = () => {
@@ -67,7 +68,7 @@ export function installUpgradeFallback(server, { timeoutMs = DEFAULT_UPGRADE_TIM
socket.off('error', cleanup);
if (socket.portosUpgradeClaimed) return;
if (!socket.writable || socket.destroyed) return;
- if (socket.bytesWritten > 0) return;
+ if (socket.bytesWritten > initialBytes) return;
socket.on('error', () => {});
socket.end();
const destroyTimer = setTimeout(() => {
@@ -81,7 +82,7 @@ export function installUpgradeFallback(server, { timeoutMs = DEFAULT_UPGRADE_TIM
timer.unref?.();
};
- server.on('upgrade', onUpgrade);
+ server.prependListener('upgrade', onUpgrade);
return () => {
mountedUpgradeFallbackServers.delete(server);
diff --git a/server/lib/upgradeFallback.test.js b/server/lib/upgradeFallback.test.js
index c9f1dfe1cc..705d634d66 100644
--- a/server/lib/upgradeFallback.test.js
+++ b/server/lib/upgradeFallback.test.js
@@ -140,6 +140,30 @@ describe('upgradeFallback', () => {
expect(serverSocket.destroyed).toBe(false);
});
+ it('ends an unclaimed upgrade even on a keep-alive socket with previous bytesWritten', async () => {
+ const server = createServer((req, res) => {
+ res.writeHead(200, { 'Content-Length': '4', Connection: 'keep-alive' });
+ res.end('pong');
+ });
+ installUpgradeFallback(server, { timeoutMs: 50 });
+ const port = await listen(server);
+
+ const { createConnection } = await import('node:net');
+ const socket = createConnection({ host: '127.0.0.1', port });
+ sockets.push(socket);
+ await once(socket, 'connect');
+
+ // First, complete an ordinary HTTP request over the connection
+ socket.write('GET /probe HTTP/1.1\r\nHost: 127.0.0.1\r\nConnection: keep-alive\r\n\r\n');
+ await once(socket, 'data');
+
+ // Next, send an unclaimed upgrade over the same keep-alive socket
+ socket.write('GET /unclaimed HTTP/1.1\r\nHost: 127.0.0.1\r\nConnection: Upgrade\r\nUpgrade: websocket\r\n\r\n');
+
+ await new Promise((resolve) => setTimeout(resolve, 180));
+ expect(socket.destroyed).toBe(true);
+ });
+
it('prevents duplicate installation and cleans up properly', async () => {
const server = createServer();
const cleanup1 = installUpgradeFallback(server);