@timber-js/app 0.2.0-alpha.224 → 0.2.0-alpha.225

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.
Files changed (77) hide show
  1. package/dist/_chunks/{actions-7dTXYJfu.js → actions-B1xSIv32.js} +2 -2
  2. package/dist/_chunks/{actions-7dTXYJfu.js.map → actions-B1xSIv32.js.map} +1 -1
  3. package/dist/_chunks/{cache-api-TDZ4hlDc.js → cache-api-DsSXA4Sp.js} +68 -47
  4. package/dist/_chunks/cache-api-DsSXA4Sp.js.map +1 -0
  5. package/dist/_chunks/{cli-check-Dv3f8d2j.js → cli-check-B33yhAPa.js} +2 -2
  6. package/dist/_chunks/{cli-check-Dv3f8d2j.js.map → cli-check-B33yhAPa.js.map} +1 -1
  7. package/dist/_chunks/cli-context-BPdyA7Fp.js +1 -0
  8. package/dist/_chunks/{cli-context-CbZp32SK.js → cli-context-CwTKMjVe.js} +10 -2
  9. package/dist/_chunks/cli-context-CwTKMjVe.js.map +1 -0
  10. package/dist/_chunks/{error-boundary-DRQXGWCp.js → error-boundary-D3YyVVuP.js} +2 -2
  11. package/dist/_chunks/{error-boundary-DRQXGWCp.js.map → error-boundary-D3YyVVuP.js.map} +1 -1
  12. package/dist/_chunks/{singleflight-BChPMjwH.js → singleflight-CzoOVB9Y.js} +2 -3
  13. package/dist/_chunks/singleflight-CzoOVB9Y.js.map +1 -0
  14. package/dist/_chunks/{status-page-marker-XIQXlTOb.js → status-page-marker-C8POawuF.js} +2 -2
  15. package/dist/_chunks/{status-page-marker-XIQXlTOb.js.map → status-page-marker-C8POawuF.js.map} +1 -1
  16. package/dist/adapters/cloudflare-kv-cache.d.ts +0 -1
  17. package/dist/adapters/cloudflare-kv-cache.d.ts.map +1 -1
  18. package/dist/adapters/cloudflare-kv-cache.js.map +1 -1
  19. package/dist/cache/index.d.ts +5 -5
  20. package/dist/cache/index.d.ts.map +1 -1
  21. package/dist/cache/index.js +1 -1
  22. package/dist/cache/redis-handler.d.ts +0 -1
  23. package/dist/cache/redis-handler.d.ts.map +1 -1
  24. package/dist/cache/singleflight.d.ts +12 -2
  25. package/dist/cache/singleflight.d.ts.map +1 -1
  26. package/dist/cache/stable-stringify.d.ts +6 -0
  27. package/dist/cache/stable-stringify.d.ts.map +1 -1
  28. package/dist/cache/tag-aware-handler.d.ts +0 -1
  29. package/dist/cache/tag-aware-handler.d.ts.map +1 -1
  30. package/dist/cache/timber-cache.d.ts +1 -1
  31. package/dist/cache/timber-cache.d.ts.map +1 -1
  32. package/dist/cli-context.d.ts +8 -0
  33. package/dist/cli-context.d.ts.map +1 -1
  34. package/dist/cli.d.ts.map +1 -1
  35. package/dist/cli.js +8 -2
  36. package/dist/cli.js.map +1 -1
  37. package/dist/client/error-boundary.js +1 -1
  38. package/dist/client/internal.js +3 -3
  39. package/dist/index.d.ts.map +1 -1
  40. package/dist/index.js +112 -0
  41. package/dist/index.js.map +1 -1
  42. package/dist/plugins/client-in-server-package-deps.d.ts +63 -0
  43. package/dist/plugins/client-in-server-package-deps.d.ts.map +1 -0
  44. package/dist/plugins/optimize-package-imports.d.ts +11 -0
  45. package/dist/plugins/optimize-package-imports.d.ts.map +1 -1
  46. package/dist/server/flight-injector-core.d.ts.map +1 -1
  47. package/dist/server/index.js +1 -1
  48. package/dist/server/internal.js +162 -33
  49. package/dist/server/internal.js.map +1 -1
  50. package/dist/server/pipeline-helpers.d.ts +5 -2
  51. package/dist/server/pipeline-helpers.d.ts.map +1 -1
  52. package/dist/server/pipeline.d.ts.map +1 -1
  53. package/dist/server/prebuilt-runtime.d.ts.map +1 -1
  54. package/dist/server/response-framing.d.ts +43 -0
  55. package/dist/server/response-framing.d.ts.map +1 -0
  56. package/package.json +2 -2
  57. package/src/adapters/cloudflare-kv-cache.ts +1 -5
  58. package/src/cache/index.ts +7 -27
  59. package/src/cache/redis-handler.ts +1 -5
  60. package/src/cache/singleflight.ts +17 -5
  61. package/src/cache/stable-stringify.ts +53 -0
  62. package/src/cache/tag-aware-handler.ts +1 -5
  63. package/src/cache/timber-cache.ts +55 -52
  64. package/src/cli-context.ts +9 -0
  65. package/src/cli.ts +16 -0
  66. package/src/index.ts +2 -0
  67. package/src/plugins/client-in-server-package-deps.ts +139 -0
  68. package/src/plugins/optimize-package-imports.ts +1 -1
  69. package/src/server/flight-injector-core.ts +13 -9
  70. package/src/server/pipeline-helpers.ts +9 -5
  71. package/src/server/pipeline.ts +7 -0
  72. package/src/server/prebuilt-runtime.ts +125 -121
  73. package/src/server/response-framing.ts +59 -0
  74. package/dist/_chunks/cache-api-TDZ4hlDc.js.map +0 -1
  75. package/dist/_chunks/cli-context-CbZp32SK.js.map +0 -1
  76. package/dist/_chunks/cli-context-n5hmkdla.js +0 -1
  77. package/dist/_chunks/singleflight-BChPMjwH.js.map +0 -1
@@ -211,7 +211,10 @@ export declare function loadFallbackModule(file: ManifestLoader, req: Request, s
211
211
  * per request that joined it, so the report happens inside the body. A
212
212
  * body still running when the singleflight times out is reported then,
213
213
  * with the timeout error (the signal's reason), and its later rejection
214
- * is dropped.
214
+ * is not reported again.
215
+ * - **Settles with the work's outcome.** The value or the error passes
216
+ * through, so an inline re-render that joined this flight receives the
217
+ * captured bytes, or the failure, instead of `undefined`.
215
218
  * - **Against the request whose stale read started it**, read from the
216
219
  * request context the work runs in. With no request (the build-time
217
220
  * capture store) it is only logged.
@@ -220,5 +223,5 @@ export declare function loadFallbackModule(file: ManifestLoader, req: Request, s
220
223
  * revalidated page tree included). The request's own abort does not
221
224
  * suppress the report: the work runs after the response either way.
222
225
  */
223
- export declare function runBackgroundFlight(signal: AbortSignal, work: () => Promise<unknown>, log: (error: unknown) => void): Promise<void>;
226
+ export declare function runBackgroundFlight<T>(signal: AbortSignal, work: () => Promise<T>, log: (error: unknown) => void): Promise<T>;
224
227
  //# sourceMappingURL=pipeline-helpers.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"pipeline-helpers.d.ts","sourceRoot":"","sources":["../../src/server/pipeline-helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pipeline-helpers.d.ts","sourceRoot":"","sources":["../../src/server/pipeline-helpers.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../src/server/pipeline.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../src/server/pipeline.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"prebuilt-runtime.d.ts","sourceRoot":"","sources":["../../src/server/prebuilt-runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AAkDH,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAkB3E;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAGlE;AAYD;;;;;;GAMG;AACH,MAAM,WAAW,wBAAwB;IACvC,wEAAwE;IACxE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kEAAkE;IAClE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,0DAA0D;IAC1D,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC;IACjE,2EAA2E;IAC3E,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;;;;;;;OASG;IACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB;;;;OAIG;IACH,8BAA8B,CAAC,EAAE,OAAO,CAAC;CAC1C;AAED,2DAA2D;AAE3D,KAAK,eAAe,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC;AAY/C,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,eAAe,CAAC;IAC3B,OAAO,EAAE,wBAAwB,CAAC;CACnC;AAoDD,UAAU,YAAY;IACpB,wBAAwB,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACnF,YAAY,EAAE,YAAY,CAAC;CAC5B;AAID;;;GAGG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI,CAEvD;AA8dD;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,eAAe,EAClD,EAAE,EAAE,MAAM,EACV,SAAS,EAAE,CAAC,EACZ,OAAO,GAAE,wBAA6B,GACrC,CAAC,CAuFH;AAED,qDAAqD;AACrD,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS,CAEpF;AAED,qEAAqE;AACrE,wBAAgB,mBAAmB,IAAI,WAAW,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAE/E"}
1
+ {"version":3,"file":"prebuilt-runtime.d.ts","sourceRoot":"","sources":["../../src/server/prebuilt-runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AAkDH,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAqB3E;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAElE;AAYD;;;;;;GAMG;AACH,MAAM,WAAW,wBAAwB;IACvC,wEAAwE;IACxE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kEAAkE;IAClE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,0DAA0D;IAC1D,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC;IACjE,2EAA2E;IAC3E,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;;;;;;;OASG;IACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB;;;;OAIG;IACH,8BAA8B,CAAC,EAAE,OAAO,CAAC;CAC1C;AAED,2DAA2D;AAE3D,KAAK,eAAe,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC;AAY/C,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,eAAe,CAAC;IAC3B,OAAO,EAAE,wBAAwB,CAAC;CACnC;AAoDD,UAAU,YAAY;IACpB,wBAAwB,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACnF,YAAY,EAAE,YAAY,CAAC;CAC5B;AAID;;;GAGG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI,CAEvD;AAgeD;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,eAAe,EAClD,EAAE,EAAE,MAAM,EACV,SAAS,EAAE,CAAC,EACZ,OAAO,GAAE,wBAA6B,GACrC,CAAC,CAuFH;AAED,qDAAqD;AACrD,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS,CAEpF;AAED,qEAAqE;AACrE,wBAAgB,mBAAmB,IAAI,WAAW,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAE/E"}
@@ -0,0 +1,43 @@
1
+ /**
2
+ * Upstream framing on forwarded responses (GHSA-pc58-hwjq-p385 class,
3
+ * design/13-security.md #42).
4
+ *
5
+ * `fetch()` transparently decodes a gzip/br/deflate/zstd body but keeps the
6
+ * upstream's `Content-Encoding` and `Content-Length`, along with its
7
+ * connection-level headers. A route handler, proxy.ts or middleware that
8
+ * returns that `Response` — directly or through
9
+ * `new Response(res.body, { headers: res.headers })` — would otherwise send
10
+ * the decoded bytes framed by the encoded length. On a keep-alive HTTP/1.1
11
+ * connection the surplus bytes are read as the *next* response: a reverse
12
+ * proxy that queues several clients on one backend connection hands an
13
+ * upstream-controlled response to another client, or one client's response
14
+ * to the wrong one.
15
+ *
16
+ * Whether a body was decoded is not observable from the `Response` (the
17
+ * header-copying proxy pattern produces an ordinary constructed `Response`),
18
+ * so the rule is stated on the headers alone:
19
+ *
20
+ * - A response that declares `Content-Encoding` loses it and its
21
+ * `Content-Length`. The length described the encoded bytes; the server
22
+ * frames what it actually writes, and the adapter's compression step may
23
+ * re-encode it. Matches Next.js (vercel/next.js#101108). The cost: a
24
+ * handler cannot hand back a pre-compressed body under its own
25
+ * `Content-Encoding`.
26
+ * - Hop-by-hop headers (RFC 9110 §7.6.1) describe the upstream's
27
+ * connection, not this one, and are owned by the server writing the
28
+ * socket. They are always dropped. A forwarded `Connection: keep-alive` otherwise
29
+ * overrides the client's `Connection: close`, and a forwarded
30
+ * `Transfer-Encoding` claims a framing the server did not choose.
31
+ * The extra headers a `Connection` value names are deliberately not
32
+ * honored: the response's headers here are the upstream's merged with
33
+ * the app's own (cookies, middleware headers), and an upstream sending
34
+ * `Connection: set-cookie` must not be able to delete the app's session.
35
+ * - A `Content-Length` on an unencoded response is the route's own claim
36
+ * and is kept — a HEAD response relies on it (head-requests.test.ts).
37
+ *
38
+ * Applied at the pipeline's single exit, before compression, so every
39
+ * producer is covered — including ones added later. Timber's own renderers
40
+ * set none of these headers inside the pipeline.
41
+ */
42
+ export declare function dropUpstreamFraming(response: Response): void;
43
+ //# sourceMappingURL=response-framing.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"response-framing.d.ts","sourceRoot":"","sources":["../../src/server/response-framing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AAYH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAM5D"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@timber-js/app",
3
- "version": "0.2.0-alpha.224",
3
+ "version": "0.2.0-alpha.225",
4
4
  "description": "Vite-native React framework built for Servers and Serverless Platforms — correct HTTP semantics, real status codes, pages that work without JavaScript",
5
5
  "keywords": [
6
6
  "cloudflare-workers",
@@ -157,7 +157,7 @@
157
157
  "cookie": "^2.0.1",
158
158
  "jsonc-parser": "^3.3.1",
159
159
  "magic-string": "^1.4.5",
160
- "nitro": "3.0.260903-beta",
160
+ "nitro": "3.0.261102-rc",
161
161
  "oxc-transform-react": "^0.156.0",
162
162
  "srvx": "^1.0.8"
163
163
  },
@@ -113,11 +113,7 @@ export class CloudflareKVCacheHandler implements CacheHandler {
113
113
  return { value: entry.value, stale };
114
114
  }
115
115
 
116
- async set(
117
- key: string,
118
- value: unknown,
119
- opts: { ttl: number; tags: string[]; generation?: number }
120
- ): Promise<void> {
116
+ async set(key: string, value: unknown, opts: { ttl: number; tags: string[] }): Promise<void> {
121
117
  warnLossyJsonValue(value, key);
122
118
  const kv = this.getKV();
123
119
  const entry: KVCacheEntry = {
@@ -4,11 +4,7 @@ import { estimateByteSize } from './sizeof.ts';
4
4
 
5
5
  export interface CacheHandler {
6
6
  get(key: string): Promise<{ value: unknown; stale: boolean } | null>;
7
- set(
8
- key: string,
9
- value: unknown,
10
- opts: { ttl: number; tags: string[]; generation?: number }
11
- ): Promise<void>;
7
+ set(key: string, value: unknown, opts: { ttl: number; tags: string[] }): Promise<void>;
12
8
  invalidate(opts: { key?: string; tag?: string }): Promise<void>;
13
9
  }
14
10
 
@@ -18,8 +14,11 @@ export interface CacheOptions<Fn extends (...args: any[]) => any> {
18
14
  key?: (...args: Parameters<Fn>) => string;
19
15
  staleWhileRevalidate?: boolean;
20
16
  tags?: string[] | ((...args: Parameters<Fn>) => string[]);
21
- /** Timeout (ms) for singleflight-coalesced calls. Prevents hung fn() from
22
- * permanently blocking all future callers for the same cache key. See TIM-518. */
17
+ /** Timeout (ms) for an execution this wrapper starts. Prevents hung fn() from
18
+ * permanently blocking all future callers for the same cache key (TIM-518).
19
+ * A call that joins an execution already in flight for the key waits under
20
+ * that execution's timeout, so wrappers sharing an explicit `key` should
21
+ * agree on it (design/06 §Residual write races). */
23
22
  timeoutMs?: number;
24
23
  }
25
24
 
@@ -42,7 +41,6 @@ export class MemoryCacheHandler implements CacheHandler {
42
41
  string,
43
42
  { value: unknown; expiresAt: number; tags: string[]; byteSize: number }
44
43
  >();
45
- private generations = new Map<string, number>();
46
44
  private maxEntries: number;
47
45
  private maxBytes: number | undefined;
48
46
  private maxEntryBytes: number | undefined;
@@ -69,17 +67,7 @@ export class MemoryCacheHandler implements CacheHandler {
69
67
  return { value: entry.value, stale };
70
68
  }
71
69
 
72
- async set(
73
- key: string,
74
- value: unknown,
75
- opts: { ttl: number; tags: string[]; generation?: number }
76
- ) {
77
- // CAS guard: skip write if a newer generation has already been written
78
- if (opts.generation !== undefined) {
79
- const current = this.generations.get(key) ?? 0;
80
- if (opts.generation < current) return;
81
- }
82
-
70
+ async set(key: string, value: unknown, opts: { ttl: number; tags: string[] }) {
83
71
  const byteSize = this._trackBytes ? estimateByteSize(value) : 0;
84
72
 
85
73
  // Reject entries exceeding per-entry byte limit
@@ -110,11 +98,6 @@ export class MemoryCacheHandler implements CacheHandler {
110
98
  }
111
99
  }
112
100
 
113
- // Record generation only after all admission checks pass
114
- if (opts.generation !== undefined) {
115
- this.generations.set(key, opts.generation);
116
- }
117
-
118
101
  this.store.set(key, {
119
102
  value,
120
103
  expiresAt: Date.now() + opts.ttl * 1000,
@@ -131,14 +114,12 @@ export class MemoryCacheHandler implements CacheHandler {
131
114
  this.currentBytes -= entry.byteSize;
132
115
  this.store.delete(opts.key);
133
116
  }
134
- this.generations.delete(opts.key);
135
117
  }
136
118
  if (opts.tag) {
137
119
  for (const [key, entry] of this.store) {
138
120
  if (entry.tags.includes(opts.tag)) {
139
121
  this.currentBytes -= entry.byteSize;
140
122
  this.store.delete(key);
141
- this.generations.delete(key);
142
123
  }
143
124
  }
144
125
  }
@@ -161,7 +142,6 @@ export class MemoryCacheHandler implements CacheHandler {
161
142
  const entry = this.store.get(oldest)!;
162
143
  this.currentBytes -= entry.byteSize;
163
144
  this.store.delete(oldest);
164
- this.generations.delete(oldest);
165
145
  }
166
146
  }
167
147
  }
@@ -169,11 +169,7 @@ export class RedisCacheHandler implements CacheHandler {
169
169
  return { value: entry.value, stale };
170
170
  }
171
171
 
172
- async set(
173
- key: string,
174
- value: unknown,
175
- opts: { ttl: number; tags: string[]; generation?: number }
176
- ): Promise<void> {
172
+ async set(key: string, value: unknown, opts: { ttl: number; tags: string[] }): Promise<void> {
177
173
  warnLossyJsonValue(value, key);
178
174
  const ck = this.cacheKey(key);
179
175
  const expiresAt = Date.now() + opts.ttl * 1000;
@@ -12,12 +12,22 @@
12
12
  */
13
13
 
14
14
  export interface SingleflightOptions {
15
- /** Maximum time (ms) a coalesced call may run before being rejected. */
15
+ /**
16
+ * Default maximum time (ms) a coalesced call may run before being
17
+ * rejected. A `timeoutMs` passed to `do()` overrides it for that flight.
18
+ */
16
19
  timeoutMs?: number;
17
20
  }
18
21
 
19
22
  export interface Singleflight {
20
- do<T>(key: string, fn: (signal: AbortSignal) => Promise<T>): Promise<T>;
23
+ /**
24
+ * Run `fn` once per key; concurrent callers join the in-flight call.
25
+ * `timeoutMs` (default: the instance option) applies to the flight this
26
+ * call starts — a caller that joins an existing flight inherits its
27
+ * timeout. Passing it per call lets callers with different timeouts
28
+ * share one keyspace instead of each needing its own instance.
29
+ */
30
+ do<T>(key: string, fn: (signal: AbortSignal) => Promise<T>, timeoutMs?: number): Promise<T>;
21
31
  /** Return the in-flight promise for a key, or undefined if none. */
22
32
  get(key: string): Promise<unknown> | undefined;
23
33
  }
@@ -35,10 +45,12 @@ export class SingleflightTimeoutError extends Error {
35
45
 
36
46
  export function createSingleflight(opts?: SingleflightOptions): Singleflight {
37
47
  const inflight = new Map<string, Promise<unknown>>();
38
- const timeoutMs = opts?.timeoutMs;
39
-
40
48
  return {
41
- do<T>(key: string, fn: (signal: AbortSignal) => Promise<T>): Promise<T> {
49
+ do<T>(
50
+ key: string,
51
+ fn: (signal: AbortSignal) => Promise<T>,
52
+ timeoutMs = opts?.timeoutMs
53
+ ): Promise<T> {
42
54
  const existing = inflight.get(key);
43
55
  if (existing) return existing as Promise<T>;
44
56
 
@@ -11,6 +11,12 @@
11
11
  * instances holding data behind getters or internal slots) — throw instead:
12
12
  * every such value would collapse to the same cache key, silently returning
13
13
  * one argument's cached data for another (TIM-1020).
14
+ *
15
+ * The same rule covers what JSON.stringify flattens: NaN, Infinity and
16
+ * -Infinity all become `null` there and -0 becomes `0`, and a typed array
17
+ * becomes a plain index object, so `Uint8Array`, `Int8Array` and
18
+ * `{ "0": 1 }` with the same values would share an entry. Both get a
19
+ * representation of their own (GHSA-rhh4-g77r-r9qj class).
14
20
  */
15
21
  export function stableStringify(value: unknown): string {
16
22
  if (value === null || value === undefined) return String(value);
@@ -22,6 +28,7 @@ export function stableStringify(value: unknown): string {
22
28
  'all such values would collide. Provide an explicit `key` option to cache().'
23
29
  );
24
30
  }
31
+ if (type === 'number') return stringifyNumber(value as number);
25
32
  if (type !== 'object') return JSON.stringify(value);
26
33
 
27
34
  if (Array.isArray(value)) {
@@ -38,6 +45,18 @@ export function stableStringify(value: unknown): string {
38
45
  if (json !== value) return stableStringify(json);
39
46
  }
40
47
 
48
+ // A typed array is tagged with its element type, which decides how its
49
+ // bytes are read. Buffer never gets here (its toJSON runs above); DataView
50
+ // has no own state and throws below. The `<Type>Array(` prefix cannot
51
+ // collide with object, array, string, Map( or Set( output.
52
+ const typed = asTypedArray(value);
53
+ if (typed) {
54
+ const elements = Array.from(typed.view, (element) =>
55
+ typeof element === 'bigint' ? `${element}n` : stringifyNumber(element)
56
+ );
57
+ return `${typed.name}(${elements.join(',')})`;
58
+ }
59
+
41
60
  // Map/Set have no enumerable own properties — serialize entries explicitly.
42
61
  // Entries are sorted after serialization so insertion order doesn't change
43
62
  // the key. The Map(/Set( prefixes can't collide with object ('{'), array
@@ -82,3 +101,37 @@ export function stableStringify(value: unknown): string {
82
101
 
83
102
  return '{' + pairs.join(',') + '}';
84
103
  }
104
+
105
+ /**
106
+ * JSON.stringify for a number, except the values it maps onto another
107
+ * value's output: NaN, ±Infinity (all `null`) and -0 (`0`). Their bare
108
+ * tokens cannot be produced by JSON output, so they cannot collide.
109
+ */
110
+ function stringifyNumber(value: number): string {
111
+ if (Number.isFinite(value)) return Object.is(value, -0) ? '-0' : JSON.stringify(value);
112
+ return String(value);
113
+ }
114
+
115
+ /**
116
+ * The %TypedArray%.prototype[Symbol.toStringTag] getter returns the
117
+ * element type name for a real typed array and undefined for anything else
118
+ * (spec §23.2.3.38). It reads an internal slot, so it holds across realms —
119
+ * unlike `instanceof`, which sent a DataView from a `vm` context into the
120
+ * typed-array branch, where it serialized as an empty, shared key — and it
121
+ * cannot be spoofed by an own `Symbol.toStringTag`.
122
+ */
123
+ const typedArrayTag = Object.getOwnPropertyDescriptor(
124
+ Object.getPrototypeOf(Uint8Array.prototype),
125
+ Symbol.toStringTag
126
+ )?.get;
127
+
128
+ function asTypedArray(
129
+ value: object
130
+ ): { name: string; view: ArrayLike<number | bigint> } | undefined {
131
+ const name: unknown = typedArrayTag?.call(value);
132
+ if (typeof name !== 'string') return undefined;
133
+ // The getter returning a name proves `value` is a typed array, but TS
134
+ // cannot see through a getter call to narrow on it, and `instanceof`
135
+ // (which it can narrow on) is the realm-bound check this replaces.
136
+ return { name, view: value as ArrayLike<number | bigint> };
137
+ }
@@ -125,11 +125,7 @@ export class TagAwareCacheHandler implements CacheHandler {
125
125
  return { value: entry.value, stale };
126
126
  }
127
127
 
128
- async set(
129
- key: string,
130
- value: unknown,
131
- opts: { ttl: number; tags: string[]; generation?: number }
132
- ): Promise<void> {
128
+ async set(key: string, value: unknown, opts: { ttl: number; tags: string[] }): Promise<void> {
133
129
  const physicalTtl = Math.max(opts.ttl * 2 + 60, 120);
134
130
  const strategy = this.strategy;
135
131
 
@@ -14,32 +14,26 @@ import { fnv1aHash } from './fast-hash.ts';
14
14
  import { devDataCacheKey } from '../server/prebuilt/dev-store.ts';
15
15
  import { KeyDisciplineViolation, observeKeyDiscipline } from './key-discipline.ts';
16
16
 
17
- let defaultSingleflight = createSingleflight();
18
-
19
17
  /**
20
- * Per-key monotonic generation counter for CAS writes (TIM-1158).
21
- *
22
- * Unbounded, like the singleflight map — the key space is the same set of
23
- * cache keys the handler already tracks. Pruning was removed because it
24
- * desyncs from MemoryCacheHandler.generations: a pruned key restarts at 1
25
- * while the handler still holds the old higher generation, causing fresh
26
- * writes to be rejected as stale.
18
+ * The one flight keyspace for every cache() wrapper. A wrapper with its own
19
+ * `timeoutMs` passes it per call rather than getting a private instance:
20
+ * two wrappers that share an explicit key must coalesce, or an older,
21
+ * slower execution can overwrite a newer result — there is no write
22
+ * ordering in the CacheHandler contract to stop it (TIM-1447).
27
23
  */
28
- const writeGenerations = new Map<string, number>();
29
- function nextGeneration(key: string): number {
30
- const gen = (writeGenerations.get(key) ?? 0) + 1;
31
- writeGenerations.set(key, gen);
32
- return gen;
33
- }
24
+ const flights = createSingleflight();
25
+
26
+ /** Timeout for calls without a per-wrapper `timeoutMs`; set at boot. */
27
+ let defaultTimeoutMs: number | undefined;
34
28
 
35
29
  /**
36
- * Set the timeout for the module-level default singleflight.
30
+ * Set the timeout for cache calls without a per-call timeoutMs.
37
31
  * Called at framework boot with renderTimeoutMs from timber.config.ts so that
38
32
  * cache calls without a per-call timeoutMs still get deadlock protection.
39
33
  * See design/06-caching.md §"Singleflight Timeout — Deadlock Risk".
40
34
  */
41
35
  export function setDefaultSingleflightTimeout(timeoutMs: number): void {
42
- defaultSingleflight = createSingleflight({ timeoutMs });
36
+ defaultTimeoutMs = timeoutMs;
43
37
  }
44
38
 
45
39
  /**
@@ -148,19 +142,15 @@ export function createCache<Fn extends (...args: any[]) => Promise<any>>(
148
142
  // rate limit and, unlike deriveFallbackFnId, never warns.
149
143
  const disciplineId = fnId ?? `key-fn:${fnv1aHash(fn.toString())}`;
150
144
 
151
- // Per-call timeoutMs gets a dedicated singleflight instance. Otherwise
152
- // resolve defaultSingleflight per invocation (not captured at creation
153
- // time) so wrappers created before boot pick up the timeout once
154
- // setDefaultSingleflightTimeout is called (TIM-1032, same rationale as
155
- // getCacheHandler for TIM-1029).
156
- const perCallSf =
157
- opts.timeoutMs !== undefined ? createSingleflight({ timeoutMs: opts.timeoutMs }) : undefined;
158
-
159
145
  // Cast to Fn to preserve the original function's generic call signature.
160
146
  // Without this, generic type parameters (e.g. <T> in apiFetch<T>) are
161
147
  // erased and callers lose type safety on the return type.
162
148
  return (async (...args: Parameters<Fn>): Promise<Awaited<ReturnType<Fn>>> => {
163
- const sf = perCallSf ?? defaultSingleflight;
149
+ // Resolve the default per invocation (not captured at creation time)
150
+ // so wrappers created before boot pick up the timeout once
151
+ // setDefaultSingleflightTimeout is called (TIM-1032, same rationale as
152
+ // getCacheHandler for TIM-1029).
153
+ const timeoutMs = opts.timeoutMs ?? defaultTimeoutMs;
164
154
  const key = opts.key ? opts.key(...args) : defaultKeyGenerator(fnId as string, args);
165
155
 
166
156
  // The key the handler sees: in dev, scoped to the source generation.
@@ -187,6 +177,9 @@ export function createCache<Fn extends (...args: any[]) => Promise<any>>(
187
177
  // NUL separator: cannot collide with user-provided key strings. The
188
178
  // store key, not the logical key: in dev it carries the source
189
179
  // generation, so a caller after a save never joins a pre-save flight.
180
+ // One flight keyspace for the SWR refetch and the miss: a caller that
181
+ // misses while a refetch is running joins it rather than racing a
182
+ // second execution whose write could land under the first (TIM-1447).
190
183
  const tags = resolveTags(opts, args);
191
184
  const flightKey = `${storeKey}\u0000${lastInvalidationEpochFor(key, tags)}`;
192
185
 
@@ -196,13 +189,16 @@ export function createCache<Fn extends (...args: any[]) => Promise<any>>(
196
189
  * - the key/tags were invalidated after fn started (TIM-1028), or
197
190
  * - the singleflight timed out (signal aborted) — the timed-out
198
191
  * flight's write could overwrite a newer value from a subsequent
199
- * flight (TIM-1092), or
200
- * - the handler rejects the write because a newer generation has
201
- * already been stored (TIM-1158 CAS guard).
192
+ * flight (TIM-1092).
193
+ * Those two guards plus the shared flight keyspace leave no second
194
+ * in-process execution for the key to race, as long as every wrapper
195
+ * using the key agrees on its tags (design/06 §Residual write races). A set issued just before
196
+ * a timeout can still land after the next flight's set; that, and
197
+ * writes from other processes, are last-write-wins and self-heal on
198
+ * the next miss (design/06 §Residual write races).
202
199
  */
203
200
  const executeAndStore = async (signal: AbortSignal): Promise<Awaited<ReturnType<Fn>>> => {
204
201
  const startEpoch = currentInvalidationEpoch();
205
- const generation = nextGeneration(key);
206
202
  // Observed on every execution — the miss path and the SWR refetch,
207
203
  // which runs in the triggering request's context. Never on a hit:
208
204
  // a hit runs no fn, so it reads nothing.
@@ -216,13 +212,10 @@ export function createCache<Fn extends (...args: any[]) => Promise<any>>(
216
212
  // Strict key discipline rejected this fn, so any entry already
217
213
  // under the key was computed by the same request-reading fn (stored
218
214
  // before strict mode was on). Drop it rather than serve it to
219
- // everyone as stale — but only under the same guards as a write: a
220
- // timed-out or superseded flight must not delete a newer result.
221
- if (
222
- err instanceof KeyDisciplineViolation &&
223
- !signal.aborted &&
224
- writeGenerations.get(key) === generation
225
- ) {
215
+ // everyone as stale — unless the flight timed out: a newer flight
216
+ // may already have replaced the entry. (A delete is never wrong,
217
+ // only a miss; this just avoids a needless one.)
218
+ if (err instanceof KeyDisciplineViolation && !signal.aborted) {
226
219
  await getHandler()
227
220
  .invalidate({ key: storeKey })
228
221
  .catch((e: unknown) => swallow(e, `cache invalidate failed for key "${key}"`));
@@ -231,7 +224,7 @@ export function createCache<Fn extends (...args: any[]) => Promise<any>>(
231
224
  }
232
225
  if (!signal.aborted && !wasInvalidatedSince(startEpoch, key, tags)) {
233
226
  try {
234
- await getHandler().set(storeKey, result, { ttl: opts.ttl, tags, generation });
227
+ await getHandler().set(storeKey, result, { ttl: opts.ttl, tags });
235
228
  } catch (err) {
236
229
  // Cache-write failure must not fail the request (TIM-1046).
237
230
  // JSON-serializing handlers (Redis, KV) throw on BigInt; network
@@ -250,20 +243,30 @@ export function createCache<Fn extends (...args: any[]) => Promise<any>>(
250
243
  duration_ms: Math.round(performance.now() - cacheStart),
251
244
  stale: true,
252
245
  });
253
- // Serve stale immediately, trigger background refetch
254
- const refetch = sf
255
- .do(`swr:${flightKey}`, async (signal) => {
256
- try {
257
- await executeAndStore(signal);
258
- } catch (err) {
259
- // Failed refetch — stale entry continues to be served (unless
260
- // executeAndStore dropped it for a key-discipline violation).
261
- logSwrRefetchFailed({ cacheKey: key, error: err });
246
+ // Serve stale immediately, trigger background refetch. The flight
247
+ // settles with fn's own outcome, so a miss that joins it gets the
248
+ // value or the error; only this background handle swallows it.
249
+ const refetch = flights
250
+ .do(
251
+ flightKey,
252
+ (signal) =>
253
+ executeAndStore(signal).catch((err: unknown) => {
254
+ // Failed refetch — stale entry continues to be served (unless
255
+ // executeAndStore dropped it for a key-discipline violation).
256
+ // Logged inside the flight so a rejection that arrives after
257
+ // the singleflight timeout is still reported.
258
+ logSwrRefetchFailed({ cacheKey: key, error: err });
259
+ throw err;
260
+ }),
261
+ timeoutMs
262
+ )
263
+ .then(
264
+ () => {},
265
+ () => {
266
+ // Logged above; the timeout rejection itself stays silent, as
267
+ // the stale entry continues to be served.
262
268
  }
263
- })
264
- .catch(() => {
265
- // Singleflight promise rejection handled — stale continues.
266
- });
269
+ );
267
270
  // Platforms that cancel work when the handler returns (Cloudflare
268
271
  // Workers, Lambda) would otherwise kill the refetch mid-flight —
269
272
  // stale data re-served forever. Register the (never-rejecting)
@@ -277,7 +280,7 @@ export function createCache<Fn extends (...args: any[]) => Promise<any>>(
277
280
  // Cache miss (or stale without SWR) — execute with singleflight.
278
281
  // The handler.set lives inside the coalesced callback, so N concurrent
279
282
  // misses produce exactly one write (TIM-1028).
280
- const result = await sf.do(flightKey, executeAndStore);
283
+ const result = await flights.do(flightKey, executeAndStore, timeoutMs);
281
284
 
282
285
  // Record cache miss as OTEL span event (fire-and-forget).
283
286
  addSpanEventSync('timber.cache.miss', {
@@ -33,6 +33,15 @@ export interface PluginWithApi {
33
33
  api?: unknown;
34
34
  }
35
35
 
36
+ /**
37
+ * Whether a resolved Vite plugin list includes timber. Vite resolves a
38
+ * missing config file to an empty one rather than failing, so a caller that
39
+ * needs timber must ask — `timber dev` would otherwise serve plain Vite.
40
+ */
41
+ export function hasTimberPlugin(plugins: readonly { name: string }[]): boolean {
42
+ return plugins.some((plugin) => plugin.name === TIMBER_ROOT_SYNC_PLUGIN);
43
+ }
44
+
36
45
  /**
37
46
  * Vite's own `resolveConfig`, narrowed to what this module passes and reads.
38
47
  *
package/src/cli.ts CHANGED
@@ -177,6 +177,22 @@ export async function runDev(options: CommandOptions, _deps?: ViteDeps): Promise
177
177
  const server = await createServer({
178
178
  configFile: options.config,
179
179
  });
180
+ // The supervisor respawns this worker whenever a config file changes,
181
+ // including when a git checkout removes it. Vite treats a missing config
182
+ // as an empty one, so without this check the respawned worker would serve
183
+ // plain Vite on its default port: no app, and full-page reloads for every
184
+ // .html file it sees, the build output included.
185
+ const { hasTimberPlugin } = await import('./cli-context.ts');
186
+ if (!hasTimberPlugin(server.config.plugins)) {
187
+ await server.close();
188
+ const where = server.config.configFile ?? `no Vite config found in ${server.config.root}`;
189
+ throw new Error(
190
+ `[timber] The Vite config does not use the timber plugin (${where}).\n\n` +
191
+ ` \`timber dev\` stopped instead of starting plain Vite. This happens when a\n` +
192
+ ` config file changes on disk, for example a git checkout to a branch\n` +
193
+ ` without timber. Run \`timber dev\` again once vite.config.ts lists timber().`
194
+ );
195
+ }
180
196
  await server.listen();
181
197
  server.printUrls();
182
198
  return;
package/src/index.ts CHANGED
@@ -36,6 +36,7 @@ import { timberEncryptionRuntime } from './plugins/encryption-runtime.ts';
36
36
  import { timberCacheTransform } from './plugins/cache.ts';
37
37
  import { timberRequestDep } from './plugins/request-dep/index.ts';
38
38
  import { timberOptimizePackageImports } from './plugins/optimize-package-imports.ts';
39
+ import { timberClientInServerPackageDeps } from './plugins/client-in-server-package-deps.ts';
39
40
  import { timberPrebuilt } from './plugins/prebuilt.ts';
40
41
  import { timberPrerenderSugar } from './plugins/prerender-sugar.ts';
41
42
  import { timberCloudflareWasm } from './plugins/cloudflare-wasm.ts';
@@ -579,6 +580,7 @@ export function timber(config?: TimberUserConfig): PluginOption[] {
579
580
  fonts,
580
581
  timberMdx(ctx),
581
582
  timberOptimizePackageImports(ctx), // Listed barrels → the modules that define the imported names
583
+ timberClientInServerPackageDeps(), // Dev: a package's inner 'use client' file → its bare path, so the browser pre-bundles it
582
584
  timberRequestDep(ctx),
583
585
  timberCacheTransform(ctx),
584
586
  timberPrerenderSugar(ctx), // export const prerender → cache.component() desugaring