Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't clobber global promise #52

Merged
merged 3 commits into from Jul 25, 2016
Merged

Don't clobber global promise #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad68d2d
Don't clobber global promise
Jul 18, 2016
0ab31fc
Lock dependencies, add node testing versiosn
Jul 18, 2016
207edbd
Clean up promise and logic
Jul 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions .travis.yml
View file
Open in desktop
@@ -1,5 +1,9 @@
language: node_js
node_js:
- '6'
- '5'
- '4'
- '0.12'
- '0.11'
- '0.10'
env:
Expand Down
99 changes: 37 additions & 62 deletions lib/index.js
View file
Open in desktop
@@ -1,53 +1,70 @@
var generateQueryString = require('./utils').generateQueryString,
request = require('request'),
parseXML = require('xml2js').parseString,
Promise = require('es6-promise').Promise;
request = require('request'),
parseXML = require('xml2js').parseString;

if (typeof Promise === 'undefined') {
Promise = require('es6-promise').Promise;
}

var runQuery = function (credentials, method) {

return function (query, cb) {
var url = generateQueryString(query, method, credentials);
var req = query.request || request;

if (typeof cb === 'function') {
req(url, function (err, response, body) {
var p = new Promise(function(resolve, reject) {
var success = function(results) {
if (typeof cb === 'function') {
cb.apply(null, [null].concat(Array.prototype.slice.call(arguments)));
}else{
resolve(results);
}
};

var failure = function(err) {
if (typeof cb === 'function') {
cb.call(null, err);
} else {
reject(err);
}
};


req(url, function (err, response, body) {
if (err) {
cb(err);
failure(err);
} else if (!response) {
cb("No response (check internet connection)");
failure("No response (check internet connection)");
} else if (response.statusCode !== 200) {
parseXML(body, function (err, resp) {
if (err) {
cb(err);
failure(err);
} else {
cb(resp[method + 'ErrorResponse']);
failure(resp[method + 'ErrorResponse']);
}
});
} else {
parseXML(body, function (err, resp) {
if (err) {
cb(err);
failure(err);
} else {
var respObj = resp[method + 'Response'];
if (respObj.Items && respObj.Items.length > 0) {
// Request Error
if (respObj.Items[0].Request && respObj.Items[0].Request.length > 0 && respObj.Items[0].Request[0].Errors) {
cb(respObj.Items[0].Request[0].Errors);
failure(respObj.Items[0].Request[0].Errors);
} else if (respObj.Items[0].Item) {
cb(
null,
success(
respObj.Items[0].Item,
respObj.Items[0]
);
}
} else if (respObj.BrowseNodes && respObj.BrowseNodes.length > 0) {
// Request Error
if (respObj.BrowseNodes[0].Request && respObj.BrowseNodes[0].Request.length > 0 && respObj.BrowseNodes[0].Request[0].Errors) {
cb(respObj.BrowseNodes[0].Request[0].Errors);
failure(respObj.BrowseNodes[0].Request[0].Errors);
} else if (respObj.BrowseNodes[0].BrowseNode) {
cb(
null,
success(
respObj.BrowseNodes[0].BrowseNode,
respObj.BrowseNodes[0]
);
Expand All @@ -57,53 +74,11 @@ var runQuery = function (credentials, method) {
});
}
});
return;
}

var promise = new Promise(function (resolve, reject) {

req(url, function (err, response, body) {

if (err) {
reject(err);
} else if (!response) {
reject("No response (check internet connection)");
} else if (response.statusCode !== 200) {
parseXML(body, function (err, resp) {
if (err) {
reject(err);
} else {
reject(resp[method + 'ErrorResponse']);
}
});
} else {
parseXML(body, function (err, resp) {
if (err) {
reject(err);
} else {
var respObj = resp[method + 'Response'];
if (respObj.Items && respObj.Items.length > 0) {
// Request Error
if (respObj.Items[0].Request && respObj.Items[0].Request.length > 0 && respObj.Items[0].Request[0].Errors) {
reject(respObj.Items[0].Request[0].Errors);
} else if (respObj.Items[0].Item) {
resolve(respObj.Items[0].Item);
}
} else if (respObj.BrowseNodes && respObj.BrowseNodes.length > 0) {
// Request Error
if (respObj.BrowseNodes[0].Request && respObj.BrowseNodes[0].Request.length > 0 && respObj.BrowseNodes[0].Request[0].Errors) {
reject(respObj.BrowseNodes[0].Request[0].Errors);
} else if (respObj.BrowseNodes[0].BrowseNode) {
resolve(respObj.BrowseNodes[0].BrowseNode);
}
}
}
});
}
});
});

return promise;

if(typeof cb !== 'function') {
return p;
}
};
};

Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Expand Up @@ -19,14 +19,14 @@
"author": "Dmitry Mazuro <dmitry.mazuro@icloud.com>",
"license": "BSD-2-Clause",
"dependencies": {
"es6-promise": "^3.0.2",
"xml2js": "^0.4.5",
"request": "^2.53.0"
"es6-promise": "3.0.2",
"xml2js": "0.4.5",
"request": "2.53.0"
},
"devDependencies": {
"coffee-script": "^1.7.1",
"mocha": "^1.20.1",
"should": "^4.0.4"
"coffee-script": "1.7.1",
"mocha": "1.20.1",
"should": "4.0.4"
},
"repository": {
"type": "git",
Expand Down