@modern-js/server-core 2.54.4 → 2.54.5

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 (8) hide show
  1. package/dist/cjs/plugins/render/render.js +1 -1
  2. package/dist/cjs/utils/error.js +11 -4
  3. package/dist/esm/plugins/render/render.js +1 -1
  4. package/dist/esm/utils/error.js +11 -4
  5. package/dist/esm-node/plugins/render/render.js +1 -1
  6. package/dist/esm-node/utils/error.js +11 -4
  7. package/dist/types/utils/error.d.ts +1 -1
  8. package/package.json +7 -7
package/dist/cjs/plugins/render/render.js CHANGED
@@ -86,7 +86,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
86
86
  }
87
87
  const renderMode = await getRenderMode(req, metaName || "modern-js", routeInfo.isSSR, forceCSR, nodeReq, onFallback);
88
88
  const onError = async (e) => {
89
- (0, import_utils.onError)(logger, import_utils.ErrorDigest.ERENDER, e, req);
89
+ (0, import_utils.onError)(import_utils.ErrorDigest.ERENDER, e, logger, req);
90
90
  await (onFallback === null || onFallback === void 0 ? void 0 : onFallback("error", e));
91
91
  };
92
92
  const renderOptions = {
package/dist/cjs/utils/error.js CHANGED
@@ -23,6 +23,7 @@ __export(error_exports, {
23
23
  onError: () => onError
24
24
  });
25
25
  module.exports = __toCommonJS(error_exports);
26
+ var import_request = require("./request");
26
27
  const ERROR_PAGE_TEXT = {
27
28
  404: "This page could not be found.",
28
29
  500: "Internal Server Error."
@@ -67,10 +68,16 @@ var ErrorDigest;
67
68
  ErrorDigest2["EINTER"] = "Internal server error";
68
69
  ErrorDigest2["ERENDER"] = "SSR render failed";
69
70
  })(ErrorDigest || (ErrorDigest = {}));
70
- function onError(logger, digest, error, req) {
71
- const headers = req === null || req === void 0 ? void 0 : req.headers;
72
- headers === null || headers === void 0 ? void 0 : headers.delete("cookie");
73
- logger.error(req ? `Server Error - ${digest}, error = %s, req.url = %s, req.headers = %o` : `Server Error - ${digest}, error = %s`, error instanceof Error ? error.stack || error.message : error, req === null || req === void 0 ? void 0 : req.url, headers);
71
+ function onError(digest, error, logger, req) {
72
+ const headerData = req && (0, import_request.parseHeaders)(req);
73
+ headerData && delete headerData.cookie;
74
+ if (logger) {
75
+ logger.error(req ? `Server Error - ${digest}, error = %s, req.url = %s, req.headers = %o` : `Server Error - ${digest}, error = %s`, error instanceof Error ? error.stack || error.message : error, req === null || req === void 0 ? void 0 : req.url, headerData);
76
+ } else if (req) {
77
+ console.error(`Server Error - ${digest}, error = ${error instanceof Error ? error.stack || error.message : error}, req.url = ${req.url}, req.headers = ${JSON.stringify(headerData)}`);
78
+ } else {
79
+ console.error(`Server Error - ${digest}, error = ${error instanceof Error ? error.stack || error.message : error} `);
80
+ }
74
81
  }
75
82
  // Annotate the CommonJS export names for ESM import in node:
76
83
  0 && (module.exports = {
package/dist/esm/plugins/render/render.js CHANGED
@@ -122,7 +122,7 @@ function _createRender() {
122
122
  return _ts_generator(this, function(_state3) {
123
123
  switch (_state3.label) {
124
124
  case 0:
125
- onErrorFn(logger, ErrorDigest.ERENDER, e, req);
125
+ onErrorFn(ErrorDigest.ERENDER, e, logger, req);
126
126
  return [
127
127
  4,
128
128
  onFallback === null || onFallback === void 0 ? void 0 : onFallback("error", e)
package/dist/esm/utils/error.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
2
+ import { parseHeaders } from "./request";
2
3
  var ERROR_PAGE_TEXT = {
3
4
  404: "This page could not be found.",
4
5
  500: "Internal Server Error."
@@ -14,10 +15,16 @@ var ErrorDigest;
14
15
  ErrorDigest2["EINTER"] = "Internal server error";
15
16
  ErrorDigest2["ERENDER"] = "SSR render failed";
16
17
  })(ErrorDigest || (ErrorDigest = {}));
17
- function onError(logger, digest, error, req) {
18
- var headers = req === null || req === void 0 ? void 0 : req.headers;
19
- headers === null || headers === void 0 ? void 0 : headers.delete("cookie");
20
- logger.error(req ? "Server Error - ".concat(digest, ", error = %s, req.url = %s, req.headers = %o") : "Server Error - ".concat(digest, ", error = %s"), _instanceof(error, Error) ? error.stack || error.message : error, req === null || req === void 0 ? void 0 : req.url, headers);
18
+ function onError(digest, error, logger, req) {
19
+ var headerData = req && parseHeaders(req);
20
+ headerData && delete headerData.cookie;
21
+ if (logger) {
22
+ logger.error(req ? "Server Error - ".concat(digest, ", error = %s, req.url = %s, req.headers = %o") : "Server Error - ".concat(digest, ", error = %s"), _instanceof(error, Error) ? error.stack || error.message : error, req === null || req === void 0 ? void 0 : req.url, headerData);
23
+ } else if (req) {
24
+ console.error("Server Error - ".concat(digest, ", error = ").concat(_instanceof(error, Error) ? error.stack || error.message : error, ", req.url = ").concat(req.url, ", req.headers = ").concat(JSON.stringify(headerData)));
25
+ } else {
26
+ console.error("Server Error - ".concat(digest, ", error = ").concat(_instanceof(error, Error) ? error.stack || error.message : error, " "));
27
+ }
21
28
  }
22
29
  export {
23
30
  ErrorDigest,
package/dist/esm-node/plugins/render/render.js CHANGED
@@ -63,7 +63,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
63
63
  }
64
64
  const renderMode = await getRenderMode(req, metaName || "modern-js", routeInfo.isSSR, forceCSR, nodeReq, onFallback);
65
65
  const onError = async (e) => {
66
- onErrorFn(logger, ErrorDigest.ERENDER, e, req);
66
+ onErrorFn(ErrorDigest.ERENDER, e, logger, req);
67
67
  await (onFallback === null || onFallback === void 0 ? void 0 : onFallback("error", e));
68
68
  };
69
69
  const renderOptions = {
package/dist/esm-node/utils/error.js CHANGED
@@ -1,3 +1,4 @@
1
+ import { parseHeaders } from "./request";
1
2
  const ERROR_PAGE_TEXT = {
2
3
  404: "This page could not be found.",
3
4
  500: "Internal Server Error."
@@ -42,10 +43,16 @@ var ErrorDigest;
42
43
  ErrorDigest2["EINTER"] = "Internal server error";
43
44
  ErrorDigest2["ERENDER"] = "SSR render failed";
44
45
  })(ErrorDigest || (ErrorDigest = {}));
45
- function onError(logger, digest, error, req) {
46
- const headers = req === null || req === void 0 ? void 0 : req.headers;
47
- headers === null || headers === void 0 ? void 0 : headers.delete("cookie");
48
- logger.error(req ? `Server Error - ${digest}, error = %s, req.url = %s, req.headers = %o` : `Server Error - ${digest}, error = %s`, error instanceof Error ? error.stack || error.message : error, req === null || req === void 0 ? void 0 : req.url, headers);
46
+ function onError(digest, error, logger, req) {
47
+ const headerData = req && parseHeaders(req);
48
+ headerData && delete headerData.cookie;
49
+ if (logger) {
50
+ logger.error(req ? `Server Error - ${digest}, error = %s, req.url = %s, req.headers = %o` : `Server Error - ${digest}, error = %s`, error instanceof Error ? error.stack || error.message : error, req === null || req === void 0 ? void 0 : req.url, headerData);
51
+ } else if (req) {
52
+ console.error(`Server Error - ${digest}, error = ${error instanceof Error ? error.stack || error.message : error}, req.url = ${req.url}, req.headers = ${JSON.stringify(headerData)}`);
53
+ } else {
54
+ console.error(`Server Error - ${digest}, error = ${error instanceof Error ? error.stack || error.message : error} `);
55
+ }
49
56
  }
50
57
  export {
51
58
  ErrorDigest,
package/dist/types/utils/error.d.ts CHANGED
@@ -5,4 +5,4 @@ export declare enum ErrorDigest {
5
5
  EINTER = "Internal server error",
6
6
  ERENDER = "SSR render failed"
7
7
  }
8
- export declare function onError(logger: Logger, digest: ErrorDigest, error: Error | string, req?: Request): void;
8
+ export declare function onError(digest: ErrorDigest, error: Error | string, logger?: Logger, req?: Request): void;
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.54.4",
18
+ "version": "2.54.5",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "main": "./dist/cjs/index.js",
@@ -53,9 +53,9 @@
53
53
  "hono": "^3.12.2",
54
54
  "ts-deepmerge": "7.0.0",
55
55
  "isbot": "3.8.0",
56
- "@modern-js/plugin": "2.54.4",
57
- "@modern-js/runtime-utils": "2.54.4",
58
- "@modern-js/utils": "2.54.4"
56
+ "@modern-js/plugin": "2.54.5",
57
+ "@modern-js/utils": "2.54.5",
58
+ "@modern-js/runtime-utils": "2.54.5"
59
59
  },
60
60
  "devDependencies": {
61
61
  "@types/jest": "^29",
@@ -65,9 +65,9 @@
65
65
  "jest": "^29",
66
66
  "ts-jest": "^29.1.0",
67
67
  "typescript": "^5",
68
- "@modern-js/types": "2.54.4",
69
- "@scripts/build": "2.54.4",
70
- "@scripts/jest-config": "2.54.4"
68
+ "@modern-js/types": "2.54.5",
69
+ "@scripts/build": "2.54.5",
70
+ "@scripts/jest-config": "2.54.5"
71
71
  },
72
72
  "sideEffects": false,
73
73
  "publishConfig": {