Skip to content
Merged
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
4 changes: 4 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 1.1.4

- Adds a message response when receiving a 429 HTTP error [#115](https://github.com/simperium/node-simperium/pull/115)

## 1.1.3

- Fixes a sync issue by reverting the changes from PR #101 [#114](https://github.com/simperium/node-simperium/pull/114)
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simperium",
"version": "1.1.3",
"version": "1.1.4",
"description": "A simperium client for node.js",
"main": "./lib/simperium/index.js",
"browser": {
Expand Down
7 changes: 6 additions & 1 deletion src/simperium/http-request.browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@ export default function(
xhr.open( 'POST', url );
xhr.setRequestHeader( 'X-Simperium-API-Key', apiKey );

xhr.onload = () => resolve( xhr.responseText );
xhr.onload = () => {
if ( xhr.status === 429 && xhr.responseText === '' ) {
return resolve('too many requests');
}
resolve(xhr.responseText);
};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

may sound silly given how simple this is right now, but I feel like a ladder of conditions would better set the stage for future changes here which might be likely. it's not the biggest issue, and there's a case to be made to let this be for now, but what are your thoughts about this construction instead?

xhr.onload = () => {
    if ( xhr.message === 429 && xhr.responseText = '' ) {
        return resolve('too many requests');
    }

    resolve(message);
}

you may find it silly for me to recommend changing a ternary into an if chain, but the early-abort here is key, that and the distinction that we're not really saying the message is one of two things, but rather that we're parsing the response and determining which of many possible outcomes we have.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the early-abort here is key, that and the distinction that we're not really saying the message is one of two things, but rather that we're parsing the response and determining which of many possible outcomes we have.

Your reasoning here makes total sense! It may not be 100% needed right now, but in the future, we may need to add more checks so I updated with your suggestion.

xhr.onerror = () => reject();

xhr.send( body );
Expand Down