Update blueprint and use static lib

Author: Anthony Nowell

.npmignore

@@ -0,0 +1,5 @@
+contrib
+examples
+src
+gulpfile.js
+tmp

contrib/lambda/algorithmia-lambda-nodejs.json

@@ -10,8 +10,8 @@
   "eventSources": {
     "s3": [{}]
   },
-  "version": "1.0.1",
-  "build": "https://s3.amazonaws.com/algorithmia-lambda/index.js",
+  "version": "1.0.2",
+  "build": "https://s3.amazonaws.com/algorithmia-lambda/algorgthmia-lambda-nodejs.zip",
   "license": "MIT",
   "tags": [
     "nodejs",
@@ -24,4 +24,4 @@
     "Algorithmia <[email protected]> (https://www.algorithmia.com)"
   ],
   "private": false
-}
+}

contrib/lambda/index.js

@@ -35,6 +35,7 @@
 }
  */
 
+var algorithmia = require("algorithmia");
 var AWS = require('aws-sdk');
 var apiKey, kmsEncryptedApiKey;
 
@@ -115,240 +116,3 @@ var processEvent = function(event, context) {
         }
     });
 }
-
-
-/*
- * Algorithmia NodeJS SDK below
- */
-var Algorithm, AlgorithmiaClient, AlgoResponse, Data, algorithmia, defaultApiAddress, http, https, packageJson, url;
-https = require('https');
-http = require('http');
-url = require('url');
-
-defaultApiAddress = 'https://api.algorithmia.com';
-
-AlgorithmiaClient = (function() {
-  function AlgorithmiaClient(key, address) {
-    this.apiAddress = address || process.env.ALGORITHMIA_API || defaultApiAddress;
-    key = key || process.env.ALGORITHMIA_API_KEY;
-    if (key) {
-      if (key.indexOf('Simple ') === 0) {
-        this.apiKey = key;
-      } else {
-        this.apiKey = 'Simple ' + key;
-      }
-    } else {
-      this.apiKey = '';
-    }
-  }
-
-  AlgorithmiaClient.prototype.algo = function(path) {
-    return new Algorithm(this, path);
-  };
-
-  AlgorithmiaClient.prototype.file = function(path) {
-    return new Data(this, path);
-  };
-
-  AlgorithmiaClient.prototype.req = function(path, method, data, cheaders, callback) {
-    var dheader, httpRequest, key, options, protocol, val;
-    dheader = {
-      'Content-Type': 'application/JSON',
-      'Accept': 'application/JSON',
-      'User-Agent': 'algorithmia-lambda/1.0.1 (NodeJS ' + process.version + ')'
-    };
-    if (this.apiKey) {
-      dheader['Authorization'] = this.apiKey;
-    }
-    for (key in cheaders) {
-      val = cheaders[key];
-      dheader[key] = val;
-    }
-    options = url.parse(this.apiAddress + path);
-    options.method = method;
-    options.headers = dheader;
-    protocol = options.protocol === 'https:' ? https : http;
-    httpRequest = protocol.request(options, function(res) {
-      var chunks;
-      res.setEncoding('utf8');
-      chunks = [];
-      res.on('data', function(chunk) {
-        return chunks.push(chunk);
-      });
-      res.on('end', function() {
-        var body, buff;
-        buff = chunks.join('');
-        if (dheader['Accept'] === 'application/JSON') {
-          body = JSON.parse(buff);
-        } else {
-          body = buff;
-        }
-        if (callback) {
-          if (res.statusCode < 200 || res.statusCode >= 300) {
-            if (!body) {
-              body = {};
-            }
-            if (!body.error) {
-              body.error = {
-                message: 'HTTP Response: ' + res.statusCode
-              };
-            }
-          }
-          callback(body, res.statusCode);
-        }
-      });
-      return res;
-    });
-    httpRequest.write(data);
-    httpRequest.end();
-  };
-
-  return AlgorithmiaClient;
-
-})();
-
-algorithmia = function(key, address) {
-  return new AlgorithmiaClient(key, address);
-};
-
-algorithmia.client = function(key, address) {
-  return new AlgorithmiaClient(key, address);
-};
-
-algorithmia.algo = function(path) {
-  this.defaultClient = this.defaultClient || new AlgorithmiaClient();
-  return this.defaultClient.algo(path);
-};
-
-algorithmia.file = function(path) {
-  this.defaultClient = this.defaultClient || new AlgorithmiaClient();
-  return this.defaultClient.file(path);
-};
-
-
-Algorithm = (function() {
-  function Algorithm(client, path) {
-    this.client = client;
-    this.algo_path = path;
-    this.promise = {
-      then: (function(_this) {
-        return function(callback) {
-          return _this.callback = callback;
-        };
-      })(this)
-    };
-  }
-
-  Algorithm.prototype.pipe = function(input) {
-    var contentType, data;
-    data = input;
-    if (Buffer.isBuffer(input)) {
-      contentType = 'application/octet-stream';
-    } else if (typeof input === 'string') {
-      contentType = 'text/plain';
-    } else {
-      contentType = 'application/json';
-      data = JSON.stringify(input);
-    }
-    this.req = this.client.req('/v1/algo/' + this.algo_path, 'POST', data, {
-      'Content-Type': contentType
-    }, (function(_this) {
-      return function(response, status) {
-        return _this.callback(new AlgoResponse(response, status));
-      };
-    })(this));
-    return this.promise;
-  };
-
-  Algorithm.prototype.pipeJson = function(input) {
-    if (typeof input !== 'string') {
-      throw "Cannot convert " + (typeof input) + " to string";
-    }
-    this.req = this.client.req('/v1/algo/' + this.algo_path, 'POST', input, {
-      'Content-Type': 'application/json'
-    }, (function(_this) {
-      return function(response, status) {
-        return _this.callback(new AlgoResponse(response, status));
-      };
-    })(this));
-    return this.promise;
-  };
-
-  return Algorithm;
-
-})();
-
-AlgoResponse = (function() {
-  function AlgoResponse(response, status) {
-    this.status = status;
-    this.result = response.result;
-    this.error = response.error;
-    this.metadata = response.metadata;
-  }
-
-  AlgoResponse.prototype.get = function() {
-    if (this.error) {
-      throw "" + this.error.message;
-    }
-    switch (this.metadata.content_type) {
-      case "void":
-        return null;
-      case "text":
-      case "json":
-        return this.result;
-      case "binary":
-        return new Buffer(this.result, 'base64');
-      default:
-        throw "Unknown result content_type: " + this.metadata.content_type + ".";
-    }
-  };
-
-  return AlgoResponse;
-
-})();
-
-
-Data = (function() {
-  function Data(client, path) {
-    this.client = client;
-    if (path.indexOf('data://') !== 0) {
-      throw 'Supplied path is invalid.';
-    }
-    this.data_path = path.replace(/data\:\/\//, '');
-  }
-
-  Data.prototype.putString = function(content, callback) {
-    var headers;
-    headers = {
-      'Content-Type': 'text/plain'
-    };
-    return this.client.req('/v1/data/' + this.data_path, 'PUT', content, headers, callback);
-  };
-
-  Data.prototype.putJson = function(content, callback) {
-    var headers;
-    headers = {
-      'Content-Type': 'application/JSON'
-    };
-    return this.client.req('/v1/data/' + this.data_path, 'PUT', content, headers, callback);
-  };
-
-  Data.prototype.getString = function(callback) {
-    var headers;
-    headers = {
-      'Accept': 'text/plain'
-    };
-    return this.client.req('/v1/data/' + this.data_path, 'GET', '', headers, callback);
-  };
-
-  Data.prototype.getJson = function(callback) {
-    var headers;
-    headers = {
-      'Accept': 'text/plain'
-    };
-    return this.client.req('/v1/data/' + this.data_path, 'GET', '', headers, callback);
-  };
-
-  return Data;
-
-})();

make-lambda-build

@@ -1,9 +1,24 @@
 #!/bin/bash
 
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+set -e
 
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 TMP=$DIR/tmp/lambda
+rm -rf "$TMP"
+
+# Create the blueprint structure
 mkdir -p $TMP
 cp contrib/lambda/index.js $TMP/
-cp -r $DIR/lib/* $TMP/
-cd $TMP && zip algorithmia-lambda-nodejs.zip *.js
+cd $TMP
+npm install $DIR --prefix .
+
+# Tweak User-Agent in the client
+sed -i -e 's/\(User-Agent.*\)algorithmia-nodejs/\1 algorithmia-lambda/' $TMP/node_modules/algorithmia/lib/algorithmia.js
+
+# Zip up the blueprint
+zip -r algorgthmia-lambda-nodejs.zip .
+
+echo "-----------------------------"
+echo "Finished packaging blueprint."
+echo "Blueprint config: $DIR/contrib/lambda/algorithmia-lambda-nodejs.json"
+echo "Blueprint zip: $TMP/algorithmia-lambda-nodejs.zip"