@webex/internal-plugin-presence 3.0.0-beta.9 → 3.0.0-bnr.2

package/src/presence-worker.js

@@ -1,4 +1,3 @@
-
 import {debounce} from 'lodash';
 
 import {
@@ -11,7 +10,7 @@ import {
   DEFAULT_SUBSCRIPTION_TTL,
   APHELEIA_SUBSCRIPTION_UPDATE,
   PRESENCE_UPDATE,
-  ENVELOPE_TYPE
+  ENVELOPE_TYPE,
 } from './constants';
 
 /**
@@ -46,12 +45,15 @@ export default class PresenceWorker {
 
     this.webex = webex;
 
-    const mercury = this.webex.internal.mercury.connected ?
-      Promise.resolve() : this.webex.internal.mercury.connect();
+    const mercury = this.webex.internal.mercury.connected
+      ? Promise.resolve()
+      : this.webex.internal.mercury.connect();
 
     mercury.then(() => {
-      this.webex.internal.mercury.on(APHELEIA_SUBSCRIPTION_UPDATE,
-        this.subscriptionUpdate.bind(this));
+      this.webex.internal.mercury.on(
+        APHELEIA_SUBSCRIPTION_UPDATE,
+        this.subscriptionUpdate.bind(this)
+      );
     });
 
     setInterval(this.groundskeeper.bind(this), GROUNDSKEEPER_INTERVAL);
@@ -67,7 +69,7 @@ export default class PresenceWorker {
 
     this.webex.internal.presence.emitEvent(PRESENCE_UPDATE, {
       type: ENVELOPE_TYPE.SUBSCRIPTION,
-      payload: event.data
+      payload: event.data,
     });
   }
 
@@ -81,8 +83,7 @@ export default class PresenceWorker {
 
     if (this.watchers[id]) {
       this.watchers[id] += 1;
-    }
-    else {
+    } else {
       this.watchers[id] = 1;
     }
 
@@ -98,9 +99,10 @@ export default class PresenceWorker {
     // not in flight or
     // don't already have the presence or
     // presence has gone stale
-    if (!this.flights[id] &&
-        (!this.presences[id] ||
-        this.presences[id] < now - UPDATE_PRESENCE_DELAY)) {
+    if (
+      !this.flights[id] &&
+      (!this.presences[id] || this.presences[id] < now - UPDATE_PRESENCE_DELAY)
+    ) {
       this.fetchers[id] = id;
       this.debouncedFetch();
     }
@@ -133,23 +135,21 @@ export default class PresenceWorker {
     Object.assign(this.flights, boarding);
     this.fetchers = {};
 
+    this.webex.internal.presence.list(Object.keys(boarding)).then((response) => {
+      const now = new Date().getTime();
 
-    this.webex.internal.presence.list(Object.keys(boarding))
-      .then((response) => {
-        const now = new Date().getTime();
-
-        response.statusList.forEach((presence) => {
-          const id = presence.subject;
+      response.statusList.forEach((presence) => {
+        const id = presence.subject;
 
-          delete this.flights[id];
-          this.presences[id] = now;
-        });
+        delete this.flights[id];
+        this.presences[id] = now;
+      });
 
-        this.webex.internal.presence.emitEvent(PRESENCE_UPDATE, {
-          type: ENVELOPE_TYPE.PRESENCE,
-          payload: response
-        });
+      this.webex.internal.presence.emitEvent(PRESENCE_UPDATE, {
+        type: ENVELOPE_TYPE.PRESENCE,
+        payload: response,
       });
+    });
   }
 
   debouncedFetch = debounce(this.checkFetchers, FETCH_DELAY);
@@ -192,11 +192,9 @@ export default class PresenceWorker {
 
       if (expiration) {
         // Renew subscription if they're about to expire
-        if (this.watchers[id] &&
-            now > expiration - PREMATURE_EXPIRATION_SUBSCRIPTION_TIME) {
+        if (this.watchers[id] && now > expiration - PREMATURE_EXPIRATION_SUBSCRIPTION_TIME) {
           renewIds.push(id);
-        }
-        else if (now > expiration) {
+        } else if (now > expiration) {
           delete this.subscribers[id];
         }
       }
@@ -228,7 +226,7 @@ export default class PresenceWorker {
     if (trash.length) {
       this.webex.internal.presence.emitEvent(PRESENCE_UPDATE, {
         type: ENVELOPE_TYPE.DELETE,
-        payload: trash
+        payload: trash,
       });
     }
   }
@@ -245,32 +243,26 @@ export default class PresenceWorker {
     const campers = this.checkCampers();
     const renewSubscriptions = this.checkSubscriptions();
 
-    const ids = [
-      ...campers,
-      ...renewSubscriptions
-    ];
+    const ids = [...campers, ...renewSubscriptions];
 
     if (ids.length) {
-      this.webex.internal.presence.subscribe(ids)
-        .then((body) => {
-          const now = new Date().getTime();
-
-          body.responses.forEach((response) => {
-            if (response.responseCode === 200) {
-              const ttl = response.subscriptionTtl * 1000;
-
-              this.subscribers[response.subject] = now + ttl;
-              this.presences[response.status.subject] = now;
-            }
-            else {
-              // If it errored for any reason, set the ttl so we clean it out eventually
-              this.subscribers[response.subject] = now + DEFAULT_SUBSCRIPTION_TTL;
-            }
-          });
+      this.webex.internal.presence.subscribe(ids).then((body) => {
+        const now = new Date().getTime();
+
+        body.responses.forEach((response) => {
+          if (response.responseCode === 200) {
+            const ttl = response.subscriptionTtl * 1000;
+
+            this.subscribers[response.subject] = now + ttl;
+            this.presences[response.status.subject] = now;
+          } else {
+            // If it errored for any reason, set the ttl so we clean it out eventually
+            this.subscribers[response.subject] = now + DEFAULT_SUBSCRIPTION_TTL;
+          }
         });
+      });
     }
 
     this.cleanPresences();
   }
 }
-

package/src/presence.js

@@ -21,7 +21,7 @@ const Presence = WebexPlugin.extend({
   namespace: 'Presence',
 
   children: {
-    batcher: PresenceBatcher
+    batcher: PresenceBatcher,
   },
 
   session: {
@@ -29,8 +29,8 @@ const Presence = WebexPlugin.extend({
       default() {
         return new PresenceWorker();
       },
-      type: 'any'
-    }
+      type: 'any',
+    },
   },
 
   /**
@@ -62,7 +62,8 @@ const Presence = WebexPlugin.extend({
    * @returns {Promise<boolean>} resolves with true, if successful
    */
   enable() {
-    return this.webex.internal.feature.setFeature(USER, USER_PRESENCE_ENABLED, true)
+    return this.webex.internal.feature
+      .setFeature(USER, USER_PRESENCE_ENABLED, true)
       .then((response) => response.value);
   },
 
@@ -71,7 +72,8 @@ const Presence = WebexPlugin.extend({
    * @returns {Promise<boolean>} resolves with false, if successful
    */
   disable() {
-    return this.webex.internal.feature.setFeature(USER, USER_PRESENCE_ENABLED, false)
+    return this.webex.internal.feature
+      .setFeature(USER, USER_PRESENCE_ENABLED, false)
       .then((response) => response.value);
   },
 
@@ -113,17 +115,18 @@ const Presence = WebexPlugin.extend({
       return Promise.reject(new Error('A person id is required'));
     }
 
-    return this.webex.request({
-      method: 'GET',
-      service: 'apheleia',
-      resource: `compositions?userId=${personId}`
-    })
+    return this.webex
+      .request({
+        method: 'GET',
+        service: 'apheleia',
+        resource: `compositions?userId=${personId}`,
+      })
       .then((response) => response.body);
   },
 
   /**
-  * @typedef {Object} PresenceStatusesObject
-  * @property {Array.<PresenceStatusObject>} statusList
+   * @typedef {Object} PresenceStatusesObject
+   * @property {Array.<PresenceStatusObject>} statusList
    */
   /**
    * Gets the current presence statuses of an array of people ids
@@ -135,9 +138,9 @@ const Presence = WebexPlugin.extend({
       return Promise.reject(new Error('An array of person ids is required'));
     }
 
-    return Promise.all(personIds.map((id) =>
-      this.batcher.request(id)))
-      .then((presences) => ({statusList: presences}));
+    return Promise.all(personIds.map((id) => this.batcher.request(id))).then((presences) => ({
+      statusList: presences,
+    }));
   },
 
   /**
@@ -157,8 +160,7 @@ const Presence = WebexPlugin.extend({
     }
     if (Array.isArray(personIds)) {
       subjects = personIds;
-    }
-    else {
+    } else {
       subjects = [personIds];
     }
     // Limit batches to 50 ids per request
@@ -166,19 +168,22 @@ const Presence = WebexPlugin.extend({
       batches.push(subjects.slice(i, i + batchLimit));
     }
 
-    return Promise.all(batches.map((ids) =>
-      this.webex.request({
-        method: 'POST',
-        api: 'apheleia',
-        resource: 'subscriptions',
-        body: {
-          subjects: ids,
-          subscriptionTtl,
-          includeStatus: true
-        }
-      })
-        .then((response) => response.body.responses)))
-      .then((idBatches) => ({responses: [].concat(...idBatches)}));
+    return Promise.all(
+      batches.map((ids) =>
+        this.webex
+          .request({
+            method: 'POST',
+            api: 'apheleia',
+            resource: 'subscriptions',
+            body: {
+              subjects: ids,
+              subscriptionTtl,
+              includeStatus: true,
+            },
+          })
+          .then((response) => response.body.responses)
+      )
+    ).then((idBatches) => ({responses: [].concat(...idBatches)}));
   },
 
   /**
@@ -194,8 +199,7 @@ const Presence = WebexPlugin.extend({
     }
     if (Array.isArray(personIds)) {
       subjects = personIds;
-    }
-    else {
+    } else {
       subjects = [personIds];
     }
 
@@ -206,8 +210,8 @@ const Presence = WebexPlugin.extend({
       body: {
         subjects,
         subscriptionTtl: 0,
-        includeStatus: true
-      }
+        includeStatus: true,
+      },
     });
   },
 
@@ -222,16 +226,17 @@ const Presence = WebexPlugin.extend({
       return Promise.reject(new Error('A status is required'));
     }
 
-    return this.webex.request({
-      method: 'POST',
-      api: 'apheleia',
-      resource: 'events',
-      body: {
-        subject: this.webex.internal.device.userId,
-        eventType: status,
-        ttl
-      }
-    })
+    return this.webex
+      .request({
+        method: 'POST',
+        api: 'apheleia',
+        resource: 'events',
+        body: {
+          subject: this.webex.internal.device.userId,
+          eventType: status,
+          ttl,
+        },
+      })
       .then((response) => response.body);
   },
 
@@ -251,7 +256,7 @@ const Presence = WebexPlugin.extend({
    */
   dequeue(id) {
     return this.worker.dequeue(id);
-  }
+  },
 });
 
 export default Presence;

package/test/integration/spec/presence.js

@@ -16,77 +16,85 @@ describe('plugin-presence', function () {
   describe('Presence', () => {
     let mccoy, spock;
 
-    beforeEach('create users', () => testUsers.create({count: 2})
-      .then((users) => {
+    beforeEach('create users', () =>
+      testUsers.create({count: 2}).then((users) => {
         [spock, mccoy] = users;
         spock.webex = new WebexCore({
           credentials: {
-            authorization: users[0].token
-          }
+            authorization: users[0].token,
+          },
         });
         mccoy.webex = new WebexCore({
           credentials: {
-            authorization: users[1].token
-          }
+            authorization: users[1].token,
+          },
         });
-      }));
+      })
+    );
 
-    beforeEach('register with wdm', () => Promise.all([
-      spock.webex.internal.device.register(),
-      mccoy.webex.internal.device.register()
-    ]));
+    beforeEach('register with wdm', () =>
+      Promise.all([spock.webex.internal.device.register(), mccoy.webex.internal.device.register()])
+    );
 
     beforeEach('register spock with mercury', () => spock.webex.internal.mercury.connect());
 
     afterEach('deregister spock with mercury', () => spock.webex.internal.mercury.disconnect());
 
     describe('#enable()', () => {
-      it('enables presence', () => spock.webex.internal.presence.enable()
-        .then((isEnabled) => {
-          assert.equal(isEnabled, true);
-        })
-        .then(() => spock.webex.internal.presence.isEnabled())
-        .then((isEnabled) => {
-          assert.equal(isEnabled, true);
-        }));
+      it('enables presence', () =>
+        spock.webex.internal.presence
+          .enable()
+          .then((isEnabled) => {
+            assert.equal(isEnabled, true);
+          })
+          .then(() => spock.webex.internal.presence.isEnabled())
+          .then((isEnabled) => {
+            assert.equal(isEnabled, true);
+          }));
     });
 
     describe('#disable()', () => {
-      it('disables presence', () => spock.webex.internal.presence.disable()
-        .then((isEnabled) => {
-          assert.equal(isEnabled, false);
-        })
-        .then(() => spock.webex.internal.presence.isEnabled())
-        .then((isEnabled) => {
-          assert.equal(isEnabled, false);
-        }));
+      it('disables presence', () =>
+        spock.webex.internal.presence
+          .disable()
+          .then((isEnabled) => {
+            assert.equal(isEnabled, false);
+          })
+          .then(() => spock.webex.internal.presence.isEnabled())
+          .then((isEnabled) => {
+            assert.equal(isEnabled, false);
+          }));
     });
 
     describe('#isEnabled()', () => {
-      it('returns true when presence is enabled', () => spock.webex.internal.presence.enable()
-        .then(() => spock.webex.internal.presence.isEnabled())
-        .then((isEnabled) => {
-          assert.equal(isEnabled, true);
-        }));
+      it('returns true when presence is enabled', () =>
+        spock.webex.internal.presence
+          .enable()
+          .then(() => spock.webex.internal.presence.isEnabled())
+          .then((isEnabled) => {
+            assert.equal(isEnabled, true);
+          }));
 
-      it('returns false when presence is disabled', () => spock.webex.internal.presence.disable()
-        .then(() => spock.webex.internal.presence.isEnabled())
-        .then((isEnabled) => {
-          assert.equal(isEnabled, false);
-        }));
+      it('returns false when presence is disabled', () =>
+        spock.webex.internal.presence
+          .disable()
+          .then(() => spock.webex.internal.presence.isEnabled())
+          .then((isEnabled) => {
+            assert.equal(isEnabled, false);
+          }));
     });
 
     describe('#get()', () => {
-      it('gets a person\'s status by id', () => spock.webex.internal.presence.get(mccoy.id)
-        .then((presenceResponse) => {
+      it("gets a person's status by id", () =>
+        spock.webex.internal.presence.get(mccoy.id).then((presenceResponse) => {
           assert.property(presenceResponse, 'subject');
           assert.equal(presenceResponse.subject, mccoy.id);
         }));
     });
 
     describe('#list()', () => {
-      it('returns an object with the status of all requested people', () => spock.webex.internal.presence.list([mccoy.id, spock.id])
-        .then((presenceResponse) => {
+      it('returns an object with the status of all requested people', () =>
+        spock.webex.internal.presence.list([mccoy.id, spock.id]).then((presenceResponse) => {
           assert.equal(presenceResponse.statusList.length, 2);
           assert.property(presenceResponse.statusList[0], 'subject');
           assert.equal(presenceResponse.statusList[0].subject, mccoy.id);
@@ -97,16 +105,18 @@ describe('plugin-presence', function () {
       describe('batching of presence requests', () => {
         let batchTestUsers;
 
-        beforeEach('create more users', () => testUsers.create({count: 6})
-          .then((users) => {
+        beforeEach('create more users', () =>
+          testUsers.create({count: 6}).then((users) => {
             batchTestUsers = users;
-          }));
+          })
+        );
 
         it('executes network requests for max limit', () => {
           spock.webex.internal.presence.config.batcherMaxCalls = 2;
           sinon.spy(spock.webex.internal.presence.batcher, 'submitHttpRequest');
 
-          return spock.webex.internal.presence.list(batchTestUsers.map((user) => user.id))
+          return spock.webex.internal.presence
+            .list(batchTestUsers.map((user) => user.id))
             .then((presenceResponse) => {
               assert.equal(presenceResponse.statusList.length, 6);
               assert.calledThrice(spock.webex.internal.presence.batcher.submitHttpRequest);
@@ -117,61 +127,87 @@ describe('plugin-presence', function () {
     });
 
     describe('#subscribe', () => {
-      afterEach(() => spock && spock.webex && spock.webex.internal.presence.unsubscribe([mccoy.id, spock.id]));
+      afterEach(
+        () =>
+          spock && spock.webex && spock.webex.internal.presence.unsubscribe([mccoy.id, spock.id])
+      );
 
-      it('subscribes to a person id and returns subscription status', () => spock.webex.internal.presence.subscribe(mccoy.id)
-        .then((presenceResponse) => {
+      it('subscribes to a person id and returns subscription status', () =>
+        spock.webex.internal.presence.subscribe(mccoy.id).then((presenceResponse) => {
           assert.property(presenceResponse, 'responses');
           assert.equal(presenceResponse.responses.length, 1);
           assert.equal(presenceResponse.responses[0].subject, mccoy.id);
         }));
 
       it('subscribes and returns subscription status of a list of people ids', () =>
-        spock.webex.internal.presence.subscribe([mccoy.id, spock.id])
-          .then((presenceResponse) => {
-            assert.property(presenceResponse, 'responses');
-            assert.equal(presenceResponse.responses.length, 2);
-            assert.equal(presenceResponse.responses[0].subject, mccoy.id);
-            assert.equal(presenceResponse.responses[1].subject, spock.id);
-          }));
+        spock.webex.internal.presence.subscribe([mccoy.id, spock.id]).then((presenceResponse) => {
+          assert.property(presenceResponse, 'responses');
+          assert.equal(presenceResponse.responses.length, 2);
+          assert.equal(presenceResponse.responses[0].subject, mccoy.id);
+          assert.equal(presenceResponse.responses[1].subject, spock.id);
+        }));
 
       // Note: The presence service no longer accepts setting status to "inactive".
       // Inactivity is now determined by a "last active time" of greater than 10 minutes.
-      it('should receive a mercury event for a subscribed person\'s change', () =>
-        spock.webex.internal.presence.subscribe(mccoy.id)
+      it("should receive a mercury event for a subscribed person's change", () =>
+        spock.webex.internal.presence
+          .subscribe(mccoy.id)
           // 'active' status
-          .then(() => Promise.all([
-            expectEvent(10000, 'event:apheleia.subscription_update', spock.webex.internal.mercury, 'spock should get the presence active event'),
-            mccoy.webex.internal.presence.setStatus('active', 1500)
-          ]))
-          .then(([event]) => assert.equal(event.data.status, 'active', 'mccoy presence event status should be active'))
+          .then(() =>
+            Promise.all([
+              expectEvent(
+                10000,
+                'event:apheleia.subscription_update',
+                spock.webex.internal.mercury,
+                'spock should get the presence active event'
+              ),
+              mccoy.webex.internal.presence.setStatus('active', 1500),
+            ])
+          )
+          .then(([event]) =>
+            assert.equal(
+              event.data.status,
+              'active',
+              'mccoy presence event status should be active'
+            )
+          )
           // 'dnd' status
-          .then(() => Promise.all([
-            expectEvent(10000, 'event:apheleia.subscription_update', spock.webex.internal.mercury, 'spock should get the presence dnd event'),
-            mccoy.webex.internal.presence.setStatus('dnd', 1500)
-          ]))
-          .then(([event]) => assert.equal(event.data.status, 'dnd', 'mccoy presence event status should be dnd')));
+          .then(() =>
+            Promise.all([
+              expectEvent(
+                10000,
+                'event:apheleia.subscription_update',
+                spock.webex.internal.mercury,
+                'spock should get the presence dnd event'
+              ),
+              mccoy.webex.internal.presence.setStatus('dnd', 1500),
+            ])
+          )
+          .then(([event]) =>
+            assert.equal(event.data.status, 'dnd', 'mccoy presence event status should be dnd')
+          ));
     });
 
     describe('#unsubscribe', () => {
       it('unsubscribes to presence updates of a single person id', () =>
-        spock.webex.internal.presence.unsubscribe(mccoy.id)
+        spock.webex.internal.presence
+          .unsubscribe(mccoy.id)
           .then((res) => assert.statusCode(res, 200)));
 
       it('unsubscribes to presence updates of a list of people ids', () =>
-        spock.webex.internal.presence.unsubscribe([mccoy.id, spock.id])
+        spock.webex.internal.presence
+          .unsubscribe([mccoy.id, spock.id])
           .then((res) => assert.statusCode(res, 200)));
     });
 
     describe('#setStatus', () => {
       it('sets the presence status of the current user', () =>
-        spock.webex.internal.presence.setStatus('dnd', 1500)
-          .then((statusResponse) => {
-            assert.property(statusResponse, 'subject');
-            assert.property(statusResponse, 'status');
-            assert.equal(statusResponse.subject, spock.id);
-            assert.equal(statusResponse.status, 'dnd');
-          }));
+        spock.webex.internal.presence.setStatus('dnd', 1500).then((statusResponse) => {
+          assert.property(statusResponse, 'subject');
+          assert.property(statusResponse, 'status');
+          assert.equal(statusResponse.subject, spock.id);
+          assert.equal(statusResponse.status, 'dnd');
+        }));
     });
   });
 });