From 5a72bad72a14556a76028b8c24a502b1466e2d2b Mon Sep 17 00:00:00 2001
From: Mark Hindess <mark.hindess@gmail.com>
Date: Wed, 15 Oct 2014 10:46:30 +0100
Subject: [PATCH 1/4] Fix missing credentials error case.

---
 aws/s3.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/aws/s3.js b/aws/s3.js
index 1a078bb3..0d764314 100644
--- a/aws/s3.js
+++ b/aws/s3.js
@@ -26,7 +26,11 @@ module.exports = function(RED) {
         this.filename = n.filename || "";
         this.localFilename = n.localFilename || "";
         var node = this;
-        var AWS = this.awsConfig.AWS;
+        var AWS = this.awsConfig ? this.awsConfig.AWS : null;
+        if (!AWS) {
+            node.warn("Missing AWS credentials");
+            return;
+        }
         if (AWS) {
             var s3 = new AWS.S3();
             node.status({fill:"blue",shape:"dot",text:"checking credentials"});

From fd5011ec7390e56976090eb33af4134c0f358925 Mon Sep 17 00:00:00 2001
From: Mark Hindess <mark.hindess@gmail.com>
Date: Thu, 9 Oct 2014 20:08:22 +0100
Subject: [PATCH 2/4] Add amazon icon.

---
 aws/icons/amazon.png | Bin 0 -> 506 bytes
 aws/s3.html          |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 aws/icons/amazon.png

diff --git a/aws/icons/amazon.png b/aws/icons/amazon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4d5405f26428022dc018356bfef0b487c17c2e6
GIT binary patch
literal 506
zcmV<W0R{evP)<h;3K|Lk000e1NJLTq000yK0015c1^@s6ED}Cz00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^(^
z69WmK$#$9m00DYQL_t(Y$L*CpYgADXhUaY7RfDDoZ2V|!5(t>WDuRWDm7Un7NFmlL
z1T7WzKiJvY1dB8wMG`F}AOr#;Vx>Pogg`3AVxPxmE;;C~aTCjZt8->J&&<5{+<PO&
z8teZ{J*!>;x+ewQ0p6PeRKEgG)Yho58ziBE)p|TC@O1+M?q=*^RbXA67zKDc0V_=m
zIIsRp;1<w1j*s&|57<z@sLkv{f$brn%MtN1B5svZA|k%22c;Avq8z8Qchv)Urgnh^
z;K#@#t22%FYQKulRz<df(}T{p1^_SQvP1+`>XF*4=SnGO{(0oz?%fA<&p*}s+n60-
zu>w9&`}JvH73k%5M_p8(t8dj;>bbh3qJ9LnftifWsmtn;I<KC}_;qzsomQ8Cl`PU7
zH0ow1UjSFtDWDBZs2z1my#(9@*3<)aQ{5frT}!<O>?ioM`X*nst@QJI=2n4g+2zHf
wu1*`cuYRg*?C1WeI(^blS$q6v80%2K0P->#;j;>5@Bjb+07*qoM6N<$f~`W>2mk;8

literal 0
HcmV?d00001

diff --git a/aws/s3.html b/aws/s3.html
index 5d4f1acd..06dd52b6 100644
--- a/aws/s3.html
+++ b/aws/s3.html
@@ -53,6 +53,7 @@
         },
         inputs:1,
         outputs:0,
+        icon: "amazon.png",
         align: "right",
         label: function() {
             return this.bucket ? "s3 "+this.bucket : "s3";

From 08388ac0871b97b7411da6904948de9cf5cde40c Mon Sep 17 00:00:00 2001
From: Mark Hindess <mark.hindess@gmail.com>
Date: Mon, 13 Oct 2014 09:10:36 +0100
Subject: [PATCH 3/4] Add Amazon S3 query node.

---
 aws/s3.html | 44 +++++++++++++++++++++++++++++++++++++++++++
 aws/s3.js   | 54 +++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 94 insertions(+), 4 deletions(-)

diff --git a/aws/s3.html b/aws/s3.html
index 06dd52b6..60750e3d 100644
--- a/aws/s3.html
+++ b/aws/s3.html
@@ -14,6 +14,49 @@
   limitations under the License.
 -->
 
+<script type="text/x-red" data-template-name="amazon s3">
+    <div class="form-row">
+        <label for="node-input-aws"><i class="fa fa-user"></i> AWS</label>
+        <input type="text" id="node-input-aws">
+    </div>
+    <div class="form-row">
+        <label for="node-input-bucket"><i class="fa fa-folder"></i> Bucket</label>
+        <input type="text" id="node-input-bucket" placeholder="bucket name">
+    </div>
+    <div class="form-row node-input-filename">
+         <label for="node-input-filename"><i class="fa fa-file"></i> Filename</label>
+         <input type="text" id="node-input-filename" placeholder="Filename">
+    </div>
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="amazon s3">
+    <p>Amazon S3 input node. Downloads content from an Amazon S3 bucket. The bucket name can be specified in the node <b>bucket</b> property or in the <b>msg.bucket</b> property. The name of the file to download is taken from the node <b>filename</b> property or the <b>msg.filename</b> property. The downloaded content is sent as <b>msg.payload</b> property. If the download fails <b>msg.error</b> will contain an error object.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('amazon s3',{
+        category: 'storage-output',
+        color:"#C0DEED",
+        defaults: {
+            aws: {type:"aws-config",required:true},
+            bucket: {required:true},
+            filename: {value:""},
+            name: {value:""},
+        },
+        inputs:1,
+        outputs:1,
+        icon: "amazon.png",
+        align: "right",
+        label: function() {
+            return this.bucket ? "s3 "+this.bucket : "s3";
+        }
+    });
+</script>
+
 <script type="text/x-red" data-template-name="amazon s3 out">
     <div class="form-row">
         <label for="node-input-aws"><i class="fa fa-user"></i> AWS</label>
@@ -50,6 +93,7 @@
             bucket: {required:true},
             filename: {value:""},
             localFilename: {value:""},
+            name: {value:""},
         },
         inputs:1,
         outputs:0,
diff --git a/aws/s3.js b/aws/s3.js
index 0d764314..8e592a62 100644
--- a/aws/s3.js
+++ b/aws/s3.js
@@ -18,6 +18,52 @@ module.exports = function(RED) {
     "use strict";
     var fs = require('fs');
 
+    function AmazonS3QueryNode(n) {
+        RED.nodes.createNode(this,n);
+        this.awsConfig = RED.nodes.getNode(n.aws);
+        this.region = n.region;
+        this.bucket = n.bucket;
+        this.filename = n.filename || "";
+        var node = this;
+        var AWS = this.awsConfig ? this.awsConfig.AWS : null;
+        if (!AWS) {
+            node.warn("Missing AWS credentials");
+            return;
+        }
+        var s3 = new AWS.S3();
+        node.on("input", function(msg) {
+            msg.filename = filename;
+            var bucket = node.bucket || msg.bucket;
+            if (bucket === "") {
+                node.warn("No bucket specified");
+                return;
+            }
+            var filename = node.filename || msg.filename;
+            if (filename === "") {
+                node.warn("No filename specified");
+                return;
+            }
+            msg.filename = filename;
+            node.status({fill:"blue",shape:"dot",text:"downloading"});
+            s3.getObject({
+                Bucket: bucket,
+                Key: filename,
+            }, function(err, data) {
+                if (err) {
+                    node.warn("download failed " + err.toString());
+                    delete msg.payload;
+                    msg.error = err;
+                } else {
+                    msg.payload = data.Body;
+                    delete msg.error;
+                }
+                node.status({});
+                node.send(msg);
+            });
+        });
+    }
+    RED.nodes.registerType("amazon s3", AmazonS3QueryNode);
+
     function AmazonS3OutNode(n) {
         RED.nodes.createNode(this,n);
         this.awsConfig = RED.nodes.getNode(n.aws);
@@ -34,7 +80,7 @@ module.exports = function(RED) {
         if (AWS) {
             var s3 = new AWS.S3();
             node.status({fill:"blue",shape:"dot",text:"checking credentials"});
-            s3.listObjects({ Bucket: this.bucket }, function(err) {
+            s3.listObjects({ Bucket: node.bucket }, function(err) {
                 if (err) {
                     node.error("AWS S3 error: " + err);
                     node.status({fill:"red",shape:"ring",text:"error"});
@@ -42,17 +88,17 @@ module.exports = function(RED) {
                 }
                 node.status({});
                 node.on("input", function(msg) {
-                    var bucket = this.bucket || msg.bucket;
+                    var bucket = node.bucket || msg.bucket;
                     if (bucket === "") {
                         node.warn("No bucket specified");
                         return;
                     }
-                    var filename = this.filename || msg.filename;
+                    var filename = node.filename || msg.filename;
                     if (filename === "") {
                         node.warn("No filename specified");
                         return;
                     }
-                    var localFilename = this.localFilename || msg.localFilename;
+                    var localFilename = node.localFilename || msg.localFilename;
                     if (localFilename) {
                         // TODO: use chunked upload for large files
                         node.status({fill:"blue",shape:"dot",text:"uploading"});

From e8198295de3fda77af9efcfad7339857fe120c57 Mon Sep 17 00:00:00 2001
From: Mark Hindess <mark.hindess@gmail.com>
Date: Mon, 13 Oct 2014 15:17:03 +0100
Subject: [PATCH 4/4] Add S3 watch node.

---
 aws/s3.html  | 47 ++++++++++++++++++++++++++++++
 aws/s3.js    | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 package.json |  1 +
 3 files changed, 129 insertions(+), 1 deletion(-)

diff --git a/aws/s3.html b/aws/s3.html
index 60750e3d..b82572e6 100644
--- a/aws/s3.html
+++ b/aws/s3.html
@@ -14,6 +14,53 @@
   limitations under the License.
 -->
 
+<script type="text/x-red" data-template-name="amazon s3 in">
+    <div class="form-row">
+        <label for="node-input-aws"><i class="fa fa-user"></i> AWS</label>
+        <input type="text" id="node-input-aws">
+    </div>
+    <div class="form-row">
+        <label for="node-input-bucket"><i class="fa fa-folder"></i> Bucket</label>
+        <input type="text" id="node-input-bucket" placeholder="bucket name">
+    </div>
+    <div class="form-row node-input-filepattern">
+         <label for="node-input-filepattern"><i class="fa fa-file"></i> Filename Pattern</label>
+         <input type="text" id="node-input-filepattern" placeholder="Filepattern">
+    </div>
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
+    </div>
+</script>
+
+<script type="text/x-red" data-help-name="amazon s3 in">
+    <p>Amazon S3 watch node. Watches for file events on Box. By default all
+    file events are reported, but the filename pattern can be supplied
+    to limit the events to files which have full filenames that match
+    the glob pattern. The event messages consist of the full filename
+    in <b>msg.payload</b> property, the filename in <b>msg.file</b>,
+    the event type in <b>msg.event</b>.</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('amazon s3 in',{
+        category: 'storage-input',
+        color:"#C0DEED",
+        defaults: {
+            aws: {type:"aws-config",required:true},
+            bucket: {required:true},
+            filepattern: {value:""},
+            name: {value:""},
+        },
+        inputs:0,
+        outputs:1,
+        icon: "amazon.png",
+        label: function() {
+            return this.bucket ? "s3 "+this.bucket : "s3";
+        }
+    });
+</script>
+
 <script type="text/x-red" data-template-name="amazon s3">
     <div class="form-row">
         <label for="node-input-aws"><i class="fa fa-user"></i> AWS</label>
diff --git a/aws/s3.js b/aws/s3.js
index 8e592a62..9f38635a 100644
--- a/aws/s3.js
+++ b/aws/s3.js
@@ -17,6 +17,86 @@
 module.exports = function(RED) {
     "use strict";
     var fs = require('fs');
+    var minimatch = require("minimatch");
+
+    function AmazonS3InNode(n) {
+        RED.nodes.createNode(this,n);
+        this.awsConfig = RED.nodes.getNode(n.aws);
+        this.region = n.region;
+        this.bucket = n.bucket;
+        this.filepattern = n.filepattern || "";
+        var node = this;
+        var AWS = this.awsConfig ? this.awsConfig.AWS : null;
+        if (!AWS) {
+            node.warn("Missing AWS credentials");
+            return;
+        }
+        var s3 = new AWS.S3();
+        node.status({fill:"blue",shape:"dot",text:"initializing"});
+        s3.listObjects({ Bucket: node.bucket }, function(err, data) {
+            if (err) {
+                node.error("failed to fetch S3 state: " + err);
+                node.status({fill:"red",shape:"ring",text:"error"});
+                return;
+            }
+            node.state = data.Contents.filter(function (e) {
+                return !node.filepattern || minimatch(e, node.filepattern);
+            }).map(function (e) {
+                return e.Key;
+            });
+            node.status({});
+            node.on("input", function(msg) {
+                node.status({fill:"blue",shape:"dot",text:"checking for changes"});
+                s3.listObjects({ Bucket: node.bucket }, function(err, data) {
+                    if (err) {
+                        node.warn("failed to fetch S3 state: " + err);
+                        node.status({});
+                        return;
+                    }
+                    node.status({});
+                    var newState = data.Contents.filter(function (e) {
+                        return !node.filepattern ||
+                            minimatch(e, node.filepattern);
+                    }).map(function (e) {
+                        return e.Key;
+                    });
+                    var seen = {};
+                    var i;
+                    for (i = 0; i < node.state.length; i++) {
+                        seen[node.state[i]] = true;
+                    }
+                    for (i = 0; i < newState.length; i++) {
+                        if (seen[newState[i]]) {
+                            delete seen[newState[i]];
+                        } else {
+                            msg.payload = newState[i];
+                            msg.file = newState[i].substring(newState[i].lastIndexOf('/') + 1);
+                            msg.event = 'add';
+                            node.send(msg);
+                        }
+                    }
+                    for (var k in seen) {
+                        if (seen.hasOwnProperty(k)) {
+                            msg.payload = k;
+                            msg.file = k.substring(k.lastIndexOf('/') + 1);
+                            msg.event = 'delete';
+                            node.send(msg);
+                        }
+                    }
+                    node.state = newState;
+                });
+            });
+            var interval = setInterval(function() {
+                node.emit("input", {});
+            }, 900000); // 15 minutes
+            node.on("close", function() {
+                if (interval !== null) {
+                    clearInterval(interval);
+                }
+            });
+        });
+    }
+    RED.nodes.registerType("amazon s3 in", AmazonS3InNode);
 
     function AmazonS3QueryNode(n) {
         RED.nodes.createNode(this,n);
@@ -32,7 +112,6 @@ module.exports = function(RED) {
         }
         var s3 = new AWS.S3();
         node.on("input", function(msg) {
-            msg.filename = filename;
             var bucket = node.bucket || msg.bucket;
             if (bucket === "") {
                 node.warn("No bucket specified");
@@ -43,6 +122,7 @@ module.exports = function(RED) {
                 node.warn("No filename specified");
                 return;
             }
+            msg.bucket = bucket;
             msg.filename = filename;
             node.status({fill:"blue",shape:"dot",text:"downloading"});
             s3.getObject({
diff --git a/package.json b/package.json
index 799ba97e..de7791a7 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
     "dependencies"  : {
         "aws-sdk": "^2.0.15",
         "dropbox":"^0.10.3",
+        "minimatch": "^1.0.0",
         "oauth":"~0.9.11",
         "request":"~2.40.0",
         "instagram-node":"0.5.1",