pusher-js 7.4.0 → 7.5.0

package/.github/PULL_REQUEST_TEMPLATE.md

@@ -8,3 +8,7 @@
 - [ ] All tests are passing.
 - [ ] New or changed API methods have been documented.
 - [ ] `npm run format` has been run
+
+## CHANGELOG
+
+- [CHANGED] Describe your change here. Look at CHANGELOG.md to see the format.

package/.github/workflows/release_pr.yml

@@ -19,8 +19,7 @@ jobs:
           echo "CURRENT_VERSION=$CURRENT_VERSION" >> $GITHUB_ENV
       - uses: actions/checkout@v2
         with:
-          repository: pusher/actions
-          token: ${{ secrets.PUSHER_CI_GITHUB_PRIVATE_TOKEN }}
+          repository: pusher/public_actions
           path: .github/actions
       - uses: ./.github/actions/prepare-version-bump
         id: bump
@@ -37,6 +36,8 @@ jobs:
 
           make build_all
 
-          git add package.json CHANGELOG.md dist/
+          git status
+
+          git add package.json package-lock.json CHANGELOG.md dist/ types/
           git commit -m "Bump to version ${{ steps.bump.outputs.new_version }}"
           git push

package/CHANGELOG.md

@@ -1,12 +1,22 @@
 # Changelog
 
+## 7.5.0
+
+- [ADDED] Watchlist Online Status
+
+## 7.4.1
+
+- [CHANGED] Authorization error message.
+
 ## 7.4.0
 
-* [FIXED] Allow presence channel authorization to depend on user authentication
+* [CHANGED] Use secure random generator instead of pseudo-random generator
+* [CHANGED] Replace git protocol with HTTPS in gitsubmodules file
+* [ADDED] Allow presence channel authorization to depend on user authentication
 
 ## 7.3.0
 
-* [FIXED] Restore previously exported types
+* [FIXED] Restore previously exported types
 
 ## 7.2.0
 

package/README.md

@@ -242,7 +242,7 @@ For more information see [authenticating users](https://pusher.com/docs/channels
 
 Object containing the configuration for user authorization. Valid keys are:
 
-* `endpoint` (String) - Endpoint on your server that will return the authorization signature needed for private and presence channels. Defaults to `/pusher/user-auth`.
+* `endpoint` (String) - Endpoint on your server that will return the authorization signature needed for private and presence channels. Defaults to `/pusher/auth`.
 
 * `transport` (String) - Defines how the authorization endpoint will be called. There are two options available:
   * `ajax` - the **default** option where an `XMLHttpRequest` object will be used to make a request. The parameters will be passed as `POST` parameters.

package/dist/node/pusher.js

@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v7.4.0
+ * Pusher JavaScript Library v7.5.0
  * https://pusher.com/
  *
  * Copyright 2020, Pusher
@@ -369,6 +369,12 @@ module.exports = Base;
 
 /***/ }),
 /* 3 */
+/***/ (function(module, exports) {
+
+module.exports = require("crypto");
+
+/***/ }),
+/* 4 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -417,17 +423,11 @@ var Driver = {
 module.exports = Driver;
 
 
-/***/ }),
-/* 4 */
-/***/ (function(module, exports) {
-
-module.exports = require("stream");
-
 /***/ }),
 /* 5 */
 /***/ (function(module, exports) {
 
-module.exports = require("crypto");
+module.exports = require("stream");
 
 /***/ }),
 /* 6 */
@@ -943,9 +943,9 @@ module.exports = HttpParser;
 "use strict";
 
 
-var Stream      = __webpack_require__(4).Stream,
+var Stream      = __webpack_require__(5).Stream,
     util        = __webpack_require__(0),
-    driver      = __webpack_require__(3),
+    driver      = __webpack_require__(4),
     EventTarget = __webpack_require__(16),
     Event       = __webpack_require__(7);
 
@@ -1148,7 +1148,7 @@ module.exports = API;
 
 
 var Buffer     = __webpack_require__(1).Buffer,
-    crypto     = __webpack_require__(5),
+    crypto     = __webpack_require__(3),
     util       = __webpack_require__(0),
     Extensions = __webpack_require__(29),
     Base       = __webpack_require__(2),
@@ -2083,7 +2083,7 @@ exports.decode = decode;
 
 
 var util   = __webpack_require__(0),
-    driver = __webpack_require__(3),
+    driver = __webpack_require__(4),
     API    = __webpack_require__(11);
 
 var WebSocket = function(request, socket, body, protocols, options) {
@@ -5132,7 +5132,7 @@ nacl.setPRNG = function(fn) {
     });
   } else if (true) {
     // Node.js.
-    crypto = __webpack_require__(5);
+    crypto = __webpack_require__(3);
     if (crypto && crypto.randomBytes) {
       nacl.setPRNG(function(x, n) {
         var i, v = crypto.randomBytes(n);
@@ -5215,7 +5215,7 @@ driver having these two methods.
 **/
 
 
-var Stream = __webpack_require__(4).Stream,
+var Stream = __webpack_require__(5).Stream,
     util   = __webpack_require__(0);
 
 
@@ -5402,7 +5402,7 @@ module.exports = StreamReader;
 
 
 var Buffer     = __webpack_require__(1).Buffer,
-    crypto     = __webpack_require__(5),
+    crypto     = __webpack_require__(3),
     url        = __webpack_require__(6),
     util       = __webpack_require__(0),
     HttpParser = __webpack_require__(10),
@@ -6529,7 +6529,7 @@ module.exports = Message;
 
 
 var Buffer     = __webpack_require__(1).Buffer,
-    Stream     = __webpack_require__(4).Stream,
+    Stream     = __webpack_require__(5).Stream,
     url        = __webpack_require__(6),
     util       = __webpack_require__(0),
     Base       = __webpack_require__(2),
@@ -6756,7 +6756,7 @@ module.exports = Server;
 var Buffer  = __webpack_require__(1).Buffer,
     Base    = __webpack_require__(2),
     Draft75 = __webpack_require__(15),
-    crypto  = __webpack_require__(5),
+    crypto  = __webpack_require__(3),
     util    = __webpack_require__(0);
 
 
@@ -6881,7 +6881,7 @@ var util   = __webpack_require__(0),
     net    = __webpack_require__(40),
     tls    = __webpack_require__(41),
     url    = __webpack_require__(6),
-    driver = __webpack_require__(3),
+    driver = __webpack_require__(4),
     API    = __webpack_require__(11),
     Event  = __webpack_require__(7);
 
@@ -6986,9 +6986,9 @@ module.exports = require("tls");
 "use strict";
 
 
-var Stream      = __webpack_require__(4).Stream,
+var Stream      = __webpack_require__(5).Stream,
     util        = __webpack_require__(0),
-    driver      = __webpack_require__(3),
+    driver      = __webpack_require__(4),
     Headers     = __webpack_require__(9),
     API         = __webpack_require__(11),
     EventTarget = __webpack_require__(16),
@@ -7487,7 +7487,7 @@ function safeJSONStringify(source) {
 
 // CONCATENATED MODULE: ./src/core/defaults.ts
 var Defaults = {
-    VERSION: "7.4.0",
+    VERSION: "7.5.0",
     PROTOCOL: 7,
     wsPort: 80,
     wssPort: 443,
@@ -8683,10 +8683,11 @@ var presence_channel_extends = (undefined && undefined.__extends) || (function (
     };
 })();
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -10025,7 +10026,7 @@ function replaceHost(url, hostname) {
     return urlParts[1] + hostname + urlParts[3];
 }
 function randomNumber(max) {
-    return Math.floor(Math.random() * max);
+    return node_runtime.randomInt(max);
 }
 function randomString(length) {
     var result = [];
@@ -10255,7 +10256,7 @@ var ajax = function (context, query, authOptions, authRequestType, callback) {
                         suffix = url_store.buildLogSuffix('authenticationEndpoint');
                         break;
                     case AuthRequestType.ChannelAuthorization:
-                        suffix = "Clients must be authenticated to join private or presence channels. " + url_store.buildLogSuffix('authorizationEndpoint');
+                        suffix = "Clients must be authorized to join private or presence channels. " + url_store.buildLogSuffix('authorizationEndpoint');
                         break;
                 }
                 callback(new HTTPAuthError(xhr.status, "Unable to retrieve auth string from " + authRequestType.toString() + " endpoint - " +
@@ -10307,6 +10308,9 @@ var xhr_timeline_xhr = {
 };
 /* harmony default export */ var xhr_timeline = (xhr_timeline_xhr);
 
+// EXTERNAL MODULE: external "crypto"
+var external_crypto_ = __webpack_require__(3);
+
 // CONCATENATED MODULE: ./src/runtimes/node/runtime.ts
 
 
@@ -10314,6 +10318,7 @@ var xhr_timeline_xhr = {
 
 
 
+
 var runtime_getDefaultStrategy = runtime.getDefaultStrategy, runtime_Transports = runtime.Transports, setup = runtime.setup, getProtocol = runtime.getProtocol, isXHRSupported = runtime.isXHRSupported, getLocalStorage = runtime.getLocalStorage, createXHR = runtime.createXHR, createWebSocket = runtime.createWebSocket, addUnloadListener = runtime.addUnloadListener, removeUnloadListener = runtime.removeUnloadListener, transportConnectionInitializer = runtime.transportConnectionInitializer, createSocketRequest = runtime.createSocketRequest, HTTPFactory = runtime.HTTPFactory;
 var NodeJS = {
     getDefaultStrategy: runtime_getDefaultStrategy,
@@ -10341,6 +10346,9 @@ var NodeJS = {
     },
     getNetwork: function () {
         return net_info_Network;
+    },
+    randomInt: function (max) {
+        return Object(external_crypto_["randomInt"])(max);
     }
 };
 /* harmony default export */ var node_runtime = (NodeJS);
@@ -10720,7 +10728,7 @@ function getEnableStatsConfig(opts) {
     return false;
 }
 function buildUserAuthenticator(opts) {
-    var userAuthentication = __assign({}, defaults.userAuthentication, opts.userAuthentication);
+    var userAuthentication = __assign(__assign({}, defaults.userAuthentication), opts.userAuthentication);
     if ('customHandler' in userAuthentication &&
         userAuthentication['customHandler'] != null) {
         return userAuthentication['customHandler'];
@@ -10730,7 +10738,7 @@ function buildUserAuthenticator(opts) {
 function buildChannelAuth(opts, pusher) {
     var channelAuthorization;
     if ('channelAuthorization' in opts) {
-        channelAuthorization = __assign({}, defaults.channelAuthorization, opts.channelAuthorization);
+        channelAuthorization = __assign(__assign({}, defaults.channelAuthorization), opts.channelAuthorization);
     }
     else {
         channelAuthorization = {
@@ -10757,6 +10765,51 @@ function buildChannelAuthorizer(opts, pusher) {
     return channel_authorizer(channelAuthorization);
 }
 
+// CONCATENATED MODULE: ./src/core/watchlist.ts
+var watchlist_extends = (undefined && undefined.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+
+
+var watchlist_WatchlistFacade = (function (_super) {
+    watchlist_extends(WatchlistFacade, _super);
+    function WatchlistFacade(pusher) {
+        var _this = _super.call(this, function (eventName, data) {
+            logger.debug("No callbacks on watchlist events for " + eventName);
+        }) || this;
+        _this.pusher = pusher;
+        _this.bindWatchlistInternalEvent();
+        return _this;
+    }
+    WatchlistFacade.prototype.handleEvent = function (pusherEvent) {
+        var _this = this;
+        pusherEvent.data.events.forEach(function (watchlistEvent) {
+            _this.emit(watchlistEvent.name, watchlistEvent);
+        });
+    };
+    WatchlistFacade.prototype.bindWatchlistInternalEvent = function () {
+        var _this = this;
+        this.pusher.connection.bind('message', function (pusherEvent) {
+            var eventName = pusherEvent.event;
+            if (eventName === 'pusher_internal:watchlist_events') {
+                _this.handleEvent(pusherEvent);
+            }
+        });
+    };
+    return WatchlistFacade;
+}(dispatcher));
+/* harmony default export */ var watchlist = (watchlist_WatchlistFacade);
+
 // CONCATENATED MODULE: ./src/core/utils/flat_promise.ts
 function flatPromise() {
     var resolve, reject;
@@ -10786,6 +10839,7 @@ var user_extends = (undefined && undefined.__extends) || (function () {
 
 
 
+
 var user_UserFacade = (function (_super) {
     user_extends(UserFacade, _super);
     function UserFacade(pusher) {
@@ -10819,6 +10873,7 @@ var user_UserFacade = (function (_super) {
                 _this._newSigninPromiseIfNeeded();
             }
         });
+        _this.watchlist = new watchlist(pusher);
         _this.pusher.connection.bind('message', function (event) {
             var eventName = event.event;
             if (eventName === 'pusher:signin_success') {
@@ -10949,7 +11004,7 @@ var pusher_Pusher = (function () {
         this.config = getConfig(options, this);
         this.channels = factory.createChannels();
         this.global_emitter = new dispatcher();
-        this.sessionID = Math.floor(Math.random() * 1000000000);
+        this.sessionID = node_runtime.randomInt(1000000000);
         this.timeline = new timeline_timeline(this.key, this.sessionID, {
             cluster: this.config.cluster,
             features: Pusher.getClientFeatures(),