Merge pull request #967 from evershopcommerce/optimize_build

fix(ssr): return 500 on render error instead of hanging; partial data…

Author: treoden

packages/evershop/src/lib/response/render.ts

@@ -117,7 +117,7 @@ function renderDevelopment(
   `);
 }
 
-function renderProduction(request, response) {
+function renderProduction(request, response, next?) {
   const route = request.currentRoute;
   const serverIndexPath = path.resolve(
     getRouteBuildPath(route),
@@ -165,12 +165,19 @@ function renderProduction(request, response) {
     })
     .catch((e) => {
       error(e);
+      // This render runs inside a floated promise, so a throw here never reaches
+      // the calling middleware's try/catch. Without forwarding it, the request
+      // hangs until the socket/requestTimeout fires (no status, no body). Hand it
+      // to the error handler so the client gets a proper 500 instead.
+      if (typeof next === 'function' && !response.headersSent) {
+        next(e);
+      }
     });
 }
 
-export function render(request, response) {
+export function render(request, response, next?) {
   if (isProductionMode()) {
-    renderProduction(request, response);
+    renderProduction(request, response, next);
   } else {
     renderDevelopment(request, response);
   }

packages/evershop/src/modules/base/pages/global/response[errorHandler].ts

@@ -119,7 +119,7 @@ export default async (request: EvershopRequest, response, next) => {
             } as AppStateContextValue
           });
         } else {
-          render(request, response);
+          render(request, response, next);
         }
       }
     }

packages/evershop/src/modules/graphql/pages/global/[buildQuery]graphql[response].js

@@ -73,17 +73,23 @@ export default async function graphql(request, response, next) {
             document,
             variableValues: graphqlVariables
           });
+          // Render with whatever data resolved instead of aborting the whole
+          // page on the first field error. A single failing or non-critical
+          // resolver (e.g. "related products") should degrade that area, not
+          // turn the entire SSR response into a 500. Field errors are logged;
+          // partial `data.data` (or {} on total failure) is passed through.
           if (data.errors) {
-            next(data.errors[0]);
-          } else {
-            response.locals = response.locals || {};
-            response.locals.graphqlResponse = JSON.parse(
-              JSON.stringify(data.data)
+            data.errors.forEach((e) =>
+              debug(`GraphQL field error: ${e.message}`)
             );
-            // Get id and props from the queryRaw object and assign to response.locals.propsMap
-            response.locals.propsMap = propsMap;
-            next();
           }
+          response.locals = response.locals || {};
+          response.locals.graphqlResponse = data.data
+            ? JSON.parse(JSON.stringify(data.data))
+            : {};
+          // Get id and props from the queryRaw object and assign to response.locals.propsMap
+          response.locals.propsMap = propsMap;
+          next();
         }
       }
     }