Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ module.exports = function(grunt) {
var taskDone = this.async();
var options = this.options({});

var request = require('request');
var fetch = require('node-fetch');
var fs = require('fs');
var util = require('util');
var async = require('async');
Expand Down Expand Up @@ -316,17 +316,21 @@ module.exports = function(grunt) {
options.username,
options.password
);
request(url, function (err, resp, body) {
var filename = util.format(
'%s/test/fixtures/%s.json',
__dirname,
fixtureName
);
var content = body.replace(/ari\.js/g, 'localhost');
fs.writeFileSync(filename, content);
fetch(url)
.then(function (res) {
return res.text();
})
.then(function (body) {
var filename = util.format(
'%s/test/fixtures/%s.json',
__dirname,
fixtureName
);
var content = body.replace(/ari\.js/g, 'localhost');
fs.writeFileSync(filename, content);

done();
});
done();
});
}
});
};
22 changes: 11 additions & 11 deletions lib/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
'use strict';

var util = require('util');
var request = require('request');
var fetch = require('node-fetch');
var url = require('url');
var events = require('events');

Expand Down Expand Up @@ -111,21 +111,21 @@ Client.prototype._attachApi = function () {
self._connection.prefix
);

request(ariUrl, function (err) {
if (err &&
['ETIMEDOUT', 'ENOTFOUND', 'ECONNREFUSED'].indexOf(err.code) !== -1) {
err.name = 'HostIsNotReachable';

self.emit('APILoadError', err);
reject(err);
} else {
fetch(ariUrl)
.then(function () {
self._swagger = new swagger.SwaggerApi({
url: ariUrl,
success: swaggerLoaded,
failure: swaggerFailed
});
}
});
})
.catch(function (err) {
if (['ETIMEDOUT', 'ENOTFOUND', 'ECONNREFUSED'].indexOf(err.code) !== -1) {
err.name = 'HostIsNotReachable';
}
self.emit('APILoadError', err);
reject(err);
});

/**
* Success handler for swagger connect.
Expand Down
Loading