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): recognize Socket.IO upgrades before async allowRequest (#12069)

Adam Eivyac844d5241b8
diff --git a/server/lib/upgradeFallback.js b/server/lib/upgradeFallback.js
index 0a0da31a6e..f72cff9067 100644
--- a/server/lib/upgradeFallback.js
+++ b/server/lib/upgradeFallback.js
@@ -31,6 +31,12 @@ 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/');
+}
+
/**
* Install an upgrade fallback listener on an HTTP/HTTPS server.
* Unclaimed sockets that receive no response after `timeoutMs` are ended.
@@ -38,9 +44,13 @@ export function markUpgradeClaimed(socket) {
* @param {import('node:http').Server|import('node:https').Server|null|undefined} server
* @param {object} [options]
* @param {number} [options.timeoutMs=1000]
+ * @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 } = {}) {
+export function installUpgradeFallback(server, {
+ timeoutMs = DEFAULT_UPGRADE_TIMEOUT_MS,
+ isClaimed = () => false,
+} = {}) {
if (!server || typeof server.on !== 'function') {
return () => {};
}
@@ -49,8 +59,11 @@ export function installUpgradeFallback(server, { timeoutMs = DEFAULT_UPGRADE_TIM
}
mountedUpgradeFallbackServers.add(server);
- const onUpgrade = (_req, socket) => {
- if (socket.portosUpgradeClaimed) return;
+ const onUpgrade = (req, socket) => {
+ if (socket.portosUpgradeClaimed || isSocketIoUpgrade(req) || isClaimed(req, socket)) {
+ socket.portosUpgradeClaimed = true;
+ return;
+ }
const initialBytes = socket.bytesWritten;
let timer = null;
diff --git a/server/services/eidoverseProxy.test.js b/server/services/eidoverseProxy.test.js
index 1ddb47c4db..1171389da4 100644
--- a/server/services/eidoverseProxy.test.js
+++ b/server/services/eidoverseProxy.test.js
@@ -332,5 +332,28 @@ describe('main-server eidoverse reverse-proxy', () => {
expect(client.connected).toBe(true);
client.disconnect();
});
+
+ it('preserves Socket.IO upgrades with delayed allowRequest authorization', async () => {
+ const app = express();
+ const server = createServer(app);
+ const io = new SocketIoServer(server, {
+ destroyUpgrade: false,
+ path: '/socket.io',
+ allowRequest: async (_req, callback) => {
+ await new Promise((resolve) => setTimeout(resolve, 1500));
+ callback(null, true);
+ },
+ });
+ ioServers.push(io);
+ installUpgradeFallback(server);
+ const port = await listen(server);
+
+ const client = SocketIoClient(`http://127.0.0.1:${port}`, {
+ path: '/socket.io',
+ transports: ['websocket'],
+ });
+ await once(client, 'connect');
+ expect(client.connected).toBe(true);
+ client.disconnect();
});
});