2 files changed, 29 insertions, 31 deletions

diff --git a/app.js b/app.js
index b568e65a..9e5c3fed 100644
--- a/app.js
+++ b/app.js
@@ -88,24 +88,20 @@
     return next();
   };
 
-  fetchRates = function() {
-    var file;
-    file = 'public/js/rates.json';
-    fs.truncate(file, 0, function() {
-      var r, stream;
-      stream = fs.createWriteStream(file);
-      r = request("https://api.bitcoinaverage.com/exchanges/all");
-      r.on('data', function(chunk) {
-        return stream.write(chunk);
-      });
-      return r.on('error', function(error) {
-        return console.log(error);
-      });
+  (fetchRates = function() {
+    request("https://api.bitcoinaverage.com/exchanges/all", function(error, response, body) {
+      var file, stream;
+      try {
+        require('util').isDate(JSON.parse(body).timestamp);
+        file = 'public/js/rates.json';
+        stream = fs.createWriteStream(file);
+        return fs.truncate(file, 0, function() {
+          return stream.write(body);
+        });
+      } catch (_error) {}
     });
     return setTimeout(fetchRates, 120000);
-  };
-
-  fetchRates();
+  })();
 
   app.get('/', cache, sessions["new"]);
 
diff --git a/src/app.coffee b/src/app.coffee
index 01e6fb15..986f3371 100644
--- a/src/app.coffee
+++ b/src/app.coffee
@@ -26,7 +26,14 @@ app.use(bodyParser.urlencoded({ extended: true}))
 app.use(bodyParser.json())
 app.use(bodyParser.json({ type: 'application/vnd.api+json' }))
 app.use(cookieParser(config.secret))
-app.use(session(resave: true, saveUninitialized: true, secret: config.secret, store: sessionStore, cookie: { maxAge: 1209600000 }, key: 'vanbtc.sid'))
+app.use(session(
+  resave: true
+  saveUninitialized: true
+  secret: config.secret
+  store: sessionStore
+  cookie: maxAge: 1209600000
+  key: 'vanbtc.sid'
+))
 app.use(passport.initialize())
 app.use(passport.session())
 
@@ -43,22 +50,17 @@ cache = (req, res, next) ->
     res.setHeader "Cache-Control", "public, max-age=900"
   next()
 
-fetchRates = ->
-  file = 'public/js/rates.json'
-  fs.truncate(file, 0, ->
-    stream = fs.createWriteStream(file)
-
-    r = request("https://api.bitcoinaverage.com/exchanges/all")
-    r.on('data', (chunk) ->
-      stream.write(chunk)
-    )
-    r.on('error', (error) ->
-      console.log(error)
-    )
+do fetchRates = ->
+  request("https://api.bitcoinaverage.com/exchanges/all", (error, response, body) ->
+    try 
+      require('util').isDate(JSON.parse(body).timestamp)
+      file = 'public/js/rates.json'
+      stream = fs.createWriteStream(file)
+      fs.truncate(file, 0, ->
+        stream.write(body)
+      )
   )
-
   setTimeout(fetchRates, 120000)
-fetchRates()
 
 app.get('/', cache, sessions.new)
 app.get('/register', cache, users.new)