Skip to content

Commit

Permalink
Merge pull request #401 from pusher/5.0.3
Browse files Browse the repository at this point in the history 
5.0.3 release
  • Loading branch information
@WillSewell
WillSewell committed Nov 18, 2019
2 parents 942a312 + eea52ef commit c7b5dcb
Show file tree
Hide file tree
Showing 10 changed files with 207 additions and 119 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## 5.0.3 (2019-11-18)

[NEW] Log a warning when there is an auth error

[CHANGED] Default logger now uses console.warn and console.error

[CHANGED] Improved log messages

## 5.0.2 (2019-09-25)

[FIXED] Utilise new API for @react-native-community/netinfo suppressing
Expand Down
14 changes: 7 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,17 +547,17 @@ First, clone this repository and run `npm install && git submodule init && git s

In the `dist/web` folder, you should see the files you need: `pusher.js`, `pusher.min.js`, `json2.js`, `json.min.js`, `sockjs.js` and `sockjs.min.js`. `pusher.js` should be built referencing your URLs as the dependency hosts.

First, make sure you expose all files from the `dist` directory. They need to be in a directory with named after the version number. For example, if you're hosting version 5.0.2 under `http://example.com/pusher-js` (and https for SSL), files should be accessible under following URL's:
First, make sure you expose all files from the `dist` directory. They need to be in a directory with named after the version number. For example, if you're hosting version 5.0.3 under `http://example.com/pusher-js` (and https for SSL), files should be accessible under following URL's:

http://example.com/pusher-js/5.0.2/pusher.js
http://example.com/pusher-js/5.0.2/json2.js
http://example.com/pusher-js/5.0.2/sockjs.js
http://example.com/pusher-js/5.0.3/pusher.js
http://example.com/pusher-js/5.0.3/json2.js
http://example.com/pusher-js/5.0.3/sockjs.js

Minified files should have `.min` in their names, as in the `dist/web` directory:

http://example.com/pusher-js/5.0.2/pusher.min.js
http://example.com/pusher-js/5.0.2/json2.min.js
http://example.com/pusher-js/5.0.2/sockjs.min.js
http://example.com/pusher-js/5.0.3/pusher.min.js
http://example.com/pusher-js/5.0.3/json2.min.js
http://example.com/pusher-js/5.0.3/sockjs.min.js

## SockJS compatibility

Expand Down
96 changes: 62 additions & 34 deletions dist/node/pusher.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Pusher JavaScript Library v5.0.2
* Pusher JavaScript Library v5.0.3
* https://pusher.com/
*
* Copyright 2017, Pusher
Expand Down Expand Up @@ -125,6 +125,8 @@ function SafeBuffer (arg, encodingOrOffset, length) {
return Buffer(arg, encodingOrOffset, length)
}

SafeBuffer.prototype = Object.create(Buffer.prototype)

// Copy static methods from Buffer
copyProps(Buffer, SafeBuffer)

Expand Down Expand Up @@ -7073,7 +7075,7 @@ function safeJSONStringify(source) {

// CONCATENATED MODULE: ./src/core/defaults.ts
var Defaults = {
VERSION: "5.0.2",
VERSION: "5.0.3",
PROTOCOL: 7,
host: 'ws.pusherapp.com',
ws_port: 80,
Expand Down Expand Up @@ -7247,37 +7249,68 @@ var dispatcher_Dispatcher = (function () {
// CONCATENATED MODULE: ./src/core/logger.ts


var Logger = {
debug: function () {
var logger_Logger = (function () {
function Logger() {
this.globalLog = function (message) {
if (global.console && global.console.log) {
global.console.log(message);
}
};
}
Logger.prototype.debug = function () {
var args = [];
for (var _i = 0; _i < arguments.length; _i++) {
args[_i] = arguments[_i];
}
if (!core_pusher.log) {
return;
this.log(this.globalLog, args);
};
Logger.prototype.warn = function () {
var args = [];
for (var _i = 0; _i < arguments.length; _i++) {
args[_i] = arguments[_i];
}
core_pusher.log(stringify.apply(this, arguments));
},
warn: function () {
this.log(this.globalLogWarn, args);
};
Logger.prototype.error = function () {
var args = [];
for (var _i = 0; _i < arguments.length; _i++) {
args[_i] = arguments[_i];
}
this.log(this.globalLogError, args);
};
Logger.prototype.globalLogWarn = function (message) {
if (global.console && global.console.warn) {
global.console.warn(message);
}
else {
this.globalLog(message);
}
};
Logger.prototype.globalLogError = function (message) {
if (global.console && global.console.error) {
global.console.error(message);
}
else {
this.globalLogWarn(message);
}
};
Logger.prototype.log = function (defaultLoggingFunction) {
var args = [];
for (var _i = 1; _i < arguments.length; _i++) {
args[_i - 1] = arguments[_i];
}
var message = stringify.apply(this, arguments);
if (core_pusher.log) {
core_pusher.log(message);
}
else if (global.console) {
if (global.console.warn) {
global.console.warn(message);
}
else if (global.console.log) {
global.console.log(message);
}
else if (core_pusher.logToConsole) {
var log = defaultLoggingFunction.bind(this);
log(message);
}
}
};
/* harmony default export */ var logger = (Logger);
};
return Logger;
}());
/* harmony default export */ var logger = (new logger_Logger());

// CONCATENATED MODULE: ./src/core/transports/transport_connection.ts
var transport_connection_extends = (undefined && undefined.__extends) || (function () {
Expand Down Expand Up @@ -8077,6 +8110,7 @@ var channel_Channel = (function (_super) {
this.subscriptionCancelled = false;
this.authorize(this.pusher.connection.socket_id, function (error, data) {
if (error) {
logger.error(data);
_this.emit('pusher:subscription_error', data);
}
else {
Expand Down Expand Up @@ -8220,7 +8254,7 @@ var presence_channel_PresenceChannel = (function (_super) {
if (!error) {
if (authData.channel_data === undefined) {
var suffix = url_store.buildLogSuffix("authenticationEndpoint");
logger.warn("Invalid auth response for channel '" + _this.name + "'," +
logger.error("Invalid auth response for channel '" + _this.name + "'," +
("expected 'channel_data' field. " + suffix));
callback("Invalid auth response");
return;
Expand Down Expand Up @@ -8326,7 +8360,6 @@ var encrypted_channel_EncryptedChannel = (function (_super) {
if (!sharedSecret) {
var errorMsg = "No shared_secret key in auth payload for encrypted channel: " + _this.name;
callback(true, errorMsg);
logger.warn("Error: " + errorMsg);
return;
}
_this.key = Object(nacl_util["decodeBase64"])(sharedSecret);
Expand All @@ -8353,30 +8386,30 @@ var encrypted_channel_EncryptedChannel = (function (_super) {
return;
}
if (!data.ciphertext || !data.nonce) {
logger.warn('Unexpected format for encrypted event, expected object with `ciphertext` and `nonce` fields, got: ' + data);
logger.error('Unexpected format for encrypted event, expected object with `ciphertext` and `nonce` fields, got: ' + data);
return;
}
var cipherText = Object(nacl_util["decodeBase64"])(data.ciphertext);
if (cipherText.length < nacl_fast["secretbox"].overheadLength) {
logger.warn("Expected encrypted event ciphertext length to be " + nacl_fast["secretbox"].overheadLength + ", got: " + cipherText.length);
logger.error("Expected encrypted event ciphertext length to be " + nacl_fast["secretbox"].overheadLength + ", got: " + cipherText.length);
return;
}
var nonce = Object(nacl_util["decodeBase64"])(data.nonce);
if (nonce.length < nacl_fast["secretbox"].nonceLength) {
logger.warn("Expected encrypted event nonce length to be " + nacl_fast["secretbox"].nonceLength + ", got: " + nonce.length);
logger.error("Expected encrypted event nonce length to be " + nacl_fast["secretbox"].nonceLength + ", got: " + nonce.length);
return;
}
var bytes = nacl_fast["secretbox"].open(cipherText, nonce, this.key);
if (bytes === null) {
logger.debug('Failed to decrypt an event, probably because it was encrypted with a different key. Fetching a new key from the authEndpoint...');
this.authorize(this.pusher.connection.socket_id, function (error, authData) {
if (error) {
logger.warn("Failed to make a request to the authEndpoint: " + authData + ". Unable to fetch new key, so dropping encrypted event");
logger.error("Failed to make a request to the authEndpoint: " + authData + ". Unable to fetch new key, so dropping encrypted event");
return;
}
bytes = nacl_fast["secretbox"].open(cipherText, nonce, _this.key);
if (bytes === null) {
logger.warn("Failed to decrypt event with new key. Dropping encrypted event");
logger.error("Failed to decrypt event with new key. Dropping encrypted event");
return;
}
_this.emitJSON(event, Object(nacl_util["encodeUTF8"])(bytes));
Expand Down Expand Up @@ -9703,15 +9736,15 @@ var ajax = function (context, socketId, callback) {
parsed = true;
}
catch (e) {
callback(true, 'JSON returned from webapp was invalid, yet status code was 200. Data was: ' + xhr.responseText);
callback(true, 'JSON returned from auth endpoint was invalid, yet status code was 200. Data was: ' + xhr.responseText);
}
if (parsed) {
callback(false, data);
}
}
else {
var suffix = url_store.buildLogSuffix("authenticationEndpoint");
logger.warn('Unable to retrieve auth string from auth endpoint - ' +
logger.error('Unable to retrieve auth string from auth endpoint - ' +
("received status " + xhr.status + " from " + self.options.authEndpoint + ". ") +
("Clients must be authenticated to join private or presence channels. " + suffix));
callback(true, xhr.status);
Expand Down Expand Up @@ -10126,7 +10159,7 @@ var pusher_Pusher = (function () {
_this.channels.disconnect();
});
this.connection.bind('error', function (err) {
logger.warn('Error', err);
logger.warn(err);
});
Pusher.instances.push(this);
this.timeline.info({ instances: Pusher.instances.length });
Expand All @@ -10140,11 +10173,6 @@ var pusher_Pusher = (function () {
Pusher.instances[i].connect();
}
};
Pusher.log = function (message) {
if (Pusher.logToConsole && global.console && global.console.log) {
global.console.log(message);
}
};
Pusher.getClientFeatures = function () {
return keys(filterObject({ ws: node_runtime.Transports.ws }, function (t) {
return t.isSupported({});
Expand Down
4 changes: 2 additions & 2 deletions dist/react-native/pusher.js
View file

Large diffs are not rendered by default.

0 comments on commit c7b5dcb

Please sign in to comment.