[major] return context to handle route

electrode-io · Aug 2, 2018 · 4a8151f · 4a8151f
1 parent 528ddaf
commit 4a8151f
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 26 deletions.
diff --git a/packages/electrode-react-webapp/lib/async-template.js b/packages/electrode-react-webapp/lib/async-template.js
@@ -61,7 +61,9 @@ class AsyncTemplate {
       await r.afterRender(context);
     }
 
-    return context.isVoidStop ? context.voidResult : result;
+    context.result = context.isVoidStop ? context.voidResult : result;
+
+    return context;
   }
 
   /*

diff --git a/packages/electrode-react-webapp/lib/express/index.js b/packages/electrode-react-webapp/lib/express/index.js
@@ -10,12 +10,16 @@ const { htmlifyError } = require("../utils");
 
 const DefaultHandleRoute = (request, response, handler, content, routeOptions) => {
   return handler({ content, mode: request.query.__mode || "", request })
-    .then(data => {
-      const status = data.status;
+    .then(context => {
+      const data = context.result;
 
       if (data instanceof Error) {
         throw data;
-      } else if (status === undefined) {
+      }
+
+      const status = data.status;
+
+      if (status === undefined) {
         response.send(data);
       } else if (HttpStatus.redirect[status]) {
         response.redirect(status, data.path);

diff --git a/packages/electrode-react-webapp/lib/hapi/index.js b/packages/electrode-react-webapp/lib/hapi/index.js
@@ -1,6 +1,6 @@
 "use strict";
 
-/* eslint-disable no-magic-numbers, max-params */
+/* eslint-disable no-magic-numbers, max-params, max-statements */
 
 const _ = require("lodash");
 const assert = require("assert");
@@ -15,22 +15,35 @@ const DefaultHandleRoute = (request, reply, handler, content, routeOptions) => {
     template: request.indexPageTemplate,
     request
   })
-    .then(data => {
-      const status = data.status;
+    .then(context => {
+      const data = context.result;
 
       if (data instanceof Error) {
         throw data;
-      } else if (status === undefined) {
-        reply(data);
+      }
+
+      let respond;
+      let status = data.status;
+
+      if (status === undefined) {
+        status = 200;
+        respond = reply(data);
       } else if (HttpStatus.redirect[status]) {
-        reply.redirect(data.path);
-      } else if (HttpStatus.displayHtml[status]) {
-        reply(data.html !== undefined ? data.html : data).code(status);
-      } else if (status >= 200 && status < 300) {
-        reply(data.html !== undefined ? data.html : data);
+        respond = reply.redirect(data.path);
+        return respond;
+      } else if (HttpStatus.displayHtml[status] || (status >= 200 && status < 300)) {
+        respond = reply(data.html !== undefined ? data.html : data);
       } else {
-        reply(data).code(status);
+        respond = reply(data);
       }
+
+      const response = context.user && context.user.response;
+
+      if (response) {
+        Object.assign(respond.headers, response.headers);
+      }
+
+      return respond.code(status);
     })
     .catch(err => {
       reply(htmlifyError(err, routeOptions.replyErrorStack)).code(err.status || 500);

diff --git a/packages/electrode-react-webapp/lib/koa/index.js b/packages/electrode-react-webapp/lib/koa/index.js
@@ -17,12 +17,16 @@ function DefaultHandleRoute(handler, content, routeOptions) {
   };
 
   return handler({ content, mode: request.query.__mode || "", request })
-    .then(data => {
-      const status = data.status;
+    .then(context => {
+      const data = context.result;
 
       if (data instanceof Error) {
         throw data;
-      } else if (status === undefined) {
+      }
+
+      const status = data.status;
+
+      if (status === undefined) {
         respond(200, data);
       } else if (HttpStatus.redirect[status]) {
         this.redirect(data.path);

diff --git a/packages/electrode-react-webapp/lib/react/token-handlers.js b/packages/electrode-react-webapp/lib/react/token-handlers.js
@@ -153,6 +153,9 @@ module.exports = function setup(handlerContext /* , asyncTemplate */) {
       context.setOutputTransform(transformOutput);
       context.user = {
         request: options.request,
+        response: {
+          headers: {}
+        },
         routeOptions,
         routeData,
         content,

diff --git a/packages/electrode-react-webapp/test/data/index-1.html b/packages/electrode-react-webapp/test/data/index-1.html
@@ -9,6 +9,7 @@
   <!--%{PAGE_TITLE}-->
   <!--%{CRITICAL_CSS}-->
   <!--%{WEBAPP_HEADER_BUNDLES}-->
+  <!--%{ user-header-token }-->
 </head>
 
 <body>

diff --git a/packages/electrode-react-webapp/test/fixtures/token-handler.js b/packages/electrode-react-webapp/test/fixtures/token-handler.js
@@ -34,6 +34,12 @@ module.exports = () => {
       });
     },
 
+    "user-header-token": context => {
+      context.user.response.headers = {
+        "x-foo-bar": "hello-world"
+      };
+    },
+
     PAGE_TITLE: () => {
       return "<title>user-handler-title</title>";
     }

diff --git a/packages/electrode-react-webapp/test/spec/hapi.index.spec.js b/packages/electrode-react-webapp/test/spec/hapi.index.spec.js
@@ -555,7 +555,7 @@ describe("hapi electrode-react-webapp", () => {
     });
   });
 
-  it("should use top level htmlFile", () => {
+  it("should use top level htmlFile and return response headers", () => {
     configOptions.prodBundleBase = "http://awesome-cdn.com/myapp/";
     configOptions.stats = "test/data/stats-test-one-bundle.json";
     configOptions.htmlFile = "test/data/index-1.html";
@@ -569,7 +569,6 @@ describe("hapi electrode-react-webapp", () => {
           url: "/"
         })
         .then(res => {
-          expect(res.statusCode).to.equal(200);
           expect(res.result).includes(`<title>user-handler-title</title>`);
           expect(res.result).includes(`</script><div>user-promise-token</div><script`);
           expect(res.result).includes(
@@ -578,6 +577,8 @@ describe("hapi electrode-react-webapp", () => {
           expect(res.result).includes(
             `</script><div>from custom-1</div><div>user-token-1</div><div>user-token-2</div><noscript>` // eslint-disable-line
           );
+          expect(res.headers["x-foo-bar"]).to.equal("hello-world");
+          expect(res.statusCode).to.equal(200);
           stopServer(server);
         })
         .catch(err => {

diff --git a/packages/electrode-react-webapp/test/spec/react-webapp.spec.js b/packages/electrode-react-webapp/test/spec/react-webapp.spec.js
@@ -63,7 +63,7 @@ describe("react-webapp", function() {
       const promise = handleRoute({ request: {}, content: { status: 200, html: "" } });
 
       return promise
-        .then(result => {
+        .then(context => {
           intercept.restore();
           const expected = `
 from wants next module
@@ -76,7 +76,7 @@ from wants next module
 not found
 from string only module
 from async ok module`;
-          expect(result).to.equal(expected);
+          expect(context.result).to.equal(expected);
         })
         .catch(err => {
           intercept.restore();
@@ -110,7 +110,7 @@ from async ok module`;
       const promise = handleRoute({ request: {}, content: { status: 200, html: "" } });
 
       return promise
-        .then(result => {
+        .then(context => {
           intercept.restore();
           const expected = `<!-- unhandled token INITIALIZE -->
 from wants next module
@@ -123,7 +123,7 @@ from wants next module
 not found
 from string only module
 from async ok module`;
-          expect(result).to.equal(expected);
+          expect(context.result).to.equal(expected);
         })
         .catch(err => {
           intercept.restore();

diff --git a/packages/electrode-react-webapp/test/spec/render-context.spec.js b/packages/electrode-react-webapp/test/spec/render-context.spec.js
@@ -63,7 +63,7 @@ from string only module
 from async ok module`;
     const intercept = xstdout.intercept(false);
     return Promise.try(() => asyncTemplate.render({}))
-      .then(result => {
+      .then(context => {
         intercept.restore();
         expect(
           internalHandler.name,
@@ -74,7 +74,7 @@ from async ok module`;
           "error from test/fixtures/async-error",
           "error from test/fixtures/async-error"
         ]);
-        expect(result).to.equal("");
+        expect(context.result).to.equal("");
         expect(receivedResult).to.equal(expected);
       })
       .catch(err => {