fix: application return 301 and buffer case (#596)

packages/egg-layer/framework/config/config.default.js

@@ -6,5 +6,5 @@ exports.logger = {
 exports.rundir = os.tmpdir();
 
 exports.static = {
-  dir: os.tmpdir(),
+  buffer: true,
 };

packages/egg-layer/framework/config/plugin.js

@@ -1,11 +1,7 @@
 'use strict';
 
-exports.onerror = false;
 exports.i18n = false;
 exports.watcher = false;
-exports.multipart = false;
-exports.security = false;
 exports.development = false;
 exports.logrotator = false;
 exports.schedule = false;
-exports.static = false;

packages/egg-layer/index.js

@@ -57,6 +57,7 @@ module.exports = engine => {
           },
           (error, response, body) => {
             context.res = response;
+            context.status = response.statusCode;
             if (error) {
               reject(error);
             }

packages/egg-layer/test/fixtures/eaas-fc/app/public/news.css

@@ -0,0 +1,6 @@
+body,
+html {
+  font-family: Verdana;
+  font-size: 13px;
+  height: 100%
+}

packages/egg-layer/test/fixtures/eaas-fc/app/router.js

@@ -5,6 +5,7 @@
  */
 module.exports = app => {
   const { router, controller } = app;
+  router.redirect('/', '/get');
   router.get('/get', controller.home.getMethod);
   router.get('/get/query', controller.home.getQueryMethod);
   router.post('/post', controller.home.postMethod);

packages/egg-layer/test/fixtures/eaas-fc/config/config.default.js

@@ -10,7 +10,7 @@ module.exports = appInfo => {
    * built-in config
    * @type {Egg.EggAppConfig}
    **/
-  const config = exports = {};
+  const config = (exports = {});
 
   // use for cookie sign key, should change to your own and keep security
   config.keys = appInfo.name + '_1574154057813_8098';
@@ -23,6 +23,12 @@ module.exports = appInfo => {
     // myAppName: 'egg',
   };
 
+  config.security = {
+    csrf: {
+      enable: false,
+    },
+  };
+
   return {
     ...config,
     ...userConfig,

packages/egg-layer/test/fixtures/eaas-scf/app/public/news.css

@@ -0,0 +1,6 @@
+body,
+html {
+  font-family: Verdana;
+  font-size: 13px;
+  height: 100%
+}

packages/egg-layer/test/fixtures/eaas-scf/app/router.js

@@ -5,6 +5,7 @@
  */
 module.exports = app => {
   const { router, controller } = app;
+  router.redirect('/', '/get');
   router.get('/get', controller.home.getMethod);
   router.get('/get/query', controller.home.getQueryMethod);
   router.post('/post', controller.home.postMethod);

packages/egg-layer/test/fixtures/eaas-scf/config/config.default.js

@@ -10,7 +10,7 @@ module.exports = appInfo => {
    * built-in config
    * @type {Egg.EggAppConfig}
    **/
-  const config = exports = {};
+  const config = (exports = {});
 
   // use for cookie sign key, should change to your own and keep security
   config.keys = appInfo.name + '_1574154057813_8098';
@@ -23,6 +23,12 @@ module.exports = appInfo => {
     // myAppName: 'egg',
   };
 
+  config.security = {
+    csrf: {
+      enable: false,
+    },
+  };
+
   return {
     ...config,
     ...userConfig,

packages/egg-layer/test/index.test.js

@@ -66,6 +66,21 @@ describe('/test/index.test.ts', () => {
         .expect(/{"body":{"b":1}}/)
         .expect(200, done);
     });
+
+    it('should test static file', done => {
+      request(app)
+        .get('/public/news.css')
+        .expect('Content-Type', 'text/css; charset=utf-8')
+        .expect(/font-size/)
+        .expect(200, done);
+    });
+
+    it('should test redirect router', done => {
+      request(app)
+        .get('/')
+        .expect('Content-Type', 'text/html; charset=utf-8')
+        .expect(301, done);
+    });
   });
 
   describe('FC test with api gateway', () => {
@@ -126,6 +141,21 @@ describe('/test/index.test.ts', () => {
         .expect(/{"body":{"b":1}}/)
         .expect(200, done);
     });
+
+    it('should test static file', done => {
+      request(app)
+        .get('/public/news.css')
+        .expect('Content-Type', 'text/css; charset=utf-8')
+        .expect(/font-size/)
+        .expect(200, done);
+    });
+
+    it('should test redirect router', done => {
+      request(app)
+        .get('/')
+        .expect('Content-Type', 'text/html; charset=utf-8')
+        .expect(301, done);
+    });
   });
 
   describe('SCF test with api gateway', () => {
@@ -186,5 +216,20 @@ describe('/test/index.test.ts', () => {
         .expect(/{"body":{"b":1}}/)
         .expect(200, done);
     });
+
+    it('should test static file', done => {
+      request(app)
+        .get('/public/news.css')
+        .expect('Content-Type', 'text/css; charset=utf-8')
+        .expect(/font-size/)
+        .expect(200, done);
+    });
+
+    it('should test redirect router', done => {
+      request(app)
+        .get('/')
+        .expect('Content-Type', 'text/html; charset=utf-8')
+        .expect(301, done);
+    });
   });
 });

packages/express-layer/index.js

@@ -34,6 +34,7 @@ module.exports = engine => {
           },
           (error, response, body) => {
             context.res = response;
+            context.status = response.statusCode;
             if (error) {
               reject(error);
             }

packages/koa-layer/index.js

@@ -34,6 +34,7 @@ module.exports = engine => {
           },
           (error, response, body) => {
             context.res = response;
+            context.status = response.statusCode;
             if (error) {
               reject(error);
             }

packages/serverless-fc-starter/src/runtime.ts

@@ -167,8 +167,14 @@ export class FCRuntime extends ServerlessLightRuntime {
               }
             }
 
-            if (res.setStatusCode) {
-              res.setStatusCode(ctx.status);
+            if (res.statusCode !== ctx.status) {
+              if (res.setStatusCode) {
+                res.setStatusCode(ctx.status);
+              }
+
+              if (res.statusCode) {
+                res.statusCode = ctx.status;
+              }
             }
 
             if (res.send) {