@rangojs/router 0.0.0-experimental.9c9afef3 → 0.0.0-experimental.a014d2b7
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/AGENTS.md +8 -0
- package/README.md +245 -49
- package/dist/bin/rango.js +440 -133
- package/dist/testing/vitest.js +82 -0
- package/dist/vite/index.js +3373 -1176
- package/dist/vite/index.js.bak +5448 -0
- package/dist/vite/plugins/cloudflare-protocol-loader-hook.mjs +76 -0
- package/package.json +68 -14
- package/skills/api-client/SKILL.md +211 -0
- package/skills/breadcrumbs/SKILL.md +64 -2
- package/skills/bundle-analysis/SKILL.md +159 -0
- package/skills/cache-guide/SKILL.md +224 -32
- package/skills/caching/SKILL.md +279 -17
- package/skills/composability/SKILL.md +27 -3
- package/skills/css/SKILL.md +76 -0
- package/skills/debug-manifest/SKILL.md +4 -2
- package/skills/document-cache/SKILL.md +78 -55
- package/skills/handler-use/SKILL.md +364 -0
- package/skills/hooks/SKILL.md +250 -30
- package/skills/host-router/SKILL.md +83 -23
- package/skills/i18n/SKILL.md +276 -0
- package/skills/intercept/SKILL.md +87 -18
- package/skills/layout/SKILL.md +35 -9
- package/skills/links/SKILL.md +249 -17
- package/skills/loader/SKILL.md +235 -9
- package/skills/middleware/SKILL.md +52 -13
- package/skills/migrate-nextjs/SKILL.md +584 -0
- package/skills/migrate-react-router/SKILL.md +771 -0
- package/skills/mime-routes/SKILL.md +28 -1
- package/skills/observability/SKILL.md +172 -0
- package/skills/parallel/SKILL.md +77 -7
- package/skills/prerender/SKILL.md +172 -125
- package/skills/rango/SKILL.md +251 -22
- package/skills/react-compiler/SKILL.md +168 -0
- package/skills/response-routes/SKILL.md +123 -48
- package/skills/route/SKILL.md +70 -5
- package/skills/router-setup/SKILL.md +65 -8
- package/skills/scripts/SKILL.md +179 -0
- package/skills/server-actions/SKILL.md +775 -0
- package/skills/streams-and-websockets/SKILL.md +283 -0
- package/skills/tailwind/SKILL.md +27 -3
- package/skills/testing/SKILL.md +130 -0
- package/skills/testing/bindings.md +103 -0
- package/skills/testing/cache-prerender.md +127 -0
- package/skills/testing/client-components.md +124 -0
- package/skills/testing/e2e-parity.md +125 -0
- package/skills/testing/flight.md +91 -0
- package/skills/testing/handles.md +129 -0
- package/skills/testing/loader.md +128 -0
- package/skills/testing/middleware.md +99 -0
- package/skills/testing/render-handler.md +122 -0
- package/skills/testing/response-routes.md +95 -0
- package/skills/testing/reverse-and-types.md +84 -0
- package/skills/testing/server-actions.md +107 -0
- package/skills/testing/server-tree.md +128 -0
- package/skills/testing/setup.md +123 -0
- package/skills/typesafety/SKILL.md +322 -29
- package/skills/use-cache/SKILL.md +57 -14
- package/skills/view-transitions/SKILL.md +337 -0
- package/src/__augment-tests__/augment.ts +81 -0
- package/src/__augment-tests__/augmented.check.ts +116 -0
- package/src/__internal.ts +1 -66
- package/src/browser/action-coordinator.ts +53 -36
- package/src/browser/action-fence.ts +47 -0
- package/src/browser/app-shell.ts +39 -0
- package/src/browser/app-version.ts +14 -0
- package/src/browser/connection-warmup.ts +134 -0
- package/src/browser/cookie-name.ts +140 -0
- package/src/browser/event-controller.ts +192 -150
- package/src/browser/history-state.ts +21 -0
- package/src/browser/index.ts +3 -3
- package/src/browser/invalidate-client-cache.ts +52 -0
- package/src/browser/navigation-bridge.ts +131 -30
- package/src/browser/navigation-client.ts +186 -100
- package/src/browser/navigation-store-handle.ts +38 -0
- package/src/browser/navigation-store.ts +157 -74
- package/src/browser/navigation-transaction.ts +9 -59
- package/src/browser/network-error-handler.ts +34 -7
- package/src/browser/partial-update.ts +165 -112
- package/src/browser/prefetch/cache.ts +205 -62
- package/src/browser/prefetch/fetch.ts +347 -39
- package/src/browser/prefetch/queue.ts +42 -8
- package/src/browser/rango-state.ts +158 -76
- package/src/browser/react/Link.tsx +102 -15
- package/src/browser/react/NavigationProvider.tsx +295 -119
- package/src/browser/react/ScrollRestoration.tsx +10 -6
- package/src/browser/react/context.ts +7 -2
- package/src/browser/react/deferred-handle-resolution.ts +75 -0
- package/src/browser/react/filter-segment-order.ts +66 -7
- package/src/browser/react/index.ts +0 -48
- package/src/browser/react/location-state-shared.ts +178 -8
- package/src/browser/react/location-state.ts +39 -14
- package/src/browser/react/use-action.ts +6 -15
- package/src/browser/react/use-handle.ts +23 -69
- package/src/browser/react/use-href.tsx +8 -1
- package/src/browser/react/use-link-status.ts +33 -8
- package/src/browser/react/use-navigation.ts +32 -7
- package/src/browser/react/use-params.ts +20 -10
- package/src/browser/react/use-reverse.ts +106 -0
- package/src/browser/react/use-router.ts +46 -11
- package/src/browser/react/use-search-params.ts +0 -5
- package/src/browser/react/use-segments.ts +11 -21
- package/src/browser/response-adapter.ts +99 -8
- package/src/browser/rsc-router.tsx +114 -24
- package/src/browser/scroll-restoration.ts +37 -22
- package/src/browser/segment-reconciler.ts +36 -14
- package/src/browser/segment-structure-assert.ts +2 -2
- package/src/browser/server-action-bridge.ts +222 -72
- package/src/browser/types.ts +102 -12
- package/src/browser/validate-redirect-origin.ts +43 -16
- package/src/build/collect-fallback-refs.ts +107 -0
- package/src/build/generate-manifest.ts +65 -40
- package/src/build/generate-route-types.ts +5 -1
- package/src/build/index.ts +8 -2
- package/src/build/prefix-tree-utils.ts +123 -0
- package/src/build/route-trie.ts +165 -36
- package/src/build/route-types/ast-route-extraction.ts +15 -8
- package/src/build/route-types/codegen.ts +16 -5
- package/src/build/route-types/include-resolution.ts +125 -24
- package/src/build/route-types/param-extraction.ts +6 -3
- package/src/build/route-types/per-module-writer.ts +22 -6
- package/src/build/route-types/router-processing.ts +260 -94
- package/src/build/route-types/scan-filter.ts +9 -2
- package/src/build/route-types/source-scan.ts +216 -0
- package/src/build/runtime-discovery.ts +9 -20
- package/src/cache/cache-error.ts +104 -0
- package/src/cache/cache-key-utils.ts +29 -13
- package/src/cache/cache-policy.ts +108 -34
- package/src/cache/cache-runtime.ts +224 -41
- package/src/cache/cache-scope.ts +188 -82
- package/src/cache/cache-tag.ts +103 -0
- package/src/cache/cf/cf-base64.ts +33 -0
- package/src/cache/cf/cf-cache-constants.ts +127 -0
- package/src/cache/cf/cf-cache-store.ts +1989 -378
- package/src/cache/cf/cf-cache-types.ts +349 -0
- package/src/cache/cf/cf-kv-utils.ts +46 -0
- package/src/cache/cf/cf-tag-marker-memo.ts +105 -0
- package/src/cache/cf/index.ts +6 -16
- package/src/cache/document-cache.ts +89 -21
- package/src/cache/handle-snapshot.ts +70 -0
- package/src/cache/index.ts +10 -20
- package/src/cache/memory-segment-store.ts +136 -37
- package/src/cache/profile-registry.ts +46 -31
- package/src/cache/read-through-swr.ts +56 -12
- package/src/cache/segment-codec.ts +9 -17
- package/src/cache/tag-invalidation.ts +230 -0
- package/src/cache/types.ts +37 -100
- package/src/client.rsc.tsx +44 -21
- package/src/client.tsx +119 -290
- package/src/cloudflare/index.ts +11 -0
- package/src/cloudflare/tracing.ts +109 -0
- package/src/component-utils.ts +19 -0
- package/src/components/DefaultDocument.tsx +8 -2
- package/src/context-var.ts +18 -6
- package/src/decode-loader-results.ts +52 -0
- package/src/defer.ts +196 -0
- package/src/deps/ssr.ts +0 -1
- package/src/encode-kv.ts +49 -0
- package/src/errors.ts +30 -4
- package/src/escape-script.ts +52 -0
- package/src/handle.ts +70 -22
- package/src/handles/MetaTags.tsx +62 -19
- package/src/handles/Scripts.tsx +183 -0
- package/src/handles/breadcrumbs.ts +37 -8
- package/src/handles/is-thenable.ts +19 -0
- package/src/handles/meta.ts +51 -40
- package/src/handles/script.ts +244 -0
- package/src/host/cookie-handler.ts +9 -60
- package/src/host/errors.ts +0 -24
- package/src/host/index.ts +8 -2
- package/src/host/pattern-matcher.ts +23 -52
- package/src/host/router.ts +107 -99
- package/src/host/testing.ts +40 -27
- package/src/host/types.ts +37 -4
- package/src/host/utils.ts +1 -1
- package/src/href-client.ts +137 -22
- package/src/index.rsc.ts +99 -13
- package/src/index.ts +139 -19
- package/src/internal-debug.ts +11 -10
- package/src/loader-store.ts +500 -0
- package/src/loader.rsc.ts +20 -13
- package/src/loader.ts +12 -11
- package/src/missing-id-error.ts +68 -0
- package/src/outlet-context.ts +1 -1
- package/src/outlet-provider.tsx +1 -5
- package/src/prerender/param-hash.ts +16 -16
- package/src/prerender/store.ts +37 -41
- package/src/prerender.ts +198 -82
- package/src/redirect-origin.ts +100 -0
- package/src/regex-escape.ts +8 -0
- package/src/render-error-thrower.tsx +20 -0
- package/src/response-utils.ts +62 -0
- package/src/reverse.ts +65 -15
- package/src/root-error-boundary.tsx +1 -19
- package/src/route-content-wrapper.tsx +19 -77
- package/src/route-definition/dsl-helpers.ts +461 -304
- package/src/route-definition/helper-factories.ts +28 -140
- package/src/route-definition/helpers-types.ts +143 -69
- package/src/route-definition/index.ts +4 -2
- package/src/route-definition/redirect.ts +51 -10
- package/src/route-definition/resolve-handler-use.ts +160 -0
- package/src/route-definition/use-item-types.ts +29 -0
- package/src/route-map-builder.ts +0 -16
- package/src/route-types.ts +37 -46
- package/src/router/basename.ts +14 -0
- package/src/router/content-negotiation.ts +164 -17
- package/src/router/error-handling.ts +45 -18
- package/src/router/find-match.ts +44 -23
- package/src/router/handler-context.ts +52 -31
- package/src/router/instrument.ts +350 -0
- package/src/router/intercept-resolution.ts +48 -24
- package/src/router/lazy-includes.ts +15 -52
- package/src/router/loader-resolution.ts +268 -56
- package/src/router/logging.ts +0 -6
- package/src/router/manifest.ts +40 -42
- package/src/router/match-api.ts +124 -204
- package/src/router/match-context.ts +0 -22
- package/src/router/match-handlers.ts +58 -58
- package/src/router/match-middleware/background-revalidation.ts +40 -24
- package/src/router/match-middleware/cache-lookup.ts +170 -276
- package/src/router/match-middleware/cache-store.ts +64 -52
- package/src/router/match-middleware/intercept-resolution.ts +0 -22
- package/src/router/match-middleware/segment-resolution.ts +45 -14
- package/src/router/match-pipelines.ts +1 -42
- package/src/router/match-result.ts +87 -39
- package/src/router/metrics.ts +0 -34
- package/src/router/middleware-types.ts +7 -140
- package/src/router/middleware.ts +266 -169
- package/src/router/navigation-snapshot.ts +131 -0
- package/src/router/params-util.ts +23 -0
- package/src/router/pattern-matching.ts +132 -90
- package/src/router/prefetch-cache-ttl.ts +51 -0
- package/src/router/prerender-match.ts +195 -56
- package/src/router/preview-match.ts +32 -102
- package/src/router/request-classification.ts +276 -0
- package/src/router/revalidation.ts +123 -73
- package/src/router/route-snapshot.ts +244 -0
- package/src/router/router-context.ts +3 -28
- package/src/router/router-interfaces.ts +115 -35
- package/src/router/router-options.ts +172 -15
- package/src/router/router-registry.ts +2 -5
- package/src/router/segment-resolution/fresh.ts +162 -84
- package/src/router/segment-resolution/helpers.ts +86 -6
- package/src/router/segment-resolution/loader-cache.ts +76 -39
- package/src/router/segment-resolution/revalidation.ts +351 -321
- package/src/router/segment-resolution/static-store.ts +19 -5
- package/src/router/segment-resolution/streamed-handler-telemetry.ts +52 -0
- package/src/router/segment-resolution/view-transition-default.ts +56 -0
- package/src/router/segment-resolution.ts +5 -1
- package/src/router/segment-wrappers.ts +6 -5
- package/src/router/state-cookie-name.ts +33 -0
- package/src/router/substitute-pattern-params.ts +56 -0
- package/src/router/telemetry-otel.ts +161 -199
- package/src/router/telemetry.ts +96 -19
- package/src/router/timeout.ts +0 -20
- package/src/router/tracing.ts +206 -0
- package/src/router/trie-matching.ts +163 -59
- package/src/router/types.ts +9 -63
- package/src/router/url-params.ts +44 -0
- package/src/router.ts +157 -54
- package/src/rsc/handler-context.ts +3 -2
- package/src/rsc/handler.ts +655 -529
- package/src/rsc/helpers.ts +168 -46
- package/src/rsc/index.ts +2 -5
- package/src/rsc/json-route-result.ts +38 -0
- package/src/rsc/loader-fetch.ts +122 -31
- package/src/rsc/manifest-init.ts +33 -42
- package/src/rsc/origin-guard.ts +39 -25
- package/src/rsc/progressive-enhancement.ts +131 -14
- package/src/rsc/redirect-guard.ts +99 -0
- package/src/rsc/response-cache-serve.ts +238 -0
- package/src/rsc/response-error.ts +79 -12
- package/src/rsc/response-route-handler.ts +99 -189
- package/src/rsc/rsc-rendering.ts +109 -74
- package/src/rsc/runtime-warnings.ts +23 -10
- package/src/rsc/server-action.ts +287 -115
- package/src/rsc/ssr-setup.ts +18 -2
- package/src/rsc/transition-gate.ts +89 -0
- package/src/rsc/types.ts +29 -9
- package/src/runtime-env.ts +18 -0
- package/src/search-params.ts +35 -30
- package/src/segment-content-promise.ts +67 -0
- package/src/segment-loader-promise.ts +149 -0
- package/src/segment-system.tsx +236 -202
- package/src/serialize.ts +243 -0
- package/src/server/context.ts +224 -52
- package/src/server/cookie-parse.ts +32 -0
- package/src/server/cookie-store.ts +80 -5
- package/src/server/handle-store.ts +40 -38
- package/src/server/loader-registry.ts +38 -46
- package/src/server/request-context.ts +401 -173
- package/src/ssr/index.tsx +24 -16
- package/src/static-handler.ts +27 -18
- package/src/testing/cache-status.ts +162 -0
- package/src/testing/collect-handle.ts +40 -0
- package/src/testing/dispatch.ts +701 -0
- package/src/testing/dom.entry.ts +22 -0
- package/src/testing/e2e/fixture.ts +188 -0
- package/src/testing/e2e/index.ts +128 -0
- package/src/testing/e2e/matchers.ts +35 -0
- package/src/testing/e2e/page-helpers.ts +272 -0
- package/src/testing/e2e/parity.ts +387 -0
- package/src/testing/e2e/server.ts +195 -0
- package/src/testing/flight-matchers.ts +97 -0
- package/src/testing/flight-normalize.ts +11 -0
- package/src/testing/flight-runtime.d.ts +57 -0
- package/src/testing/flight-tree.ts +682 -0
- package/src/testing/flight.entry.ts +52 -0
- package/src/testing/flight.ts +257 -0
- package/src/testing/generated-routes.ts +183 -0
- package/src/testing/index.ts +105 -0
- package/src/testing/internal/context.ts +371 -0
- package/src/testing/internal/flight-client-globals.ts +30 -0
- package/src/testing/internal/seed-vars.ts +54 -0
- package/src/testing/render-handler.ts +357 -0
- package/src/testing/render-route.tsx +581 -0
- package/src/testing/run-loader.ts +385 -0
- package/src/testing/run-middleware.ts +205 -0
- package/src/testing/run-transition-when.ts +164 -0
- package/src/testing/vitest-stubs/cloudflare-email.ts +9 -0
- package/src/testing/vitest-stubs/cloudflare-workers.ts +21 -0
- package/src/testing/vitest-stubs/plugin-rsc.ts +16 -0
- package/src/testing/vitest-stubs/version.ts +5 -0
- package/src/testing/vitest.ts +305 -0
- package/src/theme/ThemeProvider.tsx +20 -58
- package/src/theme/ThemeScript.tsx +7 -9
- package/src/theme/constants.ts +52 -13
- package/src/theme/index.ts +0 -7
- package/src/theme/theme-context.ts +1 -5
- package/src/theme/theme-script.ts +22 -21
- package/src/theme/use-theme.ts +0 -3
- package/src/types/boundaries.ts +0 -35
- package/src/types/cache-types.ts +17 -8
- package/src/types/error-types.ts +30 -90
- package/src/types/global-namespace.ts +54 -41
- package/src/types/handler-context.ts +125 -71
- package/src/types/index.ts +3 -10
- package/src/types/loader-types.ts +40 -11
- package/src/types/request-scope.ts +112 -0
- package/src/types/route-config.ts +6 -50
- package/src/types/route-entry.ts +12 -7
- package/src/types/segments.ts +136 -15
- package/src/urls/include-helper.ts +33 -70
- package/src/urls/index.ts +1 -11
- package/src/urls/path-helper-types.ts +68 -18
- package/src/urls/path-helper.ts +57 -111
- package/src/urls/pattern-types.ts +48 -19
- package/src/urls/response-types.ts +25 -22
- package/src/urls/type-extraction.ts +58 -139
- package/src/urls/urls-function.ts +1 -19
- package/src/use-loader.tsx +346 -89
- package/src/vite/debug.ts +185 -0
- package/src/vite/discovery/bundle-postprocess.ts +36 -38
- package/src/vite/discovery/discover-routers.ts +130 -85
- package/src/vite/discovery/discovery-errors.ts +194 -0
- package/src/vite/discovery/gate-state.ts +171 -0
- package/src/vite/discovery/prerender-collection.ts +214 -132
- package/src/vite/discovery/route-types-writer.ts +40 -84
- package/src/vite/discovery/self-gen-tracking.ts +27 -1
- package/src/vite/discovery/state.ts +57 -4
- package/src/vite/discovery/virtual-module-codegen.ts +14 -34
- package/src/vite/index.ts +6 -0
- package/src/vite/inject-client-debug.ts +36 -0
- package/src/vite/plugin-types.ts +178 -5
- package/src/vite/plugins/cjs-to-esm.ts +16 -19
- package/src/vite/plugins/client-ref-dedup.ts +16 -11
- package/src/vite/plugins/client-ref-hashing.ts +28 -15
- package/src/vite/plugins/cloudflare-protocol-loader-hook.d.mts +23 -0
- package/src/vite/plugins/cloudflare-protocol-loader-hook.mjs +76 -0
- package/src/vite/plugins/cloudflare-protocol-stub.ts +194 -0
- package/src/vite/plugins/expose-action-id.ts +48 -95
- package/src/vite/plugins/expose-id-utils.ts +96 -51
- package/src/vite/plugins/expose-ids/export-analysis.ts +101 -34
- package/src/vite/plugins/expose-ids/handler-transform.ts +15 -64
- package/src/vite/plugins/expose-ids/loader-transform.ts +14 -24
- package/src/vite/plugins/expose-ids/router-transform.ts +118 -29
- package/src/vite/plugins/expose-internal-ids.ts +553 -317
- package/src/vite/plugins/performance-tracks.ts +64 -170
- package/src/vite/plugins/refresh-cmd.ts +89 -27
- package/src/vite/plugins/use-cache-transform.ts +73 -83
- package/src/vite/plugins/version-injector.ts +40 -29
- package/src/vite/plugins/version-plugin.ts +37 -40
- package/src/vite/plugins/virtual-entries.ts +39 -25
- package/src/vite/rango.ts +118 -114
- package/src/vite/router-discovery.ts +941 -142
- package/src/vite/utils/ast-handler-extract.ts +26 -35
- package/src/vite/utils/banner.ts +1 -1
- package/src/vite/utils/bundle-analysis.ts +10 -15
- package/src/vite/utils/client-chunks.ts +184 -0
- package/src/vite/utils/directive-prologue.ts +40 -0
- package/src/vite/utils/forward-user-plugins.ts +171 -0
- package/src/vite/utils/manifest-utils.ts +4 -59
- package/src/vite/utils/package-resolution.ts +20 -52
- package/src/vite/utils/prerender-utils.ts +81 -34
- package/src/vite/utils/shared-utils.ts +92 -42
- package/src/browser/action-response-classifier.ts +0 -99
- package/src/browser/debug-channel.ts +0 -93
- package/src/browser/react/use-client-cache.ts +0 -58
- package/src/browser/shallow.ts +0 -40
- package/src/handles/index.ts +0 -7
- package/src/network-error-thrower.tsx +0 -23
- package/src/router/middleware-cookies.ts +0 -55
|
@@ -7,11 +7,12 @@
|
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
9
|
import { RouterError } from "../errors.js";
|
|
10
|
-
import {
|
|
10
|
+
import { getRequestContext } from "../server/request-context.js";
|
|
11
11
|
import { contextGet } from "../context-var.js";
|
|
12
12
|
import { NOCACHE_SYMBOL } from "../cache/taint.js";
|
|
13
|
-
import {
|
|
14
|
-
import { createCacheScope } from "../cache/cache-scope.js";
|
|
13
|
+
import { RESPONSE_TYPE_MIME } from "../router/content-negotiation.js";
|
|
14
|
+
import { createCacheScope, resolveCacheTags } from "../cache/cache-scope.js";
|
|
15
|
+
import { serveResponseRouteWithCache } from "./response-cache-serve.js";
|
|
15
16
|
import { executeMiddleware } from "../router/middleware.js";
|
|
16
17
|
import {
|
|
17
18
|
createReverseFunction,
|
|
@@ -20,13 +21,21 @@ import {
|
|
|
20
21
|
import type { MiddlewareFn } from "../router/middleware.js";
|
|
21
22
|
import type { EntryData } from "../server/context.js";
|
|
22
23
|
import type { HandlerContext } from "./handler-context.js";
|
|
23
|
-
import {
|
|
24
|
+
import { createProblemDetails } from "./response-error.js";
|
|
24
25
|
import {
|
|
25
26
|
createResponseWithMergedHeaders,
|
|
26
27
|
finalizeResponse,
|
|
27
28
|
isCacheableStatus,
|
|
28
29
|
buildRouteMiddlewareEntries,
|
|
30
|
+
mergeStubHeadersAndFinalize,
|
|
29
31
|
} from "./helpers.js";
|
|
32
|
+
import { isWebSocketUpgradeResponse } from "../response-utils.js";
|
|
33
|
+
import { stringifyJsonRouteResult } from "./json-route-result.js";
|
|
34
|
+
import {
|
|
35
|
+
EXTERNAL_REDIRECT_MARKER,
|
|
36
|
+
isExternalRedirect,
|
|
37
|
+
markExternalRedirect,
|
|
38
|
+
} from "../redirect-origin.js";
|
|
30
39
|
|
|
31
40
|
export interface ResponseRouteMatch {
|
|
32
41
|
responseType: string;
|
|
@@ -70,7 +79,7 @@ export async function handleResponseRoute<TEnv>(
|
|
|
70
79
|
}
|
|
71
80
|
|
|
72
81
|
// Build lightweight context for response handler
|
|
73
|
-
const reqCtx =
|
|
82
|
+
const reqCtx = getRequestContext();
|
|
74
83
|
const cleanUrl = stripInternalParams(url);
|
|
75
84
|
const responseHandlerCtx = {
|
|
76
85
|
request,
|
|
@@ -78,10 +87,13 @@ export async function handleResponseRoute<TEnv>(
|
|
|
78
87
|
env,
|
|
79
88
|
searchParams: cleanUrl.searchParams,
|
|
80
89
|
url: cleanUrl,
|
|
90
|
+
originalUrl: reqCtx.originalUrl,
|
|
81
91
|
pathname: url.pathname,
|
|
82
92
|
reverse: createReverseFunction(handlerCtx.getRequiredRouteMap()),
|
|
83
93
|
get: ((keyOrVar: any) => contextGet(variables, keyOrVar)) as any,
|
|
84
94
|
header: (name: string, value: string) => reqCtx.header(name, value),
|
|
95
|
+
waitUntil: reqCtx.waitUntil.bind(reqCtx),
|
|
96
|
+
executionContext: reqCtx.executionContext,
|
|
85
97
|
_responseType: preview.responseType,
|
|
86
98
|
};
|
|
87
99
|
// Brand with taint symbol so "use cache" detects it as request-scoped
|
|
@@ -96,51 +108,39 @@ export async function handleResponseRoute<TEnv>(
|
|
|
96
108
|
// so that stub headers (cookies, custom headers set via ctx.header()) are included.
|
|
97
109
|
// Use Headers (not Record<string, string>) to preserve duplicate entries like Set-Cookie.
|
|
98
110
|
const rewrapResponse = (result: Response) => {
|
|
111
|
+
// 204/205/304 are NOT short-circuited — they're valid for the Response
|
|
112
|
+
// constructor and must honor ctx.setStatus() overrides. Only upgrade
|
|
113
|
+
// responses (status 101 / `webSocket` property) bypass reconstruction.
|
|
114
|
+
if (isWebSocketUpgradeResponse(result)) {
|
|
115
|
+
return mergeStubHeadersAndFinalize(result);
|
|
116
|
+
}
|
|
99
117
|
const headers = new Headers();
|
|
100
118
|
result.headers.forEach((value, key) => {
|
|
119
|
+
// Never copy the reserved external-redirect marker off a handler result.
|
|
120
|
+
// It is not a trust signal -- the opt-in is the out-of-band brand below
|
|
121
|
+
// -- and a proxy-style route returning an attacker-controlled upstream
|
|
122
|
+
// response must not let a forged value ride through to the browser.
|
|
123
|
+
if (key.toLowerCase() === EXTERNAL_REDIRECT_MARKER) return;
|
|
101
124
|
if (key.toLowerCase() === "set-cookie") {
|
|
102
125
|
headers.append(key, value);
|
|
103
126
|
} else {
|
|
104
127
|
headers.set(key, value);
|
|
105
128
|
}
|
|
106
129
|
});
|
|
107
|
-
|
|
130
|
+
const rewrapped = createResponseWithMergedHeaders(result.body, {
|
|
108
131
|
status: result.status,
|
|
109
132
|
headers,
|
|
110
133
|
});
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
if (result instanceof Response) {
|
|
118
|
-
return rewrapResponse(result);
|
|
119
|
-
}
|
|
120
|
-
return createResponseWithMergedHeaders(
|
|
121
|
-
JSON.stringify({ data: result }),
|
|
122
|
-
{
|
|
123
|
-
status: 200,
|
|
124
|
-
headers: { "content-type": "application/json;charset=utf-8" },
|
|
125
|
-
},
|
|
126
|
-
);
|
|
127
|
-
} catch (error) {
|
|
128
|
-
handlerCtx.callOnError(error, "handler", errorCtx);
|
|
129
|
-
const isDev = process.env.NODE_ENV !== "production";
|
|
130
|
-
const status = error instanceof RouterError ? error.status : 500;
|
|
131
|
-
return createResponseWithMergedHeaders(
|
|
132
|
-
JSON.stringify({
|
|
133
|
-
error: createResponseErrorPayload(error, isDev),
|
|
134
|
-
}),
|
|
135
|
-
{
|
|
136
|
-
status,
|
|
137
|
-
headers: { "content-type": "application/json;charset=utf-8" },
|
|
138
|
-
},
|
|
139
|
-
);
|
|
134
|
+
// Transfer the out-of-band external brand only when the handler result is
|
|
135
|
+
// genuinely branded (a real redirect(url, { external: true })). A proxied
|
|
136
|
+
// upstream Response is never branded, so an attacker cannot opt a response
|
|
137
|
+
// route's redirect out of the same-origin guard by injecting the header.
|
|
138
|
+
if (isExternalRedirect(result)) {
|
|
139
|
+
markExternalRedirect(rewrapped);
|
|
140
140
|
}
|
|
141
|
-
|
|
141
|
+
return rewrapped;
|
|
142
|
+
};
|
|
142
143
|
|
|
143
|
-
// Non-JSON response routes: catch errors and return plain Response
|
|
144
144
|
try {
|
|
145
145
|
const result = await (preview.handler as Function)(responseHandlerCtx);
|
|
146
146
|
|
|
@@ -148,38 +148,56 @@ export async function handleResponseRoute<TEnv>(
|
|
|
148
148
|
return rewrapResponse(result);
|
|
149
149
|
}
|
|
150
150
|
|
|
151
|
-
//
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
});
|
|
163
|
-
case "xml":
|
|
164
|
-
return createResponseWithMergedHeaders(String(result), {
|
|
165
|
-
status: 200,
|
|
166
|
-
headers: { "content-type": "application/xml;charset=utf-8" },
|
|
167
|
-
});
|
|
168
|
-
case "md":
|
|
169
|
-
return createResponseWithMergedHeaders(String(result), {
|
|
170
|
-
status: 200,
|
|
171
|
-
headers: { "content-type": "text/markdown;charset=utf-8" },
|
|
172
|
-
});
|
|
173
|
-
default:
|
|
174
|
-
// image, stream, any -- must return Response
|
|
175
|
-
throw new Error(
|
|
176
|
-
`Response route handler for "${preview.responseType}" must return a Response object, got ${typeof result}`,
|
|
177
|
-
);
|
|
151
|
+
// Handled before the MIME lookup (json is also a RESPONSE_TYPE_MIME key).
|
|
152
|
+
if (preview.responseType === "json") {
|
|
153
|
+
// Runtime guard: the json() return type rejects nested Promises at
|
|
154
|
+
// compile time, but an `as`-cast or untyped (JS) handler can still slip
|
|
155
|
+
// one through. stringifyJsonRouteResult throws a clear error instead of
|
|
156
|
+
// shipping empty data (shared with dispatch() so the two cannot drift).
|
|
157
|
+
const body = stringifyJsonRouteResult(result);
|
|
158
|
+
return createResponseWithMergedHeaders(body, {
|
|
159
|
+
status: 200,
|
|
160
|
+
headers: { "content-type": "application/json;charset=utf-8" },
|
|
161
|
+
});
|
|
178
162
|
}
|
|
163
|
+
|
|
164
|
+
// Object.hasOwn (not truthiness) so prototype names like "toString" are not
|
|
165
|
+
// matched; image/stream/any are absent and fall through to the throw.
|
|
166
|
+
if (Object.hasOwn(RESPONSE_TYPE_MIME, preview.responseType)) {
|
|
167
|
+
return createResponseWithMergedHeaders(String(result), {
|
|
168
|
+
status: 200,
|
|
169
|
+
headers: {
|
|
170
|
+
"content-type": `${RESPONSE_TYPE_MIME[preview.responseType]};charset=utf-8`,
|
|
171
|
+
},
|
|
172
|
+
});
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
throw new Error(
|
|
176
|
+
`Response route handler for "${preview.responseType}" must return a Response object, got ${typeof result}`,
|
|
177
|
+
);
|
|
179
178
|
} catch (error) {
|
|
180
179
|
handlerCtx.callOnError(error, "handler", errorCtx);
|
|
181
180
|
const isDev = process.env.NODE_ENV !== "production";
|
|
182
|
-
const
|
|
181
|
+
const derivedStatus = error instanceof RouterError ? error.status : 500;
|
|
182
|
+
// Resolve the effective status the same way createResponseWithMergedHeaders
|
|
183
|
+
// will (ctx.res.status override) so the problem body's status/title match
|
|
184
|
+
// the actual HTTP status — e.g. when a handler called ctx.setStatus()
|
|
185
|
+
// before throwing.
|
|
186
|
+
const status =
|
|
187
|
+
reqCtx.res.status !== 200 ? reqCtx.res.status : derivedStatus;
|
|
188
|
+
|
|
189
|
+
if (preview.responseType === "json") {
|
|
190
|
+
return createResponseWithMergedHeaders(
|
|
191
|
+
JSON.stringify(createProblemDetails(error, status, isDev)),
|
|
192
|
+
{
|
|
193
|
+
status,
|
|
194
|
+
headers: {
|
|
195
|
+
"content-type": "application/problem+json;charset=utf-8",
|
|
196
|
+
},
|
|
197
|
+
},
|
|
198
|
+
);
|
|
199
|
+
}
|
|
200
|
+
|
|
183
201
|
const message =
|
|
184
202
|
error instanceof RouterError
|
|
185
203
|
? error.message
|
|
@@ -196,7 +214,9 @@ export async function handleResponseRoute<TEnv>(
|
|
|
196
214
|
// Wrap callHandler to append Vary: Accept on content-negotiated responses
|
|
197
215
|
const callHandlerWithVary = async () => {
|
|
198
216
|
const response = await callHandler();
|
|
199
|
-
if (preview.negotiated) {
|
|
217
|
+
if (preview.negotiated && !isWebSocketUpgradeResponse(response)) {
|
|
218
|
+
// Skip Vary on upgrade responses: headers are semantically immutable
|
|
219
|
+
// on some runtimes, and Vary is meaningless for a 101 response.
|
|
200
220
|
response.headers.append("Vary", "Accept");
|
|
201
221
|
}
|
|
202
222
|
return response;
|
|
@@ -217,130 +237,20 @@ export async function handleResponseRoute<TEnv>(
|
|
|
217
237
|
return callHandlerWithVary();
|
|
218
238
|
};
|
|
219
239
|
|
|
220
|
-
//
|
|
240
|
+
// Response-route cache: resolved through the shared serve leaf
|
|
241
|
+
// (rsc/response-cache-serve.ts) so production and the dispatch testing
|
|
242
|
+
// primitive share ONE owner of the cache contract. Returns undefined when no
|
|
243
|
+
// cache applies, so we fall through to a plain handler run.
|
|
221
244
|
if (preview.manifestEntry) {
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
let conditionPassed = true;
|
|
232
|
-
if (cacheScope.config !== false && cacheScope.config.condition) {
|
|
233
|
-
try {
|
|
234
|
-
conditionPassed = !!cacheScope.config.condition(reqCtx);
|
|
235
|
-
} catch {
|
|
236
|
-
conditionPassed = false;
|
|
237
|
-
}
|
|
238
|
-
}
|
|
239
|
-
|
|
240
|
-
const store = cacheScope.getStore() ?? reqCtx._cacheStore;
|
|
241
|
-
if (conditionPassed && store?.getResponse && store?.putResponse) {
|
|
242
|
-
// Build cache key with response:{type}: prefix to avoid collision
|
|
243
|
-
// with segment keys and differentiate between response types.
|
|
244
|
-
// Include host and url.search so query-driven and multi-host
|
|
245
|
-
// responses cache separately.
|
|
246
|
-
let cacheKey = `response:${preview.responseType}:${url.host}${url.pathname}${url.search}`;
|
|
247
|
-
|
|
248
|
-
// Priority 1: Route-level key function (full override)
|
|
249
|
-
if (cacheScope.config !== false && cacheScope.config.key) {
|
|
250
|
-
try {
|
|
251
|
-
const customKey = await cacheScope.config.key(reqCtx);
|
|
252
|
-
cacheKey = `response:${customKey}`;
|
|
253
|
-
} catch {
|
|
254
|
-
// Fall back to default key on route-level key failure
|
|
255
|
-
}
|
|
256
|
-
} else if (store.keyGenerator) {
|
|
257
|
-
// Priority 2: Store-level keyGenerator (modifies default key)
|
|
258
|
-
try {
|
|
259
|
-
cacheKey = await store.keyGenerator(reqCtx, cacheKey);
|
|
260
|
-
} catch {
|
|
261
|
-
// Fall back to default key on keyGenerator failure
|
|
262
|
-
}
|
|
263
|
-
}
|
|
264
|
-
|
|
265
|
-
// Save pre-handler callbacks (registered by app-level middleware
|
|
266
|
-
// before we reach the cache block) and clear the live array.
|
|
267
|
-
// createResponseWithMergedHeaders (inside the handler) eagerly
|
|
268
|
-
// executes any callbacks present in _onResponseCallbacks, so
|
|
269
|
-
// handler-registered callbacks are baked into the handler's
|
|
270
|
-
// response and the cached artifact. Pre-handler callbacks are
|
|
271
|
-
// NOT in the live array during execution, so they are applied
|
|
272
|
-
// once per serve on every path (hit + miss) below.
|
|
273
|
-
const savedCallbacks = reqCtx._onResponseCallbacks;
|
|
274
|
-
reqCtx._onResponseCallbacks = [];
|
|
275
|
-
|
|
276
|
-
const applyPreHandlerCallbacks = (response: Response): Response => {
|
|
277
|
-
let result = response;
|
|
278
|
-
for (const callback of savedCallbacks) {
|
|
279
|
-
result = callback(result) ?? result;
|
|
280
|
-
}
|
|
281
|
-
return result;
|
|
282
|
-
};
|
|
283
|
-
|
|
284
|
-
try {
|
|
285
|
-
const cached = await store.getResponse(cacheKey);
|
|
286
|
-
|
|
287
|
-
if (cached && isCacheableStatus(cached.response.status)) {
|
|
288
|
-
if (!cached.shouldRevalidate) {
|
|
289
|
-
// Fresh hit
|
|
290
|
-
return applyPreHandlerCallbacks(cached.response);
|
|
291
|
-
}
|
|
292
|
-
|
|
293
|
-
// Stale hit (SWR) - return cached, revalidate in background
|
|
294
|
-
reqCtx.waitUntil(async () => {
|
|
295
|
-
try {
|
|
296
|
-
// finalizeResponse drains any onResponse callbacks registered
|
|
297
|
-
// during middleware execution (e.g. middleware short-circuit)
|
|
298
|
-
// that createResponseWithMergedHeaders didn't reach.
|
|
299
|
-
const fresh = finalizeResponse(await executeHandler());
|
|
300
|
-
if (isCacheableStatus(fresh.status)) {
|
|
301
|
-
await store.putResponse!(
|
|
302
|
-
cacheKey,
|
|
303
|
-
fresh.clone(),
|
|
304
|
-
cacheScope!.ttl,
|
|
305
|
-
cacheScope!.swr,
|
|
306
|
-
);
|
|
307
|
-
}
|
|
308
|
-
} catch (error) {
|
|
309
|
-
console.error(`[ResponseCache] Revalidation failed:`, error);
|
|
310
|
-
}
|
|
311
|
-
});
|
|
312
|
-
|
|
313
|
-
return applyPreHandlerCallbacks(cached.response);
|
|
314
|
-
}
|
|
315
|
-
} catch (error) {
|
|
316
|
-
console.error(`[ResponseCache] Cache lookup failed:`, error);
|
|
317
|
-
}
|
|
318
|
-
|
|
319
|
-
// Cache miss - execute handler and cache the result.
|
|
320
|
-
// createResponseWithMergedHeaders inside the handler drains callbacks
|
|
321
|
-
// registered during handler execution. finalizeResponse catches any
|
|
322
|
-
// remaining callbacks (e.g. from middleware short-circuit where the
|
|
323
|
-
// handler never ran) so the cached artifact includes all transforms.
|
|
324
|
-
const response = finalizeResponse(await executeHandler());
|
|
325
|
-
|
|
326
|
-
if (isCacheableStatus(response.status)) {
|
|
327
|
-
reqCtx.waitUntil(async () => {
|
|
328
|
-
try {
|
|
329
|
-
await store.putResponse!(
|
|
330
|
-
cacheKey,
|
|
331
|
-
response.clone(),
|
|
332
|
-
cacheScope!.ttl,
|
|
333
|
-
cacheScope!.swr,
|
|
334
|
-
);
|
|
335
|
-
} catch (error) {
|
|
336
|
-
console.error(`[ResponseCache] Cache write failed:`, error);
|
|
337
|
-
}
|
|
338
|
-
});
|
|
339
|
-
}
|
|
340
|
-
|
|
341
|
-
return applyPreHandlerCallbacks(response);
|
|
342
|
-
}
|
|
343
|
-
}
|
|
245
|
+
const cached = await serveResponseRouteWithCache({
|
|
246
|
+
reqCtx,
|
|
247
|
+
manifestEntry: preview.manifestEntry,
|
|
248
|
+
responseType: preview.responseType,
|
|
249
|
+
url,
|
|
250
|
+
executeHandler,
|
|
251
|
+
deps: { createCacheScope, resolveCacheTags },
|
|
252
|
+
});
|
|
253
|
+
if (cached !== undefined) return cached;
|
|
344
254
|
}
|
|
345
255
|
|
|
346
256
|
return executeHandler().then(finalizeResponse);
|
package/src/rsc/rsc-rendering.ts
CHANGED
|
@@ -7,34 +7,95 @@
|
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
9
|
import {
|
|
10
|
-
|
|
10
|
+
getRequestContext,
|
|
11
11
|
setRequestContextParams,
|
|
12
|
-
getLocationState,
|
|
13
12
|
} from "../server/request-context.js";
|
|
14
|
-
import { resolveLocationStateEntries } from "../browser/react/location-state-shared.js";
|
|
15
13
|
import { appendMetric } from "../router/metrics.js";
|
|
16
|
-
import {
|
|
14
|
+
import { observePhase, PHASES } from "../router/instrument.js";
|
|
15
|
+
import { getSSRSetup, isRscRequest } from "./ssr-setup.js";
|
|
17
16
|
import type { RscPayload } from "./types.js";
|
|
17
|
+
import type { MatchResult } from "../types.js";
|
|
18
18
|
import {
|
|
19
19
|
createResponseWithMergedHeaders,
|
|
20
20
|
createSimpleRedirectResponse,
|
|
21
|
+
attachLocationStateIfPresent,
|
|
21
22
|
} from "./helpers.js";
|
|
22
23
|
import type { HandlerContext } from "./handler-context.js";
|
|
24
|
+
import { gateTransitions } from "./transition-gate.js";
|
|
23
25
|
|
|
24
|
-
export
|
|
26
|
+
export function handleRscRendering<TEnv>(
|
|
25
27
|
ctx: HandlerContext<TEnv>,
|
|
26
28
|
request: Request,
|
|
27
29
|
env: TEnv,
|
|
28
30
|
url: URL,
|
|
29
31
|
isPartial: boolean,
|
|
30
|
-
handleStore: ReturnType<typeof
|
|
32
|
+
handleStore: ReturnType<typeof getRequestContext>["_handleStore"],
|
|
31
33
|
nonce: string | undefined,
|
|
32
34
|
): Promise<Response> {
|
|
33
|
-
|
|
35
|
+
// Instrument the whole render phase once through the unified API: it records
|
|
36
|
+
// the "render:total" perf metric AND opens the "rango.render" span from the
|
|
37
|
+
// same boundary (match -> serialize -> SSR), so the two surfaces agree.
|
|
38
|
+
// Loaders kicked off during matching nest under the span; the SSR HTML pass
|
|
39
|
+
// below opens "rango.ssr" the same way.
|
|
40
|
+
return observePhase(PHASES.render, () =>
|
|
41
|
+
handleRscRenderingInner(
|
|
42
|
+
ctx,
|
|
43
|
+
request,
|
|
44
|
+
env,
|
|
45
|
+
url,
|
|
46
|
+
isPartial,
|
|
47
|
+
handleStore,
|
|
48
|
+
nonce,
|
|
49
|
+
),
|
|
50
|
+
);
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
async function handleRscRenderingInner<TEnv>(
|
|
54
|
+
ctx: HandlerContext<TEnv>,
|
|
55
|
+
request: Request,
|
|
56
|
+
env: TEnv,
|
|
57
|
+
url: URL,
|
|
58
|
+
isPartial: boolean,
|
|
59
|
+
handleStore: ReturnType<typeof getRequestContext>["_handleStore"],
|
|
60
|
+
nonce: string | undefined,
|
|
61
|
+
): Promise<Response> {
|
|
62
|
+
const reqCtx = getRequestContext();
|
|
34
63
|
|
|
35
64
|
let payload: RscPayload;
|
|
36
65
|
let hasInterceptSlots = false;
|
|
37
66
|
|
|
67
|
+
// Shared by the partial-fallback and full-render paths. The partial-success
|
|
68
|
+
// payload below is intentionally different (omits rootLayout/theme, adds slots).
|
|
69
|
+
const buildFullPayload = (m: MatchResult): RscPayload => ({
|
|
70
|
+
metadata: {
|
|
71
|
+
pathname: url.pathname,
|
|
72
|
+
routerId: ctx.router.id,
|
|
73
|
+
basename: ctx.router.basename,
|
|
74
|
+
segments: gateTransitions(m.segments, reqCtx, ctx.router.onError),
|
|
75
|
+
matched: m.matched,
|
|
76
|
+
diff: m.diff,
|
|
77
|
+
resolvedIds: m.resolvedIds,
|
|
78
|
+
params: m.params,
|
|
79
|
+
isPartial: false,
|
|
80
|
+
rootLayout: ctx.router.rootLayout,
|
|
81
|
+
handles: handleStore.stream(),
|
|
82
|
+
version: ctx.version,
|
|
83
|
+
prefetchCacheTTL: ctx.router.prefetchCacheTTL,
|
|
84
|
+
stateCookieName: ctx.router.resolvedStateCookieName,
|
|
85
|
+
themeConfig: ctx.router.themeConfig,
|
|
86
|
+
// Carry warmupEnabled on the initial full-render payload so the client
|
|
87
|
+
// respects warmup:false from first load. The 404 and PE payloads already
|
|
88
|
+
// include it; without it here warmup could never be disabled on the
|
|
89
|
+
// normal full-load path (partial payloads omit it by design).
|
|
90
|
+
warmupEnabled: ctx.router.warmupEnabled,
|
|
91
|
+
// Carry strictMode on the initial full-render payload so the browser
|
|
92
|
+
// entry knows whether to wrap hydration in React.StrictMode. Partial
|
|
93
|
+
// (navigation) payloads omit it by design; StrictMode is decided once.
|
|
94
|
+
strictMode: ctx.router.strictMode,
|
|
95
|
+
initialTheme: reqCtx.theme,
|
|
96
|
+
},
|
|
97
|
+
});
|
|
98
|
+
|
|
38
99
|
if (isPartial) {
|
|
39
100
|
// Partial render (navigation)
|
|
40
101
|
const result = await ctx.router.matchPartial(request, { env });
|
|
@@ -51,22 +112,7 @@ export async function handleRscRendering<TEnv>(
|
|
|
51
112
|
return createSimpleRedirectResponse(match.redirect);
|
|
52
113
|
}
|
|
53
114
|
|
|
54
|
-
payload =
|
|
55
|
-
metadata: {
|
|
56
|
-
pathname: url.pathname,
|
|
57
|
-
segments: match.segments,
|
|
58
|
-
matched: match.matched,
|
|
59
|
-
diff: match.diff,
|
|
60
|
-
params: match.params,
|
|
61
|
-
isPartial: false,
|
|
62
|
-
rootLayout: ctx.router.rootLayout,
|
|
63
|
-
handles: handleStore.stream(),
|
|
64
|
-
version: ctx.version,
|
|
65
|
-
prefetchCacheTTL: ctx.router.prefetchCacheTTL,
|
|
66
|
-
themeConfig: ctx.router.themeConfig,
|
|
67
|
-
initialTheme: reqCtx.theme,
|
|
68
|
-
},
|
|
69
|
-
};
|
|
115
|
+
payload = buildFullPayload(match);
|
|
70
116
|
} else {
|
|
71
117
|
setRequestContextParams(result.params, result.routeName);
|
|
72
118
|
|
|
@@ -75,15 +121,27 @@ export async function handleRscRendering<TEnv>(
|
|
|
75
121
|
payload = {
|
|
76
122
|
metadata: {
|
|
77
123
|
pathname: url.pathname,
|
|
78
|
-
|
|
124
|
+
// routerId is serialized on every payload (including within-session
|
|
125
|
+
// ones) so the frontend can read the current app/router identity. It
|
|
126
|
+
// always equals the current app's id: a cross-app navigation is
|
|
127
|
+
// intercepted server-side (X-RSC-Reload) and never delivers a
|
|
128
|
+
// different-router payload to the client.
|
|
129
|
+
routerId: ctx.router.id,
|
|
130
|
+
segments: gateTransitions(
|
|
131
|
+
result.segments,
|
|
132
|
+
reqCtx,
|
|
133
|
+
ctx.router.onError,
|
|
134
|
+
),
|
|
79
135
|
matched: result.matched,
|
|
80
136
|
diff: result.diff,
|
|
137
|
+
resolvedIds: result.resolvedIds,
|
|
81
138
|
params: result.params,
|
|
82
139
|
isPartial: true,
|
|
83
140
|
slots: result.slots,
|
|
84
141
|
handles: handleStore.stream(),
|
|
85
142
|
version: ctx.version,
|
|
86
143
|
prefetchCacheTTL: ctx.router.prefetchCacheTTL,
|
|
144
|
+
stateCookieName: ctx.router.resolvedStateCookieName,
|
|
87
145
|
},
|
|
88
146
|
};
|
|
89
147
|
}
|
|
@@ -130,25 +188,7 @@ export async function handleRscRendering<TEnv>(
|
|
|
130
188
|
{ headers: { "Content-Type": "application/json" } },
|
|
131
189
|
);
|
|
132
190
|
} else {
|
|
133
|
-
payload =
|
|
134
|
-
// Initial SSR can reconstruct the tree from segments + rootLayout,
|
|
135
|
-
// so we omit root to avoid sending the same structure twice.
|
|
136
|
-
|
|
137
|
-
metadata: {
|
|
138
|
-
pathname: url.pathname,
|
|
139
|
-
segments: match.segments,
|
|
140
|
-
matched: match.matched,
|
|
141
|
-
diff: match.diff,
|
|
142
|
-
params: match.params,
|
|
143
|
-
isPartial: false,
|
|
144
|
-
rootLayout: ctx.router.rootLayout,
|
|
145
|
-
handles: handleStore.stream(),
|
|
146
|
-
version: ctx.version,
|
|
147
|
-
prefetchCacheTTL: ctx.router.prefetchCacheTTL,
|
|
148
|
-
themeConfig: ctx.router.themeConfig,
|
|
149
|
-
initialTheme: reqCtx.theme,
|
|
150
|
-
},
|
|
151
|
-
};
|
|
191
|
+
payload = buildFullPayload(match);
|
|
152
192
|
}
|
|
153
193
|
}
|
|
154
194
|
|
|
@@ -156,21 +196,17 @@ export async function handleRscRendering<TEnv>(
|
|
|
156
196
|
// SSR (full page) requests ignore location state since there's no history.state
|
|
157
197
|
// to write to on a fresh page load.
|
|
158
198
|
if (isPartial && payload.metadata) {
|
|
159
|
-
|
|
160
|
-
if (locationState) {
|
|
161
|
-
payload.metadata.locationState =
|
|
162
|
-
resolveLocationStateEntries(locationState);
|
|
163
|
-
}
|
|
199
|
+
attachLocationStateIfPresent(payload);
|
|
164
200
|
}
|
|
165
201
|
|
|
166
202
|
const metricsStore = reqCtx._metricsStore;
|
|
167
|
-
const renderStart = performance.now();
|
|
168
203
|
|
|
169
204
|
// Serialize to RSC stream
|
|
170
205
|
const rscSerializeStart = performance.now();
|
|
171
|
-
const debugChannel = reqCtx._debugChannel;
|
|
172
206
|
const rscStream = ctx.renderToReadableStream<RscPayload>(payload, {
|
|
173
|
-
|
|
207
|
+
onError: (error: unknown) => {
|
|
208
|
+
ctx.callOnError(error, "rendering", { request, url, env });
|
|
209
|
+
},
|
|
174
210
|
});
|
|
175
211
|
const rscSerializeDur = performance.now() - rscSerializeStart;
|
|
176
212
|
// This measures synchronous stream creation, not end-to-end stream consumption.
|
|
@@ -181,23 +217,24 @@ export async function handleRscRendering<TEnv>(
|
|
|
181
217
|
rscSerializeDur,
|
|
182
218
|
);
|
|
183
219
|
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
// navigation or prefetch fetch(). We cannot rely on Accept alone since some
|
|
187
|
-
// browsers may send Accept: text/html for non-HTML requests.
|
|
188
|
-
const isRscRequest =
|
|
189
|
-
isPartial ||
|
|
190
|
-
(!request.headers.get("accept")?.includes("text/html") &&
|
|
191
|
-
!url.searchParams.has("__html")) ||
|
|
192
|
-
url.searchParams.has("__rsc");
|
|
193
|
-
|
|
194
|
-
if (isRscRequest) {
|
|
195
|
-
const renderDur = performance.now() - renderStart;
|
|
196
|
-
appendMetric(metricsStore, "render:total", renderStart, renderDur);
|
|
220
|
+
if (isRscRequest(request, url, isPartial)) {
|
|
221
|
+
// render:total is recorded by the observePhase wrapper around this function.
|
|
197
222
|
const rscHeaders: Record<string, string> = {
|
|
198
223
|
"content-type": "text/x-component;charset=utf-8",
|
|
199
224
|
vary: "accept, X-Rango-State, X-RSC-Router-Client-Path",
|
|
225
|
+
// Router identity, so the client can verify pre-decode (before importing
|
|
226
|
+
// chunks) that this content payload belongs to its app and refuse a
|
|
227
|
+
// foreign one (cache/proxy/bug). Control-only reload/redirect responses
|
|
228
|
+
// are deliberately NOT stamped. See browser/response-adapter.ts.
|
|
229
|
+
"X-RSC-Router-Id": ctx.router.id,
|
|
200
230
|
};
|
|
231
|
+
// Tell the client's prefetch cache to scope this response to its source
|
|
232
|
+
// URL (instead of the default source-agnostic wildcard). Intercept
|
|
233
|
+
// responses depend on the source page matching an intercept rule, so
|
|
234
|
+
// they must not be reused for navigations from other sources.
|
|
235
|
+
if (hasInterceptSlots) {
|
|
236
|
+
rscHeaders["x-rsc-prefetch-scope"] = "source";
|
|
237
|
+
}
|
|
201
238
|
// Enable browser HTTP caching for prefetch responses only.
|
|
202
239
|
// Requires X-Rango-Prefetch header (sent by Link prefetch fetch),
|
|
203
240
|
// non-intercept context (intercept responses depend on source page),
|
|
@@ -223,16 +260,14 @@ export async function handleRscRendering<TEnv>(
|
|
|
223
260
|
metricsStore,
|
|
224
261
|
);
|
|
225
262
|
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
const renderDur = performance.now() - renderStart;
|
|
235
|
-
appendMetric(metricsStore, "render:total", renderStart, renderDur);
|
|
263
|
+
// ssr-render-html metric + rango.ssr span from one boundary. render:total is
|
|
264
|
+
// recorded by the observePhase wrapper around this function.
|
|
265
|
+
const htmlStream = await observePhase(PHASES.ssr, () =>
|
|
266
|
+
ssrModule.renderHTML(rscStream, {
|
|
267
|
+
nonce,
|
|
268
|
+
streamMode,
|
|
269
|
+
}),
|
|
270
|
+
);
|
|
236
271
|
|
|
237
272
|
return createResponseWithMergedHeaders(htmlStream, {
|
|
238
273
|
headers: { "content-type": "text/html;charset=utf-8" },
|