@fedify/solidstart 2.4.2 → 2.4.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.cjs CHANGED
@@ -1,5 +1,66 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
2
2
  let _solidjs_start_middleware = require("@solidjs/start/middleware");
3
+ //#region src/response.ts
4
+ const NOT_ACCEPTABLE_BODY = "Not Acceptable";
5
+ const representationHeaders = [
6
+ "content-length",
7
+ "content-encoding",
8
+ "content-range",
9
+ "content-digest",
10
+ "digest",
11
+ "etag",
12
+ "last-modified",
13
+ "content-language",
14
+ "content-location"
15
+ ];
16
+ function notAcceptableHeaders(original, eventHeaders) {
17
+ const headers = new Headers(original);
18
+ for (const name of representationHeaders) {
19
+ headers.delete(name);
20
+ eventHeaders.delete(name);
21
+ }
22
+ const vary = [headers.get("vary"), eventHeaders.get("vary")].filter((value) => value != null).join(", ");
23
+ headers.set("vary", vary.split(/,\s*/).some((v) => v === "*" || v.toLowerCase() === "accept") ? vary : [vary, "Accept"].filter(Boolean).join(", "));
24
+ headers.set("content-type", "text/plain");
25
+ return headers;
26
+ }
27
+ /** Restore buffered error responses that skip SolidStart's response hook. */
28
+ function interceptNotAcceptable(response, cleanup) {
29
+ if (typeof response?.end !== "function") return;
30
+ const originalEnd = response.end;
31
+ const descriptor = Object.getOwnPropertyDescriptor(response, "end");
32
+ let active = true;
33
+ const restore = () => {
34
+ if (!active) return;
35
+ active = false;
36
+ if (response.end === end) if (descriptor == null) delete response.end;
37
+ else Object.defineProperty(response, "end", descriptor);
38
+ response.removeListener("close", restore);
39
+ cleanup();
40
+ };
41
+ function end(...args) {
42
+ const convert = active && this.statusCode === 404 && !this.headersSent && !this.writableEnded;
43
+ restore();
44
+ if (!convert) return Reflect.apply(originalEnd, this, args);
45
+ this.statusCode = 406;
46
+ this.statusMessage = "Not Acceptable";
47
+ const headers = new Headers();
48
+ const vary = this.getHeader("vary");
49
+ if (vary != null) headers.set("vary", Array.isArray(vary) ? vary.join(", ") : String(vary));
50
+ const negotiated = notAcceptableHeaders(headers, new Headers());
51
+ for (const name of representationHeaders) this.removeHeader(name);
52
+ negotiated.forEach((value, name) => this.setHeader(name, value));
53
+ const callback = args.at(-1);
54
+ return Reflect.apply(originalEnd, this, [
55
+ NOT_ACCEPTABLE_BODY,
56
+ "utf8",
57
+ typeof callback === "function" ? callback : void 0
58
+ ]);
59
+ }
60
+ response.end = end;
61
+ response.once("close", restore);
62
+ }
63
+ //#endregion
3
64
  //#region src/handlers.ts
4
65
  const notAcceptableResponses = /* @__PURE__ */ new WeakMap();
5
66
  /**
@@ -18,8 +79,9 @@ function createOnRequestHandler(federation, createContextData) {
18
79
  const response = await federation.fetch(event.request, {
19
80
  contextData: await createContextData(event),
20
81
  onNotFound: () => new Response("Not Found", { status: 404 }),
21
- onNotAcceptable: () => new Response("Not Acceptable", {
82
+ onNotAcceptable: () => new Response(NOT_ACCEPTABLE_BODY, {
22
83
  status: 406,
84
+ statusText: "Not Acceptable",
23
85
  headers: {
24
86
  "Content-Type": "text/plain",
25
87
  Vary: "Accept"
@@ -29,6 +91,9 @@ function createOnRequestHandler(federation, createContextData) {
29
91
  if (response.status === 404) return;
30
92
  if (response.status === 406) {
31
93
  notAcceptableResponses.set(event.request, response);
94
+ interceptNotAcceptable(event.nativeEvent.node.res, () => {
95
+ notAcceptableResponses.delete(event.request);
96
+ });
32
97
  return;
33
98
  }
34
99
  return response;
@@ -37,15 +102,26 @@ function createOnRequestHandler(federation, createContextData) {
37
102
  /**
38
103
  * Handles the response before SolidStart sends it to the client.
39
104
  *
105
+ * If a 406 response was deferred for the request and SolidStart could not
106
+ * serve the route either (404), replaces the response payload with the
107
+ * deferred 406.
108
+ *
40
109
  * @param event The SolidStart {@link FetchEvent} for the current request.
41
- * @returns The stored 406 response if SolidStart could not handle the route.
110
+ * @param payload The response payload that SolidStart is about to send.
42
111
  */
43
- function onBeforeResponse(event) {
112
+ function onBeforeResponse(event, payload) {
44
113
  const stored = notAcceptableResponses.get(event.request);
45
- if (stored != null) {
46
- notAcceptableResponses.delete(event.request);
47
- if ((event.response.status ?? 200) === 404) return stored;
48
- }
114
+ if (stored == null || event.nativeEvent.handled) return;
115
+ const body = payload.body;
116
+ const error = body instanceof Error ? body : void 0;
117
+ if ((body instanceof Response ? body.status : body === void 0 && (event.response.status ?? 200) === 200 ? 404 : error?.statusCode ?? error?.status ?? event.response.status ?? 200) !== 404) return;
118
+ const headers = notAcceptableHeaders(body instanceof Response ? body.headers : new Headers(), event.response.headers);
119
+ if (body instanceof Response) body.body?.cancel().catch(() => {});
120
+ payload.body = new Response(stored.body, {
121
+ status: 406,
122
+ statusText: "Not Acceptable",
123
+ headers
124
+ });
49
125
  }
50
126
  //#endregion
51
127
  //#region src/index.ts
package/dist/index.js CHANGED
@@ -1,4 +1,65 @@
1
1
  import { createMiddleware } from "@solidjs/start/middleware";
2
+ //#region src/response.ts
3
+ const NOT_ACCEPTABLE_BODY = "Not Acceptable";
4
+ const representationHeaders = [
5
+ "content-length",
6
+ "content-encoding",
7
+ "content-range",
8
+ "content-digest",
9
+ "digest",
10
+ "etag",
11
+ "last-modified",
12
+ "content-language",
13
+ "content-location"
14
+ ];
15
+ function notAcceptableHeaders(original, eventHeaders) {
16
+ const headers = new Headers(original);
17
+ for (const name of representationHeaders) {
18
+ headers.delete(name);
19
+ eventHeaders.delete(name);
20
+ }
21
+ const vary = [headers.get("vary"), eventHeaders.get("vary")].filter((value) => value != null).join(", ");
22
+ headers.set("vary", vary.split(/,\s*/).some((v) => v === "*" || v.toLowerCase() === "accept") ? vary : [vary, "Accept"].filter(Boolean).join(", "));
23
+ headers.set("content-type", "text/plain");
24
+ return headers;
25
+ }
26
+ /** Restore buffered error responses that skip SolidStart's response hook. */
27
+ function interceptNotAcceptable(response, cleanup) {
28
+ if (typeof response?.end !== "function") return;
29
+ const originalEnd = response.end;
30
+ const descriptor = Object.getOwnPropertyDescriptor(response, "end");
31
+ let active = true;
32
+ const restore = () => {
33
+ if (!active) return;
34
+ active = false;
35
+ if (response.end === end) if (descriptor == null) delete response.end;
36
+ else Object.defineProperty(response, "end", descriptor);
37
+ response.removeListener("close", restore);
38
+ cleanup();
39
+ };
40
+ function end(...args) {
41
+ const convert = active && this.statusCode === 404 && !this.headersSent && !this.writableEnded;
42
+ restore();
43
+ if (!convert) return Reflect.apply(originalEnd, this, args);
44
+ this.statusCode = 406;
45
+ this.statusMessage = "Not Acceptable";
46
+ const headers = new Headers();
47
+ const vary = this.getHeader("vary");
48
+ if (vary != null) headers.set("vary", Array.isArray(vary) ? vary.join(", ") : String(vary));
49
+ const negotiated = notAcceptableHeaders(headers, new Headers());
50
+ for (const name of representationHeaders) this.removeHeader(name);
51
+ negotiated.forEach((value, name) => this.setHeader(name, value));
52
+ const callback = args.at(-1);
53
+ return Reflect.apply(originalEnd, this, [
54
+ NOT_ACCEPTABLE_BODY,
55
+ "utf8",
56
+ typeof callback === "function" ? callback : void 0
57
+ ]);
58
+ }
59
+ response.end = end;
60
+ response.once("close", restore);
61
+ }
62
+ //#endregion
2
63
  //#region src/handlers.ts
3
64
  const notAcceptableResponses = /* @__PURE__ */ new WeakMap();
4
65
  /**
@@ -17,8 +78,9 @@ function createOnRequestHandler(federation, createContextData) {
17
78
  const response = await federation.fetch(event.request, {
18
79
  contextData: await createContextData(event),
19
80
  onNotFound: () => new Response("Not Found", { status: 404 }),
20
- onNotAcceptable: () => new Response("Not Acceptable", {
81
+ onNotAcceptable: () => new Response(NOT_ACCEPTABLE_BODY, {
21
82
  status: 406,
83
+ statusText: "Not Acceptable",
22
84
  headers: {
23
85
  "Content-Type": "text/plain",
24
86
  Vary: "Accept"
@@ -28,6 +90,9 @@ function createOnRequestHandler(federation, createContextData) {
28
90
  if (response.status === 404) return;
29
91
  if (response.status === 406) {
30
92
  notAcceptableResponses.set(event.request, response);
93
+ interceptNotAcceptable(event.nativeEvent.node.res, () => {
94
+ notAcceptableResponses.delete(event.request);
95
+ });
31
96
  return;
32
97
  }
33
98
  return response;
@@ -36,15 +101,26 @@ function createOnRequestHandler(federation, createContextData) {
36
101
  /**
37
102
  * Handles the response before SolidStart sends it to the client.
38
103
  *
104
+ * If a 406 response was deferred for the request and SolidStart could not
105
+ * serve the route either (404), replaces the response payload with the
106
+ * deferred 406.
107
+ *
39
108
  * @param event The SolidStart {@link FetchEvent} for the current request.
40
- * @returns The stored 406 response if SolidStart could not handle the route.
109
+ * @param payload The response payload that SolidStart is about to send.
41
110
  */
42
- function onBeforeResponse(event) {
111
+ function onBeforeResponse(event, payload) {
43
112
  const stored = notAcceptableResponses.get(event.request);
44
- if (stored != null) {
45
- notAcceptableResponses.delete(event.request);
46
- if ((event.response.status ?? 200) === 404) return stored;
47
- }
113
+ if (stored == null || event.nativeEvent.handled) return;
114
+ const body = payload.body;
115
+ const error = body instanceof Error ? body : void 0;
116
+ if ((body instanceof Response ? body.status : body === void 0 && (event.response.status ?? 200) === 200 ? 404 : error?.statusCode ?? error?.status ?? event.response.status ?? 200) !== 404) return;
117
+ const headers = notAcceptableHeaders(body instanceof Response ? body.headers : new Headers(), event.response.headers);
118
+ if (body instanceof Response) body.body?.cancel().catch(() => {});
119
+ payload.body = new Response(stored.body, {
120
+ status: 406,
121
+ statusText: "Not Acceptable",
122
+ headers
123
+ });
48
124
  }
49
125
  //#endregion
50
126
  //#region src/index.ts
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fedify/solidstart",
3
- "version": "2.4.2",
3
+ "version": "2.4.3",
4
4
  "description": "Integrate Fedify with SolidStart",
5
5
  "keywords": [
6
6
  "Fedify",
@@ -47,11 +47,13 @@
47
47
  ],
48
48
  "peerDependencies": {
49
49
  "@solidjs/start": "^1.3.0",
50
- "@fedify/fedify": "^2.4.2"
50
+ "@fedify/fedify": "^2.4.3"
51
51
  },
52
52
  "devDependencies": {
53
53
  "tsdown": "^0.22.0",
54
- "typescript": "^6.0.0"
54
+ "typescript": "^6.0.0",
55
+ "h3": "^1.15.0",
56
+ "@fedify/fixture": "^2.0.0"
55
57
  },
56
58
  "scripts": {
57
59
  "build:self": "tsdown",