@travetto/web-aws-lambda 7.1.3 → 8.0.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/web-aws-lambda",
-  "version": "7.1.3",
+  "version": "8.0.0-alpha.0",
   "type": "module",
   "description": "Web APIs entry point support for AWS Lambdas.",
   "keywords": [
@@ -26,13 +26,13 @@
     "directory": "module/web-aws-lambda"
   },
   "dependencies": {
-    "@travetto/web": "^7.1.3",
-    "@types/aws-lambda": "^8.10.159"
+    "@travetto/web": "^8.0.0-alpha.0",
+    "@types/aws-lambda": "^8.10.161"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.1.3",
-    "@travetto/pack": "^7.1.3",
-    "@travetto/test": "^7.1.3"
+    "@travetto/cli": "^8.0.0-alpha.0",
+    "@travetto/pack": "^8.0.0-alpha.0",
+    "@travetto/test": "^8.0.0-alpha.0"
   },
   "peerDependenciesMeta": {
     "@travetto/test": {

package/src/util.ts

@@ -1,8 +1,6 @@
-import { buffer } from 'node:stream/consumers';
-
 import type { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
 
-import { castTo } from '@travetto/runtime';
+import { BinaryUtil, castTo, CodecUtil, type BinaryArray } from '@travetto/runtime';
 import { WebBodyUtil, WebCommonUtil, WebRequest, WebResponse } from '@travetto/web';
 
 export class AwsLambdaWebUtil {
@@ -12,7 +10,10 @@ export class AwsLambdaWebUtil {
    */
   static toWebRequest(event: APIGatewayProxyEvent): WebRequest {
     // Build request
-    const body = event.body ? Buffer.from(event.body, event.isBase64Encoded ? 'base64' : 'utf8') : undefined;
+    const body = !event.body ? undefined :
+      event.isBase64Encoded ?
+        CodecUtil.fromBase64String(event.body) :
+        CodecUtil.fromUTF8String(event.body);
 
     return new WebRequest({
       context: {
@@ -25,7 +26,7 @@ export class AwsLambdaWebUtil {
         path: event.path,
       },
       headers: { ...event.headers, ...event.multiValueHeaders },
-      body: WebBodyUtil.markRaw(body)
+      body: WebBodyUtil.markRawBinary(body)
     });
   }
 
@@ -37,13 +38,11 @@ export class AwsLambdaWebUtil {
       context: response.context,
       ...WebBodyUtil.toBinaryMessage(response)
     });
-    let output: Buffer = Buffer.alloc(0);
-    if (Buffer.isBuffer(binaryResponse.body)) {
-      output = binaryResponse.body;
-    } else if (binaryResponse.body) {
-      output = await buffer(binaryResponse.body);
-    }
-    const isBase64Encoded = !!output.length && base64Encoded;
+    const output: BinaryArray = binaryResponse.body ?
+      await BinaryUtil.toBinaryArray(binaryResponse.body) :
+      BinaryUtil.makeBinaryArray(0);
+
+    const isBase64Encoded = !!output.byteLength && base64Encoded;
     const headers: Record<string, string> = {};
     const multiValueHeaders: Record<string, string[]> = {};
 
@@ -58,7 +57,7 @@ export class AwsLambdaWebUtil {
     return {
       statusCode: WebCommonUtil.getStatusCode(binaryResponse),
       isBase64Encoded,
-      body: output.toString(isBase64Encoded ? 'base64' : 'utf8'),
+      body: isBase64Encoded ? CodecUtil.toBase64String(output) : CodecUtil.toUTF8String(output),
       headers,
       multiValueHeaders,
     };

package/support/test/dispatcher.ts

@@ -2,7 +2,7 @@ import type { APIGatewayProxyEvent, Context } from 'aws-lambda';
 
 import { Inject, Injectable } from '@travetto/di';
 import { type WebDispatcher, type WebFilterContext, type WebRequest, WebResponse } from '@travetto/web';
-import { AppError, asFull, castTo } from '@travetto/runtime';
+import { RuntimeError, asFull, BinaryUtil, castTo, CodecUtil, type BinaryArray } from '@travetto/runtime';
 
 import { WebTestDispatchUtil } from '@travetto/web/support/test/dispatch-util.ts';
 
@@ -11,15 +11,15 @@ import type { AwsLambdaWebHandler } from '../../src/handler.ts';
 /**
  * Create an api gateway event given a web request
  */
-function toLambdaEvent(request: WebRequest): APIGatewayProxyEvent {
+function toLambdaEvent(request: WebRequest<BinaryArray>): APIGatewayProxyEvent {
   const body = request.body;
   const headers: Record<string, string> = {};
   const multiValueHeaders: Record<string, string[]> = {};
   const queryStringParameters: Record<string, string> = {};
   const multiValueQueryStringParameters: Record<string, string[]> = {};
 
-  if (!(body === undefined || body === null || Buffer.isBuffer(body))) {
-    throw new AppError('Unsupported request type, only buffer bodies supported');
+  if (body && !BinaryUtil.isBinaryArray(body)) {
+    throw new RuntimeError('Unsupported request type, only buffer bodies supported');
   }
 
   request.headers.forEach((v, k) => {
@@ -46,7 +46,7 @@ function toLambdaEvent(request: WebRequest): APIGatewayProxyEvent {
     headers,
     multiValueHeaders,
     isBase64Encoded: true,
-    body: body?.toString('base64')!,
+    body: request.body ? CodecUtil.toBase64String(request.body) : null,
     requestContext: castTo({
       identity: castTo({ sourceIp: '127.0.0.1' }),
     }),
@@ -63,13 +63,14 @@ export class LocalAwsLambdaWebDispatcher implements WebDispatcher {
   app: AwsLambdaWebHandler;
 
   async dispatch({ request }: WebFilterContext): Promise<WebResponse> {
-    const event = toLambdaEvent(await WebTestDispatchUtil.applyRequestBody(request));
-
+    const event = toLambdaEvent(await WebTestDispatchUtil.applyRequestBody(request, true));
     const response = await this.app.handle(event, asFull<Context>({}));
 
     return WebTestDispatchUtil.finalizeResponseBody(
       new WebResponse<unknown>({
-        body: Buffer.from(response.body, response.isBase64Encoded ? 'base64' : 'utf8'),
+        body: response.isBase64Encoded ?
+          CodecUtil.fromBase64String(response.body) :
+          CodecUtil.fromUTF8String(response.body),
         headers: { ...response.headers ?? {}, ...response.multiValueHeaders ?? {} },
         context: {
           httpStatusCode: response.statusCode