Add support for payload format 1.0

Author: adamthom-amzn

smithy-typescript-ssdk-libs/server-apigateway/package.json

@@ -8,13 +8,13 @@
     "prepublishOnly": "yarn build",
     "pretest": "yarn build",
     "build": "tsc -p tsconfig.json",
-    "postbuild": "downlevel-dts dist/types dist/types/ts3.4",
+    "postbuild": "rimraf dist/types/ts3.4 && downlevel-dts dist/types dist/types/ts3.4",
     "test": "jest"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/awslabs/smithy-typescript.git",
-    "directory": "smithy-typescript-libs/smithy-server-apigateway"
+    "directory": "smithy-typescript-ssdk-libs/server-apigateway"
   },
   "author": "AWS Smithy Team",
   "license": "Apache-2.0",
@@ -29,7 +29,8 @@
     "@types/node": "^14.14.37",
     "downlevel-dts": "^0.7.0",
     "jest": "^26.1.0",
-    "typescript": "~4.2.2"
+    "typescript": "~4.2.2",
+    "rimraf": "^3.0.2"
   },
   "files": [
     "dist/cjs/**/*.js",

smithy-typescript-ssdk-libs/server-apigateway/src/lambda.ts

@@ -16,14 +16,39 @@
 import { HttpRequest, HttpResponse } from "@aws-sdk/protocol-http";
 import { HeaderBag, QueryParameterBag } from "@aws-sdk/types";
 import {
+  APIGatewayProxyEvent,
   APIGatewayProxyEventHeaders,
+  APIGatewayProxyEventMultiValueHeaders,
+  APIGatewayProxyEventMultiValueQueryStringParameters,
   APIGatewayProxyEventQueryStringParameters,
   APIGatewayProxyEventV2,
+  APIGatewayProxyResult,
   APIGatewayProxyResultV2,
 } from "aws-lambda";
 import { Readable } from "stream";
 
-export function convertEvent(event: APIGatewayProxyEventV2): HttpRequest {
+export function convertEvent(event: APIGatewayProxyEvent): HttpRequest;
+export function convertEvent(event: APIGatewayProxyEventV2): HttpRequest;
+
+export function convertEvent(event: APIGatewayProxyEvent | APIGatewayProxyEventV2): HttpRequest {
+  if (isV2Event(event)) {
+    return convertV2Event(event);
+  } else {
+    return convertV1Event(event);
+  }
+}
+
+function convertV1Event(event: APIGatewayProxyEvent): HttpRequest {
+  return new HttpRequest({
+    method: event.httpMethod,
+    headers: convertMultiValueHeaders(event.multiValueHeaders),
+    query: convertMultiValueQueryStringParameters(event.multiValueQueryStringParameters),
+    path: event.path,
+    ...(event.body ? { body: Readable.from(Buffer.from(event.body, event.isBase64Encoded ? "base64" : "utf8")) } : {}),
+  });
+}
+
+function convertV2Event(event: APIGatewayProxyEventV2): HttpRequest {
   return new HttpRequest({
     method: event.requestContext.http.method,
     headers: convertHeaders(event.headers),
@@ -33,6 +58,7 @@ export function convertEvent(event: APIGatewayProxyEventV2): HttpRequest {
   });
 }
 
+export const convertVersion2Response = convertResponse;
 export function convertResponse(response: HttpResponse): APIGatewayProxyResultV2 {
   return {
     statusCode: response.statusCode,
@@ -42,14 +68,69 @@ export function convertResponse(response: HttpResponse): APIGatewayProxyResultV2
   };
 }
 
+export function convertVersion1Response(response: HttpResponse): APIGatewayProxyResult {
+  return {
+    statusCode: response.statusCode,
+    multiValueHeaders: convertResponseHeaders(response.headers),
+    body: response.body,
+    isBase64Encoded: false,
+  };
+}
+function convertResponseHeaders(headers: HeaderBag) {
+  const retVal: { [key: string]: string[] } = {};
+  for (const [key, val] of Object.entries(headers)) {
+    retVal[key] = val.split(",").map((v) => v.trim());
+  }
+  return retVal;
+}
+
+function isV2Event(event: APIGatewayProxyEvent | APIGatewayProxyEventV2): event is APIGatewayProxyEventV2 {
+  return hasVersion(event) && event.version === "2.0";
+}
+
+function hasVersion(event: any): event is Record<"version", string> {
+  return event.hasOwnProperty("version");
+}
+
+function convertMultiValueHeaders(multiValueHeaders: APIGatewayProxyEventMultiValueHeaders | null) {
+  const retVal: { [key: string]: string } = {};
+
+  if (multiValueHeaders === null) {
+    return retVal;
+  }
+
+  for (const [key, val] of Object.entries(multiValueHeaders)) {
+    if (val !== undefined) {
+      retVal[key] = val.join(", ");
+    }
+  }
+
+  return retVal;
+}
+
 // TODO: this can be rewritten with arrow functions / Object.fromEntries / filter
 // but first we need to split up generated client and servers so we can have different
 // language version targets.
 function convertHeaders(headers: APIGatewayProxyEventHeaders): HeaderBag {
   const retVal: { [key: string]: string } = {};
 
-  for (const key in headers) {
-    const val = headers[key];
+  for (const [key, val] of Object.entries(headers)) {
+    if (val !== undefined) {
+      retVal[key] = val;
+    }
+  }
+
+  return retVal;
+}
+
+function convertMultiValueQueryStringParameters(params: APIGatewayProxyEventMultiValueQueryStringParameters | null) {
+  if (params === undefined || params === null) {
+    return undefined;
+  }
+
+  const retVal: { [key: string]: string[] } = {};
+
+  for (const [key, val] of Object.entries(params)) {
     if (val !== undefined) {
       retVal[key] = val;
     }
@@ -66,8 +147,7 @@ function convertQuery(params: APIGatewayProxyEventQueryStringParameters | undefi
 
   const retVal: { [key: string]: string | string[] } = {};
 
-  for (const key in params) {
-    const val = params[key];
+  for (const [key, val] of Object.entries(params)) {
     if (val !== undefined) {
       if (val.indexOf(",") !== -1) {
         retVal[key] = val;