aws-lambda-runner 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6974bc3e8c91e3625933ccb2e4937868ce9b6db
-  data.tar.gz: 36f2002e3ee8d0d5aa57b3eddb70ce1e05f81158
+  metadata.gz: f00a420d05400ba0db54fe75fa8ec2feff66c821
+  data.tar.gz: 62fbcc48883724ea62d69687321cff22bd8b22f0
 SHA512:
-  metadata.gz: 94fc927d30b90795b845934f1f8f49031c694b227a68f9b12032cd4812e72871e1234823a89159fd8b3b0fe7afd7be36472ebb7e8034d1df71e92d06e59827aa
-  data.tar.gz: 1d852324b869731f44f2192ab9d42151ce31f1766ef5e9d27ae85b3c364805c86641e3c7f77acc0cc7a01d7d43ffdf3a31d8ef8ae310de3849343b0a69fbc326
+  metadata.gz: 2b89d4d941ccbf45904fae5a7cd5d06ee9bebf42ec975f4ae61fd887efe5eddb7995ac4cc3f53a1304f76aba2cea48770e6f08d929d10a1ec846aed21ad42923
+  data.tar.gz: b80855bc773be900831f97c0fae15c6b3055c4b901850e88fccfce46cec7d6dff13bba4701c5943b86607095d93c5d9056a424d28e5db48877b7e6dd6246a5a3

data/js/request.js

@@ -1,67 +1,107 @@
-
 var url = require('url');
 
 var next_id = 0;
-var done = {};
-var errors = {};
-var successes = {};
-var timeout = {};
+// results[id] = { threw: error, completed: [ errorValue, successValue ], timedOut: bool };
+var results = {};
 
 exports.request = function(req, res, opts, handler) {
+
   if (req.method === 'POST') {
-    var id = next_id;
-    var postOutput = '';
-    next_id += 1;
+
+    var id = ++next_id;
+    results[id] = {};
+
+    var requestBody = '';
+
     req.on('data', function(chunk) {
+      requestBody += chunk.toString();
+    });
+
+    req.on('end', function(chunk) {
       setTimeout(function() {
-        if (!done[id]) {
-          timeout[id] = true;
+        if (!results[id].completed) {
+          results[id].timedOut = true;
         }
       }, opts.timeout);
-      postOutput += chunk.toString();
-    });
-    req.on('end', function(chunk) {
-      handler(JSON.parse(postOutput), {
-        done: function(err, message) {
-          if (err) {
-            errors[id] = err;
-            console.warn('Error:', err);
-          } else {
-            successes[id] = message;
+
+      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));
+
+      try {
+        handler(requestObject, {
+          done: function(err, message) {
+            results[id].completed = [ err, message ];
+            if (err) {
+              console.warn('Error:', err);
+            }
+            console.info('Finished:', message);
           }
-          console.info('Finished:', message);
-          done[id] = true;
-        }
-      });
+        });
+      } catch (e) {
+        console.log("Handler crashed", e);
+        results[id].threw = e;
+      }
+
     });
-    res.writeHead(200, {'Content-Type': 'text/plain'});
-    res.end(String(id));
+
   } else if (req.method === 'DELETE') {
+
     // 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') {
+
     var request_id = parseInt(url.parse(req.url, true).query.id);
-    var status = 200;
-    var getOutput = null;
-
-    if (successes[request_id]) {
-      status = 201;
-      getOutput = successes[request_id];
-    } else if (errors[request_id]) {
-      status = 502;
-      getOutput = errors[request_id];
-    } else if (timeout[request_id]) {
-      status = 504;
+    var result = results[request_id];
+
+    var status = null;
+    var responseBody = null;
+
+    if (result === undefined) {
+      status = 404;
+    } else {
+      if (result.completed) {
+        if (result.completed[0] !== null) {
+          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;
+      }
     }
 
     res.writeHead(status, {'Content-Type': 'application/json'});
-    res.end(JSON.stringify(getOutput) + '\n');
+    res.end(JSON.stringify(responseBody) + '\n');
+    console.log(request_id, status, result);
+
   } else {
+
     res.writeHead(500, {'Content-Type': 'text/plain'});
     res.end('Not implemented: ' + req.method + '\n');
+
   }
+
 };

data/lib/lambda_runner.rb

@@ -59,6 +59,7 @@ module LambdaRunner
         case response.code
         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}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-lambda-runner
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - andrew wheat