@bitkyc08/opencodex 2.100.1 → 2.100.3
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 +1 -1
- package/bin/ocx.mjs +32 -18
- package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
- package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
- package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
- package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
- package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
- package/gui/dist/assets/index-DQtCRNAw.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
- package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
- package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
- package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
- package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.toml +9 -0
- package/native/ocx-child/src/cli.rs +402 -20
- package/native/ocx-child/src/codex_home.rs +98 -14
- package/native/ocx-child/src/daemon.rs +2 -1
- package/native/ocx-child/src/lib.rs +3 -0
- package/native/ocx-child/src/link_ws.rs +2598 -0
- package/native/ocx-child/src/link_ws_advert.rs +346 -0
- package/native/ocx-child/src/link_ws_frame.rs +749 -0
- package/native/ocx-child/src/parity.rs +5 -1
- package/native/ocx-child/src/platform.rs +152 -6
- package/native/ocx-child/src/relay.rs +150 -19
- package/package.json +3 -3
- package/src/adapters/anthropic/advisor-tool.ts +176 -0
- package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
- package/src/adapters/anthropic/client-identity.ts +3 -1
- package/src/adapters/anthropic/passthrough.ts +9 -3
- package/src/adapters/anthropic.ts +31 -14
- package/src/adapters/client-fingerprint.ts +6 -4
- package/src/adapters/cursor/discovery.ts +17 -0
- package/src/adapters/cursor/native-exec-desktop.ts +2 -1
- package/src/adapters/cursor/native-exec-shell.ts +2 -1
- package/src/adapters/cursor/native-exec.ts +3 -2
- package/src/adapters/cursor/protobuf-request.ts +8 -8
- package/src/adapters/cursor/tool-guidance.ts +3 -3
- package/src/adapters/cursor/tool-wording.ts +10 -1
- package/src/adapters/cursor.ts +7 -6
- package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
- package/src/adapters/google-antigravity-wire.ts +15 -6
- package/src/adapters/google-truncation.ts +4 -2
- package/src/adapters/google-wire-compiler.ts +2 -2
- package/src/adapters/google.ts +17 -4
- package/src/adapters/kiro/payload.ts +7 -4
- package/src/adapters/kiro/reasoning.ts +44 -1
- package/src/adapters/kiro/structured-output.ts +10 -8
- package/src/adapters/kiro-tools.ts +61 -15
- package/src/adapters/openai-chat/destination-policy.ts +16 -0
- package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
- package/src/adapters/openai-chat/tool-schema.ts +9 -0
- package/src/adapters/openai-responses/tool-schema.ts +18 -4
- package/src/adapters/run-turn-queue.ts +139 -5
- package/src/adapters/upstream-http-error.ts +4 -2
- package/src/adapters/zed.ts +3 -0
- package/src/advisor/consult.ts +15 -4
- package/src/advisor/context.ts +12 -3
- package/src/advisor/runtime.ts +35 -5
- package/src/advisor/settings.ts +8 -0
- package/src/advisor/synthetic-tool.ts +21 -8
- package/src/bridge/response-json.ts +11 -2
- package/src/bridge/sse.ts +51 -9
- package/src/claude/auth-detect.ts +21 -33
- package/src/claude/chat-tool-dispatch.ts +233 -0
- package/src/claude/desktop-3p.ts +11 -5
- package/src/claude/desktop-gateway-state.ts +2 -0
- package/src/claude/desktop-remote-store-artifact.ts +14 -3
- package/src/claude/desktop-remote-store.ts +24 -4
- package/src/claude/inbound-content-options.ts +31 -16
- package/src/claude/inbound-tool-loading.ts +42 -17
- package/src/claude/outbound.ts +13 -3
- package/src/cli/account-api.ts +23 -1
- package/src/cli/account-auth.ts +54 -21
- package/src/cli/account-extended.ts +60 -6
- package/src/cli/account-key-quota.ts +56 -7
- package/src/cli/account.ts +5 -3
- package/src/cli/advisor.ts +7 -4
- package/src/cli/alias.ts +38 -1
- package/src/cli/capabilities-access-remote.ts +137 -2
- package/src/cli/capabilities-accounts.ts +3 -3
- package/src/cli/capabilities-agents-routing.ts +17 -10
- package/src/cli/capabilities-base.ts +43 -18
- package/src/cli/capabilities-integrations.ts +2 -2
- package/src/cli/capabilities-provider-models.ts +18 -2
- package/src/cli/capabilities-route-to.ts +43 -0
- package/src/cli/capabilities.ts +2 -0
- package/src/cli/capability-contracts.ts +1 -1
- package/src/cli/claude-desktop.ts +30 -11
- package/src/cli/claude.ts +36 -17
- package/src/cli/codex-launcher.ts +3 -1
- package/src/cli/codex-shim-autorestore.ts +5 -42
- package/src/cli/config-command.ts +38 -2
- package/src/cli/config-root-startup.ts +34 -0
- package/src/cli/connect.ts +124 -19
- package/src/cli/desktop-runtime-guidance.ts +1 -1
- package/src/cli/disconnect-runtime.ts +168 -0
- package/src/cli/dispatch.ts +54 -12
- package/src/cli/export-command.ts +1 -1
- package/src/cli/gui-pair-client.ts +29 -5
- package/src/cli/gui.ts +10 -5
- package/src/cli/help-catalog.ts +11 -0
- package/src/cli/help.ts +5 -4
- package/src/cli/hub.ts +18 -1
- package/src/cli/index.ts +83 -92
- package/src/cli/inspect.ts +11 -2
- package/src/cli/integrations.ts +26 -1
- package/src/cli/link-capture.ts +64 -0
- package/src/cli/link-child-ops.ts +314 -0
- package/src/cli/link-cleanup.ts +8 -5
- package/src/cli/link-diagnostics.ts +67 -0
- package/src/cli/link-enrollment.ts +158 -12
- package/src/cli/link-operations.ts +52 -0
- package/src/cli/link-recover.ts +152 -0
- package/src/cli/link-routes.ts +87 -0
- package/src/cli/link-status-child.ts +137 -0
- package/src/cli/link-status-traffic.ts +34 -0
- package/src/cli/link.ts +327 -37
- package/src/cli/message-command.ts +1 -1
- package/src/cli/message-mcp-command.ts +23 -10
- package/src/cli/models-runtime.ts +3 -3
- package/src/cli/opencode.ts +3 -1
- package/src/cli/pi-sync.ts +35 -0
- package/src/cli/preflight-exemptions.ts +46 -0
- package/src/cli/registry.ts +29 -12
- package/src/cli/restart-failure.ts +5 -2
- package/src/cli/root.ts +5 -1
- package/src/cli/route-to.ts +172 -0
- package/src/cli/runtime-api.ts +5 -8
- package/src/cli/status.ts +3 -1
- package/src/cli/stop-approval.ts +66 -19
- package/src/cli/stop-report.ts +23 -0
- package/src/cli/stop-windows-checked.ts +304 -0
- package/src/cli/sync-command.ts +70 -13
- package/src/cli/sync-fanout.ts +81 -99
- package/src/cli/sync-flags.ts +40 -3
- package/src/cli/sync-link-status.ts +18 -2
- package/src/cli/sync-update-guard.ts +7 -2
- package/src/cli/system-restart-client.ts +3 -2
- package/src/cli/uninstall-plan.ts +77 -5
- package/src/cli/uninstall-stop.ts +152 -0
- package/src/cli/v2-input.ts +10 -6
- package/src/cli/v2-local-output.ts +3 -2
- package/src/cli/v2-runtime.ts +10 -3
- package/src/cli/v2.ts +22 -7
- package/src/client/connect.ts +321 -34
- package/src/client/link-home-features.ts +27 -0
- package/src/client/link-home.ts +92 -4
- package/src/client/link-ingress.ts +21 -3
- package/src/client/link-join.ts +12 -2
- package/src/client/link-parity-reporter.ts +60 -6
- package/src/client/link-readiness.ts +16 -6
- package/src/client/link-relay-transport.ts +161 -36
- package/src/client/link-relay.ts +150 -6
- package/src/client/link-request-compression.ts +84 -0
- package/src/client/link-state.ts +11 -5
- package/src/client/link-status.ts +39 -1
- package/src/client/link-teardown.ts +1 -0
- package/src/client/link-tunnel-status.ts +76 -0
- package/src/client/link-tunnel.ts +56 -5
- package/src/client/link-websocket-limits.ts +89 -0
- package/src/client/link-websocket.ts +586 -0
- package/src/client/link-ws-advertisement.ts +100 -0
- package/src/client/link-ws-framer.ts +241 -0
- package/src/client/link-ws-transport.ts +177 -0
- package/src/client/machine-api.ts +13 -2
- package/src/client/machine-listener.ts +48 -7
- package/src/client/route-intent-apply.ts +293 -0
- package/src/client/route-intent-file-originals.ts +97 -0
- package/src/client/route-intent-native-originals.ts +201 -0
- package/src/client/route-intent-watch.ts +141 -0
- package/src/client/runtime-restart.ts +127 -5
- package/src/client/runtime.ts +61 -15
- package/src/client/state.ts +30 -0
- package/src/client/sync-expectation.ts +36 -2
- package/src/client/sync-runtime.ts +7 -0
- package/src/clients/config-export/alias-selectors.ts +63 -40
- package/src/clients/config-export/contracts.ts +2 -0
- package/src/clients/config-export/nested-selectors.ts +42 -0
- package/src/clients/config-export.ts +36 -4
- package/src/codex/account-resume-health.ts +41 -0
- package/src/codex/account-store.ts +12 -3
- package/src/codex/account-usability.ts +13 -0
- package/src/codex/auth-api/account-list.ts +29 -3
- package/src/codex/auth-api/login-flow.ts +6 -0
- package/src/codex/auth-api/routes.ts +35 -2
- package/src/codex/auth-collision.ts +23 -22
- package/src/codex/auth-context.ts +21 -6
- package/src/codex/catalog/gather-capture.ts +10 -2
- package/src/codex/catalog/parsing.ts +7 -3
- package/src/codex/catalog/provider-models.ts +67 -23
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +1 -1
- package/src/codex/catalog-auto-refresh.ts +11 -0
- package/src/codex/cli-update-job.ts +35 -13
- package/src/codex/convergence-types.ts +2 -0
- package/src/codex/convergence.ts +2 -2
- package/src/codex/desktop-compatibility/native-identity.ts +4 -8
- package/src/codex/features.ts +2 -2
- package/src/codex/history-provider.ts +31 -0
- package/src/codex/inject/multi-agent-v2.ts +9 -3
- package/src/codex/inject/paginated-openai-compat.ts +54 -1
- package/src/codex/inject/plan.ts +20 -2
- package/src/codex/inject.ts +2 -0
- package/src/codex/journal-config-restore.ts +217 -0
- package/src/codex/journal.ts +75 -6
- package/src/codex/main-account.ts +23 -30
- package/src/codex/native-main-auth-file.ts +104 -0
- package/src/codex/native-profile-manager.ts +4 -3
- package/src/codex/native-profile-store.ts +3 -61
- package/src/codex/orca-import.ts +10 -1
- package/src/codex/quota-history.ts +13 -0
- package/src/codex/quota-window-conflict.ts +103 -0
- package/src/codex/quota.ts +134 -7
- package/src/codex/subagent-model-fallback.ts +3 -1
- package/src/codex/websocket-activity.ts +171 -16
- package/src/codex/websocket-registry.ts +11 -4
- package/src/combos/cooldown-store.ts +228 -0
- package/src/combos/failover.ts +760 -35
- package/src/config/dashboard-trusted-proxy.ts +83 -0
- package/src/config/diagnostics.ts +28 -0
- package/src/config/feature-flags.ts +9 -0
- package/src/config/live-reconcile.ts +10 -1
- package/src/config/load-degrade.ts +12 -1
- package/src/config/multi-agent-surface.ts +28 -5
- package/src/config/pending-teardown.ts +60 -3
- package/src/config/process-state.ts +175 -4
- package/src/config/provider-validation.ts +4 -4
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +12 -3
- package/src/config/schema/leaf-validators.ts +43 -14
- package/src/config/windows-process-command-line.ts +107 -0
- package/src/generated/compatibility-version.json +1077 -429
- package/src/generated/model-metadata.ts +1 -1
- package/src/images/loop.ts +3 -0
- package/src/integrations/model-name-guard.ts +25 -0
- package/src/integrations/route-intent-catalog.ts +26 -0
- package/src/integrations/route-intent-connected.ts +262 -0
- package/src/integrations/route-intent-contract.ts +55 -0
- package/src/integrations/route-intent-disconnect.ts +109 -0
- package/src/integrations/route-intent-initial.ts +64 -0
- package/src/integrations/route-intent-state.ts +117 -0
- package/src/integrations/route-intent-tick.ts +65 -0
- package/src/integrations/route-intent.ts +212 -0
- package/src/integrations/writer.ts +44 -11
- package/src/lib/catalog-etag.ts +10 -0
- package/src/lib/client-error-body.ts +15 -0
- package/src/lib/client-retry-after.ts +29 -0
- package/src/lib/config-ownership.ts +13 -0
- package/src/lib/context-overflow-verdict.ts +266 -9
- package/src/lib/desktop-gui-origin.ts +28 -0
- package/src/lib/errors.ts +1 -1
- package/src/lib/failure-detail.ts +72 -3
- package/src/lib/gui-pair-capability.ts +2 -1
- package/src/lib/hard-refusal.ts +259 -0
- package/src/lib/messages-error-body.ts +4 -1
- package/src/lib/outbound-credential-registry.ts +362 -4
- package/src/lib/paced-stream.ts +34 -0
- package/src/lib/passive-key-fetch-proof.ts +30 -0
- package/src/lib/passive-read.ts +5 -0
- package/src/lib/process-control.ts +76 -12
- package/src/lib/redact.ts +84 -8
- package/src/lib/state-store-registrations.ts +11 -0
- package/src/lib/state-store-sweeper.ts +4 -0
- package/src/lib/supervisor-markers.ts +18 -0
- package/src/lib/terminal-safe-text.ts +58 -0
- package/src/lib/translator-budget.ts +3 -2
- package/src/lib/upstream-retry.ts +14 -4
- package/src/link/alias-lock.ts +119 -0
- package/src/link/child-activity.ts +83 -0
- package/src/link/child-binary-cache-fill.d.mts +50 -0
- package/src/link/child-binary-cache-fill.mjs +494 -0
- package/src/link/child-binary-cache-start.ts +73 -0
- package/src/link/child-binary-source.ts +12 -5
- package/src/link/child-catalog-freshness.ts +149 -0
- package/src/link/child-gated-ocx.ts +135 -0
- package/src/link/child-observations.ts +206 -0
- package/src/link/child-observe.ts +121 -0
- package/src/link/child-ops-engine.ts +230 -0
- package/src/link/child-ops-host.ts +138 -0
- package/src/link/child-ops-runners.ts +319 -0
- package/src/link/child-ops-scheduler.ts +207 -0
- package/src/link/child-ops-types.ts +89 -0
- package/src/link/child-parity.ts +23 -4
- package/src/link/child-policy.ts +93 -0
- package/src/link/child-update-contract.ts +174 -0
- package/src/link/codex-settings.ts +1 -1
- package/src/link/compatibility.ts +18 -1
- package/src/link/diagnostics-read.ts +163 -0
- package/src/link/diagnostics.ts +20 -7
- package/src/link/explicit-route.ts +209 -0
- package/src/link/link-recover.ts +113 -0
- package/src/link/management-routes.ts +3 -1
- package/src/link/operation-recovery-slot.ts +44 -0
- package/src/link/operations-journal.ts +408 -0
- package/src/link/paths.ts +5 -0
- package/src/link/peer-report.ts +1 -1
- package/src/link/relay-auth.ts +14 -0
- package/src/link/remote-plant.ts +152 -14
- package/src/link/remote-platform.ts +21 -10
- package/src/link/remote-probe.ts +11 -3
- package/src/link/remote-windows.ts +88 -12
- package/src/link/request-compression.ts +30 -0
- package/src/link/residual-recovery.ts +54 -0
- package/src/link/retirement.ts +128 -0
- package/src/link/route-intent-watch.ts +41 -0
- package/src/link/route-intent.ts +209 -0
- package/src/link/route-proof.ts +82 -0
- package/src/link/route-rounds.ts +579 -0
- package/src/link/route-select.ts +95 -0
- package/src/link/route-trust.ts +96 -0
- package/src/link/ssh-argv.ts +285 -43
- package/src/link/ssh-capture-redact.ts +253 -0
- package/src/link/ssh-capture.ts +497 -0
- package/src/link/ssh-runner.ts +141 -14
- package/src/link/status-projection.ts +160 -0
- package/src/link/store.ts +54 -1
- package/src/link/supervisor.ts +543 -55
- package/src/link/sync-fanout-classify.ts +114 -0
- package/src/link/sync-then-restart.ts +65 -0
- package/src/link/tombstones.ts +209 -0
- package/src/link/traffic.ts +178 -0
- package/src/link/tunnel-state.ts +10 -4
- package/src/link/ws-activity-holds.ts +474 -0
- package/src/local-credentials/publication-fence.ts +20 -1
- package/src/messaging/mcp-queue-rpc.ts +3 -2
- package/src/messaging/mcp-queue-server.ts +21 -1
- package/src/messaging/mcp-reply-tools.ts +24 -9
- package/src/messaging/mcp-reply-wait.ts +70 -0
- package/src/messaging/mcp-resume-tools.ts +25 -0
- package/src/messaging/remote-enrollment.ts +3 -3
- package/src/messaging/remote-tunnels.ts +2 -2
- package/src/messaging/resume-permissions.ts +27 -0
- package/src/messaging/rpc.ts +46 -2
- package/src/oauth/account-resume-health.ts +60 -0
- package/src/oauth/anthropic-continuity.ts +23 -7
- package/src/oauth/anthropic-routing.ts +5 -2
- package/src/oauth/anthropic.ts +22 -2
- package/src/oauth/claude-keychain-read.ts +78 -68
- package/src/oauth/index.ts +25 -6
- package/src/oauth/local-token-detect.ts +8 -29
- package/src/oauth/login-cli-errors.ts +5 -1
- package/src/oauth/login-cli.ts +33 -18
- package/src/oauth/login-flow-state.ts +26 -3
- package/src/oauth/meta-muse.ts +1 -1
- package/src/oauth/store.ts +51 -1
- package/src/oauth/xai.ts +248 -14
- package/src/protocols/contract.ts +4 -0
- package/src/protocols/encoders/messages.ts +1 -0
- package/src/providers/alias-template.ts +48 -0
- package/src/providers/anthropic-billing-ownership.ts +2 -0
- package/src/providers/anthropic-output-caps.ts +46 -0
- package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
- package/src/providers/antigravity-effort-families.ts +11 -3
- package/src/providers/antigravity-models.ts +32 -9
- package/src/providers/antigravity-wire-snapshot.ts +3 -2
- package/src/providers/api-key-pause-state.ts +23 -0
- package/src/providers/api-key-pause.ts +71 -10
- package/src/providers/api-key-resolve.ts +49 -7
- package/src/providers/api-key-response-ownership.ts +2 -0
- package/src/providers/api-key-selection-capture.ts +3 -1
- package/src/providers/api-key-selection.ts +54 -11
- package/src/providers/api-keys.ts +24 -7
- package/src/providers/cache-affinity-identity.ts +73 -0
- package/src/providers/cache-affinity.ts +256 -0
- package/src/providers/claude-cli-usage-state.ts +11 -6
- package/src/providers/claude-cli-usage.ts +27 -9
- package/src/providers/codex-capacity.ts +11 -2
- package/src/providers/default-aliases.ts +98 -20
- package/src/providers/google-vertex-model-discovery.ts +510 -0
- package/src/providers/key-failover.ts +136 -14
- package/src/providers/key-store.ts +3 -3
- package/src/providers/kiro-models.ts +3 -5
- package/src/providers/label.ts +31 -5
- package/src/providers/mistral-transport.ts +17 -4
- package/src/providers/model-discovery-config.ts +31 -0
- package/src/providers/model-discovery-diagnostic.ts +34 -3
- package/src/providers/model-discovery.ts +43 -7
- package/src/providers/model-rename-fields.ts +5 -0
- package/src/providers/muse-key-quota.ts +14 -6
- package/src/providers/new-model-policy-runtime.ts +17 -4
- package/src/providers/new-model-policy.ts +30 -4
- package/src/providers/openai-sidecar.ts +15 -2
- package/src/providers/passive-key-observation.ts +252 -0
- package/src/providers/provider-id-rewrite.ts +3 -0
- package/src/providers/quota/account-cache.ts +53 -34
- package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
- package/src/providers/quota/anthropic-usage-windows.ts +19 -9
- package/src/providers/quota/passive-key-limits.ts +272 -0
- package/src/providers/quota/passive-wire-model.ts +126 -0
- package/src/providers/quota/report-cache.ts +112 -5
- package/src/providers/quota/vendor-probes-key.ts +73 -0
- package/src/providers/quota/vendor-probes-oauth.ts +57 -3
- package/src/providers/quota-key-accounts.ts +22 -10
- package/src/providers/quota-mistral-budget.ts +18 -0
- package/src/providers/quota-types.ts +43 -0
- package/src/providers/quota.ts +31 -32
- package/src/providers/reasoning-metadata.ts +1051 -12
- package/src/providers/registry/entries-core.ts +34 -16
- package/src/providers/registry/entries-extended.ts +32 -0
- package/src/providers/registry/model-seeds.ts +35 -0
- package/src/providers/resolved-model-policy.ts +7 -0
- package/src/providers/routed-config.ts +8 -3
- package/src/providers/xai-transport.ts +3 -0
- package/src/quota/reset-observer.ts +4 -2
- package/src/quota/reset-seen-store.ts +9 -0
- package/src/quota/window-mapping.ts +1 -0
- package/src/quota-pool/assemble.ts +4 -1
- package/src/remote/features.ts +17 -0
- package/src/responses/anthropic-progress.ts +10 -4
- package/src/responses/citation-markers.ts +231 -0
- package/src/responses/hosted-tool-policy.ts +56 -12
- package/src/responses/spill-store.ts +5 -1
- package/src/responses/state/replay-input.ts +50 -0
- package/src/responses/state/replay-owner.ts +24 -0
- package/src/responses/state/snapshot-codec.ts +9 -0
- package/src/responses/state/spill-queue.ts +1 -0
- package/src/responses/state.ts +42 -60
- package/src/router.ts +4 -2
- package/src/routing/home-route-capture.ts +123 -0
- package/src/routing/home-route-intent.ts +200 -0
- package/src/routing/route-intent-state.ts +178 -0
- package/src/routing/route-to-live-settings.ts +35 -0
- package/src/routing/route-to-local.ts +145 -0
- package/src/routing/route-to-status.ts +94 -0
- package/src/routing/route-to-sync-child.ts +32 -0
- package/src/server/adapter-resolve.ts +21 -1
- package/src/server/admitted-http-turn.ts +3 -0
- package/src/server/auth-cors.ts +109 -8
- package/src/server/bare-upstream-error.ts +220 -0
- package/src/server/catalog-download.ts +3 -5
- package/src/server/chat-native.ts +25 -7
- package/src/server/claude-messages.ts +8 -5
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +37 -5
- package/src/server/gui-desktop-authorization.ts +36 -0
- package/src/server/gui-pair-delivery.ts +6 -3
- package/src/server/gui-session.ts +10 -1
- package/src/server/images.ts +41 -13
- package/src/server/inbound-body-admission.ts +17 -4
- package/src/server/index/link-listener.ts +203 -11
- package/src/server/index/link-management.ts +15 -1
- package/src/server/index/link-relay-sessions.ts +128 -8
- package/src/server/index/link-websocket-limits.ts +136 -0
- package/src/server/index/link-websocket.ts +692 -0
- package/src/server/index/optional-listeners.ts +115 -7
- package/src/server/index/route-intent-watch.ts +47 -0
- package/src/server/index/serve-contract.ts +86 -0
- package/src/server/index/serve-options.ts +35 -86
- package/src/server/index/startup-warnings.ts +8 -2
- package/src/server/index/websocket-handler.ts +26 -4
- package/src/server/index.ts +12 -2
- package/src/server/inference/client-encoder-delivery.ts +2 -0
- package/src/server/inspection-tee.ts +39 -2
- package/src/server/lifecycle.ts +2 -0
- package/src/server/link-turn.ts +137 -0
- package/src/server/management/advisor-routes.ts +10 -2
- package/src/server/management/agent-settings-routes.ts +50 -16
- package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
- package/src/server/management/config-routes.ts +7 -1
- package/src/server/management/context.ts +9 -2
- package/src/server/management/desktop-authorization.ts +41 -0
- package/src/server/management/desktop-compatibility-routes.ts +9 -8
- package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
- package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
- package/src/server/management/home-integration-decision.ts +89 -0
- package/src/server/management/integration-routes.ts +208 -81
- package/src/server/management/link-child-ops-routes.ts +218 -0
- package/src/server/management/link-child-preflight.ts +31 -0
- package/src/server/management/link-diagnostics-route.ts +29 -0
- package/src/server/management/link-enrollment.ts +199 -47
- package/src/server/management/link-operation.ts +609 -0
- package/src/server/management/link-recover-route.ts +103 -0
- package/src/server/management/link-route-edit.ts +173 -0
- package/src/server/management/link-route-request.ts +62 -0
- package/src/server/management/link-route-state.ts +92 -6
- package/src/server/management/link-routes.ts +563 -51
- package/src/server/management/link-traffic-status.ts +13 -0
- package/src/server/management/model-routes.ts +122 -36
- package/src/server/management/model-rows.ts +2 -1
- package/src/server/management/native-integration-routes.ts +176 -70
- package/src/server/management/oauth-account-routes.ts +69 -17
- package/src/server/management/protocol-routes.ts +7 -0
- package/src/server/management/provider-completion-test.ts +4 -4
- package/src/server/management/provider-overwrite-carry.ts +39 -3
- package/src/server/management/provider-routes.ts +80 -72
- package/src/server/management/provider-routing-quota.ts +45 -0
- package/src/server/management/route-registry.ts +25 -3
- package/src/server/management/route-to-routes.ts +257 -0
- package/src/server/management/system-restart.ts +4 -2
- package/src/server/management/usage-aggregate-cache.ts +101 -66
- package/src/server/management-api.ts +17 -3
- package/src/server/management-auth.ts +13 -1
- package/src/server/messages-native-preflight.ts +27 -4
- package/src/server/messages-native.ts +22 -5
- package/src/server/persistent-gui-session.ts +6 -3
- package/src/server/proxy-liveness.ts +33 -6
- package/src/server/relay-eager.ts +36 -12
- package/src/server/relay.ts +183 -116
- package/src/server/request-body-facts.ts +48 -0
- package/src/server/request-decompress.ts +65 -2
- package/src/server/request-log-account-rotation.ts +6 -0
- package/src/server/request-log-attempt-usage.ts +69 -0
- package/src/server/request-log-cache-affinity.ts +60 -0
- package/src/server/request-log-conversation.ts +45 -2
- package/src/server/request-log-failure-detail.ts +59 -1
- package/src/server/request-log-terminal-status.ts +210 -24
- package/src/server/request-log.ts +71 -79
- package/src/server/responses/adapter-continuation.ts +2 -1
- package/src/server/responses/adapter-delivery.ts +2 -0
- package/src/server/responses/adapter-dispatch.ts +40 -51
- package/src/server/responses/advisor-plan-slot.ts +33 -1
- package/src/server/responses/advisor-question.ts +21 -0
- package/src/server/responses/advisor-slot.ts +10 -3
- package/src/server/responses/bare-namespace-aliases.ts +18 -0
- package/src/server/responses/buffered-sse-json.ts +9 -3
- package/src/server/responses/code-mode-collab-surface.ts +11 -0
- package/src/server/responses/codex-tool-catalog.ts +156 -0
- package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
- package/src/server/responses/combo-stream-preflight.ts +701 -81
- package/src/server/responses/compact.ts +47 -12
- package/src/server/responses/context-overflow.ts +58 -2
- package/src/server/responses/core-codex-account.ts +17 -3
- package/src/server/responses/core-combo-failure.ts +37 -4
- package/src/server/responses/core-combo-native.ts +3 -1
- package/src/server/responses/core-combo.ts +62 -7
- package/src/server/responses/core-errors.ts +8 -3
- package/src/server/responses/core-lifetime.ts +3 -2
- package/src/server/responses/core-normalize.ts +3 -1
- package/src/server/responses/core-opaque-recovery.ts +45 -2
- package/src/server/responses/core-options.ts +18 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/fetch-helpers.ts +15 -10
- package/src/server/responses/native-replay-guard.ts +57 -0
- package/src/server/responses/opengateway-completion-guard.ts +10 -4
- package/src/server/responses/outbound-request-body.ts +29 -0
- package/src/server/responses/passthrough-completion.ts +105 -8
- package/src/server/responses/passthrough-delivery.ts +31 -11
- package/src/server/responses/passthrough-dispatch.ts +99 -106
- package/src/server/responses/policy-fallback.ts +13 -1
- package/src/server/responses/request-prepare.ts +50 -6
- package/src/server/responses/request-transport.ts +53 -17
- package/src/server/responses/reset-replay.ts +104 -4
- package/src/server/responses/run-turn-execution.ts +58 -30
- package/src/server/responses/sidecar-execution.ts +14 -0
- package/src/server/responses/terminal-error-redaction.ts +222 -25
- package/src/server/responses/ws-upstream.ts +2 -2
- package/src/server/sse-payload-rewrite.ts +3 -2
- package/src/server/stop-service-route.ts +85 -0
- package/src/server/system-env-shell.ts +12 -1
- package/src/server/system-env.ts +5 -3
- package/src/server/windows-tcp-drop.ts +21 -4
- package/src/server/workflow-refusal.ts +8 -0
- package/src/server/ws-bridge.ts +191 -12
- package/src/service/cli-windows-stop.ts +189 -0
- package/src/service/cli.ts +41 -12
- package/src/service/disconnected-client-restart.ts +60 -0
- package/src/service/guarded-manager-target.ts +18 -1
- package/src/service/health.ts +99 -6
- package/src/service/launchd.ts +84 -31
- package/src/service/orchestration.ts +418 -91
- package/src/service/repair.ts +223 -6
- package/src/service/restart-proxy-stop.ts +79 -0
- package/src/service/service-child-ownership.ts +6 -2
- package/src/service/windows-checked-stop-live.ts +467 -0
- package/src/service/windows-checked-stop.ts +435 -0
- package/src/service/windows-command-line-token.ts +23 -0
- package/src/service/windows-guarded-manager.ts +77 -34
- package/src/service/windows-ops.ts +38 -56
- package/src/service/windows-process-evidence.ts +292 -0
- package/src/service/windows-process-native.ts +262 -0
- package/src/service/windows-service-stop.ts +321 -0
- package/src/service/windows-stop-binding.ts +187 -0
- package/src/service/windows-stop-budget.ts +123 -0
- package/src/service/windows-stop-confirm.ts +158 -0
- package/src/service/windows-stop-deadline.ts +56 -0
- package/src/service.ts +2 -2
- package/src/types/claude-tool-loading.ts +48 -0
- package/src/types/config.ts +47 -53
- package/src/types/link.ts +20 -0
- package/src/types/multi-agent.ts +13 -0
- package/src/types/provider.ts +68 -2
- package/src/types/request.ts +4 -0
- package/src/types.ts +4 -0
- package/src/update/guarded-runtime-ops.ts +5 -7
- package/src/update/index.ts +25 -10
- package/src/update/install-detection.mjs +3 -1
- package/src/update/job-pinned-start.ts +2 -0
- package/src/update/job-windows-restart.ts +19 -32
- package/src/update/job.ts +12 -5
- package/src/update/npm-install.d.mts +11 -0
- package/src/update/npm-install.mjs +44 -7
- package/src/update/orchestrated-entry.ts +1 -1
- package/src/update/orchestrated-node-driver.mjs +3 -2
- package/src/update/orchestrated-pnpm.d.mts +4 -0
- package/src/update/orchestrated-pnpm.mjs +50 -6
- package/src/update/orchestrated-session.d.mts +3 -1
- package/src/update/orchestrated-session.mjs +21 -6
- package/src/update/pnpm-global-install.d.mts +21 -3
- package/src/update/pnpm-global-install.mjs +322 -19
- package/src/update/pnpm-store-layout.mjs +46 -0
- package/src/update/sync-update-mutex.d.mts +3 -2
- package/src/update/sync-update-mutex.mjs +57 -8
- package/src/update/transactional-install.d.mts +3 -1
- package/src/update/transactional-install.mjs +545 -12
- package/src/update/windows-installer-marker.d.mts +1 -0
- package/src/update/windows-installer-marker.mjs +44 -0
- package/src/usage/expected-prices.ts +8 -0
- package/src/usage/filter-index.ts +326 -77
- package/src/usage/ledger-scanner.ts +15 -0
- package/src/usage/link-log-fields.ts +48 -0
- package/src/usage/log.ts +43 -2
- package/src/usage/request-body.ts +37 -0
- package/src/web-search/loop.ts +3 -0
- package/src/web-search/parse.ts +21 -2
- package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
- package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
- package/gui/dist/assets/index-Bziu8gTy.css +0 -2
- package/gui/dist/assets/index-OYzhQUNP.js +0 -94
- package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
- package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
- package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
- package/src/server/management/desktop-compatibility-authorization.ts +0 -12
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Agent, request, type IncomingMessage } from "node:http";
|
|
2
2
|
import type { Socket } from "node:net";
|
|
3
|
-
import { Readable } from "node:stream";
|
|
3
|
+
import { Readable, Transform } from "node:stream";
|
|
4
4
|
import { createBrotliDecompress, createGunzip, createInflate } from "node:zlib";
|
|
5
5
|
import { serviceApiTokenFingerprint } from "../lib/service-secrets";
|
|
6
6
|
import { clearableDeadline } from "../lib/abort";
|
|
@@ -13,6 +13,11 @@ import {
|
|
|
13
13
|
linkRelayChallenge, linkRelayProofMatches,
|
|
14
14
|
} from "../link/relay-auth";
|
|
15
15
|
import { forgetVerifiedHomeConnection, recordVerifiedHomeConnection } from "./link-connection";
|
|
16
|
+
import { linkChildReportFeatures } from "../link/compatibility";
|
|
17
|
+
import { childLinkTraffic, type LinkTrafficBook, type LinkTrafficFlow } from "../link/traffic";
|
|
18
|
+
import { LINK_HOME_FEATURES_HEADER } from "../link/request-compression";
|
|
19
|
+
import { recordLinkHomeFeatures } from "./link-home-features";
|
|
20
|
+
import { applyLinkWebsocketAnswer, linkWebsocketAnswer, nextLinkPreflightSequence, type LinkWebsocketAnswer } from "./link-ws-advertisement";
|
|
16
21
|
|
|
17
22
|
export interface BoundLinkRelayTarget {
|
|
18
23
|
tunnelPort: number;
|
|
@@ -37,8 +42,11 @@ export class LinkRelayAuthTimeoutError extends Error {
|
|
|
37
42
|
}
|
|
38
43
|
}
|
|
39
44
|
|
|
40
|
-
/**
|
|
41
|
-
|
|
45
|
+
/**
|
|
46
|
+
* One physical connection, ever. A closed keep-alive socket cannot trigger a silent reconnect.
|
|
47
|
+
* Exported for the link WebSocket's upgrade (link-ws-transport.ts), which runs on the same kind of connection.
|
|
48
|
+
*/
|
|
49
|
+
export class SingleConnectionAgent extends Agent {
|
|
42
50
|
socket: Socket | undefined;
|
|
43
51
|
private opened = false;
|
|
44
52
|
private closeFlight?: Promise<void>;
|
|
@@ -63,53 +71,104 @@ class SingleConnectionAgent extends Agent {
|
|
|
63
71
|
}
|
|
64
72
|
}
|
|
65
73
|
|
|
66
|
-
function requestOnConnection(
|
|
67
|
-
url: URL, init: RequestInit, agent: SingleConnectionAgent, authenticatedSocket?: Socket,
|
|
74
|
+
export function requestOnConnection(
|
|
75
|
+
url: URL, init: RequestInit, agent: SingleConnectionAgent, authenticatedSocket?: Socket, onSent?: (bytes: number) => void,
|
|
76
|
+
onUploadSettled?: (finished: boolean) => void, onBodySettled?: () => void,
|
|
68
77
|
): Promise<IncomingMessage> {
|
|
78
|
+
// Nothing below keeps `init`: listeners on the request live until its connection closes, and a
|
|
79
|
+
// prepared body must not stay reachable through them after its write completed.
|
|
80
|
+
const method = init.method ?? "GET", signal = init.signal ?? undefined, initHeaders = init.headers;
|
|
81
|
+
let pendingBody = init.body;
|
|
69
82
|
return new Promise((resolve, reject) => {
|
|
70
|
-
|
|
83
|
+
// Once: true when every body write completed, false when the request or its socket closed first.
|
|
84
|
+
// Response headers alone prove neither, since a Home may answer before it reads the upload, so
|
|
85
|
+
// the caller's body lease (onBodySettled) is released here too.
|
|
86
|
+
let uploadSettled = false;
|
|
87
|
+
const settleUpload = (finished: boolean) => {
|
|
88
|
+
if (uploadSettled) return;
|
|
89
|
+
uploadSettled = true;
|
|
90
|
+
onUploadSettled?.(finished);
|
|
91
|
+
onBodySettled?.();
|
|
92
|
+
};
|
|
93
|
+
const headers = Object.fromEntries(new Headers(initHeaders));
|
|
71
94
|
// No implicit decompression negotiation; handle an explicitly encoded response below anyway.
|
|
72
95
|
headers["accept-encoding"] = "identity";
|
|
73
96
|
const outgoing = request(url, {
|
|
74
|
-
method
|
|
97
|
+
method, headers, agent, signal,
|
|
75
98
|
maxHeaderSize: 64 * 1024,
|
|
76
99
|
}, resolve);
|
|
77
100
|
outgoing.on("error", reject);
|
|
101
|
+
outgoing.once("close", () => settleUpload(false));
|
|
78
102
|
outgoing.on("upgrade", (_response, socket) => { socket.destroy(); reject(new LinkRelayAuthenticationError()); });
|
|
79
103
|
outgoing.on("socket", socket => {
|
|
80
104
|
if (authenticatedSocket && socket !== authenticatedSocket) outgoing.destroy(new LinkRelayAuthenticationError());
|
|
105
|
+
// Before the agent's own close listener, so a cut upload is settled before the request reports its end.
|
|
106
|
+
socket.once("close", () => settleUpload(false));
|
|
81
107
|
});
|
|
82
108
|
void (async () => {
|
|
83
|
-
const body =
|
|
109
|
+
const body = pendingBody;
|
|
110
|
+
pendingBody = null;
|
|
84
111
|
if (body instanceof ReadableStream) {
|
|
85
112
|
const reader = body.getReader();
|
|
86
|
-
const abort = () => { void reader.cancel(
|
|
87
|
-
|
|
113
|
+
const abort = () => { void reader.cancel(signal?.reason).catch(() => {}); };
|
|
114
|
+
signal?.addEventListener("abort", abort, { once: true });
|
|
88
115
|
outgoing.once("close", abort);
|
|
89
116
|
try {
|
|
90
117
|
for (;;) {
|
|
91
|
-
|
|
118
|
+
signal?.throwIfAborted();
|
|
92
119
|
const next = await reader.read();
|
|
93
120
|
if (next.done) break;
|
|
94
121
|
// Await the write callback: upstream backpressure never buffers the whole upload.
|
|
95
122
|
await new Promise<void>((done, fail) => outgoing.write(next.value,
|
|
96
123
|
error => error ? fail(error) : done()));
|
|
124
|
+
onSent?.(next.value.byteLength);
|
|
97
125
|
}
|
|
126
|
+
settleUpload(true);
|
|
98
127
|
} finally {
|
|
99
|
-
|
|
128
|
+
signal?.removeEventListener("abort", abort);
|
|
100
129
|
outgoing.removeListener("close", abort);
|
|
101
130
|
try { await reader.cancel(); } catch { /* preserve the upload outcome */ }
|
|
102
131
|
reader.releaseLock();
|
|
103
132
|
}
|
|
104
133
|
} else if (body != null) {
|
|
105
|
-
if (typeof body === "string" || body instanceof Uint8Array)
|
|
106
|
-
|
|
107
|
-
|
|
134
|
+
if (typeof body === "string" || body instanceof Uint8Array) {
|
|
135
|
+
// Counted once the socket took it, like each streamed chunk; a write that never completes counts
|
|
136
|
+
// nothing, and the body settles with its write or with the request's close.
|
|
137
|
+
const bytes = typeof body === "string" ? Buffer.byteLength(body) : body.byteLength;
|
|
138
|
+
outgoing.write(body, error => {
|
|
139
|
+
if (error) { settleUpload(false); return; }
|
|
140
|
+
onSent?.(bytes);
|
|
141
|
+
settleUpload(true);
|
|
142
|
+
});
|
|
143
|
+
} else throw new TypeError("unsupported link relay body");
|
|
144
|
+
} else settleUpload(true);
|
|
108
145
|
outgoing.end();
|
|
109
|
-
})().catch(error => {
|
|
146
|
+
})().catch(error => {
|
|
147
|
+
settleUpload(false);
|
|
148
|
+
outgoing.destroy(error instanceof Error ? error : new Error("link upload failed"));
|
|
149
|
+
reject(error);
|
|
150
|
+
});
|
|
110
151
|
});
|
|
111
152
|
}
|
|
112
153
|
|
|
154
|
+
/**
|
|
155
|
+
* A data request's flow that ends only once both halves settled: the response (through `end`) and
|
|
156
|
+
* the upload (through `uploaded`). It is complete only when both finished, so a Home that answered in
|
|
157
|
+
* full before reading the whole body still leaves the request incomplete and `toHomeBytes` flagged as
|
|
158
|
+
* a lower bound.
|
|
159
|
+
*/
|
|
160
|
+
function untilBothSettled(flow: LinkTrafficFlow): { flow: LinkTrafficFlow; uploaded(finished: boolean): void } {
|
|
161
|
+
let response: boolean | undefined, upload: boolean | undefined;
|
|
162
|
+
const settle = () => { if (response !== undefined && upload !== undefined) flow.end(response && upload); };
|
|
163
|
+
return {
|
|
164
|
+
flow: {
|
|
165
|
+
toHome: bytes => flow.toHome(bytes), fromHome: bytes => flow.fromHome(bytes), uncounted: () => flow.uncounted(),
|
|
166
|
+
end(complete) { if (response === undefined) { response = complete; settle(); } },
|
|
167
|
+
},
|
|
168
|
+
uploaded(finished) { if (upload === undefined) { upload = finished; settle(); } },
|
|
169
|
+
};
|
|
170
|
+
}
|
|
171
|
+
|
|
113
172
|
function responseHeaders(incoming: IncomingMessage): Headers {
|
|
114
173
|
const headers = new Headers();
|
|
115
174
|
for (let i = 0; i < incoming.rawHeaders.length; i += 2) {
|
|
@@ -118,13 +177,20 @@ function responseHeaders(incoming: IncomingMessage): Headers {
|
|
|
118
177
|
return headers;
|
|
119
178
|
}
|
|
120
179
|
|
|
121
|
-
/**
|
|
122
|
-
|
|
180
|
+
/**
|
|
181
|
+
* Node HTTP compatibility is confined here; the relay continues to expose a Web Response/stream.
|
|
182
|
+
* `flow` counts the response body as it arrives on the socket, before any decoding, and ends
|
|
183
|
+
* complete when the body reached its end, incomplete on a cancel or an error.
|
|
184
|
+
*/
|
|
185
|
+
async function responseOnConnection(
|
|
186
|
+
incoming: IncomingMessage, agent: SingleConnectionAgent, method: string, flow?: LinkTrafficFlow,
|
|
187
|
+
): Promise<Response> {
|
|
123
188
|
const headers = responseHeaders(incoming);
|
|
124
189
|
const status = incoming.statusCode ?? 502;
|
|
125
190
|
if (method === "HEAD" || status === 204 || status === 205 || status === 304) {
|
|
126
|
-
for await (const
|
|
191
|
+
for await (const chunk of incoming) flow?.fromHome((chunk as Buffer).byteLength);
|
|
127
192
|
await agent.close();
|
|
193
|
+
flow?.end(true);
|
|
128
194
|
return new Response(null, { status, headers });
|
|
129
195
|
}
|
|
130
196
|
let source: Readable = incoming;
|
|
@@ -134,9 +200,19 @@ async function responseOnConnection(incoming: IncomingMessage, agent: SingleConn
|
|
|
134
200
|
if (encoding && encoding !== "identity" && !decoder) {
|
|
135
201
|
throw new Error("unsupported link response encoding");
|
|
136
202
|
}
|
|
203
|
+
// Counted as the bytes leave the socket's stream, before any adapter queue or decoder, so a
|
|
204
|
+
// cancel after they were read still counts them; pipe() keeps the caller's backpressure.
|
|
205
|
+
const counter = flow ? new Transform({
|
|
206
|
+
transform(chunk: Buffer, _encoding, done) { flow.fromHome(chunk.byteLength); done(null, chunk); },
|
|
207
|
+
}) : undefined;
|
|
208
|
+
if (counter) {
|
|
209
|
+
incoming.on("error", error => counter.destroy(error));
|
|
210
|
+
source = incoming.pipe(counter);
|
|
211
|
+
}
|
|
137
212
|
if (decoder) {
|
|
138
|
-
|
|
139
|
-
|
|
213
|
+
const upstream = source;
|
|
214
|
+
upstream.on("error", error => decoder.destroy(error));
|
|
215
|
+
source = upstream.pipe(decoder);
|
|
140
216
|
}
|
|
141
217
|
const reader = (Readable.toWeb(source) as unknown as ReadableStream<Uint8Array>).getReader();
|
|
142
218
|
let finished = false;
|
|
@@ -144,6 +220,7 @@ async function responseOnConnection(incoming: IncomingMessage, agent: SingleConn
|
|
|
144
220
|
if (finished) return agent.close();
|
|
145
221
|
finished = true;
|
|
146
222
|
if (source !== incoming) source.destroy();
|
|
223
|
+
counter?.destroy();
|
|
147
224
|
await agent.close();
|
|
148
225
|
try { reader.releaseLock(); } catch { /* a cancelled read may still be settling */ }
|
|
149
226
|
};
|
|
@@ -151,43 +228,64 @@ async function responseOnConnection(incoming: IncomingMessage, agent: SingleConn
|
|
|
151
228
|
async pull(controller) {
|
|
152
229
|
try {
|
|
153
230
|
const next = await reader.read();
|
|
154
|
-
if (next.done) { await finish(); controller.close(); }
|
|
231
|
+
if (next.done) { flow?.end(true); await finish(); controller.close(); }
|
|
155
232
|
else controller.enqueue(next.value);
|
|
156
|
-
} catch (error) { await finish(); controller.error(error); }
|
|
233
|
+
} catch (error) { flow?.end(false); await finish(); controller.error(error); }
|
|
157
234
|
},
|
|
158
235
|
async cancel(reason) {
|
|
236
|
+
flow?.end(false);
|
|
159
237
|
try { await reader.cancel(reason); } finally { await finish(); }
|
|
160
238
|
},
|
|
161
239
|
}, { highWaterMark: 0 }), { status, headers });
|
|
162
240
|
}
|
|
163
241
|
|
|
242
|
+
/** Test seam: the response half alone, over any readable that looks like an IncomingMessage. */
|
|
243
|
+
export const linkResponseOnConnectionForTests = (incoming: IncomingMessage, close: () => Promise<void>, method: string, flow?: LinkTrafficFlow) =>
|
|
244
|
+
responseOnConnection(incoming, { close } as SingleConnectionAgent, method, flow);
|
|
245
|
+
|
|
164
246
|
let peerReport: Record<string, string> | undefined;
|
|
165
247
|
|
|
166
|
-
/**
|
|
167
|
-
|
|
248
|
+
/**
|
|
249
|
+
* The credential-free challenge for one connection; the proof binds this nonce to the link key. It
|
|
250
|
+
* takes its preflight number when it starts, which orders the Home's WebSocket advertisement.
|
|
251
|
+
*/
|
|
252
|
+
export function relayChallenge(target: BoundLinkRelayTarget, origin: URL) {
|
|
253
|
+
const preflight = nextLinkPreflightSequence();
|
|
168
254
|
const challenge = linkRelayChallenge(serviceApiTokenFingerprint(target.admissionKey), target.apiKeyId!, target.linkId!);
|
|
169
255
|
const probe = new URL(LINK_RELAY_AUTH_PATH, origin);
|
|
170
256
|
probe.search = new URLSearchParams({ version: LINK_RELAY_AUTH_VERSION, key: target.apiKeyId!,
|
|
171
257
|
link: target.linkId!, nonce: challenge.nonce, proof: challenge.caller }).toString();
|
|
172
258
|
// The challenge also carries this Child's version and features for the Home's link status.
|
|
173
|
-
peerReport ??= linkPeerReportHeaders(packageVersion("0.0.0"), buildPeerFeatures());
|
|
174
|
-
return { challenge, probe, headers: peerReport };
|
|
259
|
+
peerReport ??= linkPeerReportHeaders(packageVersion("0.0.0"), linkChildReportFeatures(buildPeerFeatures()));
|
|
260
|
+
return { challenge, probe, headers: peerReport, preflight };
|
|
175
261
|
}
|
|
176
262
|
|
|
177
263
|
/**
|
|
178
264
|
* Called only after the Home's relay proof verified. Keep its connection generation when its own
|
|
179
265
|
* proof binds it to this nonce and key; otherwise the connection is unknown, never the old value.
|
|
266
|
+
* Its Responses WebSocket state is applied under the preflight ordering rule (link-ws-advertisement.ts)
|
|
267
|
+
* and returned, so an upgrade decides from its own answer.
|
|
180
268
|
*/
|
|
181
|
-
function noteHomeConnection(
|
|
182
|
-
|
|
269
|
+
export function noteHomeConnection(
|
|
270
|
+
target: BoundLinkRelayTarget, nonce: string, headers: IncomingMessage["headers"], preflight: number,
|
|
271
|
+
): { features: readonly string[] | null; websocket: LinkWebsocketAnswer } {
|
|
272
|
+
if (!target.linkId || !target.apiKeyId) return { features: null, websocket: "off" };
|
|
273
|
+
const fingerprint = serviceApiTokenFingerprint(target.admissionKey);
|
|
274
|
+
const websocket = linkWebsocketAnswer(headers, { fingerprint, keyId: target.apiKeyId, linkId: target.linkId, nonce });
|
|
275
|
+
applyLinkWebsocketAnswer(target.linkId, preflight, websocket);
|
|
276
|
+
// What this Home serves, as it named it on this verified answer (#3023). Recorded for the next
|
|
277
|
+
// request's decision and returned so this connection's own body can be chosen from it.
|
|
278
|
+
const named = headers[LINK_HOME_FEATURES_HEADER];
|
|
279
|
+
const features = recordLinkHomeFeatures(target.linkId, typeof named === "string" ? named : null);
|
|
183
280
|
const generation = headers[LINK_RELAY_CONNECTION_HEADER];
|
|
184
281
|
const proof = headers[LINK_RELAY_CONNECTION_PROOF_HEADER];
|
|
185
282
|
const expected = typeof generation === "string"
|
|
186
|
-
? linkConnectionProof(
|
|
283
|
+
? linkConnectionProof(fingerprint, target.apiKeyId, target.linkId, nonce, generation)
|
|
187
284
|
: null;
|
|
188
285
|
if (typeof generation === "string" && typeof proof === "string" && linkRelayProofMatches(proof, expected)) {
|
|
189
286
|
recordVerifiedHomeConnection(target.linkId, generation);
|
|
190
287
|
} else forgetVerifiedHomeConnection(target.linkId);
|
|
288
|
+
return { features, websocket };
|
|
191
289
|
}
|
|
192
290
|
|
|
193
291
|
/**
|
|
@@ -220,7 +318,7 @@ export async function probeLinkRelayPreflight(
|
|
|
220
318
|
}, agent);
|
|
221
319
|
const proof = response.headers["x-opencodex-link-proof"];
|
|
222
320
|
if (response.statusCode === 204 && typeof proof === "string" && linkRelayProofMatches(proof, request.challenge.expected)) {
|
|
223
|
-
noteHomeConnection(target, request.challenge.nonce, response.headers);
|
|
321
|
+
noteHomeConnection(target, request.challenge.nonce, response.headers, request.preflight);
|
|
224
322
|
return "ok";
|
|
225
323
|
}
|
|
226
324
|
return response.statusCode === 404 ? "unrecognized" : "auth_failed";
|
|
@@ -236,20 +334,36 @@ export async function probeLinkRelayPreflight(
|
|
|
236
334
|
* Authenticate and stream one request on the SAME socket; never fall back to an ordinary fetch.
|
|
237
335
|
* LinkRelayAuthTimeoutError certifies that only the credential-free preflight expired before
|
|
238
336
|
* data-request construction. Caller aborts and failures after that boundary keep their own errors.
|
|
337
|
+
*
|
|
338
|
+
* Every link body is counted here (#3023), so the relay and the Child's own reads of the Home
|
|
339
|
+
* count alike: a request from the moment its data request starts on the authenticated socket,
|
|
340
|
+
* each request-body chunk once the socket took it, and each response-body chunk as it arrives,
|
|
341
|
+
* before any decoding. A failed challenge or a refused connection sent no data and counts nothing.
|
|
239
342
|
*/
|
|
240
343
|
export async function fetchBoundLinkRelay(
|
|
241
344
|
target: BoundLinkRelayTarget, destination: string, init: RequestInit,
|
|
242
|
-
options: {
|
|
345
|
+
options: {
|
|
346
|
+
authTimeoutMs?: number;
|
|
347
|
+
traffic?: LinkTrafficBook;
|
|
348
|
+
/**
|
|
349
|
+
* Choose the request body once this connection's Home has proved itself and named its
|
|
350
|
+
* features: a prepared body's zstd form only when this very answer names the capability.
|
|
351
|
+
*/
|
|
352
|
+
selectBody?: (homeFeatures: readonly string[] | null) => { body: Uint8Array<ArrayBuffer>; headers: Record<string, string> };
|
|
353
|
+
/** Called once the data request's body was flushed to the socket or the request was torn down. */
|
|
354
|
+
onBodySettled?: () => void;
|
|
355
|
+
} = {},
|
|
243
356
|
): Promise<Response> {
|
|
244
357
|
const authTimeoutMs = options.authTimeoutMs ?? LINK_RELAY_AUTH_TIMEOUT_MS;
|
|
245
358
|
if (!Number.isFinite(authTimeoutMs) || authTimeoutMs <= 0) throw new RangeError("invalid link relay auth timeout");
|
|
246
359
|
if (!target.linkId || !target.apiKeyId) throw new LinkRelayAuthenticationError();
|
|
247
360
|
const url = new URL(destination);
|
|
248
361
|
if (url.origin !== `http://127.0.0.1:${target.tunnelPort}`) throw new LinkRelayAuthenticationError();
|
|
249
|
-
const { challenge, probe, headers: preflightHeaders } = relayChallenge(target, url);
|
|
362
|
+
const { challenge, probe, headers: preflightHeaders, preflight } = relayChallenge(target, url);
|
|
250
363
|
const agent = new SingleConnectionAgent({ keepAlive: true, maxSockets: 1, maxFreeSockets: 1 });
|
|
251
364
|
const deadline = clearableDeadline(authTimeoutMs, init.signal ?? undefined);
|
|
252
365
|
let dataRequestStarted = false;
|
|
366
|
+
let flow: ReturnType<typeof untilBothSettled> | undefined;
|
|
253
367
|
try {
|
|
254
368
|
const response = await requestOnConnection(probe, { method: "GET", signal: deadline.signal, headers: preflightHeaders }, agent);
|
|
255
369
|
const socket = agent.socket;
|
|
@@ -257,7 +371,7 @@ export async function fetchBoundLinkRelay(
|
|
|
257
371
|
if (response.statusCode !== 204 || typeof proof !== "string" || !linkRelayProofMatches(proof, challenge.expected)) {
|
|
258
372
|
throw new LinkRelayAuthenticationError(response.statusCode === 404);
|
|
259
373
|
}
|
|
260
|
-
noteHomeConnection(target, challenge.nonce, response.headers);
|
|
374
|
+
const homeFeatures = noteHomeConnection(target, challenge.nonce, response.headers, preflight).features;
|
|
261
375
|
// Drain the credential-free response before the Agent can reuse its socket.
|
|
262
376
|
for await (const chunk of response) {
|
|
263
377
|
if (chunk.length) throw new LinkRelayAuthenticationError();
|
|
@@ -268,13 +382,24 @@ export async function fetchBoundLinkRelay(
|
|
|
268
382
|
if (!socket || socket.destroyed || socket !== agent.socket) throw new LinkRelayAuthenticationError();
|
|
269
383
|
const headers = new Headers(init.headers);
|
|
270
384
|
headers.set(LINK_RELAY_SESSION_HEADER, challenge.nonce);
|
|
385
|
+
let body = init.body;
|
|
386
|
+
if (options.selectBody) {
|
|
387
|
+
const chosen = options.selectBody(homeFeatures);
|
|
388
|
+
body = chosen.body;
|
|
389
|
+
for (const [name, value] of Object.entries(chosen.headers)) headers.set(name, value);
|
|
390
|
+
}
|
|
271
391
|
dataRequestStarted = true;
|
|
272
|
-
|
|
273
|
-
|
|
392
|
+
flow = target.linkId ? untilBothSettled((options.traffic ?? childLinkTraffic).begin(target.linkId)) : undefined;
|
|
393
|
+
const incoming = await requestOnConnection(url, { ...init, headers, body }, agent, socket, bytes => flow?.flow.toHome(bytes),
|
|
394
|
+
finished => flow?.uploaded(finished), options.onBodySettled);
|
|
395
|
+
return await responseOnConnection(incoming, agent, init.method ?? "GET", flow?.flow);
|
|
274
396
|
} catch (error) {
|
|
397
|
+
flow?.flow.end(false);
|
|
275
398
|
const authDeadlineExpired = !dataRequestStarted && deadline.didExpire()
|
|
276
399
|
&& !(error instanceof LinkRelayAuthenticationError);
|
|
277
400
|
await agent.close();
|
|
401
|
+
// The connection is gone, so an upload that has not settled yet never will.
|
|
402
|
+
flow?.uploaded(false);
|
|
278
403
|
if (authDeadlineExpired && !init.signal?.aborted) throw new LinkRelayAuthTimeoutError();
|
|
279
404
|
throw error;
|
|
280
405
|
} finally { deadline.clear(); }
|
package/src/client/link-relay.ts
CHANGED
|
@@ -11,6 +11,15 @@ import type { LinkDiagnosticRecord, LinkDiagnosticSink } from "../link/diagnosti
|
|
|
11
11
|
import { linkRouteAllowed } from "../link/routes";
|
|
12
12
|
import { isLinkPort } from "../link/ports";
|
|
13
13
|
import { resolveInboundBodyLimitBytes } from "../server/request-decompress";
|
|
14
|
+
import type { LinkTrafficBook } from "../link/traffic";
|
|
15
|
+
import { LINK_REQUEST_ZSTD_FEATURE } from "../link/request-compression";
|
|
16
|
+
import { linkHomeAcceptsRequestZstd } from "./link-home-features";
|
|
17
|
+
import {
|
|
18
|
+
chooseLinkBody, compressLinkBody, linkRequestCompressible, linkRequestPrepareBudget, readDeclaredBody, type LinkBodyCompressor,
|
|
19
|
+
type PreparedLinkBody,
|
|
20
|
+
} from "./link-request-compression";
|
|
21
|
+
import type { InboundBodyBudget } from "../server/inbound-body-budget";
|
|
22
|
+
import { linkChildRelayWaitObserver } from "./link-websocket-limits";
|
|
14
23
|
|
|
15
24
|
export interface LinkRelayTarget {
|
|
16
25
|
tunnelPort: number;
|
|
@@ -52,6 +61,13 @@ export interface LinkTunnelGate {
|
|
|
52
61
|
* when the tunnel stops being re-established (failed or stopped), or when too many requests wait.
|
|
53
62
|
*/
|
|
54
63
|
waitForConnected(timeoutMs: number, signal?: AbortSignal): Promise<boolean>;
|
|
64
|
+
/**
|
|
65
|
+
* Optional: `listener` runs once, synchronously, when the gate's owner starts stopping, before the
|
|
66
|
+
* tunnel goes away: the supervisor's stop(), or the link ending (its sidecar gone, naming another link,
|
|
67
|
+
* or the connected link id unreadable for several checks in a row) before the runtime recycles. The link
|
|
68
|
+
* WebSocket drains its sockets here.
|
|
69
|
+
*/
|
|
70
|
+
onStopping?(listener: () => void): void;
|
|
55
71
|
}
|
|
56
72
|
|
|
57
73
|
/**
|
|
@@ -87,6 +103,14 @@ export interface LinkRelayDeps {
|
|
|
87
103
|
* authenticated management relay passes the read-only management table (#6957).
|
|
88
104
|
*/
|
|
89
105
|
routeAllowed?: (url: URL, req: Request) => boolean;
|
|
106
|
+
/** Where the link transport counts the bodies it carries; this process's Child book by default. */
|
|
107
|
+
traffic?: LinkTrafficBook;
|
|
108
|
+
/**
|
|
109
|
+
* Per-body zstd toward the Home (#3023). On by default; it applies only when the Home named
|
|
110
|
+
* `link-request-zstd/1` on its last verified answer and again on the connection carrying the body.
|
|
111
|
+
* Test seams: the compressor and the Home's last answer.
|
|
112
|
+
*/
|
|
113
|
+
requestCompression?: { enabled?: boolean; compress?: LinkBodyCompressor; homeAccepts?: (linkId: string) => boolean; budget?: InboundBodyBudget };
|
|
90
114
|
}
|
|
91
115
|
|
|
92
116
|
export const LINK_RELAY_RETRY_AFTER_SECONDS = 1;
|
|
@@ -180,6 +204,24 @@ export function forwardLinkRequestHeaders(source: Headers, admissionKey: string,
|
|
|
180
204
|
return linkRequestHeaders(source, admissionKey, pathname, validation.connectionNamed);
|
|
181
205
|
}
|
|
182
206
|
|
|
207
|
+
/** The handshake headers of Codex's own upgrade, which the Home leg replaces with its own (link-ws-transport.ts). */
|
|
208
|
+
const UPGRADE_HANDSHAKE_HEADERS = ["connection", "upgrade", "origin", "sec-websocket-key", "sec-websocket-version", "sec-websocket-extensions", "sec-websocket-protocol"];
|
|
209
|
+
|
|
210
|
+
/**
|
|
211
|
+
* The headers a link WebSocket's upgrade sends to the Home: Codex's headers without its handshake, then
|
|
212
|
+
* the same filter an HTTP request gets (hop-by-hop, Connection-nominated and caller credentials dropped)
|
|
213
|
+
* and the link key as a Bearer. Null when the rest would be refused as malformed or too large.
|
|
214
|
+
*/
|
|
215
|
+
export function forwardLinkUpgradeHeaders(source: Headers, admissionKey: string): Headers | null {
|
|
216
|
+
const connectionNamed = new Set((source.get("connection") ?? "").split(",").map(token => token.trim().toLowerCase()).filter(Boolean));
|
|
217
|
+
const rest = new Headers(source);
|
|
218
|
+
for (const name of UPGRADE_HANDSHAKE_HEADERS) rest.delete(name);
|
|
219
|
+
const validation = validateHubRelayRequestHeaders(linkFramingHeaders(rest));
|
|
220
|
+
if (!validation.ok) return null;
|
|
221
|
+
const headers = linkRequestHeaders(rest, admissionKey, "/v1/responses", new Set([...validation.connectionNamed, ...connectionNamed]));
|
|
222
|
+
return headersWithinLimit(headers) ? headers : null;
|
|
223
|
+
}
|
|
224
|
+
|
|
183
225
|
function linkRequestHeaders(
|
|
184
226
|
source: Headers,
|
|
185
227
|
admissionKey: string,
|
|
@@ -342,6 +384,61 @@ function idleBoundedStream(
|
|
|
342
384
|
});
|
|
343
385
|
}
|
|
344
386
|
|
|
387
|
+
/**
|
|
388
|
+
* Test-only (link-websocket-limits.ts): the relayed body passed through unchanged, with the observer told from each
|
|
389
|
+
* chunk handed over until the reader asks again, and when the body ends, errors or is cancelled. A high-water mark of 0
|
|
390
|
+
* means it reads only when the reader does, so the wait it reports is the reader's. `ended` runs from the relay's own
|
|
391
|
+
* cleanup, so a relay that ends underneath a reader holding a chunk (a caller abort, the SSE idle limit) stops being
|
|
392
|
+
* reported as waiting at once and is never reported again. The signal follows the relay's own lifetime: a Home
|
|
393
|
+
* failure the relay has not read yet (its read-ahead chunk is queued and nothing reads the Home) keeps it reported as
|
|
394
|
+
* waiting, as the Home's signal does, because the relay still holds that chunk and its request until its next read, a
|
|
395
|
+
* reader cancel, a caller abort or (SSE) the idle limit ends it. Used only while a test sets an observer.
|
|
396
|
+
*/
|
|
397
|
+
function waitObservation(observer: (waiting: boolean) => void) {
|
|
398
|
+
let waiting = false;
|
|
399
|
+
let ended = false;
|
|
400
|
+
const tell = (value: boolean): void => {
|
|
401
|
+
if (waiting === value || (value && ended)) return;
|
|
402
|
+
waiting = value;
|
|
403
|
+
try { observer(value); } catch { /* a test observer never breaks the relay */ }
|
|
404
|
+
};
|
|
405
|
+
const end = (): void => { ended = true; tell(false); };
|
|
406
|
+
const stream = (body: ReadableStream<Uint8Array>): ReadableStream<Uint8Array> => {
|
|
407
|
+
const reader = body.getReader();
|
|
408
|
+
return new ReadableStream<Uint8Array>({
|
|
409
|
+
async pull(controller) {
|
|
410
|
+
tell(false);
|
|
411
|
+
try {
|
|
412
|
+
const next = await reader.read();
|
|
413
|
+
if (next.done) { controller.close(); return; }
|
|
414
|
+
controller.enqueue(next.value);
|
|
415
|
+
tell(true);
|
|
416
|
+
} catch (error) {
|
|
417
|
+
controller.error(error);
|
|
418
|
+
}
|
|
419
|
+
},
|
|
420
|
+
async cancel(reason) {
|
|
421
|
+
tell(false);
|
|
422
|
+
try { await reader.cancel(reason); } catch { /* best effort */ }
|
|
423
|
+
},
|
|
424
|
+
}, { highWaterMark: 0 });
|
|
425
|
+
};
|
|
426
|
+
return { ended: end, stream };
|
|
427
|
+
}
|
|
428
|
+
|
|
429
|
+
/**
|
|
430
|
+
* The fetch seam has no relay-auth answer, so a prepared body is chosen from the Home's last
|
|
431
|
+
* recorded features, as the transport would choose it from this connection's.
|
|
432
|
+
*/
|
|
433
|
+
function seamInit(init: RequestInit, select: ((features: readonly string[] | null) => { body: Uint8Array<ArrayBuffer>; headers: Record<string, string> }) | undefined,
|
|
434
|
+
linkId: string | undefined): RequestInit {
|
|
435
|
+
if (!select) return init;
|
|
436
|
+
const chosen = select(linkId && linkHomeAcceptsRequestZstd(linkId) ? [LINK_REQUEST_ZSTD_FEATURE] : null);
|
|
437
|
+
const headers = new Headers(init.headers);
|
|
438
|
+
for (const [name, value] of Object.entries(chosen.headers)) headers.set(name, value);
|
|
439
|
+
return { ...init, headers, body: chosen.body };
|
|
440
|
+
}
|
|
441
|
+
|
|
345
442
|
/**
|
|
346
443
|
* Admit an allowlisted route and stream it through the authenticated tunnel with bounded bodies.
|
|
347
444
|
* Owner/auth preflight deadlines share one recovery attempt before data dispatch; an ambiguous
|
|
@@ -393,20 +490,54 @@ export async function relayLinkDataRequest(
|
|
|
393
490
|
};
|
|
394
491
|
const onClientAbort = () => relayAbort.abort(req.signal.reason);
|
|
395
492
|
req.signal.addEventListener("abort", onClientAbort, { once: true });
|
|
493
|
+
let releasePrepared = () => {};
|
|
396
494
|
const cleanup = () => {
|
|
495
|
+
releasePrepared();
|
|
397
496
|
stopHeaderDeadline();
|
|
398
497
|
req.signal.removeEventListener("abort", onClientAbort);
|
|
399
498
|
};
|
|
400
499
|
if (req.signal.aborted) onClientAbort();
|
|
401
500
|
|
|
501
|
+
// Per-body zstd (#3023): a compressible body for a Home that named the capability is read into
|
|
502
|
+
// one buffer of its declared length (at most LINK_REQUEST_COMPRESSION_MAX_BYTES) and compressed
|
|
503
|
+
// once; every other body streams exactly as before.
|
|
504
|
+
const compression = deps.requestCompression;
|
|
505
|
+
let prepared: PreparedLinkBody | null = null;
|
|
506
|
+
// A shared allowance bounds the bodies held at once; without room now, the body streams unchanged.
|
|
507
|
+
const lease = compression?.enabled !== false && target.linkId && declaredLength !== null && Number(declaredLength) <= bodyLimit
|
|
508
|
+
&& linkRequestCompressible(url, req, declaredLength) && (compression?.homeAccepts ?? linkHomeAcceptsRequestZstd)(target.linkId)
|
|
509
|
+
? await (compression?.budget ?? linkRequestPrepareBudget).acquire(2 * Number(declaredLength), relayAbort.signal, 0).catch(() => null)
|
|
510
|
+
: null;
|
|
511
|
+
releasePrepared = () => { lease?.release(); };
|
|
512
|
+
// The allowance covers the prepared bytes for as long as anything here can still send them: until
|
|
513
|
+
// the Home answered (a refused or timed-out preflight sends them again) and the transport settled
|
|
514
|
+
// the upload. Then the references go with the charge.
|
|
515
|
+
let uploadSettled = false, answered = false;
|
|
516
|
+
const releaseWhenSent = () => {
|
|
517
|
+
if (!uploadSettled || !answered) return;
|
|
518
|
+
prepared = null;
|
|
519
|
+
releasePrepared();
|
|
520
|
+
};
|
|
521
|
+
if (lease) {
|
|
522
|
+
let raw: Uint8Array<ArrayBuffer>;
|
|
523
|
+
try {
|
|
524
|
+
raw = await readDeclaredBody(req.body!, Number(declaredLength), relayAbort.signal);
|
|
525
|
+
} catch {
|
|
526
|
+
cleanup();
|
|
527
|
+
// An aborted caller or the header deadline: the same answer a wait for the tunnel ends with.
|
|
528
|
+
return relayAbort.signal.aborted ? homeUnreachable("link tunnel unavailable") : jsonError(400, "link relay request body unreadable");
|
|
529
|
+
}
|
|
530
|
+
prepared = { raw, zstd: await compressLinkBody(raw, compression?.compress) };
|
|
531
|
+
}
|
|
402
532
|
let bodyOverflow = false;
|
|
403
533
|
let bodyCancelled = false;
|
|
404
|
-
const body = req.method === "GET" || req.method === "HEAD" || !req.body
|
|
534
|
+
const body = prepared || req.method === "GET" || req.method === "HEAD" || !req.body
|
|
405
535
|
? null
|
|
406
536
|
: byteCappedRequestBody(req.body, bodyLimit, () => { bodyOverflow = true; }, () => { bodyCancelled = true; });
|
|
407
537
|
// A streamed body keeps the caller's Content-Length, so the Home sees the same framing a
|
|
408
538
|
// buffered body produced instead of a chunked upload.
|
|
409
539
|
if (body && declaredLength !== null) headers.set("content-length", declaredLength);
|
|
540
|
+
if (prepared) headers.set("content-length", String(prepared.raw.byteLength));
|
|
410
541
|
|
|
411
542
|
// The hold: only while the tunnel is connecting or reconnecting, and at most `holdMs` from the
|
|
412
543
|
// first wait. A positive connected verdict is required again before every fetch.
|
|
@@ -464,9 +595,14 @@ export async function relayLinkDataRequest(
|
|
|
464
595
|
headers,
|
|
465
596
|
redirect: "manual",
|
|
466
597
|
signal: relayAbort.signal,
|
|
467
|
-
...(body ? { body, duplex: "half" } : {}),
|
|
598
|
+
...(body ? { body, duplex: "half" } : prepared ? { body: prepared.raw } : {}),
|
|
468
599
|
};
|
|
469
|
-
|
|
600
|
+
const selectBody = prepared ? (features: readonly string[] | null) => chooseLinkBody(prepared!, features) : undefined;
|
|
601
|
+
upstream = await (deps.fetchImpl
|
|
602
|
+
? deps.fetchImpl(destination, seamInit(init, selectBody, target.linkId))
|
|
603
|
+
: fetchBoundLinkRelay(target, destination, init, {
|
|
604
|
+
traffic: deps.traffic, ...(selectBody ? { selectBody, onBodySettled: () => { uploadSettled = true; releaseWhenSent(); } } : {}),
|
|
605
|
+
}));
|
|
470
606
|
} catch (error) {
|
|
471
607
|
if (error instanceof LinkRelayAuthenticationError) {
|
|
472
608
|
return await tunnelUnavailable("auth_failed", error.message);
|
|
@@ -488,6 +624,10 @@ export async function relayLinkDataRequest(
|
|
|
488
624
|
if (!tunnel || !resendable || !tunnel.pending() || !await holdForTunnel(tunnel)) return await tunnelUnavailable("transport_error");
|
|
489
625
|
}
|
|
490
626
|
}
|
|
627
|
+
// The fetch seam has no socket to wait for; the transport settles the upload itself.
|
|
628
|
+
answered = true;
|
|
629
|
+
if (deps.fetchImpl) uploadSettled = true;
|
|
630
|
+
releaseWhenSent();
|
|
491
631
|
if (relayAbort.signal.aborted) {
|
|
492
632
|
try { await upstream.body?.cancel(); } catch { /* best effort */ }
|
|
493
633
|
return await tunnelUnavailable();
|
|
@@ -516,9 +656,13 @@ export async function relayLinkDataRequest(
|
|
|
516
656
|
|
|
517
657
|
// The header deadline ends once a response exists. The body owns cleanup after that.
|
|
518
658
|
stopHeaderDeadline();
|
|
659
|
+
const waitObserver = linkChildRelayWaitObserver();
|
|
660
|
+
const observed = waitObserver ? waitObservation(waitObserver) : null;
|
|
661
|
+
const bodyCleanup = observed ? () => { observed.ended(); cleanup(); } : cleanup;
|
|
519
662
|
const responseBody = sse
|
|
520
663
|
? idleBoundedStream(upstream.body, relayAbort.signal, clock,
|
|
521
|
-
deps.sseIdleTimeoutMs ?? LINK_RELAY_SSE_IDLE_TIMEOUT_MS, () => relayAbort.abort(new DOMException("link relay SSE idle timeout", "TimeoutError")),
|
|
522
|
-
: boundedRelayResponseStream(upstream.body, bodyLimit, relayAbort.signal,
|
|
523
|
-
return new Response(
|
|
664
|
+
deps.sseIdleTimeoutMs ?? LINK_RELAY_SSE_IDLE_TIMEOUT_MS, () => relayAbort.abort(new DOMException("link relay SSE idle timeout", "TimeoutError")), bodyCleanup)
|
|
665
|
+
: boundedRelayResponseStream(upstream.body, bodyLimit, relayAbort.signal, bodyCleanup);
|
|
666
|
+
return new Response(observed ? observed.stream(responseBody) : responseBody,
|
|
667
|
+
{ status: upstream.status, statusText: upstream.statusText, headers: responseHeaders });
|
|
524
668
|
}
|