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
JavaScript ai-agentsdashboarddeveloper-toolsdigital-twinquantified-selfsecond-brainself-hostedtailscale
fix(upgradeFallback): only exempt upgrades claimed by Engine.IO with prefix matching (#12069)
Adam Eivy0ecc0d969e6b
diff --git a/server/lib/upgradeFallback.js b/server/lib/upgradeFallback.jsindex f72cff9067..1aa12a5ef0 100644--- a/server/lib/upgradeFallback.js+++ b/server/lib/upgradeFallback.js@@ -31,10 +31,18 @@ export function markUpgradeClaimed(socket) {}}-function isSocketIoUpgrade(req) {- if (!req?.url) return false;- const pathname = req.url.split('?', 1)[0];- return pathname === '/socket.io' || pathname.startsWith('/socket.io/');+function hasEngineIoListener(server) {+ if (!server || typeof server.listeners !== 'function') return false;+ return server.listeners('upgrade').some((fn) => {+ const src = fn.toString();+ return src.includes('handleUpgrade') && src.includes('destroyUpgrade');+ });+}++function isEngineIoUpgrade(server, req, customPath = '/socket.io') {+ if (!hasEngineIoListener(server)) return false;+ const prefix = (customPath || '/socket.io').replace(/\/$/, '') + '/';+ return typeof req?.url === 'string' && req.url.slice(0, prefix.length) === prefix;}/**@@ -44,11 +52,13 @@ function isSocketIoUpgrade(req) {* @param {import('node:http').Server|import('node:https').Server|null|undefined} server* @param {object} [options]* @param {number} [options.timeoutMs=1000]+ * @param {string} [options.socketIoPath='/socket.io']* @param {((req: import('node:http').IncomingMessage, socket: import('node:net').Socket) => boolean)} [options.isClaimed]* @returns {(() => void)} Cleanup function to detach listener*/export function installUpgradeFallback(server, {timeoutMs = DEFAULT_UPGRADE_TIMEOUT_MS,+ socketIoPath = '/socket.io',isClaimed = () => false,} = {}) {if (!server || typeof server.on !== 'function') {@@ -60,7 +70,7 @@ export function installUpgradeFallback(server, {mountedUpgradeFallbackServers.add(server);const onUpgrade = (req, socket) => {- if (socket.portosUpgradeClaimed || isSocketIoUpgrade(req) || isClaimed(req, socket)) {+ if (socket.portosUpgradeClaimed || isEngineIoUpgrade(server, req, socketIoPath) || isClaimed(req, socket)) {socket.portosUpgradeClaimed = true;return;}diff --git a/server/services/eidoverseProxy.test.js b/server/services/eidoverseProxy.test.jsindex 1171389da4..603cbc8151 100644--- a/server/services/eidoverseProxy.test.js+++ b/server/services/eidoverseProxy.test.js@@ -356,4 +356,26 @@ describe('main-server eidoverse reverse-proxy', () => {expect(client.connected).toBe(true);client.disconnect();});++ it('ends an unanswered upgrade to /socket.io (without trailing slash) after timeout', async () => {+ const app = express();+ const server = createServer(app);+ const io = new SocketIoServer(server, {+ destroyUpgrade: false,+ path: '/socket.io',+ });+ ioServers.push(io);+ installUpgradeFallback(server, { timeoutMs: 100 });+ const port = await listen(server);++ const client = new WebSocket(`ws://127.0.0.1:${port}/socket.io`);+ webSocketClients.push(client);+ const closed = await new Promise((resolve) => {+ client.on('close', () => resolve(true));+ client.on('error', () => resolve(true));+ });+ expect(closed).toBe(true);+ expect(client.readyState).toBeGreaterThanOrEqual(WebSocket.CLOSING);+ webSocketClients.pop();+ });});