pusher-js 7.4.0 → 7.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pusher-js",
-  "version": "7.4.0",
+  "version": "7.5.0",
   "description": "Pusher Channels JavaScript library for browsers, React Native, NodeJS and web workers",
   "main": "dist/node/pusher.js",
   "browser": "dist/web/pusher.js",

package/spec/javascripts/unit/core/watchlist_spec.js

@@ -0,0 +1,48 @@
+var WatchlistFacade = require("core/watchlist").default;
+
+describe("WatchlistFacade", function () {
+  var connection;
+  var pusher;
+
+  beforeEach(function() {
+    connection = jasmine.createSpy('connection');
+    pusher = jasmine.createSpy('pusher');
+    pusher.connection = connection;
+
+    spyOn(pusher.connection, 'bind')
+  });
+
+  it('should bind to pusher_internal:user_presence events', function() {
+    new WatchlistFacade(pusher);
+    expect(connection.bind).toHaveBeenCalledWith('message', jasmine.any(Function));
+  });
+
+  describe('#handleEvent', function() {
+    var watchlistFacade;
+
+    beforeEach(function() {
+      watchlistFacade = new WatchlistFacade(pusher);
+    });
+
+    const watchlistEvents = [
+      { name: 'online', user_ids: ['1'] },
+      { name: 'offline', user_ids: ['2', '3', '4'] },
+      { name: 'subscribe', user_ids: ['5', '6'], channel_name: 'presence-chat' }
+    ];
+
+    it(`should emit ${watchlistEvents.length} events`, function() {
+      const pusherEvent = {
+        event: 'pusher_internal:watchlist_events',
+        data: { events: watchlistEvents }
+      };
+
+      spyOn(watchlistFacade, 'emit').and.callThrough();
+      watchlistFacade.handleEvent(pusherEvent);
+      
+      expect(watchlistFacade.emit).toHaveBeenCalledTimes(watchlistEvents.length)
+      watchlistEvents.forEach(function(event) {
+        expect(watchlistFacade.emit).toHaveBeenCalledWith(event.name, event);
+      });
+    });
+  })
+});

package/src/core/pusher.ts

@@ -62,7 +62,6 @@ export default class Pusher {
   connection: ConnectionManager;
   timelineSenderTimer: PeriodicTimer;
   user: UserFacade;
-
   constructor(app_key: string, options?: Options) {
     checkAppKey(app_key);
     options = options || {};

package/src/core/user.ts

@@ -5,6 +5,7 @@ import {
   UserAuthenticationCallback
 } from './auth/options';
 import Channel from './channels/channel';
+import WatchlistFacade from './watchlist';
 import EventsDispatcher from './events/dispatcher';
 import flatPromise from './utils/flat_promise';
 
@@ -14,6 +15,7 @@ export default class UserFacade extends EventsDispatcher {
   user_data: any = null;
   serverToUserChannel: Channel = null;
   signinDonePromise: Promise<any> = null;
+  watchlist: WatchlistFacade;
   private _signinDoneResolve: Function = null;
 
   public constructor(pusher: Pusher) {
@@ -30,6 +32,9 @@ export default class UserFacade extends EventsDispatcher {
         this._newSigninPromiseIfNeeded();
       }
     });
+
+    this.watchlist = new WatchlistFacade(pusher);
+
     this.pusher.connection.bind('message', event => {
       var eventName = event.event;
       if (eventName === 'pusher:signin_success') {

package/src/core/watchlist.ts

@@ -0,0 +1,31 @@
+import Logger from './logger';
+import Pusher from './pusher';
+import EventsDispatcher from './events/dispatcher';
+
+export default class WatchlistFacade extends EventsDispatcher {
+  private pusher: Pusher;
+
+  public constructor(pusher: Pusher) {
+    super(function(eventName, data) {
+      Logger.debug(`No callbacks on watchlist events for ${eventName}`);
+    });
+
+    this.pusher = pusher;
+    this.bindWatchlistInternalEvent();
+  }
+
+  handleEvent(pusherEvent) {
+    pusherEvent.data.events.forEach(watchlistEvent => {
+      this.emit(watchlistEvent.name, watchlistEvent);
+    });
+  }
+
+  private bindWatchlistInternalEvent() {
+    this.pusher.connection.bind('message', pusherEvent => {
+      var eventName = pusherEvent.event;
+      if (eventName === 'pusher_internal:watchlist_events') {
+        this.handleEvent(pusherEvent);
+      }
+    });
+  }
+}

package/src/runtimes/isomorphic/auth/xhr_auth.ts

@@ -60,7 +60,7 @@ const ajax: AuthTransport = function(
             suffix = UrlStore.buildLogSuffix('authenticationEndpoint');
             break;
           case AuthRequestType.ChannelAuthorization:
-            suffix = `Clients must be authenticated to join private or presence channels. ${UrlStore.buildLogSuffix(
+            suffix = `Clients must be authorized to join private or presence channels. ${UrlStore.buildLogSuffix(
               'authorizationEndpoint'
             )}`;
             break;

package/types/src/core/user.d.ts

@@ -1,5 +1,6 @@
 import Pusher from './pusher';
 import Channel from './channels/channel';
+import WatchlistFacade from './watchlist';
 import EventsDispatcher from './events/dispatcher';
 export default class UserFacade extends EventsDispatcher {
     pusher: Pusher;
@@ -7,6 +8,7 @@ export default class UserFacade extends EventsDispatcher {
     user_data: any;
     serverToUserChannel: Channel;
     signinDonePromise: Promise<any>;
+    watchlist: WatchlistFacade;
     private _signinDoneResolve;
     constructor(pusher: Pusher);
     signin(): void;

package/types/src/core/watchlist.d.ts

@@ -0,0 +1,8 @@
+import Pusher from './pusher';
+import EventsDispatcher from './events/dispatcher';
+export default class WatchlistFacade extends EventsDispatcher {
+    private pusher;
+    constructor(pusher: Pusher);
+    handleEvent(pusherEvent: any): void;
+    private bindWatchlistInternalEvent;
+}