Merge pull request #11 from spring-media/minor-refactoring

avoid error if no response body

Author: Jun-Zhe Lai

index.js

@@ -2,7 +2,12 @@
 
 function handler(routeConfig) {
     const eventProcessorMapping = extractEventProcessorMapping(routeConfig);
+
     return (event, context, callback) => {
+        if (routeConfig.debug) {
+            console.log("Lambda invoked with request:", event)
+        }
+
         for (const eventProcessorName of eventProcessorMapping.keys()) {
 
             try {
@@ -22,6 +27,10 @@ function handler(routeConfig) {
                             console.log(error.stack);
                             callback(error.toString());
                         });
+                } else {
+                    if (routeConfig.debug) {
+                        console.log("Event processor couldn't handle request.")
+                    }
                 }
             } catch (error) {
                 if (error.stack) {

lib/proxyIntegration.js

@@ -14,7 +14,39 @@ function addCorsHeaders(toAdd) {
     return toAdd;
 }
 
+function processActionAndReturn(actionConfig, event, headers, errorMapping) {
+    return Promise.resolve(actionConfig.action(event)).then(res => {
+
+        if (res && res.body) {
+            const mergedHeaders = Object.assign({}, headers, res.headers);
+
+            return Object.assign({
+                    statusCode: 200
+                },
+                res, {
+                    headers: mergedHeaders
+                });
+        } else {
+            const consolidateBody = res && JSON.stringify(res) || '{}';
+
+            return {
+                statusCode: 200,
+                headers: headers,
+                body: consolidateBody
+            };
+        }
+    }).catch(err => {
+        console.log('Error while handling action function.')
+        return convertError(err, errorMapping, headers);
+    });
+}
+
 function process(proxyIntegrationConfig, event) {
+    if (proxyIntegrationConfig.debug) {
+        console.log("Lambda proxyIntegrationConfig: ", proxyIntegrationConfig)
+        console.log("Lambda request: ", event)
+    }
+
     //validate config
     if (!Array.isArray(proxyIntegrationConfig.routes) || proxyIntegrationConfig.routes.length < 1) {
         throw new Error('proxyIntegration.routes must not be empty');
@@ -65,27 +97,7 @@ function process(proxyIntegrationConfig, event) {
                 });
             }
         }
-        return Promise.resolve(actionConfig.action(event)).then(res => {
-
-            if (res.body) {
-                const mergedHeaders = Object.assign({}, headers, res.headers);
-
-                return Object.assign({
-                        statusCode: 200
-                    },
-                    res, {
-                        headers: mergedHeaders
-                    });
-            }
-
-            return {
-                statusCode: 200,
-                headers: headers,
-                body: JSON.stringify(res)
-            };
-        }).catch(err => {
-            return convertError(err, errorMapping, headers);
-        });
+        return processActionAndReturn(actionConfig, event, headers, errorMapping);
     } catch (error) {
         console.log('Error while evaluating matching action handler', error);
         return Promise.resolve(convertError(error, errorMapping, headers));

test/index.spec.js

@@ -8,6 +8,7 @@ describe('processor.configuration', () => {
         './lib/lib2': () => Promise.resolve(2)
     });
 
+
     it('should throw error if processor does not exist', () => {
         expect(() => router.handler({
             lib1: {},

test/proxyIntegration.spec.js

@@ -269,6 +269,7 @@ describe('proxyIntegration.routeHandler', () => {
         });
     });
 
+
     it('should return default headers', (done) => {
         const routeConfig = {
             defaultHeaders: {'a': '1', 'b': '2'},
@@ -289,6 +290,28 @@ describe('proxyIntegration.routeHandler', () => {
             done();
         });
     });
+
+
+    it('should return error headers', (done) => {
+        const routeConfig = {
+            routes: [
+                {
+                    method: 'GET',
+                    path: '/',
+                    action: () => (Promise.resolve())
+                }
+            ]
+        };
+        proxyIntegration(routeConfig, {path: '/', httpMethod: 'GET'}).then(result => {
+            expect(result).toEqual({
+                statusCode: 200,
+                headers: {"Content-Type": "application/json"},
+                body: "{}"
+            });
+            done();
+        });
+    });
+
     it('should return error including CORS header', (done) => {
         const routeConfig = {
             cors: true,