Merge pull request #228 from futurice/master

Fix requests if SOAP service is not on port 80, do not crash on errors
vpulim · Jan 28, 2014 · 860eecc · 860eecc
2 parents 52e857d + 488e141
commit 860eecc
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 11 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -145,7 +145,7 @@ Client.prototype._invoke = function(method, args, location, callback, options) {
     var result;
     var obj;
     self.lastResponse = body;
-    self.lastResponseHeaders = response.headers;
+    self.lastResponseHeaders = response && response.headers;
     if (err) {
       callback(err);
     } else {

diff --git a/lib/http.js b/lib/http.js
@@ -23,7 +23,7 @@ exports.request = function(rurl, data, callback, exheaders, exoptions) {
     "Accept-Encoding": "none",
     "Accept-Charset": "utf-8",
     "Connection": "close",
-    "Host" : host
+    "Host" : host + (port ? ":"+port : "")
   };
   var attr;
 

diff --git a/test/server-test.js b/test/server-test.js
@@ -48,17 +48,29 @@ wsdlNonStrictTests['should not parse connection error'] = function(done) {
     });
 };
 
+
+var server = null;
 module.exports = {
+    beforeEach: function() {
+        var wsdl = fs.readFileSync(__dirname+'/wsdl/strict/stockquote.wsdl', 'utf8');
+        server = http.createServer(function(req, res) {
+            res.statusCode = 404;
+            res.end();
+        });
+        server.listen(15099);
+        soap.listen(server, '/stockquote', service, wsdl);
+    },
+    afterEach: function(done) {
+        if (!server) return done()
+        server.close(function() {
+            server = null;
+            done();
+        });
+    },
+
     'SOAP Server': {
 
-        'should start': function(done) {
-            var wsdl = fs.readFileSync(__dirname+'/wsdl/strict/stockquote.wsdl', 'utf8'),
-                server = http.createServer(function(req, res) {
-                    res.statusCode = 404;
-                    res.end();
-                });
-            server.listen(15099);
-            soap.listen(server, '/stockquote', service, wsdl);
+        'should be running': function(done) {
             request('http://localhost:15099', function(err, res, body) {
                 assert.ok(!err);
                 done();
@@ -82,6 +94,19 @@ module.exports = {
             })
         },
 
+        'should return a valid error if the server stops responding': function(done) {
+            soap.createClient('http://localhost:15099/stockquote?wsdl', function(err, client) {
+                assert.ok(!err);
+                server.close(function() {
+                  server = null;
+                  client.GetLastTradePrice({ tickerSymbol: 'trigger error' }, function(err, response, body) {
+                      assert.ok(err);
+                      done();
+                  });
+                });
+            });
+        },
+
         'should return complete client description': function(done) {
             soap.createClient('http://localhost:15099/stockquote?wsdl', function(err, client) {
                 assert.ok(!err);
@@ -113,7 +138,7 @@ module.exports = {
                     done();
                 });
             });
-        }
+        },
     },
     'WSDL Parser (strict)': wsdlStrictTests,
     'WSDL Parser (non-strict)': wsdlNonStrictTests