@nuxt/bridge-edge 3.0.0-28056559.8397018 → 3.0.0-28056564.e2be178

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.
@@ -1,4 +1,6 @@
1
- import { withQuery } from "ufo";
1
+ import { joinURL, withQuery } from "ufo";
2
+ import { getRequestHeaders, setResponseHeader, setResponseStatus } from "h3";
3
+ import { useNitroApp, useRuntimeConfig } from "#internal/nitro";
2
4
  import { normalizeError, isJsonRequest } from "#internal/nitro/utils";
3
5
  export default (async function errorhandler(_error, event) {
4
6
  const { stack, statusCode, statusMessage, message } = normalizeError(_error);
@@ -7,24 +9,42 @@ export default (async function errorhandler(_error, event) {
7
9
  statusCode,
8
10
  statusMessage,
9
11
  message,
10
- description: process.env.NODE_ENV === "development" && statusCode !== 404 ? `<pre>${stack.map((i) => `<span class="stack${i.internal ? " internal" : ""}">${i.text}</span>`).join("\n")}</pre>` : "",
12
+ stack: process.env.NODE_ENV === "development" && statusCode !== 404 ? `<pre>${stack.map((i) => `<span class="stack${i.internal ? " internal" : ""}">${i.text}</span>`).join("\n")}</pre>` : "",
11
13
  data: _error.data
12
14
  };
13
- event.node.res.statusCode = errorObject.statusCode;
14
- event.node.res.statusMessage = errorObject.statusMessage;
15
- if (errorObject.statusCode !== 404) {
16
- console.error("[nuxt] [request error]", errorObject.message + "\n" + stack.map((l) => " " + l.text).join(" \n"));
15
+ setResponseStatus(event, errorObject.statusCode !== 200 && errorObject.statusCode || 500, errorObject.statusMessage);
16
+ if (_error.unhandled || _error.fatal) {
17
+ const tags = [
18
+ "[nuxt]",
19
+ "[request error]",
20
+ _error.unhandled && "[unhandled]",
21
+ _error.fatal && "[fatal]",
22
+ Number(errorObject.statusCode) !== 200 && `[${errorObject.statusCode}]`
23
+ ].filter(Boolean).join(" ");
24
+ console.error(tags, errorObject.message + "\n" + stack.map((l) => " " + l.text).join(" \n"));
17
25
  }
18
26
  if (isJsonRequest(event)) {
19
27
  event.node.res.setHeader("Content-Type", "application/json");
20
28
  event.node.res.end(JSON.stringify(errorObject));
21
29
  return;
22
30
  }
23
- const url = withQuery("/__nuxt_error", errorObject);
24
- const html = await $fetch(url).catch((error) => {
25
- console.error("[nitro] Error while generating error response", error);
26
- return errorObject.statusMessage;
27
- });
28
- event.node.res.setHeader("Content-Type", "text/html;charset=UTF-8");
29
- event.node.res.end(html);
31
+ const isErrorPage = event.node.req.url?.startsWith("/__nuxt_error");
32
+ const res = !isErrorPage ? await useNitroApp().localFetch(withQuery(joinURL(useRuntimeConfig().app.baseURL, "/__nuxt_error"), errorObject), {
33
+ headers: getRequestHeaders(event),
34
+ redirect: "manual"
35
+ }).catch(() => null) : null;
36
+ if (!res) {
37
+ const { template } = process.env.NODE_ENV === "development" ? await import("@nuxt/ui-templates/templates/error-dev.mjs") : await import("@nuxt/ui-templates/templates/error-500.mjs");
38
+ if (process.env.NODE_ENV === "development") {
39
+ errorObject.description = errorObject.message;
40
+ }
41
+ setResponseHeader(event, "Content-Type", "text/html;charset=UTF-8");
42
+ event.node.res.end(template(errorObject));
43
+ return;
44
+ }
45
+ for (const [header, value] of res.headers.entries()) {
46
+ setResponseHeader(event, header, value);
47
+ }
48
+ setResponseStatus(event, res.status && res.status !== 200 ? res.status : void 0, res.statusText);
49
+ event.node.res.end(await res.text());
30
50
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nuxt/bridge-edge",
3
- "version": "3.0.0-28056559.8397018",
3
+ "version": "3.0.0-28056564.e2be178",
4
4
  "repository": "nuxt/bridge",
5
5
  "license": "MIT",
6
6
  "type": "module",
@@ -19,7 +19,7 @@
19
19
  "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
20
20
  "@babel/plugin-proposal-optional-chaining": "^7.21.0",
21
21
  "@babel/plugin-transform-typescript": "^7.21.3",
22
- "@nuxt/bridge-schema": "npm:@nuxt/bridge-schema-edge@3.0.0-28056559.8397018",
22
+ "@nuxt/bridge-schema": "npm:@nuxt/bridge-schema-edge@3.0.0-28056564.e2be178",
23
23
  "@nuxt/devalue": "^2.0.2",
24
24
  "@nuxt/kit": "3.4.3",
25
25
  "@nuxt/postcss8": "^1.1.3",