aws-lambda-runner 1.8.0 → 2.0.0

data/js/package.json

@@ -1,26 +1,30 @@
 {
   "name": "lambda-helper",
   "version": "1.0.0",
-  "description": "",
+  "description": "lambda-helper",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/bbc/aws-lambda-runner.git"
+  },
   "main": "startup.js",
   "scripts": {
     "test": "mocha"
   },
   "author": "",
-  "license": " ",
+  "license": "Apache-2.0",
   "devDependencies": {
     "assert": "^1.4.1",
     "jshint": "^2.9.4",
-    "mocha": "^3.3.0",
+    "mocha": "^5.2.0",
     "mocha-jshint": "^2.3.1",
     "mock-res": "^0.4.1",
     "should": "^11.2.1"
   },
   "dependencies": {
+    "always-done": "^1.1.0",
     "aws-sdk": "*",
-    "istanbul": "^0.4.5",
-    "merge": "^1.2.0",
     "mock-req": "^0.2.0",
+    "nyc": "^13.1.0",
     "stdio": "^0.2.7"
   }
 }

data/js/request.js

@@ -1,5 +1,6 @@
-var merge = require('merge');
+/* istanbul ignore file */
 var url = require('url');
+const alwaysDone = require('always-done');
 
 var next_id = 0;
 // FIXME: this object grows forever - entries are never removed.  Should they
@@ -28,24 +29,22 @@ Job.prototype.doTimedOut = function () {
 };
 
 var region = function () {
-    return process.env.AWS_DEFAULT_REGION || process.env.AWS_REGION || process.env.AMAZON_REGION || "xx-dummy-0";
+  return process.env.AWS_DEFAULT_REGION || process.env.AWS_REGION || process.env.AMAZON_REGION || "xx-dummy-0";
 };
 
-var defaultContextObject = function () {
-  return {
-    // Fixed, but reasonably representative
-    functionName: "via-aws-lambda-runner",
-    functionVersion: "$LATEST",
-    invokedFunctionArn: "arn:aws:lambda:" + region() + ":000000000000:function:via-aws-lambda-runner:$LATEST",
-    memoryLimitInMB: 100,
-    awsRequestId: "00000000-0000-0000-0000-000000000000",
-    logGroupName: "/aws/lambda/via-aws-lambda-runner",
-    logStreamName: "some-log-stream-name",
-  };
-};
+const defaultContextObject = () => ({
+  // Fixed, but reasonably representative
+  functionName: "via-aws-lambda-runner",
+  functionVersion: "$LATEST",
+  invokedFunctionArn: "arn:aws:lambda:" + region() + ":000000000000:function:via-aws-lambda-runner:$LATEST",
+  memoryLimitInMB: 100,
+  awsRequestId: "00000000-0000-0000-0000-000000000000",
+  logGroupName: "/aws/lambda/via-aws-lambda-runner",
+  logStreamName: "some-log-stream-name",
+});
 
 var makeContextObject = function (timeout, overrides) {
-  var context = merge(true, defaultContextObject(), overrides);
+  const context = Object.assign(defaultContextObject(), overrides);
 
   var approximateEndTime = (new Date().getTime()) + timeout;
 
@@ -64,19 +63,24 @@ var startJob = function (job, requestObject, handler, opts) {
   var event = requestObject.event;
 
   var context = makeContextObject(opts.timeout, requestObject.context || {});
-  context.done = function (err, result) {
-    job.doCompletion(err, result);
+
+  const done = (err, res) => {
     if (err) {
       console.warn('Error:', err);
+      job.doError(err);
+    } else {
+      job.doCompletion(err, res);
     }
   };
 
-  try {
-    handler(event, context, context.done);
-  } catch (e) {
-    console.log("Handler crashed", e);
-    job.doError(e);
-  }
+  context.done = done;
+
+  const options = {
+    args: [event, context]
+  };
+
+  alwaysDone(handler, options, done);
+
 };
 
 var doCreateJob = function (req, res, opts, handler) {
@@ -112,17 +116,12 @@ var getJobStatus = function (result) {
   var status = null;
   var responseBody = null;
 
-  if (result.completionValues) {
-    if (result.completionValues[0] !== null && result.completionValues[0] !== undefined) {
-      status = 502;
-      responseBody = result.completionValues[0];
-    } else {
-      status = 201;
-      responseBody = result.completionValues[1];
-    }
-  } else if (result.threw) {
+  if (result.threw) {
     status = 500;
-      responseBody = result.threw.toString();
+    responseBody = result.threw instanceof Error ? `Error: ${result.threw.message}` : JSON.stringify(result.threw);
+  } else if (result.completionValues) {
+    status = 201;
+    responseBody = result.completionValues[1];
   } else if (result.timedOut) {
     status = 504;
   } else {
@@ -141,30 +140,26 @@ exports.request = function(req, res, opts, handler, server) {
 
   } else if (req.method === 'DELETE') {
 
-    (function () {
-      // FIXME untested
-      res.writeHead(202, {'Content-Type': 'text/plain'});
-      var terminationMessage = 'Terminating server at http://[localhost]:' + opts.port + ' for ' + opts['module-path'] + ' / ' + opts.handler;
-      res.end(terminationMessage + '\n');
-      console.info(terminationMessage);
-      if (server) {
-        server.close();
-      }
-    })();
+    // FIXME untested
+    res.writeHead(202, {'Content-Type': 'text/plain'});
+    var terminationMessage = 'Terminating server at http://[localhost]:' + opts.port + ' for ' + opts['module-path'] + ' / ' + opts.handler;
+    res.end(terminationMessage + '\n');
+    console.info(terminationMessage);
+    if (server) {
+      server.close();
+    }
 
   } else if (req.method === 'GET') {
 
-    (function () {
-      var request_id = parseInt(url.parse(req.url, true).query.id);
-      var result = jobs[request_id];
-      var answer = result ? getJobStatus(result) : { status: 404, data: null };
+    var request_id = parseInt(url.parse(req.url, true).query.id);
+    var result = jobs[request_id];
+    var answer = result ? getJobStatus(result) : { status: 404, data: null };
 
-      // non-standard stringification of undefined
-      if (answer.data === undefined) answer.data = null;
+    // non-standard stringification of undefined
+    if (answer.data === undefined) answer.data = null;
 
-      res.writeHead(answer.status, {'Content-Type': 'application/json'});
-      res.end(JSON.stringify(answer.data) + '\n');
-    })();
+    res.writeHead(answer.status, {'Content-Type': 'application/json'});
+    res.end(JSON.stringify(answer.data) + '\n');
 
   } else {
 

data/js/startup.js

@@ -1,5 +1,4 @@
-
-
+/* istanbul ignore file */
 var http = require('http');
 var stdio = require('stdio');
 var request = require('./request.js');
@@ -10,7 +9,7 @@ var opts = stdio.getopt({
   'handler': {mandatory: true, args: 1, key: 'h', description: 'handler function to call'},
   'timeout': {mandatory: true, args: 1, key: 't', description: 'timeout for handler function'}
 });
-console.info(opts);
+console.info('Startup with options: ', JSON.stringify(opts, null, 2));
 
 var module = require(opts['module-path']);
 var server = http.createServer();

data/lib/lambda_runner.rb

@@ -16,10 +16,10 @@ module LambdaRunner
 
     def install_deps
       @npm_cwd = File.expand_path('../../js/', __FILE__)
-      STDOUT.puts("trying to use npm install in #{@npm_cwd}")
+      STDOUT.puts("Trying to use npm install in #{@npm_cwd}")
       npm_install_pid = spawn('npm', 'install', chdir: @npm_cwd)
       Process.wait(npm_install_pid)
-      fail 'failed to install the lambda startup' if ($CHILD_STATUS.exitstatus != 0)
+      fail 'Failed to install the lambda startup' if ($CHILD_STATUS.exitstatus != 0)
     end
 
     def add_aws_sdk
@@ -31,6 +31,7 @@ module LambdaRunner
       if opts[:timeout] == nil
         opts[:timeout] = '30000'
       end
+      @cover = opts[:cover]
       install_deps
       #copy over aws sdk only if it is not already there
       if !File.directory?("#{File.dirname(@module_path)}/node_modules/aws-sdk")
@@ -38,9 +39,17 @@ module LambdaRunner
       end
       # start node in a way that emulates how it's run in production
       cmd = ['node']
-      cmd = [File.join(@npm_cwd, 'node_modules/.bin/istanbul'), 'cover', '--root', File.dirname(@module_path), '--'] if opts[:cover]
+      cmd = [
+          File.join(@npm_cwd, 'node_modules/.bin/nyc'),
+          '--cwd ', File.dirname(@module_path),
+          '--reporter=lcov',
+          '--report-dir ', File.join(Dir.pwd, 'coverage'),
+          '--temp-dir ', File.join(Dir.pwd, 'coverage', 'temp'),
+          'node'
+      ] if opts[:cover]
       cmd += [File.join(@npm_cwd, 'startup.js'), '-p', @port.to_s, '-m', @module_path, '-h', @name, '-t', opts[:timeout]]
       @proc = ProcessHelper::ProcessHelper.new(print_lines: true)
+      puts cmd.join(' ')
       @proc.start(cmd, 'Server running at http')
     end
 
@@ -59,7 +68,6 @@ module LambdaRunner
         when 200 then sleep(0.1)
         when 201 then return data
         when 500 then fail data
-        when 502 then fail data
         when 504 then fail 'timeout'
         else fail "unknown response #{response.code}"
         end
@@ -67,7 +75,18 @@ module LambdaRunner
     end
 
     def stop
+      puts "Stopping Lambda Server"
       RestClient.delete(url)
+      @proc.kill
+
+      # TODO currently coverage is not working on other projects
+      cmd = [
+          File.join(@npm_cwd, 'node_modules/.bin/nyc'),
+          'report',
+          '--report-dir ', File.join(Dir.pwd, 'coverage'),
+          '--temp-dir ', File.join(Dir.pwd, 'coverage', 'temp'),
+      ]
+      system(cmd.join(' ')) if @cover
     end
   end
 

data/spec/lambdarunner_runner_spec.rb

@@ -1,11 +1,12 @@
 require 'rspec'
 require_relative '../lib/lambda_runner'
 
-describe LambdaRunner::Runner do
+
+shared_examples "AWS Lambda: " do |lambda_file|
 
   before(:all) do
-    test_js = File.expand_path("test.js", File.dirname(__FILE__))
-    @under_test = LambdaRunner::Runner.new(test_js, "node_4_3_handler")
+    test_js = File.expand_path(lambda_file, File.dirname(__FILE__))
+    @under_test = LambdaRunner::Runner.new(test_js, "handler")
     @under_test.start
   end
 
@@ -13,15 +14,23 @@ describe LambdaRunner::Runner do
     @under_test.stop
   end
 
-  it "should emulate AWS Lambda (node.js v4.3) - success" do
+  it "should emulate - success" do
     r = @under_test.process_event({ succeed: { delay: 50, result: "ohai" } })
     expect(r).to eq("ohai")
   end
 
-  it "should emulate AWS Lambda (node.js v4.3) - failure" do
+  it "should emulate - failure" do
     expect {
       @under_test.process_event({ fail: { delay: 50, err: "oh noes" } })
-    }.to raise_error("oh noes")
+    }.to raise_error("Error: oh noes")
   end
 
 end
+
+describe LambdaRunner::Runner do
+
+  it_should_behave_like "AWS Lambda: ", "test_callback.js"
+  it_should_behave_like "AWS Lambda: ", "test_promise.js"
+  it_should_behave_like "AWS Lambda: ", "test_async.js"
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-lambda-runner
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.0
 platform: ruby
 authors:
 - andrew wheat
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: process-helper
@@ -145,6 +145,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- js/package-lock.json
 - js/package.json
 - js/request.js
 - js/startup.js
@@ -177,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: AWS Lambda testing helper