Merge pull request #182 from humanmade/fix-import

Import with file extensions

global.d.ts

@@ -2,6 +2,7 @@ declare type ResponseStream = {
 	setContentType( type: string ): void;
 	write( stream: string | Buffer ): void;
 	end(): void;
+	metadata?: any;
 };
 
 declare type StreamifyHandler = ( event: APIGatewayProxyEventV2, response: ResponseStream ) => Promise<any>;
@@ -13,7 +14,7 @@ declare var awslambda: {
 	HttpResponseStream: {
 		from( response: ResponseStream, metadata: {
 			headers?: Record<string, string>,
-			statusCode?: number,
+			statusCode: number,
 			cookies?: string[],
 		} ): ResponseStream
 	}

jest.config.js

@@ -13,4 +13,7 @@ export default {
 			},
 		],
 	},
+	moduleNameMapper: {
+		"(.+)\\.js": "$1"
+	},
 };

src/lambda-handler.ts

@@ -1,4 +1,4 @@
-import { Args, getS3File, resizeBuffer, Config } from './lib';
+import { Args, getS3File, resizeBuffer, Config } from './lib.js';
 /**
  *
  * @param event
@@ -67,13 +67,14 @@ const streamify_handler: StreamifyHandler = async ( event, response ) => {
 
 	// Somewhat undocumented API on how to pass headers to a stream response.
 	response = awslambda.HttpResponseStream.from( response, {
+		statusCode: 200,
 		headers: {
 			'Cache-Control': `max-age=${ maxAge }`,
 			'Last-Modified': ( new Date() ).toUTCString(),
+			'Content-Type': 'image/' + info.format,
 		},
 	} );
 
-	response.setContentType( 'image/' + info.format );
 	response.write( data );
 	response.end();
 };
@@ -96,6 +97,7 @@ if ( typeof awslambda === 'undefined' ) {
 			from( response: ResponseStream, metadata: {
 				headers?: Record<string, string>,
 			} ): ResponseStream {
+				response.metadata = metadata;
 				return response;
 			},
 		},

tests/test-lambda.ts

@@ -32,6 +32,7 @@ class TestResponseStream {
 	contentType: string | undefined;
 	body: string | Buffer | undefined;
 	headers: { [key: string]: string } = {};
+	metadata: any;
 
 	setContentType( type: string ): void {
 		this.contentType = type;
@@ -46,7 +47,9 @@ class TestResponseStream {
 		}
 	}
 	end(): void {
-
+		if ( this.metadata.headers['Content-Type'] ) {
+			this.contentType = this.metadata.headers['Content-Type'];
+		}
 	}
 }
 
@@ -63,7 +66,8 @@ global.awslambda = {
 		 * @param stream The response stream.
 		 * @param metadata The metadata for the response.
 		 */
-		from( stream: ResponseStream, metadata ) : ResponseStream {
+		from( stream: TestResponseStream, metadata ) : TestResponseStream {
+			stream.metadata = metadata;
 			return stream;
 		},
 	},

tests/test-private-upload.ts

@@ -74,6 +74,9 @@ test( 'Test get private upload', async () => {
 		 * End the response.
 		 */
 		end(): void {
+			if ( this.metadata.headers['Cache-Control'] ) {
+				contentType = this.metadata.headers['Content-Type'];
+			}
 		},
 	} );
 
@@ -115,6 +118,9 @@ test( 'Test get private upload with presign params', async () => {
 		 * End the response.
 		 */
 		end(): void {
+			if ( this.metadata.headers['Cache-Control'] ) {
+				contentType = this.metadata.headers['Content-Type'];
+			}
 		},
 	} );
 

tsconfig.json

@@ -4,8 +4,8 @@
 		"strict": true,
 		"preserveConstEnums": true,
 		"sourceMap": false,
-		"module": "ES2022",
-		"moduleResolution": "node",
+		"module": "Node16",
+		"moduleResolution": "node16",
 		"esModuleInterop": true,
 		"skipLibCheck": true,
 		"forceConsistentCasingInFileNames": true,

tsconfig.test.json

@@ -5,8 +5,8 @@
 		"preserveConstEnums": true,
 		"noEmit": false,
 		"sourceMap": true,
-		"module": "ES2022",
-		"moduleResolution": "node",
+		"module": "Node16",
+		"moduleResolution": "Node16",
 		"esModuleInterop": true,
 		"skipLibCheck": true,
 		"forceConsistentCasingInFileNames": true,