Skip to content

Add ability to pass whole response object to NS1Error class #15

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

Merged
merged 1 commit into from
Sep 30, 2020
Merged

Add ability to pass whole response object to NS1Error class #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions lib/NS1_request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,15 @@ function handle_error(err, response) {
errorCb(err, response);
}
if (response && response.text) {
var final_message = void 0;
var final_message = void 0,
data = void 0;
try {
final_message = JSON.parse(response.text).message;
data = JSON.parse(response.text);
final_message = data.message;
} catch (e) {
final_message = response.text;
}
return new NS1Error('NS1 API Request Failed on \n ' + this.method.toUpperCase() + ' ' + api_url + this.uri + ' \n ' + final_message + ' \n', final_message);
return new NS1Error('NS1 API Request Failed on \n ' + this.method.toUpperCase() + ' ' + api_url + this.uri + ' \n ' + final_message + ' \n', final_message, data);
} else {
return new NS1Error('NS1 API Request Failed on \n ' + this.method.toUpperCase() + ' ' + api_url + this.uri + ' \n ' + err.message + ' \n', err.message);
}
Expand All @@ -206,12 +208,13 @@ function handle_error(err, response) {
var NS1Error = function (_Error) {
_inherits(NS1Error, _Error);

function NS1Error(message, raw) {
function NS1Error(message, raw, data) {
_classCallCheck(this, NS1Error);

var _this3 = _possibleConstructorReturn(this, (NS1Error.__proto__ || Object.getPrototypeOf(NS1Error)).call(this, message));

_this3.raw = raw;
_this3.data = data;
return _this3;
}

Expand Down
10 changes: 6 additions & 4 deletions src/NS1_request.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,22 +161,24 @@ function handle_error(err, response) {
errorCb(err, response);
}
if (response && response.text) {
let final_message
let final_message, data
try {
final_message = JSON.parse(response.text).message
data = JSON.parse(response.text)
final_message = data.message
} catch(e) {
final_message = response.text
}
return new NS1Error(`NS1 API Request Failed on \n ${this.method.toUpperCase()} ${api_url}${this.uri} \n ${final_message} \n`, final_message)
return new NS1Error(`NS1 API Request Failed on \n ${this.method.toUpperCase()} ${api_url}${this.uri} \n ${final_message} \n`, final_message, data)
} else {
return new NS1Error(`NS1 API Request Failed on \n ${this.method.toUpperCase()} ${api_url}${this.uri} \n ${err.message} \n`, err.message)
}
}

class NS1Error extends Error {
constructor(message, raw) {
constructor(message, raw, data) {
super(message)
this.raw = raw
this.data = data
}
}

Expand Down