change response for seneca actions

Author: mirceaalexandru

lib/npm.js

@@ -23,14 +23,21 @@ module.exports = function (options) {
 }
 
 function cmdGet (msg, done) {
-  var cache = opts.cache
+  let cache = opts.cache
+  let context = this
 
   cache.load$(msg.name, (err, npm) => {
-    if (err) return done(err)
+    if (err) {
+      context.log.debug(`Cannot load from cache module ${msg.name}, try now to get it remotely`)
+    }
 
     function complete (err, entity) {
-      if (err) return done(err)
-      else done(null, entity.data$(entity))
+      if (err) {
+        return done(null, {ok: false, err: err})
+      }
+      else {
+        done(null, {ok: true, data: entity.data$(entity)})
+      }
     }
 
     if (npm && !msg.update) {
@@ -40,9 +47,19 @@ function cmdGet (msg, done) {
     var registry = opts.registry + msg.name
 
     Request.get({url: registry, gzip: true}, (err, res, body) => {
-      if (err) return done(err)
+      if (err) {
+        return complete(err)
+      }
+
+      var data = null
+
+      try {
+        data = JSON.parse(body)
+      }
+      catch (e) {
+        return complete(e)
+      }
 
-      var data = JSON.parse(body)
       var distTags = data['dist-tags'] || {}
       var latest = ((data.versions || {})[distTags.latest]) || {}
       var repository = latest.repository || {}
@@ -77,7 +94,7 @@ function cmdGet (msg, done) {
         }
       }
       else {
-        return done(new Error('not found on npm'))
+        return done(null, {ok: false, err: new Error('not found on npm')})
       }
     })
   })
@@ -87,11 +104,16 @@ function aliasGet (msg, done) {
   var seneca = this
   var payload = {name: msg.name}
 
-  seneca.act('role:npm,cmd:get', payload, (err, data) => {
-    if (err) return done(err)
+  seneca.act('role:npm,cmd:get', payload, (err, res) => {
+    if (err) {
+      return done(null, {ok: false, err: err})
+    }
+
+    if (res && res.ok) {
+      payload.data = res.data
+      seneca.act('role:info,res:part,part:npm', payload)
+    }
 
-    payload.data = data
-    seneca.act('role:info,res:part,part:npm', payload)
     done(null, {ok: true})
   })
 }