@farm.js/plugin 0.1.0-beta.98 → 0.1.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.
Files changed (39) hide show
  1. package/README.md +2 -2
  2. package/dist/api/index.d.ts +2 -0
  3. package/dist/api/index.d.ts.map +1 -1
  4. package/dist/api/index.js +43 -31
  5. package/dist/index.d.ts +1 -1
  6. package/dist/index.d.ts.map +1 -1
  7. package/dist/index.js +1 -1
  8. package/dist/middleware/index.d.ts +2 -3
  9. package/dist/middleware/index.d.ts.map +1 -1
  10. package/dist/middleware/index.js +44 -10
  11. package/dist/middleware/matching.d.ts +8 -3
  12. package/dist/middleware/matching.d.ts.map +1 -1
  13. package/dist/middleware/matching.js +15 -7
  14. package/dist/observability/index.d.ts.map +1 -1
  15. package/dist/observability/index.js +7 -2
  16. package/dist/rsc/entries/client.d.ts.map +1 -1
  17. package/dist/rsc/entries/client.js +37 -2
  18. package/dist/rsc/entries/rsc.d.ts.map +1 -1
  19. package/dist/rsc/entries/rsc.js +77 -22
  20. package/dist/rsc/index.d.ts +2 -0
  21. package/dist/rsc/index.d.ts.map +1 -1
  22. package/dist/rsc/index.js +163 -30
  23. package/dist/rsc/middleware-config-module.d.ts +19 -0
  24. package/dist/rsc/middleware-config-module.d.ts.map +1 -0
  25. package/dist/rsc/middleware-config-module.js +355 -0
  26. package/dist/rsc/nitro-build.d.ts +2 -0
  27. package/dist/rsc/nitro-build.d.ts.map +1 -1
  28. package/dist/rsc/nitro-build.js +64 -39
  29. package/dist/rsc/server-fn-transform.d.ts.map +1 -1
  30. package/dist/rsc/server-fn-transform.js +177 -0
  31. package/dist/rsc/test-fixture-dependencies.d.ts +2 -0
  32. package/dist/rsc/test-fixture-dependencies.d.ts.map +1 -0
  33. package/dist/rsc/test-fixture-dependencies.js +23 -0
  34. package/dist/rsc/types.d.ts +20 -0
  35. package/dist/rsc/types.d.ts.map +1 -1
  36. package/dist/rsc/vite-plugin-nitro.d.ts +20 -7
  37. package/dist/rsc/vite-plugin-nitro.d.ts.map +1 -1
  38. package/dist/rsc/vite-plugin-nitro.js +51 -66
  39. package/package.json +5 -4
package/README.md CHANGED
@@ -2,10 +2,10 @@
2
2
 
3
3
  Official plugins for Farm.js framework
4
4
 
5
- Farm.js is currently in beta.
5
+ See [Stability and Support](https://farmjs.dev/docs/stability) for what this package guarantees.
6
6
 
7
7
  ```bash
8
- npm install @farm.js/plugin@beta
8
+ npm install @farm.js/plugin
9
9
  ```
10
10
 
11
11
  See the [Farm.js repository](https://github.com/farming-labs/farm.js) for documentation, examples, and support.
@@ -27,6 +27,8 @@ export interface FarmApiOptions {
27
27
  srcDir?: string;
28
28
  /** Enable debug logging */
29
29
  debug?: boolean;
30
+ /** Maximum request body size, for example `"10mb"`. */
31
+ bodySizeLimit?: number | string;
30
32
  }
31
33
  export interface ApiRoute {
32
34
  path: string;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAC;AAMlD,MAAM,WAAW,cAAc;IAC7B,kEAAkE;IAClE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,cAAmB,GAAG,MAAM,CA8gBpE;AAED,OAAO,EAAE,OAAO,EAAE,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAC;AAiBlD,MAAM,WAAW,cAAc;IAC7B,kEAAkE;IAClE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,uDAAuD;IACvD,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,cAAmB,GAAG,MAAM,CA6hBpE;AAED,OAAO,EAAE,OAAO,EAAE,CAAC"}
package/dist/api/index.js CHANGED
@@ -22,8 +22,8 @@
22
22
  * ```
23
23
  */
24
24
  import { _withAfterNodeMiddleware } from "@farm.js/core/after";
25
- import { _runWithAPIRequestRuntime } from "@farm.js/core/internal/production-runtime";
26
- import { invokeAPIRouteEndpoint } from "@farm.js/core/api/runtime";
25
+ import { _runWithAPIRequestRuntime, createFarmRequestBodyErrorResponse, readNodeRequestBody, resolveFarmServerConfig, } from "@farm.js/core/internal/production-runtime";
26
+ import { API_ROUTE_METHODS, getAllowedAPIRouteMethods, invokeAPIRouteEndpoint, matchAPIRouteAtBasePath, resolveAPIRouteEndpoint, } from "@farm.js/core/api/runtime";
27
27
  import { sendWebResponse } from "@farm.js/core/server";
28
28
  /**
29
29
  * Farm.js API Routes Plugin
@@ -31,6 +31,9 @@ import { sendWebResponse } from "@farm.js/core/server";
31
31
  export default function farmApi(options = {}) {
32
32
  const srcDir = options.srcDir ?? "src";
33
33
  const debug = options.debug ?? false;
34
+ const bodySizeLimit = resolveFarmServerConfig({
35
+ bodySizeLimit: options.bodySizeLimit,
36
+ }).bodySizeLimit;
34
37
  // API routes cache
35
38
  let apiRoutesCache = new Map();
36
39
  let apiRouterHandler = null;
@@ -85,23 +88,30 @@ export default function farmApi(options = {}) {
85
88
  const url = new URL(request.url);
86
89
  const method = request.method;
87
90
  const pathname = url.pathname;
88
- // Find matching route
89
- const route = apiRoutesCache.get(pathname);
90
- if (!route) {
91
+ // Match through core's matcher, the same one the production entry
92
+ // uses, so dynamic segments resolve here too. An exact Map lookup
93
+ // registers `src/api/users/[id]/route.ts` under the literal
94
+ // "/api/users/[id]" and 404s every real request for it.
95
+ const match = matchAPIRouteAtBasePath(apiRoutesCache, pathname);
96
+ if (!match) {
91
97
  return new Response(JSON.stringify({ error: "Not Found" }), {
92
98
  status: 404,
93
99
  headers: { "Content-Type": "application/json" },
94
100
  });
95
101
  }
96
- const endpoint = route.endpoints[method];
102
+ const route = match.route;
103
+ const endpoint = resolveAPIRouteEndpoint(route, method);
97
104
  if (!endpoint) {
98
105
  return new Response(JSON.stringify({ error: "Method Not Allowed" }), {
99
106
  status: 405,
100
- headers: { "Content-Type": "application/json" },
107
+ headers: {
108
+ Allow: getAllowedAPIRouteMethods(route).join(", "),
109
+ "Content-Type": "application/json",
110
+ },
101
111
  });
102
112
  }
103
113
  try {
104
- return await invokeAPIRouteEndpoint(endpoint, request);
114
+ return await invokeAPIRouteEndpoint(endpoint, request, match.params);
105
115
  }
106
116
  catch (error) {
107
117
  return new Response(JSON.stringify({ error: error.message || "Internal Server Error" }), {
@@ -118,19 +128,22 @@ export default function farmApi(options = {}) {
118
128
  return async (request) => {
119
129
  const url = new URL(request.url);
120
130
  const method = request.method;
121
- // Find matching route
122
- const route = apiRoutesCache.get(url.pathname);
123
- if (!route) {
131
+ // Same core matcher as above so dynamic segments resolve here too.
132
+ const match = matchAPIRouteAtBasePath(apiRoutesCache, url.pathname);
133
+ if (!match) {
124
134
  return new Response(JSON.stringify({ error: "Not Found" }), {
125
135
  status: 404,
126
136
  headers: { "Content-Type": "application/json" },
127
137
  });
128
138
  }
129
- const endpoint = route.endpoints[method];
139
+ const endpoint = resolveAPIRouteEndpoint(match.route, method);
130
140
  if (!endpoint) {
131
141
  return new Response(JSON.stringify({ error: "Method Not Allowed" }), {
132
142
  status: 405,
133
- headers: { "Content-Type": "application/json" },
143
+ headers: {
144
+ Allow: getAllowedAPIRouteMethods(match.route).join(", "),
145
+ "Content-Type": "application/json",
146
+ },
134
147
  });
135
148
  }
136
149
  try {
@@ -191,10 +204,9 @@ export default function farmApi(options = {}) {
191
204
  const relativePath = path.relative(apiDir, path.dirname(filePath));
192
205
  const routePath = "/api/" + (relativePath === "." ? "" : relativePath.replace(/\\/g, "/"));
193
206
  const routeModule = await server.ssrLoadModule(filePath);
194
- const methods = ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"];
195
207
  const endpoints = {};
196
208
  const availableMethods = [];
197
- for (const method of methods) {
209
+ for (const method of API_ROUTE_METHODS) {
198
210
  if (routeModule[method]) {
199
211
  availableMethods.push(method);
200
212
  endpoints[method] = routeModule[method];
@@ -311,8 +323,11 @@ export default function farmApi(options = {}) {
311
323
  return;
312
324
  }
313
325
  }
314
- // Convert Node request to Web Request
315
- const fullUrl = `http://${req.headers.host || "localhost:3000"}${url}`;
326
+ // Convert Node request to Web Request. ctx.rewrite() updates
327
+ // req.url, so dispatch from the current value, not the one
328
+ // captured before middleware ran.
329
+ const currentUrl = req.url || url;
330
+ const fullUrl = `http://${req.headers.host || "localhost:3000"}${currentUrl}`;
316
331
  const headers = new Headers();
317
332
  for (const [key, value] of Object.entries(req.headers)) {
318
333
  if (value) {
@@ -322,20 +337,14 @@ export default function farmApi(options = {}) {
322
337
  // Get body for non-GET requests
323
338
  let body;
324
339
  if (method !== "GET" && method !== "HEAD") {
325
- body = await new Promise((resolve) => {
326
- let data = "";
327
- req.on("data", (chunk) => {
328
- data += chunk;
329
- });
330
- req.on("end", () => {
331
- resolve(data);
332
- });
333
- });
340
+ body = await readNodeRequestBody(req, bodySizeLimit);
334
341
  }
335
342
  const request = new Request(fullUrl, {
336
343
  method,
337
344
  headers,
338
- body: body || undefined,
345
+ body: body
346
+ ? body.buffer.slice(body.byteOffset, body.byteOffset + body.byteLength)
347
+ : undefined,
339
348
  });
340
349
  const response = await apiRouterHandler(request);
341
350
  const duration = Date.now() - startTime;
@@ -343,6 +352,11 @@ export default function farmApi(options = {}) {
343
352
  await sendWebResponse(res, response);
344
353
  }
345
354
  catch (error) {
355
+ const bodyErrorResponse = createFarmRequestBodyErrorResponse(error);
356
+ if (bodyErrorResponse) {
357
+ await sendWebResponse(res, bodyErrorResponse);
358
+ return;
359
+ }
346
360
  const duration = Date.now() - startTime;
347
361
  logResponse(method, pathname, 500, duration);
348
362
  console.error("[FARM] API error:", error);
@@ -428,10 +442,9 @@ export default function farmApi(options = {}) {
428
442
  try {
429
443
  // Reload the module
430
444
  const routeModule = await server.ssrLoadModule(file);
431
- const methods = ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"];
432
445
  const endpoints = {};
433
446
  const availableMethods = [];
434
- for (const method of methods) {
447
+ for (const method of API_ROUTE_METHODS) {
435
448
  if (routeModule[method]) {
436
449
  availableMethods.push(method);
437
450
  endpoints[method] = routeModule[method];
@@ -462,10 +475,9 @@ export default function farmApi(options = {}) {
462
475
  const relativePath = path.relative(apiDir, path.dirname(file));
463
476
  const routePath = "/api/" + (relativePath === "." ? "" : relativePath.replace(/\\/g, "/"));
464
477
  const routeModule = await server.ssrLoadModule(file);
465
- const methods = ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"];
466
478
  const endpoints = {};
467
479
  const availableMethods = [];
468
- for (const method of methods) {
480
+ for (const method of API_ROUTE_METHODS) {
469
481
  if (routeModule[method]) {
470
482
  availableMethods.push(method);
471
483
  endpoints[method] = routeModule[method];
package/dist/index.d.ts CHANGED
@@ -39,5 +39,5 @@
39
39
  * })
40
40
  * ```
41
41
  */
42
- export declare const version = "0.1.0-beta.98";
42
+ export declare const version = "0.1.0";
43
43
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AAEH,eAAO,MAAM,OAAO,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AAEH,eAAO,MAAM,OAAO,UAAU,CAAC"}
package/dist/index.js CHANGED
@@ -39,7 +39,7 @@
39
39
  * })
40
40
  * ```
41
41
  */
42
- export const version = "0.1.0-beta.98";
42
+ export const version = "0.1.0";
43
43
  // Note: Import plugins from their respective subpaths:
44
44
  // - @farm.js/plugin/rsc
45
45
  // - @farm.js/plugin/middleware
@@ -15,6 +15,7 @@
15
15
  */
16
16
  import type { Plugin, ViteDevServer } from "vite";
17
17
  import type { IncomingMessage, ServerResponse } from "http";
18
+ import type { MiddlewareConfig } from "@farm.js/core/middleware";
18
19
  export interface FarmMiddlewareOptions {
19
20
  /** Source directory containing middleware files (default: 'src') */
20
21
  srcDir?: string;
@@ -85,9 +86,7 @@ export interface DiscoveredMiddleware {
85
86
  };
86
87
  setBasePath?: (path: string) => void;
87
88
  };
88
- config?: {
89
- matcher?: string[];
90
- };
89
+ config?: MiddlewareConfig;
91
90
  }
92
91
  /**
93
92
  * Farm.js Middleware Plugin
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"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"}
@@ -16,6 +16,7 @@
16
16
  import { createRequire } from "node:module";
17
17
  import { _withAfterNodeMiddleware } from "@farm.js/core/after";
18
18
  import { devServableFileExists } from "../dev-static.js";
19
+ import { matchesMiddlewareConfig } from "@farm.js/core/middleware";
19
20
  import { middlewareMatchesPath, parseCookies, serializeCookie } from "./matching.js";
20
21
  // Create require for ESM compatibility
21
22
  const require_ = createRequire(import.meta.url);
@@ -83,6 +84,21 @@ function createContext(req, res, viteServer) {
83
84
  const data = new Map();
84
85
  const cookies = createCookieJar(req, res);
85
86
  let handled = false;
87
+ // Mirror @farm.js/core's createContext: a header set on ctx.headers in the
88
+ // same handler that then short-circuits via a helper must still reach the
89
+ // response. The runner's tail flush is unreachable once a helper sets
90
+ // _handled, so each helper applies ctx.headers to res before its writeHead.
91
+ const applyResponseHeaders = () => {
92
+ for (const [key, value] of headers) {
93
+ try {
94
+ res.setHeader(key, value);
95
+ }
96
+ catch {
97
+ // An invalid optional header must not prevent the response itself
98
+ // from completing.
99
+ }
100
+ }
101
+ };
86
102
  const ctx = {
87
103
  request: req,
88
104
  response: res,
@@ -109,6 +125,7 @@ function createContext(req, res, viteServer) {
109
125
  ctx._redirectUrl = redirectUrl;
110
126
  ctx._handled = true;
111
127
  handled = true;
128
+ applyResponseHeaders();
112
129
  res.writeHead(status, {
113
130
  Location: redirectUrl,
114
131
  "Content-Type": "text/plain",
@@ -132,6 +149,7 @@ function createContext(req, res, viteServer) {
132
149
  }
133
150
  ctx._handled = true;
134
151
  handled = true;
152
+ applyResponseHeaders();
135
153
  res.writeHead(status, {
136
154
  "Content-Type": "application/json",
137
155
  });
@@ -144,6 +162,7 @@ function createContext(req, res, viteServer) {
144
162
  }
145
163
  ctx._handled = true;
146
164
  handled = true;
165
+ applyResponseHeaders();
147
166
  res.writeHead(status, {
148
167
  "Content-Type": "text/plain",
149
168
  });
@@ -156,6 +175,7 @@ function createContext(req, res, viteServer) {
156
175
  }
157
176
  ctx._handled = true;
158
177
  handled = true;
178
+ applyResponseHeaders();
159
179
  res.writeHead(status, {
160
180
  "Content-Type": "text/html",
161
181
  });
@@ -247,9 +267,22 @@ export default function farmMiddleware(options = {}) {
247
267
  if (discoveryPromise && !discoveryComplete) {
248
268
  await discoveryPromise;
249
269
  }
250
- // Find applicable middleware (cascading from root to specific)
270
+ // Create the context first: a function matcher in `export const
271
+ // config` receives it, so it has to exist before the filter runs.
272
+ const ctx = createContext(req, res, server);
273
+ // Use shared data if provided
274
+ if (sharedData) {
275
+ for (const [key, value] of sharedData) {
276
+ ctx.data.set(key, value);
277
+ }
278
+ }
279
+ // Find applicable middleware (cascading from root to specific). The
280
+ // directory path decides the subtree; `export const config` then
281
+ // narrows it, using core's own matcher so a matcher/exclude behaves
282
+ // here exactly as it does in the production runner.
251
283
  const applicable = Array.from(middlewareCache.values())
252
- .filter((mw) => middlewareMatchesPath(pathname, mw.path))
284
+ .filter((mw) => middlewareMatchesPath(pathname, mw.path) &&
285
+ (!mw.config || matchesMiddlewareConfig(pathname, mw.config, ctx).matched))
253
286
  .sort((a, b) => a.path.split("/").length - b.path.split("/").length);
254
287
  if (applicable.length === 0)
255
288
  return false;
@@ -266,14 +299,6 @@ export default function farmMiddleware(options = {}) {
266
299
  pc.dim(` (${applicable.length} middleware)`),
267
300
  ].join(" ");
268
301
  console.log(logMsg);
269
- // Create full middleware context
270
- const ctx = createContext(req, res, server);
271
- // Use shared data if provided
272
- if (sharedData) {
273
- for (const [key, value] of sharedData) {
274
- ctx.data.set(key, value);
275
- }
276
- }
277
302
  for (const mw of applicable) {
278
303
  const middleware = mw.module;
279
304
  // Handle middleware chain object (has .build method)
@@ -347,6 +372,12 @@ export default function farmMiddleware(options = {}) {
347
372
  devServableFileExists(pathname, [server.config.publicDir, server.config.root]))) {
348
373
  return next();
349
374
  }
375
+ // @farm.js/plugin/api runs middleware itself for the requests it
376
+ // serves, because it may be registered ahead of this hook. Running
377
+ // it here as well executed every middleware twice per API request.
378
+ if (server.__farmApi__ && pathname.startsWith("/api/")) {
379
+ return next();
380
+ }
350
381
  try {
351
382
  // Execute middleware
352
383
  const middlewareData = new Map();
@@ -356,7 +387,10 @@ export default function farmMiddleware(options = {}) {
356
387
  }
357
388
  }
358
389
  catch (e) {
390
+ // Fail the request, as core's dev server does. Carrying on would
391
+ // render the page a throwing auth check was meant to protect.
359
392
  console.error("[FARM] Middleware error:", e);
393
+ return next(e);
360
394
  }
361
395
  next();
362
396
  }));
@@ -5,9 +5,8 @@ import type { CookieOptions } from "./index.js";
5
5
  * A single request cookie whose value is not valid UTF-8 percent-encoding
6
6
  * (a latin-1 value from an old link, a crawler, or a bare `%`) must not take
7
7
  * the whole map down: an unguarded `decodeURIComponent` throws `URIError`,
8
- * which — because the middleware runner swallows the throw and calls `next()` —
9
- * would silently skip every middleware for that request (a dev-time auth
10
- * bypass). Decoding falls back to the raw value per entry instead.
8
+ * which fails the request before any middleware runs. Decoding falls back to
9
+ * the raw value per entry instead.
11
10
  */
12
11
  export declare function parseCookies(cookieHeader?: string): Record<string, string>;
13
12
  /**
@@ -16,6 +15,12 @@ export declare function parseCookies(cookieHeader?: string): Record<string, stri
16
15
  * Matching is by path segment, not raw string prefix: middleware at `/admin`
17
16
  * covers `/admin` and everything under `/admin/`, but not sibling routes like
18
17
  * `/administrator` or `/admin-public` that merely share a textual prefix.
18
+ *
19
+ * The request is compared as the router sees it: each segment decoded once and
20
+ * empty segments dropped. Comparing the raw pathname let `/api/%61dmin/users`,
21
+ * `/api//admin/users` and `//api/admin/users` skip middleware at `/api/admin`
22
+ * while the API router, which decodes segments and ignores empty ones, still
23
+ * served `/api/admin/users`.
19
24
  */
20
25
  export declare function middlewareMatchesPath(pathname: string, middlewarePath: string): boolean;
21
26
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"matching.d.ts","sourceRoot":"","sources":["../../src/middleware/matching.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAc1E;AAUD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAIvF;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,MAAM,CAkChG"}
1
+ {"version":3,"file":"matching.d.ts","sourceRoot":"","sources":["../../src/middleware/matching.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAc1E;AAUD;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAMvF;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,aAAkB,GAAG,MAAM,CAkChG"}
@@ -1,12 +1,12 @@
1
+ import { canonicalizeRequestPathSegments } from "@farm.js/core/middleware";
1
2
  /**
2
3
  * Parse cookies from a Cookie header.
3
4
  *
4
5
  * A single request cookie whose value is not valid UTF-8 percent-encoding
5
6
  * (a latin-1 value from an old link, a crawler, or a bare `%`) must not take
6
7
  * the whole map down: an unguarded `decodeURIComponent` throws `URIError`,
7
- * which — because the middleware runner swallows the throw and calls `next()` —
8
- * would silently skip every middleware for that request (a dev-time auth
9
- * bypass). Decoding falls back to the raw value per entry instead.
8
+ * which fails the request before any middleware runs. Decoding falls back to
9
+ * the raw value per entry instead.
10
10
  */
11
11
  export function parseCookies(cookieHeader) {
12
12
  if (!cookieHeader)
@@ -34,13 +34,21 @@ function decodeCookieValue(value) {
34
34
  * Matching is by path segment, not raw string prefix: middleware at `/admin`
35
35
  * covers `/admin` and everything under `/admin/`, but not sibling routes like
36
36
  * `/administrator` or `/admin-public` that merely share a textual prefix.
37
+ *
38
+ * The request is compared as the router sees it: each segment decoded once and
39
+ * empty segments dropped. Comparing the raw pathname let `/api/%61dmin/users`,
40
+ * `/api//admin/users` and `//api/admin/users` skip middleware at `/api/admin`
41
+ * while the API router, which decodes segments and ignores empty ones, still
42
+ * served `/api/admin/users`.
37
43
  */
38
44
  export function middlewareMatchesPath(pathname, middlewarePath) {
39
- if (middlewarePath === "/")
40
- return true;
41
- if (pathname === middlewarePath)
45
+ const middlewareSegments = middlewarePath.split("/").filter(Boolean);
46
+ if (middlewareSegments.length === 0)
42
47
  return true;
43
- return pathname.startsWith(`${middlewarePath}/`);
48
+ const requestSegments = canonicalizeRequestPathSegments(pathname);
49
+ if (requestSegments.length < middlewareSegments.length)
50
+ return false;
51
+ return middlewareSegments.every((segment, index) => requestSegments[index] === segment);
44
52
  }
45
53
  /**
46
54
  * Serialize a cookie.
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/observability/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/observability/index.ts"],"names":[],"mappings":"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"}
@@ -301,7 +301,10 @@ export function observabilityPlugin(options = {}) {
301
301
  console.log("[obs] ready");
302
302
  },
303
303
  beforeRequest(req) {
304
- const pathname = req.url || "/";
304
+ // `req.url` carries the query string, and a pathname feeds incident
305
+ // titles and dedupe fingerprints: a reset `?token=` would reach every
306
+ // pipeline action, and each distinct query would open a new incident.
307
+ const pathname = (req.url || "/").split("?", 1)[0] || "/";
305
308
  const method = req.method || "GET";
306
309
  const requestId = `req_${now()}_${(signalCounter++).toString(36)}`;
307
310
  requestStarts.set(req, {
@@ -342,8 +345,10 @@ export function observabilityPlugin(options = {}) {
342
345
  if (!annotateHtml)
343
346
  return html;
344
347
  const marker = `<!-- observability:path=${render.pathname} route=${render.routePattern ?? "unmatched"} -->`;
348
+ // A replacer function: as a replacement string, $` and $' in the request
349
+ // path would expand into copies of the page's own HTML.
345
350
  return html.includes("</body>")
346
- ? html.replace("</body>", `${marker}\n</body>`)
351
+ ? html.replace("</body>", () => `${marker}\n</body>`)
347
352
  : `${html}\n${marker}`;
348
353
  },
349
354
  async onError(error) {
@@ -1 +1 @@
1
- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,eAAO,MAAM,mCAAmC,62BA6B9C,CAAC;AAEH;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAsR7D"}
1
+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,eAAO,MAAM,mCAAmC,62BA6B9C,CAAC;AAEH;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CAyT7D"}
@@ -78,8 +78,11 @@ import {
78
78
  actionSetup = `
79
79
  ${serverFnTransportErrorClientRuntime}
80
80
 
81
- // Ref for payload setter (used by server action callback and refetch)
81
+ // Refs for payload setter and router navigation. refetch() is defined inside
82
+ // main(), so the action callback reaches it through this ref rather than by
83
+ // closing over it.
82
84
  const setPayloadRef = { current: null };
85
+ const farmNavigateRef = { current: null };
83
86
 
84
87
  // Ensure __viteRscCallServer is a function before any other chunk may call it (avoids "is not a function")
85
88
  if (typeof globalThis.__viteRscCallServer !== 'function') {
@@ -130,6 +133,14 @@ setServerCallback(async (id, args) => {
130
133
  applyFarmCacheInvalidations(p.returnValue?.invalidations);
131
134
  }
132
135
  if (!p.returnValue || !p.returnValue.ok) {
136
+ // A redirect() from the action comes back as data, not as a 3xx, so the
137
+ // router performs the navigation here.
138
+ if (p.returnValue?.redirect?.url) {
139
+ debug('Server action redirected:', p.returnValue.redirect.url);
140
+ history.pushState(null, '', p.returnValue.redirect.url);
141
+ await farmNavigateRef.current?.(location.href);
142
+ return;
143
+ }
133
144
  debug('Server action failed:', id);
134
145
  throw createFarmServerFnTransportError(p.returnValue?.data);
135
146
  }
@@ -140,6 +151,7 @@ setServerCallback(async (id, args) => {
140
151
  else {
141
152
  actionSetup = `
142
153
  const setPayloadRef = { current: null };
154
+ const farmNavigateRef = { current: null };
143
155
  `;
144
156
  }
145
157
  return `${imports}
@@ -228,7 +240,16 @@ async function main() {
228
240
  if (a.hasAttribute('data-native') || a.hasAttribute('data-reload')) {
229
241
  return;
230
242
  }
231
-
243
+ if (e.metaKey || e.altKey || e.ctrlKey || e.shiftKey) return;
244
+ if (e.button !== 0) return;
245
+
246
+ // Same-document fragment link: let the browser update the hash and
247
+ // scroll to the anchor natively. Refetching the route here would
248
+ // discard the browser's fragment scroll and re-render for nothing.
249
+ if (a.hash && a.pathname === location.pathname && a.search === location.search) {
250
+ return;
251
+ }
252
+
232
253
  e.preventDefault();
233
254
  history.pushState(null, '', a.href);
234
255
  nav();
@@ -254,6 +275,7 @@ async function main() {
254
275
  }
255
276
 
256
277
  // Fetch new RSC payload for a URL
278
+ farmNavigateRef.current = (url) => refetch(url);
257
279
  async function refetch(url) {
258
280
  debug('Fetching RSC for:', url);
259
281
 
@@ -277,6 +299,19 @@ async function main() {
277
299
  return;
278
300
  }
279
301
 
302
+ // A server redirect during navigation is followed transparently by
303
+ // fetch, so the payload is for res.url while the address bar still shows
304
+ // the URL the click pushed. Reconcile it so refresh, share, and back all
305
+ // reflect the page actually rendered (auth gates redirect this way).
306
+ if (res.redirected && res.url) {
307
+ const dest = new URL(res.url);
308
+ if (dest.origin === location.origin) {
309
+ const target = dest.pathname + dest.search + dest.hash;
310
+ if (target !== location.pathname + location.search + location.hash) {
311
+ history.replaceState(null, '', target);
312
+ }
313
+ }
314
+ }
280
315
  const newPayload = await createFromReadableStream(res.body);
281
316
  setPayloadRef.current?.(newPayload);
282
317
  debug('RSC navigation complete');
@@ -1 +1 @@
1
- {"version":3,"file":"rsc.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/rsc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CA86B1D"}
1
+ {"version":3,"file":"rsc.d.ts","sourceRoot":"","sources":["../../../src/rsc/entries/rsc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,CA6+B1D"}