Merge branch 'master' into refactor/get-path-with-query

Author: brettstack

README.md

@@ -80,5 +80,4 @@ app.use(awsServerlessExpressMiddleware.eventContext())
  - May be more expensive for high-traffic apps
  - Cannot use native libraries (aka [Addons](https://nodejs.org/api/addons.html)) unless you package your app on an EC2 machine running Amazon Linux
  - Stateless only
- - Multiple headers with same name not currently supported
  - API Gateway has a timeout of 30 seconds, and Lambda has a maximum execution time of 5 minutes.

__tests__/index.js

@@ -95,34 +95,55 @@ test('getSocketPath', () => {
     expect(socketPath).toEqual('/tmp/server0.sock')
 })
 
-describe('forwardResponseToApiGateway: content-type encoding', () => {
-    const PassThrough = require('stream').PassThrough
-
-    class MockResponse extends PassThrough {
-        constructor(statusCode, headers, body) {
-            super()
-            this.statusCode = statusCode
-            this.headers = headers || {}
-            this.write(body)
-            this.end()
-        }
+const PassThrough = require('stream').PassThrough
+
+class MockResponse extends PassThrough {
+    constructor(statusCode, headers, body) {
+        super()
+        this.statusCode = statusCode
+        this.headers = headers || {}
+        this.write(body)
+        this.end()
     }
+}
 
-    class MockServer {
-        constructor(binaryTypes) {
-            this._binaryTypes = binaryTypes || []
-        }
+class MockServer {
+    constructor(binaryTypes) {
+        this._binaryTypes = binaryTypes || []
     }
+}
 
-    class MockContext {
-        constructor(resolve) {
-            this.resolve = resolve
-        }
-        succeed(successResponse) {
-            this.resolve(successResponse)
-        }
+class MockContext {
+    constructor(resolve) {
+        this.resolve = resolve
+    }
+    succeed(successResponse) {
+        this.resolve(successResponse)
     }
+}
 
+describe('forwardResponseToApiGateway: header handling', () => {
+  test('multiple headers with the same name get transformed', () => {
+      const server = new MockServer()
+      const headers = {'foo': ['bar', 'baz']}
+      const body = 'hello world'
+      const response = new MockResponse(200, headers, body)
+      return new Promise(
+          (resolve, reject) => {
+              const context = new MockContext(resolve)
+              awsServerlessExpress.forwardResponseToApiGateway(
+                  server, response, context)
+          }
+      ).then(successResponse => expect(successResponse).toEqual({
+          statusCode: 200,
+          body: body,
+          headers: { Foo: 'bar', fOo: 'baz' },
+          isBase64Encoded: false
+      }))
+  })
+})
+
+describe('forwardResponseToApiGateway: content-type encoding', () => {
     test('content-type header missing', () => {
         const server = new MockServer()
         const headers = {'foo': 'bar'}

example/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-serverless-express-example",
-  "version": "1.1.0",
+  "version": "2.1.0",
   "description": "Example application for running a Node Express app on AWS Lambda using Amazon API Gateway.",
   "main": "lambda.js",
   "config": {
@@ -22,7 +22,6 @@
     "package-deploy": "npm run package && npm run deploy",
     "delete-stack": "aws cloudformation delete-stack --stack-name $npm_package_config_cloudFormationStackName --region $npm_package_config_region",
     "setup": "npm install && (aws s3api get-bucket-location --bucket $npm_package_config_s3BucketName --region $npm_package_config_region || npm run create-bucket) && npm run package-deploy",
-
     "win-config": "npm run config",
     "win-deconfig": "npm run deconfig",
     "win-local": "npm run local",

example/scripts/configure.js

@@ -33,7 +33,7 @@ const accountId = args['account-id']
 const bucketName = args['bucket-name']
 const functionName = args['function-name']
 const region = args.region
-const availableRegions = ['us-east-1', 'us-west-2', 'eu-west-1', 'eu-central-1', 'ap-northeast-1', 'ap-northeast-2', 'ap-southeast-1', 'ap-southeast-2']
+const availableRegions = ['us-east-1', 'us-east-2', 'us-west-1', 'us-west-2', 'eu-west-1', 'eu-west-2', 'eu-central-1', 'ap-northeast-1', 'ap-northeast-2', 'ap-southeast-1', 'ap-southeast-2']
 
 if (!accountId || accountId.length !== 12) {
     console.error('You must supply a 12 digit account id as --account-id="<accountId>"')

example/simple-proxy-api.yaml

@@ -19,7 +19,7 @@ paths:
         responses:
           default:
             statusCode: 200
-        uri: arn:aws:apigateway:YOUR_AWS_REGION:lambda:path/2015-03-31/functions/arn:aws:lambda:YOUR_AWS_REGION:YOUR_ACCOUNT_ID:function:${stageVariables.YOUR_SERVERLESS_EXPRESS_LAMBDA_FUNCTION_NAME}/invocations
+        uri: arn:aws:apigateway:YOUR_AWS_REGION:lambda:path/2015-03-31/functions/arn:aws:lambda:YOUR_AWS_REGION:YOUR_ACCOUNT_ID:function:${stageVariables.ServerlessExpressLambdaFunctionName}/invocations
         passthroughBehavior: when_no_match
         httpMethod: POST
         type: aws_proxy
@@ -63,7 +63,7 @@ paths:
         type: string
       responses: {}
       x-amazon-apigateway-integration:
-        uri: arn:aws:apigateway:YOUR_AWS_REGION:lambda:path/2015-03-31/functions/arn:aws:lambda:YOUR_AWS_REGION:YOUR_ACCOUNT_ID:function:${stageVariables.YOUR_SERVERLESS_EXPRESS_LAMBDA_FUNCTION_NAME}/invocations
+        uri: arn:aws:apigateway:YOUR_AWS_REGION:lambda:path/2015-03-31/functions/arn:aws:lambda:YOUR_AWS_REGION:YOUR_ACCOUNT_ID:function:${stageVariables.ServerlessExpressLambdaFunctionName}/invocations
         httpMethod: POST
         type: aws_proxy
     options:

index.js

@@ -15,6 +15,7 @@
 'use strict'
 const http = require('http')
 const url = require('url')
+const binarycase = require('binary-case')
 
 function getPathWithQueryStringParams(event) {
   return url.format({ pathname: event.path, query: event.queryStringParameters })
@@ -50,9 +51,16 @@ function forwardResponseToApiGateway(server, response, context) {
             const statusCode = response.statusCode
             const headers = response.headers
 
+            // HACK: modifies header casing to get around API Gateway's limitation of not allowing multiple
+            // headers with the same name, as discussed on the AWS Forum https://forums.aws.amazon.com/message.jspa?messageID=725953#725953
             Object.keys(headers)
                 .forEach(h => {
-                    if(Array.isArray(headers[h])) headers[h] = headers[h].join(',')
+                    if(Array.isArray(headers[h])) {
+                      headers[h].forEach((value, i) => {
+                        headers[binarycase(h, i + 1)] = value
+                      })
+                      delete headers[h]
+                    }
                 })
 
             const contentType = headers['content-type']

package.json

@@ -32,5 +32,8 @@
   },
   "scripts": {
     "test": "jest"
+  },
+  "dependencies": {
+    "binary-case": "^1.0.0"
   }
 }