Switch to JSON based requests #6
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 3 commits
February 19, 2015 15:24
diff --git a/README.md b/README.md index 00bdb30..159c0b8 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,10 @@ As a submodule of your project var message = { registration_id: 'Device registration id', // required collapse_key: 'Collapse key', - 'data.key1': 'value1', - 'data.key2': 'value2' + data: { + key1: 'value1', + key2: 'value2' + } }; gcm.send(message, function(err, messageId){ diff --git a/lib/gcm.js b/lib/gcm.js index b8cccea..bac227d 100644 --- a/lib/gcm.js +++ b/lib/gcm.js @@ -1,6 +1,5 @@ var util = require('util'); var https = require('https'); -var querystring = require('querystring'); var emitter = require('events').EventEmitter; var retry = require('retry'); @@ -30,11 +29,11 @@ GCM.prototype.send = function(packet, cb) { var operation = retry.operation(); operation.attempt(function(currentAttempt) { - var postData = querystring.stringify(packet); + var postData = JSON.stringify(packet); var headers = { 'Host': self.gcmOptions.host, 'Authorization': 'key=' + self.apiKey, - 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8', + 'Content-Type': 'application/json', 'Content-length': postData.length }; self.gcmOptions.headers = headers;
…ording to https://developer.android.com/google/gcm/http.html diff --git a/lib/gcm.js b/lib/gcm.js index bac227d..adec210 100644 --- a/lib/gcm.js +++ b/lib/gcm.js @@ -43,7 +43,7 @@ GCM.prototype.send = function(packet, cb) { var request = https.request(self.gcmOptions, function(res) { var data = ''; - if (res.statusCode == 503) { + if (res.statusCode >= 501 && res.statusCode < 600) { // If the server is temporary unavailable, the C2DM spec requires that we implement exponential backoff // and respect any Retry-After header if (res.headers['retry-after']) { @@ -64,26 +64,22 @@ GCM.prototype.send = function(packet, cb) { } function respond() { - var error = null, id = null; + var error = null; - if (data.indexOf('Error=') === 0) { - error = data.substring(6).trim(); - } - else if (data.indexOf('id=') === 0) { - id = data.substring(3).trim(); - } - else { - // No id nor error? - error = 'InvalidServerResponse'; - } + if(res.statusCode >= 200 && res.statusCode < 300) { + //Success + self.emit('sent', null, JSON.parse(data)) + } else { + //Error - // Only retry if error is QuotaExceeded or DeviceQuotaExceeded - if (operation.retry(['QuotaExceeded', 'DeviceQuotaExceeded', 'InvalidServerResponse'].indexOf(error) >= 0 ? error : null)) { - return; - } + if (data == "DeviceMessageRateExceeded" || data == "DEVICE_MESSAGE_RATE_EXCEEDED") { + if (operation.retry(data)) { + return; + } + } - // Success, return message id (without id=) - self.emit('sent', error, id); + self.emit('sent', data, null) + } } res.on('data', function(chunk) {
|
I hope this pull request will solve the issues with sending notifications to iOS devices. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Modified the package to use JSON instead of urlencoded form. It simplifies the interface a bunch (you can just pass in a native javascript hash instead of doing things like using 'data.key1' as a key)
I did this mostly because I wanted to use GCM's user notifications feature and was having a ton of trouble getting it to work via the urlencoded form. I managed to get it to work by sending
message = {to: 'notification_key', data: {foo: 'hello'}};