@openchambery/web 2.0.0-beta.1 → 2.0.0-beta.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +15 -11
- package/bin/cli-opencode.test.js +4 -4
- package/bin/cli.js +1 -1
- package/bin/lib/cli-startup.js +1 -1
- package/bin/lib/cli-startup.test.js +18 -4
- package/dist/assets/{AgentAvatar-CLWWNu_Q.js → AgentAvatar-pLaqWWmB.js} +1 -1
- package/dist/assets/AssistantView-C4GkABnI.js +3 -0
- package/dist/assets/{DiagramView-xuSJTnv7.js → DiagramView-ByYLIfWo.js} +1 -1
- package/dist/assets/{FadeInOnReveal-Ov0D96d0.js → FadeInOnReveal-MuJAzJq_.js} +1 -1
- package/dist/assets/Icon-Dz2kO9RN.js +1 -0
- package/dist/assets/MarkdownRenderer-CPU6kSHd.js +2 -0
- package/dist/assets/{MarkdownRendererImpl-SKi4oG0c.js → MarkdownRendererImpl-2hw5cdqQ.js} +3 -3
- package/dist/assets/MarkstreamRendererImpl-DXZQkLTa.js +3 -0
- package/dist/assets/{MobileDetailNavigation-Bnx59U_J.js → MobileDetailNavigation-C9BzieQY.js} +1 -1
- package/dist/assets/{MobileShareBridge-BQlP4J-F.js → MobileShareBridge-2_iOfzqO.js} +2 -2
- package/dist/assets/MobileSurface-DNVA7K_1.js +2 -0
- package/dist/assets/{MultiRunWindow-ChZGob0v.js → MultiRunWindow-QA6pMrJ9.js} +1 -1
- package/dist/assets/{OnboardingScreen-DtQJxZG-.js → OnboardingScreen-XWkr7MjT.js} +1 -1
- package/dist/assets/OverlayScrollbar-DCWyGseO.js +2 -0
- package/dist/assets/SettingsView-dWuu0VIb.js +25 -0
- package/dist/assets/{SettingsWindow-DfnsFa8y.js → SettingsWindow-CetgiJMX.js} +1 -1
- package/dist/assets/TerminalView-BuXuo7gm.js +8 -0
- package/dist/assets/{ToolOutputDialog-BejmjrRk.js → ToolOutputDialog-DNSSOaCt.js} +2 -2
- package/dist/assets/appThemeRegistry-Cb7qFBsc.js +1 -0
- package/dist/assets/{assistant-attachment-cache-C0aRnFkj.js → assistant-attachment-cache-DphJleHr.js} +1 -1
- package/dist/assets/{button-D-rATN7w.js → button-Doq9FI1I.js} +1 -1
- package/dist/assets/{collapsible-BXRd5_Hr.js → collapsible-CYUeu3_N.js} +1 -1
- package/dist/assets/{context-menu-jGtH6fR9.js → context-menu-C8kOMVtC.js} +1 -1
- package/dist/assets/{desktopHosts-B1ixEylr.js → desktopHosts-DbxnIQdS.js} +1 -1
- package/dist/assets/{desktopRelayRestore-4JmFUw8r.js → desktopRelayRestore-dvxF4V2p.js} +1 -1
- package/dist/assets/{diagram-DQf7Y_uR.js → diagram-B1p9Yn1h.js} +1 -1
- package/dist/assets/{dialog-bfbvR4VH.js → dialog-D08-Lg-e.js} +1 -1
- package/dist/assets/es-Dsmc0A_3.js +15 -0
- package/dist/assets/fileMentionTouchSelection-BCAKb-NS.js +3 -0
- package/dist/assets/{fileQueries-DQc8EJUf.js → fileQueries-X773xxvX.js} +1 -1
- package/dist/assets/fr-C_ZlZDI2.js +13 -0
- package/dist/assets/gitApi-3VBj3fbR.js +10 -0
- package/dist/assets/{imageSource-BlAJJUEI.js → imageSource-BMztRu0c.js} +1 -1
- package/dist/assets/{input-8r6F_Fza.js → input-DZZuQ1IL.js} +1 -1
- package/dist/assets/insertionBoundaries-BMuCcvPy.js +1 -0
- package/dist/assets/ja-BqqTaWTi.js +15 -0
- package/dist/assets/ko-DP2XPM37.js +15 -0
- package/dist/assets/main-COEILjRF.js +169 -0
- package/dist/assets/main-D2BzpnUt.css +1 -0
- package/dist/assets/{main-CCE_4y5F.js → main-DsUewWPt.js} +2 -2
- package/dist/assets/markdown-worker-bS5OgGO3.js +2 -0
- package/dist/assets/{markdownHeightCache-1Qo6y6IJ.js → markdownHeightCache-DBgXGze8.js} +1 -1
- package/dist/assets/markdownTheme-DM5h1i18.js +1 -0
- package/dist/assets/mcpQueries-B05QR67V.js +1 -0
- package/dist/assets/miniChat-D7IPMm-k.js +2 -0
- package/dist/assets/mobile-BnCoDxnv.js +2 -0
- package/dist/assets/multirun-BDmFjX9N.js +4 -0
- package/dist/assets/persistence-DznVIKwz.js +3 -0
- package/dist/assets/pl-BCf5uLlK.js +15 -0
- package/dist/assets/platform-DSTtx-DI.js +6 -0
- package/dist/assets/projectMeta-C5gcAd5f.js +3 -0
- package/dist/assets/pt-BR-W09Q2pvn.js +15 -0
- package/dist/assets/{relay-image-stream-DM7atqJs.js → relay-image-stream-DrdVj99c.js} +1 -1
- package/dist/assets/renderElectronMiniChatApp-DsAaWCss.js +2 -0
- package/dist/assets/renderMobileApp-DOaoohlp.js +28 -0
- package/dist/assets/runtime-fetch-Fs9ZV2V8.js +1 -0
- package/dist/assets/{runtimeConfig-BMvqa5we.js → runtimeConfig-CzPK1uMj.js} +1 -1
- package/dist/assets/runtimeEndpointReset-DKjVJCdt.js +149 -0
- package/dist/assets/sessionChangeSummary-CktSWasa.js +2 -0
- package/dist/assets/{sessionLookup-gh-hVRIc.js → sessionLookup-CDA1aAcI.js} +1 -1
- package/dist/assets/{sortable-tabs-strip-CudoSgV4.js → sortable-tabs-strip-Q3bb6MVj.js} +1 -1
- package/dist/assets/src-lS1keDVV.css +2 -0
- package/dist/assets/store-jaP79mqI.js +15 -0
- package/dist/assets/{terminalApi-DiF6JmBP.js → terminalApi-Da_DO_Uh.js} +1 -1
- package/dist/assets/textarea--CYehp07.js +1 -0
- package/dist/assets/{tooltip-CQvpK-UV.js → tooltip-CGLzBwEK.js} +1 -1
- package/dist/assets/uk-BgFzz8m2.js +15 -0
- package/dist/assets/{url-_z7evzdK.js → url-Byz3kd29.js} +1 -1
- package/dist/assets/{useAppFontEffects-Cpmpo7Wb.js → useAppFontEffects-2zzPMQF2.js} +64 -45
- package/dist/assets/{useAssistantUIStore-CMutVh9B.js → useAssistantUIStore-Bz4tRflF.js} +1 -1
- package/dist/assets/useDesktopWindowControlsLayout-B-2YooUd.js +1 -0
- package/dist/assets/useEffectiveDirectory-K3U4eL5F.js +1 -0
- package/dist/assets/{useFontPreferences-DcbXQOkc.js → useFontPreferences-D9OIZs1p.js} +1 -1
- package/dist/assets/useMobileNavigationStore-B0zSdCwP.js +414 -0
- package/dist/assets/useSessionAutoCleanup-BCXHAcbX.js +2 -0
- package/dist/assets/useUIStore-syVmbuDA.js +1 -0
- package/dist/assets/{useWorkerHighlightedLines-Bqn4AiBL.js → useWorkerHighlightedLines-CsoMQNik.js} +2 -2
- package/dist/assets/vendor-opencode-client-C12gfjag.js +12 -0
- package/dist/assets/{vendor-reactuses-core-BnW6GxJt.js → vendor-reactuses-core-Dq5ocTF8.js} +1 -1
- package/dist/assets/zh-CN-BhqSLgUY.js +15 -0
- package/dist/assets/zh-TW-BsaBgY-p.js +15 -0
- package/dist/index.html +12 -12
- package/dist/mini-chat.html +12 -12
- package/dist/mobile.html +12 -12
- package/package.json +3 -2
- package/server/index.js +359 -63
- package/server/lib/assistants/DOCUMENTATION.md +14 -9
- package/server/lib/assistants/contracts.js +11 -1
- package/server/lib/assistants/projection-history.test.js +265 -18
- package/server/lib/assistants/routes.js +6 -0
- package/server/lib/assistants/service.js +417 -231
- package/server/lib/assistants/service.test.js +392 -148
- package/server/lib/browser-provider/DOCUMENTATION.md +141 -0
- package/server/lib/browser-provider/contract.js +312 -0
- package/server/lib/browser-provider/host.js +421 -0
- package/server/lib/browser-provider/host.test.js +304 -0
- package/server/lib/browser-provider/routes.js +122 -0
- package/server/lib/browser-provider/routes.test.js +120 -0
- package/server/lib/browser-provider/selection-store.js +43 -0
- package/server/lib/browser-provider/selection-store.test.js +35 -0
- package/server/lib/conversations/DOCUMENTATION.md +1 -1
- package/server/lib/conversations/service.js +1 -0
- package/server/lib/conversations/service.test.js +16 -0
- package/server/lib/conversations/validation.js +11 -1
- package/server/lib/event-stream/DOCUMENTATION.md +3 -1
- package/server/lib/event-stream/directory-ws-bridge.js +13 -2
- package/server/lib/event-stream/global-hub.js +49 -4
- package/server/lib/event-stream/reasoning-projection.js +16 -1
- package/server/lib/event-stream/reasoning-projection.test.js +15 -0
- package/server/lib/event-stream/runtime.js +57 -20
- package/server/lib/event-stream/runtime.test.js +112 -0
- package/server/lib/llm/DOCUMENTATION.md +33 -9
- package/server/lib/llm/catalog.js +1 -1
- package/server/lib/llm/completions.js +5 -1
- package/server/lib/llm/completions.test.js +3 -3
- package/server/lib/llm/generate.js +237 -145
- package/server/lib/llm/generate.test.js +201 -46
- package/server/lib/llm/routes.js +2 -0
- package/server/lib/message-queue/runtime.js +15 -2
- package/server/lib/notifications/DOCUMENTATION.md +3 -1
- package/server/lib/notifications/runtime.js +133 -31
- package/server/lib/notifications/runtime.test.js +103 -0
- package/server/lib/notifications/template-runtime.js +130 -38
- package/server/lib/notifications/template-runtime.test.js +96 -0
- package/server/lib/opencode/DOCUMENTATION.md +89 -17
- package/server/lib/opencode/agent-document.d.ts +28 -0
- package/server/lib/opencode/agent-document.js +280 -0
- package/server/lib/opencode/agent-document.test.js +137 -0
- package/server/lib/opencode/agents.js +96 -0
- package/server/lib/opencode/auth-state-runtime.js +5 -0
- package/server/lib/opencode/bootstrap-runtime.js +2 -0
- package/server/lib/opencode/config-entity-routes.js +42 -99
- package/server/lib/opencode/config-entity-routes.test.js +107 -0
- package/server/lib/opencode/config-hot-reload.integration.test.js +105 -0
- package/server/lib/opencode/ensure-cli.d.ts +8 -0
- package/server/lib/opencode/ensure-cli.js +1 -2
- package/server/lib/opencode/env-runtime.js +40 -26
- package/server/lib/opencode/env-runtime.test.js +10 -17
- package/server/lib/opencode/feature-routes-runtime.js +53 -4
- package/server/lib/opencode/feature-routes-runtime.test.js +25 -0
- package/server/lib/opencode/http-server-connections.js +98 -0
- package/server/lib/opencode/http-server-connections.test.js +321 -0
- package/server/lib/opencode/lifecycle.js +349 -39
- package/server/lib/opencode/lifecycle.test.js +322 -0
- package/server/lib/opencode/managed-capabilities-runtime.js +15 -2
- package/server/lib/opencode/managed-capabilities-runtime.test.js +1 -0
- package/server/lib/opencode/openchamber-routes.js +7 -1
- package/server/lib/opencode/opencode2-pin.js +4 -4
- package/server/lib/opencode/opencode2-pin.test.js +1 -0
- package/server/lib/opencode/opencode2-sidecar.e2e.test.js +127 -4
- package/server/lib/opencode/owned-runtime-upgrade.js +431 -0
- package/server/lib/opencode/owned-runtime-upgrade.test.js +160 -0
- package/server/lib/opencode/plugin-routes.js +3 -18
- package/server/lib/opencode/plugin-routes.test.js +9 -9
- package/server/lib/opencode/provider-catalog.js +58 -12
- package/server/lib/opencode/provider-catalog.test.js +48 -0
- package/server/lib/opencode/proxy.js +254 -46
- package/server/lib/opencode/proxy.test.js +238 -5
- package/server/lib/opencode/routes.js +326 -62
- package/server/lib/opencode/routes.test.js +278 -12
- package/server/lib/opencode/runtime-contract.js +401 -0
- package/server/lib/opencode/runtime-contract.test.js +214 -0
- package/server/lib/opencode/server-opencode-fetch.js +242 -0
- package/server/lib/opencode/server-opencode-fetch.test.js +130 -0
- package/server/lib/opencode/server-utils-runtime.js +33 -0
- package/server/lib/opencode/shared-service.integration.test.js +66 -0
- package/server/lib/opencode/shared-service.js +147 -0
- package/server/lib/opencode/shared-service.test.js +93 -0
- package/server/lib/opencode/shared.js +3 -3
- package/server/lib/opencode/shutdown-runtime.js +15 -6
- package/server/lib/opencode/shutdown-runtime.test.js +49 -1
- package/server/lib/opencode/skill-routes.js +20 -33
- package/server/lib/opencode/skill-routes.test.js +35 -2
- package/server/lib/opencode/skills.test.js +15 -0
- package/server/lib/opencode/startup-pipeline-runtime.js +4 -0
- package/server/lib/opencode/static-routes-runtime.js +3 -1
- package/server/lib/opencode/static-routes-runtime.test.js +33 -0
- package/server/lib/opencode/upgrade-screen.d.ts +30 -0
- package/server/lib/opencode/upgrade-screen.js +299 -0
- package/server/lib/opencode/upgrade-screen.test.js +196 -0
- package/server/lib/opencode/v2-client.js +14 -3
- package/server/lib/opencode/v2-plugin-host-shim/index.mjs +155 -0
- package/server/lib/opencode/v2-plugin-host-shim/package.json +4 -0
- package/server/lib/permission-auto-accept/DOCUMENTATION.md +5 -5
- package/server/lib/permission-auto-accept/runtime.js +14 -7
- package/server/lib/permission-auto-accept/runtime.test.js +27 -12
- package/server/lib/relay/reasoning-projection.e2e.test.ts +22 -7
- package/server/lib/scheduled-tasks/DOCUMENTATION.md +8 -0
- package/server/lib/scheduled-tasks/runtime.js +52 -4
- package/server/lib/scheduled-tasks/runtime.test.js +80 -1
- package/server/lib/session-goal/DOCUMENTATION.md +113 -13
- package/server/lib/session-goal/routes.js +9 -0
- package/server/lib/session-goal/runtime.js +1579 -117
- package/server/lib/session-goal/runtime.test.js +1453 -84
- package/server/lib/session-index/DOCUMENTATION.md +18 -15
- package/server/lib/session-index/event-ingest.js +89 -16
- package/server/lib/session-index/event-ingest.test.js +73 -0
- package/server/lib/session-index/host-authority-snapshot.js +92 -0
- package/server/lib/session-index/routes.host-archive.test.js +201 -0
- package/server/lib/session-index/routes.js +63 -10
- package/server/lib/session-index/routes.test.js +8 -8
- package/server/lib/session-index/service.js +7 -1
- package/server/lib/session-index/sync-runtime.js +161 -34
- package/server/lib/session-index/sync-runtime.test.js +155 -1
- package/server/lib/session-metadata/DOCUMENTATION.md +73 -18
- package/server/lib/session-metadata/opencode-session-record.d.ts +57 -0
- package/server/lib/session-metadata/opencode-session-record.js +316 -0
- package/server/lib/session-metadata/opencode-session-record.test.js +242 -0
- package/server/lib/session-metadata/routes.js +112 -9
- package/server/lib/session-metadata/routes.test.js +47 -2
- package/server/lib/session-metadata/session-archive.d.ts +73 -0
- package/server/lib/session-metadata/session-archive.js +654 -0
- package/server/lib/session-metadata/session-archive.test.js +359 -0
- package/server/lib/session-metadata/session-metadata-store.d.ts +38 -0
- package/server/lib/session-metadata/session-metadata-store.js +270 -83
- package/server/lib/session-metadata/session-metadata-store.test.js +205 -10
- package/server/lib/session-metadata/session-projection.d.ts +41 -0
- package/server/lib/session-metadata/session-projection.js +279 -0
- package/server/lib/session-metadata/session-projection.test.js +64 -0
- package/server/lib/session-metadata/system-session.js +55 -0
- package/server/lib/session-metadata/system-session.test.js +55 -0
- package/server/lib/session-title/DOCUMENTATION.md +40 -7
- package/server/lib/session-title/native-runtime.test.js +167 -0
- package/server/lib/session-title/runtime.js +69 -44
- package/server/lib/session-title/session-access.js +46 -0
- package/server/lib/session-title/session-access.test.js +91 -0
- package/server/lib/session-turn-pages/DOCUMENTATION.md +9 -8
- package/server/lib/session-turn-pages/routes.js +17 -102
- package/server/lib/session-turn-pages/routes.test.js +281 -0
- package/server/lib/session-turn-pages/session-message-projection.d.ts +13 -0
- package/server/lib/session-turn-pages/session-message-projection.js +281 -0
- package/server/lib/small-model/DOCUMENTATION.md +101 -147
- package/server/lib/small-model/catalog.js +31 -51
- package/server/lib/small-model/catalog.test.js +65 -10
- package/server/lib/small-model/custom-api.js +68 -0
- package/server/lib/small-model/custom-api.test.js +64 -0
- package/server/lib/small-model/index.js +124 -240
- package/server/lib/small-model/resolve.js +35 -120
- package/server/lib/small-model/resolve.test.js +20 -110
- package/server/lib/small-model/routes.js +1 -3
- package/server/lib/small-model/summary-settings.test.js +157 -253
- package/server/opencode-proxy.test.js +2 -0
- package/dist/assets/AssistantView-BTCkm8yk.js +0 -3
- package/dist/assets/Icon-DD-BuMfZ.js +0 -1
- package/dist/assets/MarkdownRenderer-bc_p1H7l.js +0 -2
- package/dist/assets/MarkstreamRendererImpl-CnkodGJW.js +0 -3
- package/dist/assets/MobileSurface-BXLeiZ4d.js +0 -2
- package/dist/assets/OverlayScrollbar-pMwxaCca.js +0 -2
- package/dist/assets/SettingsView-B5I0KDTZ.js +0 -25
- package/dist/assets/TerminalView-Dh9MWCpS.js +0 -8
- package/dist/assets/appThemeRegistry-COGfxTFV.js +0 -1
- package/dist/assets/es-c52LTHHe.js +0 -15
- package/dist/assets/fileMentionTouchSelection-BvrNCroG.js +0 -4
- package/dist/assets/fr-PisFbUE8.js +0 -13
- package/dist/assets/gitApi-ButwzQ0N.js +0 -9
- package/dist/assets/insertionBoundaries-DGs7S5zv.js +0 -1
- package/dist/assets/ja-C8Ikun3Z.js +0 -15
- package/dist/assets/ko-ClFys5o2.js +0 -15
- package/dist/assets/main-Dn9rpsgl.js +0 -169
- package/dist/assets/main-qSeeJRW1.css +0 -1
- package/dist/assets/markdown-worker-CptoICmq.js +0 -2
- package/dist/assets/markdownTheme-DOfGg-A7.js +0 -1
- package/dist/assets/miniChat-BpjxVqgg.js +0 -2
- package/dist/assets/mobile-nMJCaNq1.js +0 -2
- package/dist/assets/multirun-BvSG94mW.js +0 -4
- package/dist/assets/persistence-Ce3AnpEr.js +0 -3
- package/dist/assets/pl-CnaKWN5F.js +0 -15
- package/dist/assets/platform-CWTIp02q.js +0 -4
- package/dist/assets/projectMeta-DOe49dM_.js +0 -3
- package/dist/assets/pt-BR-s8OpfRI6.js +0 -15
- package/dist/assets/renderElectronMiniChatApp-R6dKh79f.js +0 -2
- package/dist/assets/renderMobileApp-y-S8y8v_.js +0 -28
- package/dist/assets/runtime-fetch-zIalUnbb.js +0 -1
- package/dist/assets/runtimeEndpointReset-B6BxhvR0.js +0 -147
- package/dist/assets/sessionChangeSummary-VVBlEXuh.js +0 -2
- package/dist/assets/src-BzX5UI-c.css +0 -2
- package/dist/assets/store-DJczmczv.js +0 -15
- package/dist/assets/textarea-3XR8sUfy.js +0 -1
- package/dist/assets/uk-CaX0iqkB.js +0 -15
- package/dist/assets/useDesktopWindowControlsLayout-B1GX59-L.js +0 -1
- package/dist/assets/useEffectiveDirectory-CN6JoCFw.js +0 -1
- package/dist/assets/useMobileNavigationStore-BVjFtXSy.js +0 -414
- package/dist/assets/useSessionAutoCleanup-BLjymaFt.js +0 -2
- package/dist/assets/useUIStore-Bxv3f23A.js +0 -1
- package/dist/assets/vendor-opencode-client-BOe2qpQb.js +0 -12
- package/dist/assets/zh-CN-20MYEjha.js +0 -15
- package/dist/assets/zh-TW-DiN04qTw.js +0 -15
- package/server/lib/small-model/call.js +0 -427
- package/server/lib/small-model/call.test.js +0 -382
- package/server/lib/small-model/opencode-session.js +0 -183
- package/server/lib/small-model/opencode-session.test.js +0 -147
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Track sockets owned by an HTTP server so force-close can destroy upgraded
|
|
3
|
+
* WebSocket/SSE sockets that Node's `server.closeAllConnections()` leaves open
|
|
4
|
+
* (those keep `server.close()` from firing until SHUTDOWN_TIMEOUT).
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
export const HTTP_SERVER_CONNECTIONS = Symbol.for('openchamber.httpServerConnections');
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* @param {import('node:http').Server} server
|
|
11
|
+
* @returns {{
|
|
12
|
+
* getOpenSocketCount: () => number,
|
|
13
|
+
* destroyRemainingSockets: () => number,
|
|
14
|
+
* dispose: () => void,
|
|
15
|
+
* }}
|
|
16
|
+
*/
|
|
17
|
+
export const attachHttpServerConnectionTracker = (server) => {
|
|
18
|
+
if (!server || typeof server.on !== 'function') {
|
|
19
|
+
return {
|
|
20
|
+
getOpenSocketCount: () => 0,
|
|
21
|
+
destroyRemainingSockets: () => 0,
|
|
22
|
+
dispose: () => {},
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
const existing = server[HTTP_SERVER_CONNECTIONS];
|
|
27
|
+
if (existing && typeof existing.destroyRemainingSockets === 'function') {
|
|
28
|
+
return existing;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/** @type {Set<import('node:net').Socket>} */
|
|
32
|
+
const sockets = new Set();
|
|
33
|
+
|
|
34
|
+
const track = (socket) => {
|
|
35
|
+
if (!socket || sockets.has(socket)) return;
|
|
36
|
+
sockets.add(socket);
|
|
37
|
+
const release = () => {
|
|
38
|
+
sockets.delete(socket);
|
|
39
|
+
};
|
|
40
|
+
socket.once('close', release);
|
|
41
|
+
socket.once('error', release);
|
|
42
|
+
};
|
|
43
|
+
|
|
44
|
+
// Plain HTTP and pre-upgrade TCP both emit `connection`. After `upgrade`, the
|
|
45
|
+
// same socket object remains; tracking it here covers WS/SSE leftovers.
|
|
46
|
+
const onConnection = (socket) => {
|
|
47
|
+
track(socket);
|
|
48
|
+
};
|
|
49
|
+
server.on('connection', onConnection);
|
|
50
|
+
|
|
51
|
+
const api = {
|
|
52
|
+
getOpenSocketCount: () => sockets.size,
|
|
53
|
+
destroyRemainingSockets: () => {
|
|
54
|
+
let destroyed = 0;
|
|
55
|
+
for (const socket of [...sockets]) {
|
|
56
|
+
try {
|
|
57
|
+
if (!socket.destroyed) {
|
|
58
|
+
socket.destroy();
|
|
59
|
+
destroyed += 1;
|
|
60
|
+
}
|
|
61
|
+
} catch {
|
|
62
|
+
}
|
|
63
|
+
sockets.delete(socket);
|
|
64
|
+
}
|
|
65
|
+
return destroyed;
|
|
66
|
+
},
|
|
67
|
+
dispose: () => {
|
|
68
|
+
server.off?.('connection', onConnection);
|
|
69
|
+
sockets.clear();
|
|
70
|
+
try {
|
|
71
|
+
delete server[HTTP_SERVER_CONNECTIONS];
|
|
72
|
+
} catch {
|
|
73
|
+
}
|
|
74
|
+
},
|
|
75
|
+
};
|
|
76
|
+
|
|
77
|
+
server[HTTP_SERVER_CONNECTIONS] = api;
|
|
78
|
+
return api;
|
|
79
|
+
};
|
|
80
|
+
|
|
81
|
+
/**
|
|
82
|
+
* Stop accepting new connections, drop Node-tracked HTTP connections, then
|
|
83
|
+
* destroy any remaining server-owned sockets (including upgraded ones).
|
|
84
|
+
* @param {import('node:http').Server | null | undefined} server
|
|
85
|
+
* @returns {{ destroyedTracked: number }}
|
|
86
|
+
*/
|
|
87
|
+
export const forceCloseHttpServerConnections = (server) => {
|
|
88
|
+
if (!server) return { destroyedTracked: 0 };
|
|
89
|
+
try {
|
|
90
|
+
server.closeAllConnections?.();
|
|
91
|
+
} catch {
|
|
92
|
+
}
|
|
93
|
+
const tracker = server[HTTP_SERVER_CONNECTIONS];
|
|
94
|
+
const destroyedTracked = typeof tracker?.destroyRemainingSockets === 'function'
|
|
95
|
+
? tracker.destroyRemainingSockets()
|
|
96
|
+
: 0;
|
|
97
|
+
return { destroyedTracked };
|
|
98
|
+
};
|
|
@@ -0,0 +1,321 @@
|
|
|
1
|
+
import http from 'node:http';
|
|
2
|
+
import net from 'node:net';
|
|
3
|
+
import { afterEach, describe, expect, it } from 'vitest';
|
|
4
|
+
|
|
5
|
+
import {
|
|
6
|
+
attachHttpServerConnectionTracker,
|
|
7
|
+
forceCloseHttpServerConnections,
|
|
8
|
+
} from './http-server-connections.js';
|
|
9
|
+
import { createGracefulShutdownRuntime } from './shutdown-runtime.js';
|
|
10
|
+
|
|
11
|
+
const freePort = () => new Promise((resolve, reject) => {
|
|
12
|
+
const server = net.createServer();
|
|
13
|
+
server.once('error', reject);
|
|
14
|
+
server.listen(0, '127.0.0.1', () => {
|
|
15
|
+
const { port } = server.address();
|
|
16
|
+
server.close((error) => (error ? reject(error) : resolve(port)));
|
|
17
|
+
});
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
const listen = (server, port) => new Promise((resolve, reject) => {
|
|
21
|
+
server.once('error', reject);
|
|
22
|
+
server.listen(port, '127.0.0.1', () => resolve());
|
|
23
|
+
});
|
|
24
|
+
|
|
25
|
+
const closeQuiet = (server) => new Promise((resolve) => {
|
|
26
|
+
try {
|
|
27
|
+
server.closeAllConnections?.();
|
|
28
|
+
} catch {
|
|
29
|
+
}
|
|
30
|
+
server.close(() => resolve());
|
|
31
|
+
setTimeout(resolve, 2000);
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
describe('http server connection force-close', () => {
|
|
35
|
+
/** @type {import('node:http').Server[]} */
|
|
36
|
+
const servers = [];
|
|
37
|
+
/** @type {import('node:net').Socket[]} */
|
|
38
|
+
const sockets = [];
|
|
39
|
+
|
|
40
|
+
afterEach(async () => {
|
|
41
|
+
for (const socket of sockets.splice(0)) {
|
|
42
|
+
try {
|
|
43
|
+
socket.destroy();
|
|
44
|
+
} catch {
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
await Promise.all(servers.splice(0).map((server) => closeQuiet(server)));
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
it('red: hanging upgrade socket blocks server.close until force-destroy of tracked sockets', async () => {
|
|
51
|
+
const port = await freePort();
|
|
52
|
+
const server = http.createServer((_req, res) => {
|
|
53
|
+
res.writeHead(200);
|
|
54
|
+
res.end('ok');
|
|
55
|
+
});
|
|
56
|
+
servers.push(server);
|
|
57
|
+
// Intentionally leave upgrade hanging (no socket handoff) — Node keeps the
|
|
58
|
+
// TCP connection open and server.close() will not fire.
|
|
59
|
+
server.on('upgrade', () => {});
|
|
60
|
+
const tracker = attachHttpServerConnectionTracker(server);
|
|
61
|
+
await listen(server, port);
|
|
62
|
+
|
|
63
|
+
const client = net.connect({ host: '127.0.0.1', port });
|
|
64
|
+
sockets.push(client);
|
|
65
|
+
await new Promise((resolve, reject) => {
|
|
66
|
+
client.once('connect', resolve);
|
|
67
|
+
client.once('error', reject);
|
|
68
|
+
});
|
|
69
|
+
client.write(
|
|
70
|
+
'GET /ws HTTP/1.1\r\n'
|
|
71
|
+
+ 'Host: 127.0.0.1\r\n'
|
|
72
|
+
+ 'Connection: Upgrade\r\n'
|
|
73
|
+
+ 'Upgrade: websocket\r\n'
|
|
74
|
+
+ 'Sec-WebSocket-Version: 13\r\n'
|
|
75
|
+
+ 'Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n'
|
|
76
|
+
+ '\r\n',
|
|
77
|
+
);
|
|
78
|
+
await new Promise((r) => setTimeout(r, 50));
|
|
79
|
+
expect(tracker.getOpenSocketCount()).toBeGreaterThanOrEqual(1);
|
|
80
|
+
|
|
81
|
+
let closedFast = false;
|
|
82
|
+
const closeStarted = Date.now();
|
|
83
|
+
const closePromise = new Promise((resolve) => {
|
|
84
|
+
server.close(() => {
|
|
85
|
+
closedFast = true;
|
|
86
|
+
resolve('closed');
|
|
87
|
+
});
|
|
88
|
+
// Baseline: closeAllConnections alone does not finish upgraded leftovers.
|
|
89
|
+
server.closeAllConnections?.();
|
|
90
|
+
});
|
|
91
|
+
const early = await Promise.race([
|
|
92
|
+
closePromise,
|
|
93
|
+
new Promise((resolve) => setTimeout(() => resolve('timeout'), 250)),
|
|
94
|
+
]);
|
|
95
|
+
expect(early).toBe('timeout');
|
|
96
|
+
expect(closedFast).toBe(false);
|
|
97
|
+
|
|
98
|
+
const { destroyedTracked } = forceCloseHttpServerConnections(server);
|
|
99
|
+
expect(destroyedTracked).toBeGreaterThanOrEqual(1);
|
|
100
|
+
await expect(closePromise).resolves.toBe('closed');
|
|
101
|
+
expect(Date.now() - closeStarted).toBeLessThan(2000);
|
|
102
|
+
expect(tracker.getOpenSocketCount()).toBe(0);
|
|
103
|
+
});
|
|
104
|
+
|
|
105
|
+
it('forceCloseConnections destroys hanging upgrade and reaches HTTP closed without timeout race', async () => {
|
|
106
|
+
const port = await freePort();
|
|
107
|
+
const server = http.createServer((_req, res) => {
|
|
108
|
+
res.writeHead(200);
|
|
109
|
+
res.end('ok');
|
|
110
|
+
});
|
|
111
|
+
servers.push(server);
|
|
112
|
+
server.on('upgrade', () => {});
|
|
113
|
+
attachHttpServerConnectionTracker(server);
|
|
114
|
+
await listen(server, port);
|
|
115
|
+
|
|
116
|
+
const client = net.connect({ host: '127.0.0.1', port });
|
|
117
|
+
sockets.push(client);
|
|
118
|
+
await new Promise((resolve, reject) => {
|
|
119
|
+
client.once('connect', resolve);
|
|
120
|
+
client.once('error', reject);
|
|
121
|
+
});
|
|
122
|
+
client.write(
|
|
123
|
+
'GET /ws HTTP/1.1\r\n'
|
|
124
|
+
+ 'Host: 127.0.0.1\r\n'
|
|
125
|
+
+ 'Connection: Upgrade\r\n'
|
|
126
|
+
+ 'Upgrade: websocket\r\n'
|
|
127
|
+
+ 'Sec-WebSocket-Version: 13\r\n'
|
|
128
|
+
+ 'Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n'
|
|
129
|
+
+ '\r\n',
|
|
130
|
+
);
|
|
131
|
+
await new Promise((r) => setTimeout(r, 50));
|
|
132
|
+
|
|
133
|
+
const warn = [];
|
|
134
|
+
const originalWarn = console.warn;
|
|
135
|
+
console.warn = (...args) => {
|
|
136
|
+
warn.push(args.map(String).join(' '));
|
|
137
|
+
};
|
|
138
|
+
|
|
139
|
+
const runtime = createGracefulShutdownRuntime({
|
|
140
|
+
process: { exit: () => {} },
|
|
141
|
+
shutdownTimeoutMs: 10_000,
|
|
142
|
+
getExitOnShutdown: () => false,
|
|
143
|
+
getIsShuttingDown: () => false,
|
|
144
|
+
setIsShuttingDown: () => {},
|
|
145
|
+
syncToHmrState: () => {},
|
|
146
|
+
openCodeWatcherRuntime: { stop: () => {} },
|
|
147
|
+
sessionRuntime: { dispose: () => {} },
|
|
148
|
+
scheduledTasksRuntime: { stop: () => {} },
|
|
149
|
+
getHealthCheckInterval: () => null,
|
|
150
|
+
clearHealthCheckInterval: () => {},
|
|
151
|
+
getTerminalRuntime: () => null,
|
|
152
|
+
setTerminalRuntime: () => {},
|
|
153
|
+
getMessageStreamRuntime: () => null,
|
|
154
|
+
setMessageStreamRuntime: () => {},
|
|
155
|
+
shouldSkipOpenCodeStop: () => true,
|
|
156
|
+
getOpenCodePort: () => null,
|
|
157
|
+
getOpenCodeProcess: () => null,
|
|
158
|
+
setOpenCodeProcess: () => {},
|
|
159
|
+
waitForPortRelease: async () => true,
|
|
160
|
+
getServer: () => server,
|
|
161
|
+
getUiAuthController: () => null,
|
|
162
|
+
setUiAuthController: () => {},
|
|
163
|
+
tunnelAuthController: { clearActiveTunnel: () => {} },
|
|
164
|
+
});
|
|
165
|
+
|
|
166
|
+
const started = Date.now();
|
|
167
|
+
await runtime.gracefulShutdown({ exitProcess: false, forceCloseConnections: true });
|
|
168
|
+
console.warn = originalWarn;
|
|
169
|
+
|
|
170
|
+
expect(Date.now() - started).toBeLessThan(3000);
|
|
171
|
+
expect(warn.some((line) => /Server close timeout reached/i.test(line))).toBe(false);
|
|
172
|
+
});
|
|
173
|
+
|
|
174
|
+
it('non-force path does not destroy hanging upgrade sockets', async () => {
|
|
175
|
+
const port = await freePort();
|
|
176
|
+
const server = http.createServer((_req, res) => {
|
|
177
|
+
res.writeHead(200);
|
|
178
|
+
res.end('ok');
|
|
179
|
+
});
|
|
180
|
+
servers.push(server);
|
|
181
|
+
server.on('upgrade', () => {});
|
|
182
|
+
const tracker = attachHttpServerConnectionTracker(server);
|
|
183
|
+
await listen(server, port);
|
|
184
|
+
|
|
185
|
+
const client = net.connect({ host: '127.0.0.1', port });
|
|
186
|
+
sockets.push(client);
|
|
187
|
+
await new Promise((resolve, reject) => {
|
|
188
|
+
client.once('connect', resolve);
|
|
189
|
+
client.once('error', reject);
|
|
190
|
+
});
|
|
191
|
+
client.write(
|
|
192
|
+
'GET /ws HTTP/1.1\r\n'
|
|
193
|
+
+ 'Host: 127.0.0.1\r\n'
|
|
194
|
+
+ 'Connection: Upgrade\r\n'
|
|
195
|
+
+ 'Upgrade: websocket\r\n'
|
|
196
|
+
+ 'Sec-WebSocket-Version: 13\r\n'
|
|
197
|
+
+ 'Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n'
|
|
198
|
+
+ '\r\n',
|
|
199
|
+
);
|
|
200
|
+
await new Promise((r) => setTimeout(r, 50));
|
|
201
|
+
const before = tracker.getOpenSocketCount();
|
|
202
|
+
expect(before).toBeGreaterThanOrEqual(1);
|
|
203
|
+
|
|
204
|
+
const runtime = createGracefulShutdownRuntime({
|
|
205
|
+
process: { exit: () => {} },
|
|
206
|
+
shutdownTimeoutMs: 300,
|
|
207
|
+
getExitOnShutdown: () => false,
|
|
208
|
+
getIsShuttingDown: () => false,
|
|
209
|
+
setIsShuttingDown: () => {},
|
|
210
|
+
syncToHmrState: () => {},
|
|
211
|
+
openCodeWatcherRuntime: { stop: () => {} },
|
|
212
|
+
sessionRuntime: { dispose: () => {} },
|
|
213
|
+
scheduledTasksRuntime: { stop: () => {} },
|
|
214
|
+
getHealthCheckInterval: () => null,
|
|
215
|
+
clearHealthCheckInterval: () => {},
|
|
216
|
+
getTerminalRuntime: () => null,
|
|
217
|
+
setTerminalRuntime: () => {},
|
|
218
|
+
getMessageStreamRuntime: () => null,
|
|
219
|
+
setMessageStreamRuntime: () => {},
|
|
220
|
+
shouldSkipOpenCodeStop: () => true,
|
|
221
|
+
getOpenCodePort: () => null,
|
|
222
|
+
getOpenCodeProcess: () => null,
|
|
223
|
+
setOpenCodeProcess: () => {},
|
|
224
|
+
waitForPortRelease: async () => true,
|
|
225
|
+
getServer: () => server,
|
|
226
|
+
getUiAuthController: () => null,
|
|
227
|
+
setUiAuthController: () => {},
|
|
228
|
+
tunnelAuthController: { clearActiveTunnel: () => {} },
|
|
229
|
+
});
|
|
230
|
+
|
|
231
|
+
await runtime.gracefulShutdown({ exitProcess: false, forceCloseConnections: false });
|
|
232
|
+
// Non-force timed out without destroying tracked upgrade sockets.
|
|
233
|
+
expect(tracker.getOpenSocketCount()).toBeGreaterThanOrEqual(1);
|
|
234
|
+
});
|
|
235
|
+
|
|
236
|
+
it('does not touch sockets belonging to a separate external HTTP server', async () => {
|
|
237
|
+
const externalPort = await freePort();
|
|
238
|
+
const external = http.createServer((_req, res) => {
|
|
239
|
+
res.writeHead(200);
|
|
240
|
+
res.end('external');
|
|
241
|
+
});
|
|
242
|
+
servers.push(external);
|
|
243
|
+
await listen(external, externalPort);
|
|
244
|
+
|
|
245
|
+
const managedPort = await freePort();
|
|
246
|
+
const managed = http.createServer((_req, res) => {
|
|
247
|
+
res.writeHead(200);
|
|
248
|
+
res.end('managed');
|
|
249
|
+
});
|
|
250
|
+
servers.push(managed);
|
|
251
|
+
managed.on('upgrade', () => {});
|
|
252
|
+
attachHttpServerConnectionTracker(managed);
|
|
253
|
+
await listen(managed, managedPort);
|
|
254
|
+
|
|
255
|
+
const externalClient = net.connect({ host: '127.0.0.1', port: externalPort });
|
|
256
|
+
sockets.push(externalClient);
|
|
257
|
+
await new Promise((resolve, reject) => {
|
|
258
|
+
externalClient.once('connect', resolve);
|
|
259
|
+
externalClient.once('error', reject);
|
|
260
|
+
});
|
|
261
|
+
externalClient.write('GET / HTTP/1.1\r\nHost: 127.0.0.1\r\nConnection: keep-alive\r\n\r\n');
|
|
262
|
+
await new Promise((r) => setTimeout(r, 30));
|
|
263
|
+
|
|
264
|
+
const managedClient = net.connect({ host: '127.0.0.1', port: managedPort });
|
|
265
|
+
sockets.push(managedClient);
|
|
266
|
+
await new Promise((resolve, reject) => {
|
|
267
|
+
managedClient.once('connect', resolve);
|
|
268
|
+
managedClient.once('error', reject);
|
|
269
|
+
});
|
|
270
|
+
managedClient.write(
|
|
271
|
+
'GET /ws HTTP/1.1\r\n'
|
|
272
|
+
+ 'Host: 127.0.0.1\r\n'
|
|
273
|
+
+ 'Connection: Upgrade\r\n'
|
|
274
|
+
+ 'Upgrade: websocket\r\n'
|
|
275
|
+
+ 'Sec-WebSocket-Version: 13\r\n'
|
|
276
|
+
+ 'Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n'
|
|
277
|
+
+ '\r\n',
|
|
278
|
+
);
|
|
279
|
+
await new Promise((r) => setTimeout(r, 30));
|
|
280
|
+
|
|
281
|
+
const runtime = createGracefulShutdownRuntime({
|
|
282
|
+
process: { exit: () => {} },
|
|
283
|
+
shutdownTimeoutMs: 5000,
|
|
284
|
+
getExitOnShutdown: () => false,
|
|
285
|
+
getIsShuttingDown: () => false,
|
|
286
|
+
setIsShuttingDown: () => {},
|
|
287
|
+
syncToHmrState: () => {},
|
|
288
|
+
openCodeWatcherRuntime: { stop: () => {} },
|
|
289
|
+
sessionRuntime: { dispose: () => {} },
|
|
290
|
+
scheduledTasksRuntime: { stop: () => {} },
|
|
291
|
+
getHealthCheckInterval: () => null,
|
|
292
|
+
clearHealthCheckInterval: () => {},
|
|
293
|
+
getTerminalRuntime: () => null,
|
|
294
|
+
setTerminalRuntime: () => {},
|
|
295
|
+
getMessageStreamRuntime: () => null,
|
|
296
|
+
setMessageStreamRuntime: () => {},
|
|
297
|
+
shouldSkipOpenCodeStop: () => true,
|
|
298
|
+
getOpenCodePort: () => null,
|
|
299
|
+
getOpenCodeProcess: () => null,
|
|
300
|
+
setOpenCodeProcess: () => {},
|
|
301
|
+
waitForPortRelease: async () => true,
|
|
302
|
+
getServer: () => managed,
|
|
303
|
+
getUiAuthController: () => null,
|
|
304
|
+
setUiAuthController: () => {},
|
|
305
|
+
tunnelAuthController: { clearActiveTunnel: () => {} },
|
|
306
|
+
});
|
|
307
|
+
|
|
308
|
+
await runtime.gracefulShutdown({ exitProcess: false, forceCloseConnections: true });
|
|
309
|
+
|
|
310
|
+
// External keep-alive client must still be connected to the other server.
|
|
311
|
+
expect(externalClient.destroyed).toBe(false);
|
|
312
|
+
const externalProbe = await new Promise((resolve) => {
|
|
313
|
+
const req = http.get({ host: '127.0.0.1', port: externalPort, path: '/' }, (res) => {
|
|
314
|
+
res.resume();
|
|
315
|
+
resolve(res.statusCode);
|
|
316
|
+
});
|
|
317
|
+
req.on('error', () => resolve(null));
|
|
318
|
+
});
|
|
319
|
+
expect(externalProbe).toBe(200);
|
|
320
|
+
});
|
|
321
|
+
});
|