Finally smash S3 upload crash bugv0.1.16

2 files changed, 24 insertions, 15 deletions

diff --git a/app/node_modules/okservices/oks3/index.js b/app/node_modules/okservices/oks3/index.js
index bd0915e..d556c20 100644
--- a/app/node_modules/okservices/oks3/index.js
+++ b/app/node_modules/okservices/oks3/index.js
@@ -1,6 +1,12 @@
 var skipper = require('skipper');
 var skipperS3 = require('skipper-s3')
 
+// Hack to prevent this god-forsaken module from crashing our shit
+var d = require('domain').create()
+d.on('error', function (err) {
+  console.error('Stupid error in S3 upload. Image upload probably prematurely canceled')
+})
+
 function OKS3(options) {
   if (!(this instanceof OKS3)) return new OKS3(options);
   options = options || {};
@@ -17,19 +23,22 @@ function OKS3(options) {
   router.post('/', function(req, res) {
     // req should have a method `file` on it which is
     // provided by skipper. Use that to do AWS stuff
-    req.file('image').upload({
-      adapter: skipperS3,
-      key: options.s3.key,
-      secret: options.s3.secret,
-      bucket: options.s3.bucket,
-      dirname: options.s3.dirname,
-      maxBytes: options.s3.maxbytes,
-      headers: {
-        'x-amz-acl': 'public-read'
-      }
-    }, function (err, uploadedFiles) {
-      res.json(uploadedFiles);
-    });
+    d.run(function () {
+      req.file('image').upload({
+        adapter: skipperS3,
+        key: options.s3.key,
+        secret: options.s3.secret,
+        bucket: options.s3.bucket,
+        dirname: options.s3.dirname,
+        maxBytes: options.s3.maxbytes,
+        headers: {
+          'x-amz-acl': 'public-read'
+        }
+      }, function (err, uploadedFiles) {
+        if (err) res.status(500).send(err)
+        res.json(uploadedFiles);
+      });
+    })
   });
 
   this._middleware = router;
diff --git a/app/node_modules/okservices/oks3/package.json b/app/node_modules/okservices/oks3/package.json
index 982fbfe..1d72a26 100644
--- a/app/node_modules/okservices/oks3/package.json
+++ b/app/node_modules/okservices/oks3/package.json
@@ -9,7 +9,7 @@
   "author": "OKFocus",
   "license": "None",
   "dependencies": {
-    "skipper": "^0.5.7",
-    "skipper-s3": "^0.5.5"
+    "skipper": "^0.5.8",
+    "skipper-s3": "^0.5.6"
   }
 }