npm - @modern-js/prod-server - Versions diffs - 2.68.11 → 2.68.13 - Mend

@modern-js/prod-server 2.68.11 → 2.68.13

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 (4) hide show

package/dist/cjs/apply.js CHANGED Viewed

@@ -34,7 +34,9 @@ function getLogger(_) {
   }
 }
 async function applyPlugins(serverBase, options, nodeServer) {
+  var _options_serverConfig;
   const { pwd, appContext, config, logger: optLogger } = options;
+  const serverErrorHandler = (_options_serverConfig = options.serverConfig) === null || _options_serverConfig === void 0 ? void 0 : _options_serverConfig.onError;
   const loadCachePwd = (0, import_utils.isProd)() ? pwd : appContext.appDirectory || pwd;
   const cacheConfig = await (0, import_node.loadCacheConfig)(loadCachePwd);
   serverBase.notFound((c) => {
@@ -42,10 +44,29 @@ async function applyPlugins(serverBase, options, nodeServer) {
     (0, import_server_core.onError)(import_server_core.ErrorDigest.ENOTF, "404 not found", monitors, c.req.raw);
     return c.html((0, import_server_core.createErrorHtml)(404), 404);
   });
-  serverBase.onError((err, c) => {
+  serverBase.onError(async (err, c) => {
+    var _config_bff;
     const monitors = c.get("monitors");
     (0, import_server_core.onError)(import_server_core.ErrorDigest.EINTER, err, monitors, c.req.raw);
-    return c.html((0, import_server_core.createErrorHtml)(500), 500);
+    if (serverErrorHandler) {
+      try {
+        const result = await serverErrorHandler(err, c);
+        if (result instanceof Response) {
+          return result;
+        }
+      } catch (configError) {
+        import_utils.logger.error(`Error in serverConfig.onError handler: ${configError}`);
+      }
+    }
+    const bffPrefix = ((_config_bff = config.bff) === null || _config_bff === void 0 ? void 0 : _config_bff.prefix) || "/api";
+    const isApiPath = c.req.path.startsWith(bffPrefix);
+    if (isApiPath) {
+      return c.json({
+        message: (err === null || err === void 0 ? void 0 : err.message) || "[BFF] Internal Server Error"
+      }, (err === null || err === void 0 ? void 0 : err.status) || 500);
+    } else {
+      return c.html((0, import_server_core.createErrorHtml)(500), 500);
+    }
   });
   const loggerOptions = config.server.logger;
   const { middlewares, renderMiddlewares } = options.serverConfig || {};

package/dist/esm/apply.js CHANGED Viewed

@@ -1,9 +1,10 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { ErrorDigest, createDefaultPlugins, createErrorHtml, faviconPlugin, injectConfigMiddlewarePlugin, onError, renderPlugin } from "@modern-js/server-core";
 import { injectNodeSeverPlugin, injectResourcePlugin, injectRscManifestPlugin, loadCacheConfig, serverStaticPlugin } from "@modern-js/server-core/node";
-import { createLogger, isProd } from "@modern-js/utils";
+import { createLogger, isProd, logger } from "@modern-js/utils";
 function getLogger(_) {
   if (process.env.DEBUG || process.env.NODE_ENV === "production") {
     return createLogger({
@@ -18,11 +19,12 @@ function applyPlugins(serverBase, options, nodeServer) {
 }
 function _applyPlugins() {
   _applyPlugins = _async_to_generator(function(serverBase, options, nodeServer) {
-    var pwd, appContext, config, optLogger, loadCachePwd, cacheConfig, loggerOptions, _ref, middlewares, renderMiddlewares, plugins;
+    var _options_serverConfig, pwd, appContext, config, optLogger, serverErrorHandler, loadCachePwd, cacheConfig, loggerOptions, _ref, middlewares, renderMiddlewares, plugins;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           pwd = options.pwd, appContext = options.appContext, config = options.config, optLogger = options.logger;
+          serverErrorHandler = (_options_serverConfig = options.serverConfig) === null || _options_serverConfig === void 0 ? void 0 : _options_serverConfig.onError;
           loadCachePwd = isProd() ? pwd : appContext.appDirectory || pwd;
           return [
             4,
@@ -35,11 +37,76 @@ function _applyPlugins() {
             onError(ErrorDigest.ENOTF, "404 not found", monitors, c.req.raw);
             return c.html(createErrorHtml(404), 404);
           });
-          serverBase.onError(function(err, c) {
-            var monitors = c.get("monitors");
-            onError(ErrorDigest.EINTER, err, monitors, c.req.raw);
-            return c.html(createErrorHtml(500), 500);
-          });
+          serverBase.onError(function() {
+            var _ref2 = _async_to_generator(function(err, c) {
+              var _config_bff, monitors, result, configError, bffPrefix, isApiPath;
+              return _ts_generator(this, function(_state2) {
+                switch (_state2.label) {
+                  case 0:
+                    monitors = c.get("monitors");
+                    onError(ErrorDigest.EINTER, err, monitors, c.req.raw);
+                    if (!serverErrorHandler)
+                      return [
+                        3,
+                        4
+                      ];
+                    _state2.label = 1;
+                  case 1:
+                    _state2.trys.push([
+                      1,
+                      3,
+                      ,
+                      4
+                    ]);
+                    return [
+                      4,
+                      serverErrorHandler(err, c)
+                    ];
+                  case 2:
+                    result = _state2.sent();
+                    if (_instanceof(result, Response)) {
+                      return [
+                        2,
+                        result
+                      ];
+                    }
+                    return [
+                      3,
+                      4
+                    ];
+                  case 3:
+                    configError = _state2.sent();
+                    logger.error("Error in serverConfig.onError handler: ".concat(configError));
+                    return [
+                      3,
+                      4
+                    ];
+                  case 4:
+                    bffPrefix = ((_config_bff = config.bff) === null || _config_bff === void 0 ? void 0 : _config_bff.prefix) || "/api";
+                    isApiPath = c.req.path.startsWith(bffPrefix);
+                    if (isApiPath) {
+                      return [
+                        2,
+                        c.json({
+                          message: (err === null || err === void 0 ? void 0 : err.message) || "[BFF] Internal Server Error"
+                        }, (err === null || err === void 0 ? void 0 : err.status) || 500)
+                      ];
+                    } else {
+                      return [
+                        2,
+                        c.html(createErrorHtml(500), 500)
+                      ];
+                    }
+                    return [
+                      2
+                    ];
+                }
+              });
+            });
+            return function(err, c) {
+              return _ref2.apply(this, arguments);
+            };
+          }());
           loggerOptions = config.server.logger;
           _ref = options.serverConfig || {}, middlewares = _ref.middlewares, renderMiddlewares = _ref.renderMiddlewares;
           plugins = _to_consumable_array(nodeServer ? [

package/dist/esm-node/apply.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { ErrorDigest, createDefaultPlugins, createErrorHtml, faviconPlugin, injectConfigMiddlewarePlugin, onError, renderPlugin } from "@modern-js/server-core";
 import { injectNodeSeverPlugin, injectResourcePlugin, injectRscManifestPlugin, loadCacheConfig, serverStaticPlugin } from "@modern-js/server-core/node";
-import { createLogger, isProd } from "@modern-js/utils";
+import { createLogger, isProd, logger } from "@modern-js/utils";
 function getLogger(_) {
   if (process.env.DEBUG || process.env.NODE_ENV === "production") {
     return createLogger({
@@ -11,7 +11,9 @@ function getLogger(_) {
   }
 }
 async function applyPlugins(serverBase, options, nodeServer) {
+  var _options_serverConfig;
   const { pwd, appContext, config, logger: optLogger } = options;
+  const serverErrorHandler = (_options_serverConfig = options.serverConfig) === null || _options_serverConfig === void 0 ? void 0 : _options_serverConfig.onError;
   const loadCachePwd = isProd() ? pwd : appContext.appDirectory || pwd;
   const cacheConfig = await loadCacheConfig(loadCachePwd);
   serverBase.notFound((c) => {
@@ -19,10 +21,29 @@ async function applyPlugins(serverBase, options, nodeServer) {
     onError(ErrorDigest.ENOTF, "404 not found", monitors, c.req.raw);
     return c.html(createErrorHtml(404), 404);
   });
-  serverBase.onError((err, c) => {
+  serverBase.onError(async (err, c) => {
+    var _config_bff;
     const monitors = c.get("monitors");
     onError(ErrorDigest.EINTER, err, monitors, c.req.raw);
-    return c.html(createErrorHtml(500), 500);
+    if (serverErrorHandler) {
+      try {
+        const result = await serverErrorHandler(err, c);
+        if (result instanceof Response) {
+          return result;
+        }
+      } catch (configError) {
+        logger.error(`Error in serverConfig.onError handler: ${configError}`);
+      }
+    }
+    const bffPrefix = ((_config_bff = config.bff) === null || _config_bff === void 0 ? void 0 : _config_bff.prefix) || "/api";
+    const isApiPath = c.req.path.startsWith(bffPrefix);
+    if (isApiPath) {
+      return c.json({
+        message: (err === null || err === void 0 ? void 0 : err.message) || "[BFF] Internal Server Error"
+      }, (err === null || err === void 0 ? void 0 : err.status) || 500);
+    } else {
+      return c.html(createErrorHtml(500), 500);
+    }
   });
   const loggerOptions = config.server.logger;
   const { middlewares, renderMiddlewares } = options.serverConfig || {};

package/package.json CHANGED Viewed

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.68.11",
+  "version": "2.68.13",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -41,9 +41,9 @@
   },
   "dependencies": {
     "@swc/helpers": "^0.5.17",
-    "@modern-js/runtime-utils": "2.68.11",
-    "@modern-js/server-core": "2.68.11",
-    "@modern-js/utils": "2.68.11"
+    "@modern-js/runtime-utils": "2.68.13",
+    "@modern-js/server-core": "2.68.13",
+    "@modern-js/utils": "2.68.13"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -53,7 +53,7 @@
     "lint-staged": "~13.3.0",
     "tsx": "^3.12.7",
     "typescript": "~5.0.4",
-    "@modern-js/types": "2.68.11",
+    "@modern-js/types": "2.68.13",
     "@scripts/build": "2.66.0",
     "@scripts/jest-config": "2.66.0"
   },