feat: use event.pathParameters.proxy if available ({proxy+}); fall back to event.path, fixes #182

Author: adrai

index.js

@@ -39,7 +39,8 @@ module.exports = (app, options) => {
     event.body = event.body || ''
 
     const method = event.httpMethod || (event.requestContext && event.requestContext.http ? event.requestContext.http.method : undefined)
-    let url = event.path || event.rawPath || '/' // seen rawPath for HTTP-API
+    // NOTE: Use `event.pathParameters.proxy` if available ({proxy+}); fall back to `event.path`
+    let url = (event.pathParameters && event.pathParameters.proxy && `/${event.pathParameters.proxy}`) || event.path || event.rawPath || '/' // seen rawPath for HTTP-API
     // NOTE: if used directly via API Gateway domain and /stage
     if (!options.retainStage && event.requestContext && event.requestContext.stage &&
         event.requestContext.resourcePath && (url).indexOf(`/${event.requestContext.stage}/`) === 0 &&

test/basic.test.js

@@ -459,3 +459,104 @@ test('with existing onRequest hook', async (t) => {
   // t.same(ret.multiValueHeaders['set-cookie'], ['qwerty=one', 'qwerty=two'])
   t.same(ret.cookies, ['qwerty=one', 'qwerty=two'])
 })
+
+test('proxy in pathParameters with http api', async (t) => {
+  t.plan(13)
+
+  const app = fastify()
+  const evt = {
+    version: '2.0',
+    routeKey: 'GET /prod/{proxy+}',
+    rawPath: '/prod/projects',
+    rawQueryString: 't=1698604776681',
+    requestContext: {
+      http: {
+        method: 'GET',
+        path: '/prod/projects'
+      }
+    },
+    headers: {
+      'X-My-Header': 'wuuusaaa'
+    },
+    queryStringParameters: {
+      t: '1698604776681'
+    },
+    pathParameters: {
+      proxy: 'projects'
+    }
+  }
+  app.get('/projects', async (request, reply) => {
+    t.equal(request.headers['x-my-header'], 'wuuusaaa')
+    t.equal(request.headers['user-agent'], 'lightMyRequest')
+    t.equal(request.headers.host, 'localhost:80')
+    t.equal(request.headers['content-length'], '0')
+    t.equal(request.query.t, '1698604776681')
+    reply.send({ hello: 'world' })
+  })
+  const proxy = awsLambdaFastify(app)
+  const ret = await proxy(evt)
+  t.equal(ret.statusCode, 200)
+  t.equal(ret.body, '{"hello":"world"}')
+  t.equal(ret.isBase64Encoded, false)
+  t.ok(ret.headers)
+  t.equal(ret.headers['content-type'], 'application/json; charset=utf-8')
+  t.equal(ret.headers['content-length'], '17')
+  t.ok(ret.headers.date)
+  t.equal(ret.headers.connection, 'keep-alive')
+})
+
+test('proxy in pathParameters with rest api', async (t) => {
+  t.plan(13)
+
+  const app = fastify()
+  const evt = {
+    resource: '/area/project',
+    path: '/area/projects',
+    rawPath: '/prod/projects',
+    httpMethod: 'GET',
+    headers: {
+      'X-My-Header': 'wuuusaaa'
+    },
+    multiValueHeaders: {
+      'X-My-Header': [
+        'wuuusaaa'
+      ]
+    },
+    queryStringParameters: {
+      t: '1698604776681'
+    },
+    multiValueQueryStringParameters: {
+      t: [
+        '1698604776681'
+      ]
+    },
+    pathParameters: {
+      proxy: 'projects'
+    },
+    stageVariables: null,
+    requestContext: {
+      resourcePath: '/area/{proxy+}',
+      httpMethod: 'GET',
+      path: '/dev/area/projects',
+      stage: 'dev'
+    }
+  }
+  app.get('/projects', async (request, reply) => {
+    t.equal(request.headers['x-my-header'], 'wuuusaaa')
+    t.equal(request.headers['user-agent'], 'lightMyRequest')
+    t.equal(request.headers.host, 'localhost:80')
+    t.equal(request.headers['content-length'], '0')
+    t.equal(request.query.t, '1698604776681')
+    reply.send({ hello: 'world' })
+  })
+  const proxy = awsLambdaFastify(app)
+  const ret = await proxy(evt)
+  t.equal(ret.statusCode, 200)
+  t.equal(ret.body, '{"hello":"world"}')
+  t.equal(ret.isBase64Encoded, false)
+  t.ok(ret.headers)
+  t.equal(ret.headers['content-type'], 'application/json; charset=utf-8')
+  t.equal(ret.headers['content-length'], '17')
+  t.ok(ret.headers.date)
+  t.equal(ret.headers.connection, 'keep-alive')
+})