Merge pull request #179 from cnpm/show-server-error

Show registry server error response. fixed #178

proxy/npm.js

@@ -26,7 +26,16 @@ function request(url, options, callback) {
   options.dataType = options.dataType || 'json';
   options.timeout = options.timeout || 120000;
   url = config.sourceNpmRegistry + url;
-  urllib.request(url, options, callback);
+  urllib.request(url, options, function (err, data, res) {
+    if (err) {
+      var statusCode = res && res.statusCode || -1;
+      if (err.name === 'JSONResponseFormatError' && statusCode >= 500) {
+        err.name = 'NPMServerError';
+        err.message = 'Status ' + statusCode + ', ' + (data && data.toString() || 'empty body');
+      }
+    }
+    callback(err, data, res);
+  });
 }
 
 exports.get = function (name, callback) {

test/fixtures/500.txt

@@ -0,0 +1,7 @@
+Internal routing error
+
+Sorry, we cannot connect to the intended server.
+
+We have just been notified of this problem. We will correct it as soon as possible.
+
+Feel free to contact us if you have any questions: [email protected]

test/proxy/npm.test.js

@@ -16,8 +16,12 @@
 
 var should = require('should');
 var mm = require('mm');
+var fs = require('fs');
+var path = require('path');
 var npm = require('../../proxy/npm');
 
+var fixtures = path.join(path.dirname(__dirname), 'fixtures');
+
 describe('proxy/npm.test.js', function () {
   afterEach(mm.restore);
 
@@ -47,4 +51,16 @@ describe('proxy/npm.test.js', function () {
       done();
     });
   });
+
+  it('should return ServerError when http 500 response', function (done) {
+    var content = fs.readFileSync(path.join(fixtures, '500.txt'), 'utf8');
+    mm.http.request(/\//, content, { statusCode: 500 });
+    // http://registry.npmjs.org/octopie
+    npm.get('octopie', function (err, data) {
+      should.exist(err);
+      err.name.should.equal('NPMServerError');
+      err.message.should.equal('Status 500, ' + content);
+      done();
+    });
+  });
 });