aws-lambda-runner 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1072f1479b4079a9ad869e54f88e9d7868c5b43b
-  data.tar.gz: 8385219cdbf104fed5b41b7b44192e78023c0e25
+  metadata.gz: fef3ce92ca629b7b66df8d9a5600a690c84c041f
+  data.tar.gz: 38d7af195b18d8be62f8ee4591c0cd72ae811744
 SHA512:
-  metadata.gz: a36af0663924daa993afb7eac23650e743f7687aa8169a2157959be3866f75e94663a18944da8fd599d8b985d7efb4c709c36abe2b30867d05eda29381a67cd2
-  data.tar.gz: fa743cd813123c3dc80dee145b0fee65d942a0dec0515c5c063bcd1b0c2978e4deb885a7fe1d7fb8113f6c2e887d67663fcc0cf9eaf74fc3ce99a5ff93bb7897
+  metadata.gz: 7c1dab1a066ceaa9608f8041b7e42a1ffa60f7c22ca7a2b6ec504fab3cf36b08bc635bbbfaabaccd7e4a7527d7880c971b42c45c7f5d691a92054e25775d5911
+  data.tar.gz: 3a1abbd85b75a90b3307a62c50a4555e85ee3bd452aceb2d17d2e1a4fb0de4264444c7e96167a4dcfcb242efdcc39faee59dc104d4d011f6f297b18e50311bf5

data/js/request.js

@@ -2,128 +2,170 @@ var merge = require('merge');
 var url = require('url');
 
 var next_id = 0;
-// results[id] = { threw: error, completed: [ errorValue, successValue ], timedOut: bool };
-var results = {};
+// FIXME: this object grows forever - entries are never removed.  Should they
+// be removed by expiry (time), and/or a REST API call?
+var jobs = {};
+
+var Job = function () {
+};
+
+Job.prototype.doError = function (error) {
+  if (!this.completionValues && !this.timedOut) {
+    this.threw = error;
+  }
+};
+
+Job.prototype.doCompletion = function (errorValue, successValue) {
+  if (!this.threw && !this.timedOut) {
+    this.completionValues = [ errorValue, successValue ];
+  }
+};
+
+Job.prototype.doTimedOut = function () {
+  if (!this.threw && !this.completionValues) {
+    this.timedOut = true;
+  }
+};
 
 var region = function () {
     return process.env.AWS_DEFAULT_REGION || process.env.AWS_REGION || process.env.AMAZON_REGION || "xx-dummy-0";
 };
 
-exports.request = function(req, res, opts, handler) {
+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",
+  };
+};
 
-  if (req.method === 'POST') {
+var makeContextObject = function (timeout, overrides) {
+  var context = merge(true, defaultContextObject(), overrides);
 
-    var id = ++next_id;
-    results[id] = {};
-
-    var requestBody = '';
-
-    req.on('data', function(chunk) {
-      requestBody += chunk.toString();
-    });
-
-    req.on('end', function(chunk) {
-      setTimeout(function() {
-        if (!results[id].completed) {
-          results[id].timedOut = true;
-        }
-      }, opts.timeout);
-
-      var requestObject;
-      try {
-        requestObject = JSON.parse(requestBody);
-      } catch (e) {
-        console.log("POSTed bad json: " + e.toString());
-        res.writeHead(400, {'Content-Type': 'text/plain'});
-        res.end(e.toString());
-        return;
-      }
-
-      res.writeHead(200, {'Content-Type': 'text/plain'});
-      res.end(String(id));
-
-      var approximateEndTime = (new Date().getTime()) + opts.timeout;
-
-      var context = {
-        done: function(err, message) {
-          results[id].completed = [ err, message ];
-          if (err) {
-            console.warn('Error:', err);
-          }
-        },
-        getRemainingTimeInMillis: function () {
-          return approximateEndTime - (new Date().getTime());
-        },
-
-        // 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",
-      };
-
-      context.fail = function(err) { context.done(err, null); };
-      context.succeed = function(data) { context.done(null, data); };
-
-      var event = requestObject.event;
-      merge(context, requestObject.context || {});
-
-      try {
-        handler(event, context);
-      } catch (e) {
-        console.log("Handler crashed", e);
-        results[id].threw = e;
-      }
-
-    });
+  var approximateEndTime = (new Date().getTime()) + timeout;
 
-  } else if (req.method === 'DELETE') {
+  context.getRemainingTimeInMillis = function () {
+    return approximateEndTime - (new Date().getTime());
+  };
 
-    // 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);
-    server.close();
+  context.fail = function(err) { context.done(err, null); };
+  context.succeed = function(data) { context.done(null, data); };
 
-  } else if (req.method === 'GET') {
+  return context;
+};
+
+var startJob = function (job, requestObject, handler, opts) {
+  setTimeout(function() {
+    job.doTimedOut();
+  }, opts.timeout);
+
+  var event = requestObject.event;
+
+  var context = makeContextObject(opts.timeout, requestObject.context || {});
+  context.done = function (err, result) {
+    job.doCompletion(err, result);
+    if (err) {
+      console.warn('Error:', err);
+    }
+  };
+
+  try {
+    handler(event, context);
+  } catch (e) {
+    console.log("Handler crashed", e);
+    job.doError(e);
+  }
+};
 
-    var request_id = parseInt(url.parse(req.url, true).query.id);
-    var result = results[request_id];
+var doCreateJob = function (req, res, opts, handler) {
+  var id = ++next_id;
+  var job = jobs[id] = new Job();
 
-    var status = null;
-    var responseBody = null;
+  var requestBody = '';
 
-    if (result === undefined) {
-      status = 404;
+  req.on('data', function(chunk) {
+    requestBody += chunk.toString();
+  });
+
+  req.on('end', function() {
+    var requestObject;
+
+    try {
+      requestObject = JSON.parse(requestBody);
+    } catch (e) {
+      console.log("POSTed bad json: " + e.toString());
+      res.writeHead(400, {'Content-Type': 'text/plain'});
+      res.end(e.toString());
+      return;
+    }
+
+    res.writeHead(200, {'Content-Type': 'text/plain'});
+    res.end(String(id));
+
+    startJob(job, requestObject, handler, opts);
+  });
+};
+
+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 {
-      if (result.completed) {
-        if (result.completed[0] !== null && result.completed[0] !== undefined) {
-          status = 502;
-          responseBody = result.completed[0];
-        } else {
-          status = 201;
-          responseBody = result.completed[1];
-        }
-      } else if (result.threw) {
-        status = 500;
-          responseBody = result.threw.toString();
-      } else if (result.timedOut) {
-        status = 504;
-      } else {
-        // still in progress
-        status = 200;
-      }
+      status = 201;
+      responseBody = result.completionValues[1];
     }
+  } else if (result.threw) {
+    status = 500;
+      responseBody = result.threw.toString();
+  } else if (result.timedOut) {
+    status = 504;
+  } else {
+    // still in progress
+    status = 200;
+  }
+  
+  return { status: status, data: responseBody };
+};
 
-    // non-standard stringification of undefined
-    if (responseBody === undefined) responseBody = null;
+exports.request = function(req, res, opts, handler) {
 
-    res.writeHead(status, {'Content-Type': 'application/json'});
-    res.end(JSON.stringify(responseBody) + '\n');
+  if (req.method === 'POST') {
+
+    doCreateJob(req, res, opts, handler);
+
+  } 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);
+      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 };
+
+      // 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');
+    })();
 
   } else {
 
@@ -133,3 +175,5 @@ exports.request = function(req, res, opts, handler) {
   }
 
 };
+
+// vi: set sw=2 et :

data/lib/lambda_runner.rb

@@ -4,10 +4,6 @@ require 'json'
 require 'English'
 require 'fileutils'
 
-def load_json(name)
-  File.open(File.join(File.dirname(__FILE__), name)) { |file| return JSON.load(file) }
-end
-
 # runs a nodejs lambda program so the s3 events can be sent to it via http post
 module LambdaRunner
   # abstract for running the program
@@ -84,7 +80,7 @@ module LambdaRunner
         record['s3']['object']['key'] = key
         record
       end
-      event.to_json
+      event
     end
 
     def self.sns_event(topicArn, messageId, timestamp, messageBody)
@@ -95,8 +91,16 @@ module LambdaRunner
         record['Sns']['Timestamp'] = timestamp
         record['Sns']['Message'] = messageBody
       end
-      event.to_json
+      event
+    end
+
+    private
+
+    def self.load_json(name)
+      base = File.dirname(File.dirname(__FILE__))
+      File.open(File.join(base, "samples", name)) { |file| return JSON.load(file) }
     end
+
   end
 end
 

data/spec/lambda-runner_spec.rb

@@ -4,8 +4,7 @@ require_relative '../lib/lambda_runner'
 describe LambdaRunner::Events do
 
   it "should generate an S3 event" do
-    json = LambdaRunner::Events.s3_event("some-bucket", "some/key", "local/path")
-    data = JSON.parse json
+    data = LambdaRunner::Events.s3_event("some-bucket", "some/key", "local/path")
     expect(data["Records"][0]["file"]["path"]).to eq("local/path")
     expect(data["Records"][0]["s3"]["bucket"]["name"]).to eq("some-bucket")
     expect(data["Records"][0]["s3"]["bucket"]["arn"]).to eq("arn:aws:s3:::some-bucket")
@@ -13,8 +12,7 @@ describe LambdaRunner::Events do
   end
 
   it "should generate an SNS event" do
-    json = LambdaRunner::Events.sns_event("some-arn", "some-id", "some-timestamp", "some-body")
-    data = JSON.parse json
+    data = LambdaRunner::Events.sns_event("some-arn", "some-id", "some-timestamp", "some-body")
     expect(data["Records"][0]["Sns"]["TopicArn"]).to eq("some-arn")
     expect(data["Records"][0]["Sns"]["MessageId"]).to eq("some-id")
     expect(data["Records"][0]["Sns"]["Timestamp"]).to eq("some-timestamp")

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: aws-lambda-runner
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - andrew wheat
 - tristan hill
 - stuart hicks
+- rachel evans
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -148,11 +149,11 @@ files:
 - js/request.js
 - js/startup.js
 - lib/lambda_runner.rb
-- lib/sample_cloudwatch_event.json
-- lib/sample_s3_event.json
-- lib/sample_s3_test_event.json
-- lib/sample_scheduled_event.json
-- lib/sample_sns_event.json
+- samples/sample_cloudwatch_event.json
+- samples/sample_s3_event.json
+- samples/sample_s3_test_event.json
+- samples/sample_scheduled_event.json
+- samples/sample_sns_event.json
 - spec/lambda-runner_spec.rb
 homepage: https://github.com/bbc/aws-lambda-runner
 licenses: