Merge pull request #7 from amasses/support-all-proxy-runtimes

Updated support to cover Proxy-runtimes (python, ruby) not just python

Author: alhazmy13

manual_test/handler.js

@@ -4,7 +4,7 @@ module.exports.hello = (event, context, callback) => {
   const response = {
     statusCode: 200,
     body: JSON.stringify({
-      message: 'Go Serverless v1.0! Your function executed successfully!',
+      message: 'NodeJS Go Serverless v1.0! Your function executed successfully!',
       input: event,
     }),
   };

manual_test/handler.py

@@ -0,0 +1,3 @@
+
+def hello(event, context):
+    return {"statusCode": 200, "body": "{\"message\": \"hi there from python\"}"}

manual_test/handler.rb

@@ -0,0 +1,13 @@
+require 'json'
+
+def hello(event:, context:)
+  begin
+    # puts "Received Request (RUBY): #{event}"
+
+    { statusCode: 200, body: JSON.generate("Ruby Go Serverless v1.0! Your function executed successfully! #{event['body']}") }
+  rescue StandardError => e  
+    puts e.message  
+    puts e.backtrace.inspect  
+    { statusCode: 400, body: JSON.generate("Bad request, please POST a request body!") }
+  end
+end

manual_test/serverless.yml

@@ -14,11 +14,13 @@
 service: basic
 
 plugins:
-  - serverless-offline
+  - serverless-offline-python
 
 provider:
   name: aws
   runtime: nodejs4.3
+  # runtime: ruby2.5
+  # runtime: python2.7
   apiKeys:
     - token
 # you can overwrite defaults here

src/createAuthScheme.js

@@ -22,9 +22,9 @@ module.exports = function createAuthScheme(authFun, authorizerOptions, funName,
     identityHeader = identitySourceMatch[1].toLowerCase();
   }
 
-  // HACK: since handlerName is used to invoke python function locally,
+  // HACK: since handlerName is used to invoke python/ruby (ie. a proxy runtime) function locally,
   // we have to pass the authFunName instead of funcName
-  const funOptions = functionHelper.getFunctionOptions(authFun, utils.isPythonRuntime(serviceRuntime) ? authFunName : funName, servicePath, serviceRuntime);
+  const funOptions = functionHelper.getFunctionOptions(authFun, utils.isProxyRuntime(serviceRuntime) ? authFunName : funName, servicePath, serviceRuntime);
 
   // Create Auth Scheme
   return () => ({

src/functionHelper.js

@@ -11,60 +11,60 @@ const utils = require('./utils');
 const handlerCache = {};
 const messageCallbacks = {};
 
-function runPythonHandler(funOptions, options) {
-    var spawn = require("child_process").spawn;
-    return function (event, context) {
-        var args = ["invoke", "local", "-f", funOptions.funName]
-        var stage = options.s || options.stage
-        if (stage)
-            args = args.concat(["-s", stage])
-
-        var process = spawn('sls', args,
-            { 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 = /{[\r\n]\s+"isBase64Encoded"|{[\r\n]\s+"statusCode"|{[\r\n]\s+"headers"|{[\r\n]\s+"body"|{[\r\n]\s+"principalId"/.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);
-            }
-        });
-    }
+function runProxyHandler(funOptions, options) {
+  var spawn = require("child_process").spawn;
+  return function (event, context) {
+      var args = ["invoke", "local", "-f", funOptions.funName]
+      var stage = options.s || options.stage
+      if (stage)
+          args = args.concat(["-s", stage])
+
+      var process = spawn('sls', args,
+          { 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 = /{[\r\n]?\s*"isBase64Encoded"|{[\r\n]?\s*"statusCode"|{[\r\n]?\s*"headers"|{[\r\n]?\s*"body"|{[\r\n]?\s*"principalId"/.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('Proxy Handler could not detect JSON:', '\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);
+          }
+      });
+  }
 }
 
 
@@ -159,10 +159,10 @@ module.exports = {
         if (!key.match('node_modules')) delete require.cache[key];
       }
     }
-    let user_python = true
+
     let handler = null;
-    if (utils.isPythonRuntime(funOptions['serviceRuntime'])) {
-      handler = runPythonHandler(funOptions, options)
+    if (utils.isProxyRuntime(funOptions['serviceRuntime'])) {
+      handler = runProxyHandler(funOptions, options)
     } else {
       debugLog(`Loading handler... (${funOptions.handlerPath})`);
       handler = require(funOptions.handlerPath)[funOptions.handlerName];

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', 'python2.7', 'python3.6'].indexOf(serviceRuntime) === -1) {
+    if (['nodejs', 'nodejs4.3', 'nodejs6.10', 'nodejs8.10', 'babel', 'python2.7', 'python3.6', 'ruby2.5'].indexOf(serviceRuntime) === -1) {
       this.printBlankLine();
       this.serverlessLog(`Warning: found unsupported runtime '${serviceRuntime}'`);
 

src/utils.js

@@ -17,5 +17,5 @@ module.exports = {
   // Detect the toString encoding from the request headers content-type
   // enhance if further content types need to be non utf8 encoded.
   detectEncoding: request => _.includes(request.headers['content-type'], 'multipart/form-data') ? 'binary' : 'utf8',
-  isPythonRuntime: runtime => runtime.startsWith('python')
+  isProxyRuntime: runtime => { return runtime.startsWith('python') || runtime.startsWith('ruby') }
 };