@decocms/tanstack 8.20.2 → 8.21.0
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 +24 -1
- package/dist/scope/server.d.ts +2 -0
- package/dist/scope/server.d.ts.map +1 -1
- package/dist/scope/server.js.map +1 -1
- package/dist/stream/index.d.ts +4 -0
- package/dist/stream/index.d.ts.map +1 -0
- package/dist/stream/index.js +89 -0
- package/dist/stream/index.js.map +1 -0
- package/dist/worker/index.d.ts.map +1 -1
- package/dist/worker/index.js +63 -11
- package/dist/worker/index.js.map +1 -1
- package/package.json +16 -4
- package/src/scope/server.ts +2 -0
- package/src/stream/index.tsx +93 -0
- package/src/worker/index.ts +95 -21
package/README.md
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
Deco CMS for [TanStack Start](https://tanstack.com/start) sites on Cloudflare Workers, deployed the way Deco deploys them. It is opinionated: one worker entry with a few options, one escape hatch for your own routes, and the behaviour every Deco TanStack site should have, always on.
|
|
4
4
|
|
|
5
|
-
Peers: `@decocms/blocks` (same version), `@tanstack/react-start`, `@tanstack/react-router`, `react`, and `vite` for `/vite`.
|
|
5
|
+
Peers: `@decocms/blocks` (same version), `@tanstack/react-start`, `@tanstack/react-router`, `react`, `react-dom` for `/stream`, and `vite` for `/vite`. The optional `/stream` entry requires router 1.170.39 / Start 1.168.58 or later; existing entry points retain their existing framework compatibility.
|
|
6
6
|
|
|
7
7
|
## The worker
|
|
8
8
|
|
|
@@ -83,6 +83,29 @@ export const Route = createRootRoute({ component: () => <DecoDocument site="my-s
|
|
|
83
83
|
|
|
84
84
|
`DecoDocument` mounts v7's "." edit shortcut, the Studio channel and the draft badge. It is v8 only: v7's framed handler (`scrollToComponent`, `editor::rerender`) is gone, so no script on the page compares the window with `top` or `parent`, and a test runner that rewrites "frame-busting" code (Cypress's `modifyObstructiveCode`) serves the page byte for byte. The Studio channel is on every page, production included: a small inline script (about 0.7 kB gzipped) through which Studio loads its own editor code (the section wireframe, the page swap after a save) into the page when it frames it. It is the only way Studio runs code in the page: the bridge evaluates no script Studio sends. The page trusts a list of exact Studio origins: the `studioOrigins` prop when given, else the `DECO_STUDIO_ORIGIN` environment variable, comma-separated (read on the server; a local Studio, such as `http://localhost:3000`), else Studio's production and staging origins (`DEFAULT_STUDIO_ORIGINS`). Framed, the page posts `{ type: "deco:ready" }` with each of them as the target origin (only a parent at one of them receives it) and imports a module only when Studio's answer, `{ type: "deco:load", url }`, comes from exactly one of them and names a URL on the origin of that message; not framed, or framed by any other origin, it does nothing. The worker adds the same list to every HTML response's CSP: to `frame-ancestors`, and to `script-src` (or `script-src-elem`; a policy that restricts scripts only through `default-src` gets a `script-src` with its sources plus Studio's). A site that sets `studioOrigins` on `DecoDocument` sets the worker's `studioOrigins` option too; `DECO_STUDIO_ORIGIN` sets both. The inline scripts take the site's `nonce`. The message and module types are in `@decocms/blocks/protocol`. A page route returns `pathTemplate` (the page block's `path`, as `matchRoute` matched it) in its loader data, so "." on the store page opens that page in Studio's editor. A site that keeps its own document (a skip link before `<main>`, say) renders `<DecoPreview site="my-store" />` in its `<body>` instead: the shortcut, the channel, the badge and the draft they read.
|
|
85
85
|
|
|
86
|
+
## Server error reporting
|
|
87
|
+
|
|
88
|
+
With CMS telemetry configured, `createDecoWorker` reports thrown handlers and failed renders, including failures a page cache replaces with stale content. It also records returned 5xx responses without reading their bodies. Request metadata uses route templates; raw URLs, headers, cookies, bodies and component props are omitted. Error logs keep the CMS error sampling rate even when request metrics are disabled.
|
|
89
|
+
|
|
90
|
+
React can recover from an SSR error after a successful response has started. Use the Deco stream handler to report those errors from React's `onError` callback:
|
|
91
|
+
|
|
92
|
+
```ts
|
|
93
|
+
// src/server.ts
|
|
94
|
+
import { createStartHandler } from "@tanstack/react-start/server";
|
|
95
|
+
import { createServerEntry } from "@tanstack/react-start/server-entry";
|
|
96
|
+
import { decoStreamHandler } from "@decocms/tanstack/stream";
|
|
97
|
+
|
|
98
|
+
export default createServerEntry({ fetch: createStartHandler(decoStreamHandler) });
|
|
99
|
+
|
|
100
|
+
// src/worker-entry.ts: pass the custom entry explicitly
|
|
101
|
+
import serverEntry from "./server";
|
|
102
|
+
export default createDecoWorker({ serverEntry, cms });
|
|
103
|
+
```
|
|
104
|
+
|
|
105
|
+
This handler uses Web Streams and the public router SSR APIs introduced in router 1.170.39. A site pinned to an older router must upgrade its framework dependencies before adopting `/stream`. The Worker must import the site's own server entry: the package default from `@tanstack/react-start/server-entry` always uses TanStack's default renderer and does not delegate to `src/server.ts`.
|
|
106
|
+
|
|
107
|
+
Requests cancelled by their client remain quiet. The stream handler preserves ordinary server console diagnostics, including when telemetry is disabled. Reporting is best effort if the collector or runtime cannot accept a batch.
|
|
108
|
+
|
|
86
109
|
## Images
|
|
87
110
|
|
|
88
111
|
```tsx
|
package/dist/scope/server.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
export interface RequestScope {
|
|
2
|
+
/** The render's error reporter; server-only, never serialized into a page. */
|
|
3
|
+
reportError?: (error: unknown) => void;
|
|
2
4
|
/** The CDN segment token for this request's page (the site's `pageCache` passes it to `render`), or undefined. */
|
|
3
5
|
csegToken?: string;
|
|
4
6
|
/** The draft this request renders (after the worker's host check). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/scope/server.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,YAAY;IAC3B,kHAAkH;IAClH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sEAAsE;IACtE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAQD,qDAAqD;AACrD,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAEjE;AAED,4FAA4F;AAC5F,wBAAgB,YAAY,IAAI,YAAY,GAAG,SAAS,CAEvD;AAED,4EAA4E;AAC5E,eAAO,MAAM,oBAAoB,EAA4B,qBAAqB,GAAG,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/scope/server.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,YAAY;IAC3B,8EAA8E;IAC9E,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC,kHAAkH;IAClH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sEAAsE;IACtE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAQD,qDAAqD;AACrD,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAEjE;AAED,4FAA4F;AAC5F,wBAAgB,YAAY,IAAI,YAAY,GAAG,SAAS,CAEvD;AAED,4EAA4E;AAC5E,eAAO,MAAM,oBAAoB,EAA4B,qBAAqB,GAAG,cAAc,CAAC"}
|
package/dist/scope/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/scope/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/scope/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAgBrD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;AACxD,MAAM,MAAM,GAAG,UAAoF,CAAC;AACpG,MAAM,OAAO,GACX,MAAM,CAAC,GAAG,CAAC,IAAI,IAAI,iBAAiB,EAAgB,CAAC;AACvD,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;AAEtB,qDAAqD;AACrD,MAAM,UAAU,UAAU,CAAI,KAAmB,EAAE,EAAW;IAC5D,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAChC,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,YAAY;IAC1B,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;AAC5B,CAAC;AAED,4EAA4E;AAC5E,MAAM,CAAC,MAAM,oBAAoB,GAAG,qBAA+D,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import * as ssr from "@tanstack/react-router/ssr/server";
|
|
2
|
+
/** Use with createStartHandler(decoStreamHandler) in the site's server entry. */
|
|
3
|
+
export declare const decoStreamHandler: ssr.HandlerCallback<import("@tanstack/router-core").AnyRouter>;
|
|
4
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/stream/index.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,GAAG,MAAM,mCAAmC,CAAC;AAKzD,iFAAiF;AACjF,eAAO,MAAM,iBAAiB,gEAgF7B,CAAC"}
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
/**
|
|
3
|
+
* A TanStack Start stream handler for React 19 Web Streams (Cloudflare Workers).
|
|
4
|
+
* React reports failures inside Suspense through onError, even after a 200
|
|
5
|
+
* response has started. Keep those failures on the site's telemetry pipeline.
|
|
6
|
+
*/
|
|
7
|
+
import { reportError } from "@decocms/blocks/telemetry";
|
|
8
|
+
import * as ssr from "@tanstack/react-router/ssr/server";
|
|
9
|
+
import { isbot } from "isbot";
|
|
10
|
+
import { renderToReadableStream } from "react-dom/server.edge";
|
|
11
|
+
import { currentScope } from "../scope/server.js";
|
|
12
|
+
/** Use with createStartHandler(decoStreamHandler) in the site's server entry. */
|
|
13
|
+
export const decoStreamHandler = ssr.defineHandlerCallback(async ({ request, router, responseHeaders }) => {
|
|
14
|
+
const signal = request.signal;
|
|
15
|
+
if (signal.aborted) {
|
|
16
|
+
router.serverSsr?.cleanup();
|
|
17
|
+
throw signal.reason;
|
|
18
|
+
}
|
|
19
|
+
// Only this opt-in handler needs the newer streaming lifecycle API. A
|
|
20
|
+
// namespace import keeps existing binding exports importable on older routers.
|
|
21
|
+
if (!("createSsrStreamResponse" in ssr) ||
|
|
22
|
+
typeof ssr.createSsrStreamResponse !== "function" ||
|
|
23
|
+
!("getSsrStatus" in ssr) ||
|
|
24
|
+
typeof ssr.getSsrStatus !== "function" ||
|
|
25
|
+
!("waitForRequest" in ssr) ||
|
|
26
|
+
typeof ssr.waitForRequest !== "function") {
|
|
27
|
+
throw new Error("decoStreamHandler requires @tanstack/react-router >=1.170.39 and @tanstack/react-start >=1.168.58");
|
|
28
|
+
}
|
|
29
|
+
const reportInRequest = currentScope()?.reportError;
|
|
30
|
+
const reported = new Set();
|
|
31
|
+
let rendererTeardown = false;
|
|
32
|
+
const onError = (error, info) => {
|
|
33
|
+
if (rendererTeardown || signal.aborted || reported.has(error))
|
|
34
|
+
return;
|
|
35
|
+
reported.add(error);
|
|
36
|
+
try {
|
|
37
|
+
console.error("Error in renderToReadableStream:", error, info);
|
|
38
|
+
}
|
|
39
|
+
catch {
|
|
40
|
+
// A site's console wrapper must not interrupt rendering or reporting.
|
|
41
|
+
}
|
|
42
|
+
try {
|
|
43
|
+
if (reportInRequest)
|
|
44
|
+
reportInRequest(error);
|
|
45
|
+
else {
|
|
46
|
+
void reportError(error, {
|
|
47
|
+
framework: "tanstack",
|
|
48
|
+
source: "render",
|
|
49
|
+
route: () => router.state.matches.at(-1)?.fullPath,
|
|
50
|
+
method: request.method,
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
catch {
|
|
55
|
+
// Instrumentation never replaces a renderer's error.
|
|
56
|
+
}
|
|
57
|
+
};
|
|
58
|
+
try {
|
|
59
|
+
const stream = await renderToReadableStream(_jsx(ssr.RouterServer, { router: router }), {
|
|
60
|
+
signal,
|
|
61
|
+
nonce: router.options.ssr?.nonce,
|
|
62
|
+
progressiveChunkSize: Number.POSITIVE_INFINITY,
|
|
63
|
+
onError,
|
|
64
|
+
});
|
|
65
|
+
const rendererAbort = isbot(request.headers.get("User-Agent"))
|
|
66
|
+
? new AbortController()
|
|
67
|
+
: undefined;
|
|
68
|
+
const responseStream = ssr.transformReadableStreamWithRouter(router, stream, {
|
|
69
|
+
rendererSafePoint: "script-close",
|
|
70
|
+
signal,
|
|
71
|
+
onAbort: (reason) => {
|
|
72
|
+
rendererTeardown = true;
|
|
73
|
+
rendererAbort?.abort(reason);
|
|
74
|
+
},
|
|
75
|
+
});
|
|
76
|
+
if (rendererAbort)
|
|
77
|
+
await ssr.waitForRequest(stream.allReady, rendererAbort.signal);
|
|
78
|
+
return ssr.createSsrStreamResponse(router, new Response(responseStream, {
|
|
79
|
+
status: ssr.getSsrStatus(router),
|
|
80
|
+
headers: responseHeaders,
|
|
81
|
+
}));
|
|
82
|
+
}
|
|
83
|
+
catch (error) {
|
|
84
|
+
onError(error);
|
|
85
|
+
router.serverSsr?.cleanup();
|
|
86
|
+
throw error;
|
|
87
|
+
}
|
|
88
|
+
});
|
|
89
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/stream/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH,OAAO,EAAE,KAAK,GAAG,EAA6B,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAiC,KAAK,OAAO,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"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"}
|
package/dist/worker/index.js
CHANGED
|
@@ -48,6 +48,7 @@
|
|
|
48
48
|
import { matchRoute } from "@decocms/blocks";
|
|
49
49
|
import { readVisitor, serializeVisitor } from "@decocms/blocks/experiments";
|
|
50
50
|
import { recordServerRequest } from "@decocms/blocks/metrics";
|
|
51
|
+
import { reportError } from "@decocms/blocks/telemetry";
|
|
51
52
|
import { runInScope } from "@decocms/tanstack/scope";
|
|
52
53
|
import { ASSIGNMENTS_HEADER, serializeAssignments } from "../assignments.js";
|
|
53
54
|
import { draftResponseHeaders, RELEASE_CHECK_HEADER, VERSION_HEADER } from "../draft.js";
|
|
@@ -160,6 +161,33 @@ export function createDecoWorker(options) {
|
|
|
160
161
|
const match = matchRoute(url, { routes: routes ?? [] });
|
|
161
162
|
return match.kind === "match" ? match.entry.path : undefined;
|
|
162
163
|
}
|
|
164
|
+
/** One request owns its deduplication: a reused Error can fail later requests too. */
|
|
165
|
+
function errorsFor(request, ctx) {
|
|
166
|
+
const reported = new Set();
|
|
167
|
+
return {
|
|
168
|
+
rendered: false,
|
|
169
|
+
report(error, source, status, routed = false) {
|
|
170
|
+
if (request.signal.aborted || reported.has(error))
|
|
171
|
+
return;
|
|
172
|
+
reported.add(error);
|
|
173
|
+
try {
|
|
174
|
+
ctx.waitUntil(reportError(error, {
|
|
175
|
+
framework: "tanstack",
|
|
176
|
+
source,
|
|
177
|
+
route: () => {
|
|
178
|
+
const url = new URL(request.url);
|
|
179
|
+
return fixedRoute(url.pathname) ?? (routed ? undefined : routeTemplate(url));
|
|
180
|
+
},
|
|
181
|
+
method: request.method,
|
|
182
|
+
status,
|
|
183
|
+
}));
|
|
184
|
+
}
|
|
185
|
+
catch {
|
|
186
|
+
// Reporting never replaces the response or the error being thrown.
|
|
187
|
+
}
|
|
188
|
+
},
|
|
189
|
+
};
|
|
190
|
+
}
|
|
163
191
|
/**
|
|
164
192
|
* Records the request (`http.server.request.duration`). The route is a
|
|
165
193
|
* function, found after the response and only while telemetry measures:
|
|
@@ -233,7 +261,7 @@ export function createDecoWorker(options) {
|
|
|
233
261
|
}
|
|
234
262
|
return { request: forwarded, visitor, assignments, visitorCookie: cookie };
|
|
235
263
|
}
|
|
236
|
-
async function handle(request, env, ctx, decision, preview) {
|
|
264
|
+
async function handle(request, env, ctx, decision, preview, errors) {
|
|
237
265
|
const draft = decision.version?.version ?? null;
|
|
238
266
|
const url = new URL(request.url);
|
|
239
267
|
const method = request.method;
|
|
@@ -291,7 +319,7 @@ export function createDecoWorker(options) {
|
|
|
291
319
|
url,
|
|
292
320
|
visitor: visited.visitor,
|
|
293
321
|
assignments: visited.assignments,
|
|
294
|
-
});
|
|
322
|
+
}, errors);
|
|
295
323
|
return visited.visitorCookie === undefined
|
|
296
324
|
? served
|
|
297
325
|
: { ...served, visitorCookie: visited.visitorCookie };
|
|
@@ -301,13 +329,32 @@ export function createDecoWorker(options) {
|
|
|
301
329
|
* cache it, else the app. A preview (any draft signal) always renders: its
|
|
302
330
|
* headers are set at the exit (`serve`).
|
|
303
331
|
*/
|
|
304
|
-
async function page(request, env, ctx, inputs) {
|
|
332
|
+
async function page(request, env, ctx, inputs, errors) {
|
|
305
333
|
const { draft, preview, unavailable, url, visitor, assignments } = inputs;
|
|
306
|
-
const render = async (scope) =>
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
334
|
+
const render = async (scope) => {
|
|
335
|
+
const source = isServerFnPath(url.pathname) ? "action" : "render";
|
|
336
|
+
let reported = false;
|
|
337
|
+
const report = (error, status) => {
|
|
338
|
+
reported = true;
|
|
339
|
+
errors.rendered = true;
|
|
340
|
+
errors.report(error, source, status);
|
|
341
|
+
};
|
|
342
|
+
try {
|
|
343
|
+
const response = withPageStatus(await runInScope({
|
|
344
|
+
csegToken: scope?.csegToken,
|
|
345
|
+
draft: draft ?? undefined,
|
|
346
|
+
reportError: report,
|
|
347
|
+
...(unavailable ? { draftUnavailable: true } : {}),
|
|
348
|
+
}, () => serverEntry.fetch(request, env, ctx)));
|
|
349
|
+
if (response.status >= 500 && !reported)
|
|
350
|
+
report(undefined, response.status);
|
|
351
|
+
return response;
|
|
352
|
+
}
|
|
353
|
+
catch (error) {
|
|
354
|
+
report(error, 500);
|
|
355
|
+
throw error;
|
|
356
|
+
}
|
|
357
|
+
};
|
|
311
358
|
if (draft !== null || preview)
|
|
312
359
|
return { response: await render() };
|
|
313
360
|
// A signed request's page is that caller's: no shared cache may keep it,
|
|
@@ -335,7 +382,7 @@ export function createDecoWorker(options) {
|
|
|
335
382
|
});
|
|
336
383
|
return { response, cached: true };
|
|
337
384
|
}
|
|
338
|
-
async function serve(incoming, env, ctx) {
|
|
385
|
+
async function serve(incoming, env, ctx, errors) {
|
|
339
386
|
// Any draft signal makes the request a preview, whatever the decision.
|
|
340
387
|
const preview = hasDraftSignal(incoming);
|
|
341
388
|
let decision = { version: null, setCookie: null };
|
|
@@ -361,7 +408,7 @@ export function createDecoWorker(options) {
|
|
|
361
408
|
}
|
|
362
409
|
request = new Request(incoming, { headers });
|
|
363
410
|
}
|
|
364
|
-
const served = await handle(request, env, ctx, decision, preview);
|
|
411
|
+
const served = await handle(request, env, ctx, decision, preview, errors);
|
|
365
412
|
const draft = decision.version !== null || preview;
|
|
366
413
|
let response = served.response;
|
|
367
414
|
// A WebSocket upgrade passes through untouched.
|
|
@@ -412,16 +459,21 @@ export function createDecoWorker(options) {
|
|
|
412
459
|
return {
|
|
413
460
|
async fetch(incoming, env, ctx) {
|
|
414
461
|
const clock = performance.now();
|
|
462
|
+
const errors = errorsFor(incoming, ctx);
|
|
415
463
|
let result;
|
|
416
464
|
try {
|
|
417
|
-
result = await serve(incoming, env, ctx);
|
|
465
|
+
result = await serve(incoming, env, ctx, errors);
|
|
418
466
|
}
|
|
419
467
|
catch (error) {
|
|
420
468
|
// The runtime answers a thrown request with a 500.
|
|
421
469
|
measure(incoming, ctx, (performance.now() - clock) / 1000, 500, "BYPASS", undefined);
|
|
470
|
+
errors.report(error, "request", 500);
|
|
422
471
|
throw error;
|
|
423
472
|
}
|
|
424
473
|
const { response, served, draft } = result;
|
|
474
|
+
if (response.status >= 500 && !errors.rendered) {
|
|
475
|
+
errors.report(undefined, served.routed ? "route" : "request", response.status, served.routed);
|
|
476
|
+
}
|
|
425
477
|
measure(incoming, ctx, (performance.now() - clock) / 1000, response.status, cacheLabel(response, draft, served), served);
|
|
426
478
|
return response;
|
|
427
479
|
},
|
package/dist/worker/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@decocms/tanstack",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.21.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=24"
|
|
@@ -73,6 +73,11 @@
|
|
|
73
73
|
"source": "./src/scope/server.ts",
|
|
74
74
|
"default": "./dist/scope/server.js"
|
|
75
75
|
}
|
|
76
|
+
},
|
|
77
|
+
"./stream": {
|
|
78
|
+
"types": "./dist/stream/index.d.ts",
|
|
79
|
+
"source": "./src/stream/index.tsx",
|
|
80
|
+
"default": "./dist/stream/index.js"
|
|
76
81
|
}
|
|
77
82
|
},
|
|
78
83
|
"scripts": {
|
|
@@ -82,19 +87,23 @@
|
|
|
82
87
|
"typecheck": "node ../../scripts/tsc.mjs -p tsconfig.json"
|
|
83
88
|
},
|
|
84
89
|
"peerDependencies": {
|
|
85
|
-
"@decocms/blocks": "^8.
|
|
90
|
+
"@decocms/blocks": "^8.21.0",
|
|
86
91
|
"@tanstack/react-router": ">=1.166.0",
|
|
87
92
|
"@tanstack/react-start": ">=1.166.0",
|
|
88
93
|
"react": "^19.0.0",
|
|
89
|
-
"vite": ">=7.0.0"
|
|
94
|
+
"vite": ">=7.0.0",
|
|
95
|
+
"react-dom": "^19.0.0"
|
|
90
96
|
},
|
|
91
97
|
"peerDependenciesMeta": {
|
|
92
98
|
"vite": {
|
|
93
99
|
"optional": true
|
|
100
|
+
},
|
|
101
|
+
"react-dom": {
|
|
102
|
+
"optional": true
|
|
94
103
|
}
|
|
95
104
|
},
|
|
96
105
|
"devDependencies": {
|
|
97
|
-
"@decocms/blocks": "8.
|
|
106
|
+
"@decocms/blocks": "8.21.0",
|
|
98
107
|
"@tanstack/react-router": "1.170.39",
|
|
99
108
|
"@tanstack/react-start": "1.168.58",
|
|
100
109
|
"@types/react": "^19.0.0",
|
|
@@ -107,5 +116,8 @@
|
|
|
107
116
|
"publishConfig": {
|
|
108
117
|
"registry": "https://registry.npmjs.org",
|
|
109
118
|
"access": "public"
|
|
119
|
+
},
|
|
120
|
+
"dependencies": {
|
|
121
|
+
"isbot": "^5.1.44"
|
|
110
122
|
}
|
|
111
123
|
}
|
package/src/scope/server.ts
CHANGED
|
@@ -11,6 +11,8 @@
|
|
|
11
11
|
import { AsyncLocalStorage } from "node:async_hooks";
|
|
12
12
|
|
|
13
13
|
export interface RequestScope {
|
|
14
|
+
/** The render's error reporter; server-only, never serialized into a page. */
|
|
15
|
+
reportError?: (error: unknown) => void;
|
|
14
16
|
/** The CDN segment token for this request's page (the site's `pageCache` passes it to `render`), or undefined. */
|
|
15
17
|
csegToken?: string;
|
|
16
18
|
/** The draft this request renders (after the worker's host check). */
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A TanStack Start stream handler for React 19 Web Streams (Cloudflare Workers).
|
|
3
|
+
* React reports failures inside Suspense through onError, even after a 200
|
|
4
|
+
* response has started. Keep those failures on the site's telemetry pipeline.
|
|
5
|
+
*/
|
|
6
|
+
import { reportError } from "@decocms/blocks/telemetry";
|
|
7
|
+
import * as ssr from "@tanstack/react-router/ssr/server";
|
|
8
|
+
import { isbot } from "isbot";
|
|
9
|
+
import { renderToReadableStream } from "react-dom/server.edge";
|
|
10
|
+
import { currentScope } from "../scope/server.ts";
|
|
11
|
+
|
|
12
|
+
/** Use with createStartHandler(decoStreamHandler) in the site's server entry. */
|
|
13
|
+
export const decoStreamHandler = ssr.defineHandlerCallback(
|
|
14
|
+
async ({ request, router, responseHeaders }) => {
|
|
15
|
+
const signal = request.signal;
|
|
16
|
+
if (signal.aborted) {
|
|
17
|
+
router.serverSsr?.cleanup();
|
|
18
|
+
throw signal.reason;
|
|
19
|
+
}
|
|
20
|
+
// Only this opt-in handler needs the newer streaming lifecycle API. A
|
|
21
|
+
// namespace import keeps existing binding exports importable on older routers.
|
|
22
|
+
if (
|
|
23
|
+
!("createSsrStreamResponse" in ssr) ||
|
|
24
|
+
typeof ssr.createSsrStreamResponse !== "function" ||
|
|
25
|
+
!("getSsrStatus" in ssr) ||
|
|
26
|
+
typeof ssr.getSsrStatus !== "function" ||
|
|
27
|
+
!("waitForRequest" in ssr) ||
|
|
28
|
+
typeof ssr.waitForRequest !== "function"
|
|
29
|
+
) {
|
|
30
|
+
throw new Error(
|
|
31
|
+
"decoStreamHandler requires @tanstack/react-router >=1.170.39 and @tanstack/react-start >=1.168.58",
|
|
32
|
+
);
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
const reportInRequest = currentScope()?.reportError;
|
|
36
|
+
const reported = new Set<unknown>();
|
|
37
|
+
let rendererTeardown = false;
|
|
38
|
+
const onError = (error: unknown, info?: unknown) => {
|
|
39
|
+
if (rendererTeardown || signal.aborted || reported.has(error)) return;
|
|
40
|
+
reported.add(error);
|
|
41
|
+
try {
|
|
42
|
+
console.error("Error in renderToReadableStream:", error, info);
|
|
43
|
+
} catch {
|
|
44
|
+
// A site's console wrapper must not interrupt rendering or reporting.
|
|
45
|
+
}
|
|
46
|
+
try {
|
|
47
|
+
if (reportInRequest) reportInRequest(error);
|
|
48
|
+
else {
|
|
49
|
+
void reportError(error, {
|
|
50
|
+
framework: "tanstack",
|
|
51
|
+
source: "render",
|
|
52
|
+
route: () => router.state.matches.at(-1)?.fullPath,
|
|
53
|
+
method: request.method,
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
} catch {
|
|
57
|
+
// Instrumentation never replaces a renderer's error.
|
|
58
|
+
}
|
|
59
|
+
};
|
|
60
|
+
|
|
61
|
+
try {
|
|
62
|
+
const stream = await renderToReadableStream(<ssr.RouterServer router={router} />, {
|
|
63
|
+
signal,
|
|
64
|
+
nonce: router.options.ssr?.nonce,
|
|
65
|
+
progressiveChunkSize: Number.POSITIVE_INFINITY,
|
|
66
|
+
onError,
|
|
67
|
+
});
|
|
68
|
+
const rendererAbort = isbot(request.headers.get("User-Agent"))
|
|
69
|
+
? new AbortController()
|
|
70
|
+
: undefined;
|
|
71
|
+
const responseStream = ssr.transformReadableStreamWithRouter(router, stream, {
|
|
72
|
+
rendererSafePoint: "script-close",
|
|
73
|
+
signal,
|
|
74
|
+
onAbort: (reason) => {
|
|
75
|
+
rendererTeardown = true;
|
|
76
|
+
rendererAbort?.abort(reason);
|
|
77
|
+
},
|
|
78
|
+
});
|
|
79
|
+
if (rendererAbort) await ssr.waitForRequest(stream.allReady, rendererAbort.signal);
|
|
80
|
+
return ssr.createSsrStreamResponse(
|
|
81
|
+
router,
|
|
82
|
+
new Response(responseStream, {
|
|
83
|
+
status: ssr.getSsrStatus(router),
|
|
84
|
+
headers: responseHeaders,
|
|
85
|
+
}),
|
|
86
|
+
);
|
|
87
|
+
} catch (error) {
|
|
88
|
+
onError(error);
|
|
89
|
+
router.serverSsr?.cleanup();
|
|
90
|
+
throw error;
|
|
91
|
+
}
|
|
92
|
+
},
|
|
93
|
+
);
|
package/src/worker/index.ts
CHANGED
|
@@ -48,6 +48,7 @@
|
|
|
48
48
|
import { type CMS, matchRoute, type Redirect } from "@decocms/blocks";
|
|
49
49
|
import { readVisitor, serializeVisitor, type Visitor } from "@decocms/blocks/experiments";
|
|
50
50
|
import { recordServerRequest } from "@decocms/blocks/metrics";
|
|
51
|
+
import { reportError } from "@decocms/blocks/telemetry";
|
|
51
52
|
import { runInScope } from "@decocms/tanstack/scope";
|
|
52
53
|
import { ASSIGNMENTS_HEADER, serializeAssignments } from "../assignments.ts";
|
|
53
54
|
import { draftResponseHeaders, RELEASE_CHECK_HEADER, VERSION_HEADER } from "../draft.ts";
|
|
@@ -279,6 +280,44 @@ export function createDecoWorker<Env = unknown>(options: DecoWorkerOptions<Env>)
|
|
|
279
280
|
return match.kind === "match" ? match.entry.path : undefined;
|
|
280
281
|
}
|
|
281
282
|
|
|
283
|
+
interface ErrorCapture {
|
|
284
|
+
rendered: boolean;
|
|
285
|
+
report(
|
|
286
|
+
error: unknown,
|
|
287
|
+
source: "render" | "request" | "action" | "route",
|
|
288
|
+
status?: number,
|
|
289
|
+
routed?: boolean,
|
|
290
|
+
): void;
|
|
291
|
+
}
|
|
292
|
+
|
|
293
|
+
/** One request owns its deduplication: a reused Error can fail later requests too. */
|
|
294
|
+
function errorsFor(request: Request, ctx: ExecutionContextLike): ErrorCapture {
|
|
295
|
+
const reported = new Set<unknown>();
|
|
296
|
+
return {
|
|
297
|
+
rendered: false,
|
|
298
|
+
report(error, source, status, routed = false) {
|
|
299
|
+
if (request.signal.aborted || reported.has(error)) return;
|
|
300
|
+
reported.add(error);
|
|
301
|
+
try {
|
|
302
|
+
ctx.waitUntil(
|
|
303
|
+
reportError(error, {
|
|
304
|
+
framework: "tanstack",
|
|
305
|
+
source,
|
|
306
|
+
route: () => {
|
|
307
|
+
const url = new URL(request.url);
|
|
308
|
+
return fixedRoute(url.pathname) ?? (routed ? undefined : routeTemplate(url));
|
|
309
|
+
},
|
|
310
|
+
method: request.method,
|
|
311
|
+
status,
|
|
312
|
+
}),
|
|
313
|
+
);
|
|
314
|
+
} catch {
|
|
315
|
+
// Reporting never replaces the response or the error being thrown.
|
|
316
|
+
}
|
|
317
|
+
},
|
|
318
|
+
};
|
|
319
|
+
}
|
|
320
|
+
|
|
282
321
|
/**
|
|
283
322
|
* Records the request (`http.server.request.duration`). The route is a
|
|
284
323
|
* function, found after the response and only while telemetry measures:
|
|
@@ -390,6 +429,7 @@ export function createDecoWorker<Env = unknown>(options: DecoWorkerOptions<Env>)
|
|
|
390
429
|
ctx: ExecutionContextLike,
|
|
391
430
|
decision: DraftDecision,
|
|
392
431
|
preview: boolean,
|
|
432
|
+
errors: ErrorCapture,
|
|
393
433
|
): Promise<Served> {
|
|
394
434
|
const draft = decision.version?.version ?? null;
|
|
395
435
|
const url = new URL(request.url);
|
|
@@ -446,14 +486,20 @@ export function createDecoWorker<Env = unknown>(options: DecoWorkerOptions<Env>)
|
|
|
446
486
|
}
|
|
447
487
|
|
|
448
488
|
const visited = await withDecisions(request, decision);
|
|
449
|
-
const served = await page(
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
489
|
+
const served = await page(
|
|
490
|
+
visited.request,
|
|
491
|
+
env,
|
|
492
|
+
ctx,
|
|
493
|
+
{
|
|
494
|
+
draft,
|
|
495
|
+
preview,
|
|
496
|
+
unavailable: decision.unavailable === true,
|
|
497
|
+
url,
|
|
498
|
+
visitor: visited.visitor,
|
|
499
|
+
assignments: visited.assignments,
|
|
500
|
+
},
|
|
501
|
+
errors,
|
|
502
|
+
);
|
|
457
503
|
return visited.visitorCookie === undefined
|
|
458
504
|
? served
|
|
459
505
|
: { ...served, visitorCookie: visited.visitorCookie };
|
|
@@ -476,19 +522,36 @@ export function createDecoWorker<Env = unknown>(options: DecoWorkerOptions<Env>)
|
|
|
476
522
|
visitor: Visitor | null;
|
|
477
523
|
assignments: RequestAssignments | undefined;
|
|
478
524
|
},
|
|
525
|
+
errors: ErrorCapture,
|
|
479
526
|
): Promise<Served> {
|
|
480
527
|
const { draft, preview, unavailable, url, visitor, assignments } = inputs;
|
|
481
|
-
const render = async (scope?: { csegToken?: string }): Promise<Response> =>
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
528
|
+
const render = async (scope?: { csegToken?: string }): Promise<Response> => {
|
|
529
|
+
const source = isServerFnPath(url.pathname) ? "action" : "render";
|
|
530
|
+
let reported = false;
|
|
531
|
+
const report = (error: unknown, status?: number) => {
|
|
532
|
+
reported = true;
|
|
533
|
+
errors.rendered = true;
|
|
534
|
+
errors.report(error, source, status);
|
|
535
|
+
};
|
|
536
|
+
try {
|
|
537
|
+
const response = withPageStatus(
|
|
538
|
+
await runInScope(
|
|
539
|
+
{
|
|
540
|
+
csegToken: scope?.csegToken,
|
|
541
|
+
draft: draft ?? undefined,
|
|
542
|
+
reportError: report,
|
|
543
|
+
...(unavailable ? { draftUnavailable: true } : {}),
|
|
544
|
+
},
|
|
545
|
+
() => serverEntry.fetch(request, env, ctx),
|
|
546
|
+
),
|
|
547
|
+
);
|
|
548
|
+
if (response.status >= 500 && !reported) report(undefined, response.status);
|
|
549
|
+
return response;
|
|
550
|
+
} catch (error) {
|
|
551
|
+
report(error, 500);
|
|
552
|
+
throw error;
|
|
553
|
+
}
|
|
554
|
+
};
|
|
492
555
|
|
|
493
556
|
if (draft !== null || preview) return { response: await render() };
|
|
494
557
|
// A signed request's page is that caller's: no shared cache may keep it,
|
|
@@ -523,6 +586,7 @@ export function createDecoWorker<Env = unknown>(options: DecoWorkerOptions<Env>)
|
|
|
523
586
|
incoming: Request,
|
|
524
587
|
env: Env,
|
|
525
588
|
ctx: ExecutionContextLike,
|
|
589
|
+
errors: ErrorCapture,
|
|
526
590
|
): Promise<{ response: Response; served: Served; draft: boolean }> {
|
|
527
591
|
// Any draft signal makes the request a preview, whatever the decision.
|
|
528
592
|
const preview = hasDraftSignal(incoming);
|
|
@@ -547,7 +611,7 @@ export function createDecoWorker<Env = unknown>(options: DecoWorkerOptions<Env>)
|
|
|
547
611
|
request = new Request(incoming, { headers });
|
|
548
612
|
}
|
|
549
613
|
|
|
550
|
-
const served = await handle(request, env, ctx, decision, preview);
|
|
614
|
+
const served = await handle(request, env, ctx, decision, preview, errors);
|
|
551
615
|
const draft = decision.version !== null || preview;
|
|
552
616
|
let response = served.response;
|
|
553
617
|
// A WebSocket upgrade passes through untouched.
|
|
@@ -599,15 +663,25 @@ export function createDecoWorker<Env = unknown>(options: DecoWorkerOptions<Env>)
|
|
|
599
663
|
return {
|
|
600
664
|
async fetch(incoming, env, ctx) {
|
|
601
665
|
const clock = performance.now();
|
|
666
|
+
const errors = errorsFor(incoming, ctx);
|
|
602
667
|
let result: Awaited<ReturnType<typeof serve>>;
|
|
603
668
|
try {
|
|
604
|
-
result = await serve(incoming, env, ctx);
|
|
669
|
+
result = await serve(incoming, env, ctx, errors);
|
|
605
670
|
} catch (error) {
|
|
606
671
|
// The runtime answers a thrown request with a 500.
|
|
607
672
|
measure(incoming, ctx, (performance.now() - clock) / 1000, 500, "BYPASS", undefined);
|
|
673
|
+
errors.report(error, "request", 500);
|
|
608
674
|
throw error;
|
|
609
675
|
}
|
|
610
676
|
const { response, served, draft } = result;
|
|
677
|
+
if (response.status >= 500 && !errors.rendered) {
|
|
678
|
+
errors.report(
|
|
679
|
+
undefined,
|
|
680
|
+
served.routed ? "route" : "request",
|
|
681
|
+
response.status,
|
|
682
|
+
served.routed,
|
|
683
|
+
);
|
|
684
|
+
}
|
|
611
685
|
measure(
|
|
612
686
|
incoming,
|
|
613
687
|
ctx,
|