fix: /user/ => /user (#941)

* fix: /user/ => /user

* fix: serverless app init context

* fix: serverless-app files

packages-serverless/serverless-app/package.json

@@ -27,9 +27,8 @@
     "node": ">= 10"
   },
   "files": [
-    "plugin.json",
-    "dist",
-    "src"
+    "dist/**/*.js",
+    "dist/**/*.d.ts"
   ],
   "scripts": {
     "build": "midway-bin build -c",

packages-serverless/serverless-app/src/index.ts

@@ -204,7 +204,7 @@ export class Framework
       framework: Framework,
       layers: layers,
       starter: require(starterName),
-      initializeContext: undefined,
+      initializeContext: this.configurationOptions?.initContext,
     });
     this.innerFramework = startResult.framework;
     this.runtime = startResult.runtime;

packages-serverless/serverless-app/src/start.ts

@@ -34,6 +34,9 @@ export const start2 = async options => {
   });
   const runtime = await start({
     layers: layers,
+    getApp: () => {
+      return starterInstance && starterInstance.getApplication();
+    },
     initContext: initializeContext,
   });
   return {

packages-serverless/serverless-app/src/utils.ts

@@ -65,7 +65,10 @@ export const analysisDecorator = async (cwd: string) => {
           {
             http: {
               method: [].concat(func.requestMethod || 'get'),
-              path: (func.prefix + func.url).replace(/\/{1,}/g, '/'),
+              path: (func.prefix + (func.url === '/' ? '' : func.url)).replace(
+                /\/{1,}/g,
+                '/'
+              ),
             },
           },
         ],

packages-serverless/serverless-app/test/faas-v2.test.ts

@@ -34,6 +34,26 @@ describe('test/faas-v2.test.ts', () => {
       })
       .catch(err => done(err));
   });
+  it('http get controller', async done => {
+    request(app)
+      .get('/user')
+      .expect(200)
+      .then(response => {
+        assert(response.text === 'user');
+        done();
+      })
+      .catch(err => done(err));
+  });
+  it('http get controller params', async done => {
+    request(app)
+      .get('/user/midway')
+      .expect(200)
+      .then(response => {
+        assert(response.text === 'midway');
+        done();
+      })
+      .catch(err => done(err));
+  });
   it('http post', async done => {
     await request(app)
       .post('/hello')

packages-serverless/serverless-app/test/fixtures/faas-v2/src/controller.ts

@@ -0,0 +1,20 @@
+import { Provide, Controller, Get, Inject } from '@midwayjs/decorator';
+
+@Provide()
+@Controller('/user')
+export class ControllerTestService {
+
+  @Inject()
+  ctx;
+
+
+  @Get('/')
+  async handler() {
+    return 'user'
+  }
+
+  @Get('/:test')
+  async test() {
+    return this.ctx.params.test;
+  }
+}