* update js dependencies

Author: alhazmy13

package.json

@@ -109,6 +109,7 @@
     "jsonpath-plus": "^0.16.0",
     "jsonwebtoken": "^8.2.1",
     "lodash": "^4.17.4",
+    "trim-newlines": "^2.0.0",
     "uuid": "^3.2.1",
     "velocityjs": "^0.9.3"
   },

src/functionHelper.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const trimNewlines = require('trim-newlines');
 const debugLog = require('./debugLog');
 const fork = require('child_process').fork;
 const _ = require('lodash');
@@ -9,52 +10,76 @@ const uuid = require('uuid/v4');
 const handlerCache = {};
 const messageCallbacks = {};
 
-function runPythonHandler(funOptions, options){
+function runPythonHandler(funOptions, options) {
     var spawn = require("child_process").spawn;
-      return function(event,context){
-      var process = spawn('sls',["invoke", "local", "-f", funOptions.funName],
-          {stdio: ['pipe', 'pipe', 'pipe'], shell: true, cwd:funOptions.servicePath});
-      process.stdin.write(JSON.stringify(event)+"\n");
-      process.stdin.end();
-      let results = ''
-      process.stdout.on('data', (data) => {
-         results = results + data;
-      });
-      process.stderr.on('data', (data) => {
-         context.fail(data);
-      });
-      process.on('close', (code) => {
-          if (code == 0) {
-              try {
-                context.succeed( JSON.parse(results) );
-              } catch (ex) {
-                context.fail(results);
-              }
-          } else {
-              context.succeed( code ,results );
-          }  
+    return function (event, context) {
+        var process = spawn('sls', ["invoke", "local", "-f", funOptions.funName],
+            { stdio: ['pipe', 'pipe', 'pipe'], shell: true, cwd: funOptions.servicePath });
+        process.stdin.write(JSON.stringify(event) + "\n");
+        process.stdin.end();
+        let results = ''
+        let hasDetectedJson = false;
+        process.stdout.on('data', (data) => {
+            let str = data.toString('utf8');
+            if (hasDetectedJson) {
+                // Assumes that all data after matching the start of the
+                // JSON result is the rest of the context result.
+                results = results + trimNewlines(str);
+            } else {
+                // Search for the start of the JSON result
+                // https://docs.aws.amazon.com/apigateway/latest/developerguide/set-up-lambda-proxy-integrations.html#api-gateway-simple-proxy-for-lambda-output-format
+                const match = /{\n\s+"isBase64Encoded"|{\n\s+"statusCode"|{\n\s+"headers"|{\n\s+"body"/.exec(str);
+                if (match && match.index > -1) {
+                    // The JSON result was in this chunk so slice it out
+                    hasDetectedJson = true;
+                    results = results + trimNewlines(str.slice(match.index));
+                    str = str.slice(0, match.index);
+                }
+
+                if(str.length > 0) {
+                    // The data does not look like JSON and we have not
+                    // detected the start of JSON, so write the
+                    // output to the console instead.
+                    console.log('Python:', '\x1b[34m' + str + '\x1b[0m');
+                }
+            }
         });
-      }
+        process.stderr.on('data', (data) => {
+            context.fail(data);
+        });
+        process.on('close', (code) => {
+            if (code == 0) {
+                try {
+                    context.succeed(JSON.parse(results));
+                } catch (ex) {
+                    context.fail(results);
+                }
+            } else {
+                context.succeed(code, results);
+            }
+        });
+    }
 }
 
+
 module.exports = {
-  getFunctionOptions(fun, funName, servicePath,serviceRuntime) {
-    console.log(fun, funName, servicePath)
-    // Split handler into method name and path i.e. handler.run
-    const handlerFile = fun.handler.split('.')[0];
-    const handlerName = fun.handler.split('/').pop().split('.')[1];
-
-    return {
-      funName,
-      handlerName, // i.e. run
-      handlerFile,
-      handlerPath: `${servicePath}/${handlerFile}`,
-      servicePath,
-      funTimeout: (fun.timeout || 30) * 1000,
-      babelOptions: ((fun.custom || {}).runtime || {}).babel,
-      serviceRuntime,
-    };
-  },
+  getFunctionOptions(fun, funName, servicePath, serviceRuntime) {
+        console.log(fun, funName, servicePath)
+        // Split handler into method name and path i.e. handler.run
+        const handlerFile = fun.handler.split('.')[0];
+        const handlerName = fun.handler.split('/').pop().split('.')[1];
+
+        return {
+            funName,
+            handlerName, // i.e. run
+            handlerFile,
+            handlerPath: `${servicePath}/${handlerFile}`,
+            servicePath,
+            funTimeout: (fun.timeout || 30) * 1000,
+            babelOptions: ((fun.custom || {}).runtime || {}).babel,
+            serviceRuntime,
+        };
+    },
 
   createExternalHandler(funOptions, options) {
     let handlerContext = handlerCache[funOptions.handlerPath];

src/index.js

@@ -324,7 +324,7 @@ class Offline {
     const apiKeys = this.service.provider.apiKeys;
     const protectedRoutes = [];
 
-    if (['nodejs', 'nodejs4.3', 'nodejs6.10', 'nodejs8.10', 'babel'].indexOf(serviceRuntime) === -1) {
+    if (['nodejs', 'nodejs4.3', 'nodejs6.10', 'nodejs8.10', 'babel', 'python2.7', 'python3.6'].indexOf(serviceRuntime) === -1) {
       this.printBlankLine();
       this.serverlessLog(`Warning: found unsupported runtime '${serviceRuntime}'`);