@webex/internal-plugin-mercury 2.59.2 → 2.59.3-next.1

package/src/socket/socket.js

@@ -1,13 +1,13 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import WS from 'ws';
-
-import Socket from './socket-base';
-
-Socket.getWebSocketConstructor = function getWebSocketConstructor() {
-  return WS;
-};
-
-export default Socket;
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import WS from 'ws';
+
+import Socket from './socket-base';
+
+Socket.getWebSocketConstructor = function getWebSocketConstructor() {
+  return WS;
+};
+
+export default Socket;

package/src/socket/socket.shim.js

@@ -1,31 +1,31 @@
-/* eslint-disable no-restricted-globals */
-
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-/* eslint-env browser */
-
-import Socket from './socket-base';
-
-Socket.getWebSocketConstructor = function getWebSocketConstructor() {
-  // Grabed from https://github.com/heineiuo/isomorphic-ws/blob/9b977394ac875638c045fd9cf774ed418484b394/browser.js
-  let ws;
-
-  if (typeof WebSocket !== 'undefined') {
-    ws = WebSocket;
-  } else if (typeof MozWebSocket !== 'undefined') {
-    // eslint-disable-next-line no-undef
-    ws = MozWebSocket;
-  } else if (typeof global !== 'undefined') {
-    ws = global.WebSocket || global.MozWebSocket;
-  } else if (typeof window !== 'undefined') {
-    ws = window.WebSocket || window.MozWebSocket;
-  } else if (typeof self !== 'undefined') {
-    ws = self.WebSocket || self.MozWebSocket;
-  }
-
-  return ws;
-};
-
-export default Socket;
+/* eslint-disable no-restricted-globals */
+
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+/* eslint-env browser */
+
+import Socket from './socket-base';
+
+Socket.getWebSocketConstructor = function getWebSocketConstructor() {
+  // Grabed from https://github.com/heineiuo/isomorphic-ws/blob/9b977394ac875638c045fd9cf774ed418484b394/browser.js
+  let ws;
+
+  if (typeof WebSocket !== 'undefined') {
+    ws = WebSocket;
+  } else if (typeof MozWebSocket !== 'undefined') {
+    // eslint-disable-next-line no-undef
+    ws = MozWebSocket;
+  } else if (typeof global !== 'undefined') {
+    ws = global.WebSocket || global.MozWebSocket;
+  } else if (typeof window !== 'undefined') {
+    ws = window.WebSocket || window.MozWebSocket;
+  } else if (typeof self !== 'undefined') {
+    ws = self.WebSocket || self.MozWebSocket;
+  }
+
+  return ws;
+};
+
+export default Socket;

package/test/integration/spec/mercury.js

@@ -1,117 +1,117 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import '@webex/internal-plugin-mercury';
-
-import {assert} from '@webex/test-helper-chai';
-import {flaky} from '@webex/test-helper-mocha';
-import sinon from 'sinon';
-import WebexCore from '@webex/webex-core';
-import testUsers from '@webex/test-helper-test-users';
-import refreshCallback from '@webex/test-helper-refresh-callback';
-
-describe('plugin-mercury', function () {
-  this.timeout(30000);
-  describe('Mercury', () => {
-    let webex;
-
-    beforeEach(() =>
-      testUsers.create({count: 1}).then((users) => {
-        webex = new WebexCore({
-          credentials: {
-            supertoken: users[0].token,
-          },
-          config: {
-            credentials: {
-              refreshCallback,
-            },
-          },
-        });
-      })
-    );
-
-    afterEach(() => webex && webex.internal.mercury.disconnect());
-
-    describe('#connect()', () => {
-      it('connects to mercury', () => webex.internal.mercury.connect());
-
-      it('refreshes the access token when a 4401 is received', () =>
-        webex.internal.device
-          .register()
-          .then(() => {
-            // eslint-disable-next-line camelcase
-            webex.credentials.supertoken.access_token = 'fake token';
-
-            return webex.internal.mercury.connect();
-          })
-          // eslint-disable-next-line camelcase
-          .then(() => assert.notEqual(webex.credentials.supertoken.access_token, 'fake token')));
-
-      // This doesn't work as designed yet. The only way to get a 4404 is to try
-      // to connect to someone else's valid registration; the intent was to get
-      // a 4404 any time we try to connect to an invalid url. Actually, as it's
-      // implemented, it should really be a 4403.
-      // it(`refreshes the device when a 4404 is received`, () => webex.internal.device.register()
-      //   .then(() => {
-      //     const webSocketUrl = webex.internal.device.webSocketUrl;
-      //     const wsu = webex.internal.device.webSocketUrl.split(`/`);
-      //     wsu.reverse();
-      //     wsu[1] = uuid.v4();
-      //     wsu.reverse();
-      //     webex.internal.device.webSocketUrl = wsu.join(`/`);
-      //     return webex.internal.mercury.connect()
-      //       .then(() => assert.notEqual(webex.internal.device.webSocketUrl, webSocketUrl));
-      //   }));
-
-      describe('when using an ephemeral device', () => {
-        beforeEach(() => {
-          webex.config.device.ephemeral = true;
-        });
-
-        it('connects to mercury', () => webex.internal.mercury.connect());
-      });
-
-      describe('when web-high-availability is enabled', () => {
-        flaky(it, process.env.SKIP_FLAKY_TESTS)(
-          'connects to mercury using service catalog url',
-          () => {
-            let defaultWebSocketUrl;
-
-            // we need to ensure the feature is set for user before "registering"
-            // the device
-            return (
-              webex.internal.device
-                .register()
-                .then(() =>
-                  webex.internal.feature.setFeature('developer', 'web-high-availability', true)
-                )
-                .then(() => webex.internal.device.unregister())
-                // start the test flow the device list
-                .then(() => webex.internal.device.register())
-                .then(() => {
-                  defaultWebSocketUrl = webex.internal.device.webSocketUrl;
-                })
-                .then(() => webex.internal.mercury.connect())
-                .then(() => webex.internal.device.getWebSocketUrl())
-                .then((wsUrl) => {
-                  assert.notEqual(defaultWebSocketUrl, webex.internal.mercury.socket.url);
-                  assert.include(webex.internal.mercury.socket.url, wsUrl);
-                })
-            );
-          }
-        );
-      });
-    });
-
-    it('emits messages that arrive before authorization completes', () => {
-      const spy = sinon.spy();
-
-      webex.internal.mercury.on('event:mercury.buffer_state', spy);
-
-      return webex.internal.mercury.connect().then(() => {
-        assert.calledOnce(spy);
-      });
-    });
-  });
-});
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import '@webex/internal-plugin-mercury';
+
+import {assert} from '@webex/test-helper-chai';
+import {flaky} from '@webex/test-helper-mocha';
+import sinon from 'sinon';
+import WebexCore from '@webex/webex-core';
+import testUsers from '@webex/test-helper-test-users';
+import refreshCallback from '@webex/test-helper-refresh-callback';
+
+describe('plugin-mercury', function () {
+  this.timeout(30000);
+  describe('Mercury', () => {
+    let webex;
+
+    beforeEach(() =>
+      testUsers.create({count: 1}).then((users) => {
+        webex = new WebexCore({
+          credentials: {
+            supertoken: users[0].token,
+          },
+          config: {
+            credentials: {
+              refreshCallback,
+            },
+          },
+        });
+      })
+    );
+
+    afterEach(() => webex && webex.internal.mercury.disconnect());
+
+    describe('#connect()', () => {
+      it('connects to mercury', () => webex.internal.mercury.connect());
+
+      it('refreshes the access token when a 4401 is received', () =>
+        webex.internal.device
+          .register()
+          .then(() => {
+            // eslint-disable-next-line camelcase
+            webex.credentials.supertoken.access_token = 'fake token';
+
+            return webex.internal.mercury.connect();
+          })
+          // eslint-disable-next-line camelcase
+          .then(() => assert.notEqual(webex.credentials.supertoken.access_token, 'fake token')));
+
+      // This doesn't work as designed yet. The only way to get a 4404 is to try
+      // to connect to someone else's valid registration; the intent was to get
+      // a 4404 any time we try to connect to an invalid url. Actually, as it's
+      // implemented, it should really be a 4403.
+      // it(`refreshes the device when a 4404 is received`, () => webex.internal.device.register()
+      //   .then(() => {
+      //     const webSocketUrl = webex.internal.device.webSocketUrl;
+      //     const wsu = webex.internal.device.webSocketUrl.split(`/`);
+      //     wsu.reverse();
+      //     wsu[1] = uuid.v4();
+      //     wsu.reverse();
+      //     webex.internal.device.webSocketUrl = wsu.join(`/`);
+      //     return webex.internal.mercury.connect()
+      //       .then(() => assert.notEqual(webex.internal.device.webSocketUrl, webSocketUrl));
+      //   }));
+
+      describe('when using an ephemeral device', () => {
+        beforeEach(() => {
+          webex.config.device.ephemeral = true;
+        });
+
+        it('connects to mercury', () => webex.internal.mercury.connect());
+      });
+
+      describe('when web-high-availability is enabled', () => {
+        flaky(it, process.env.SKIP_FLAKY_TESTS)(
+          'connects to mercury using service catalog url',
+          () => {
+            let defaultWebSocketUrl;
+
+            // we need to ensure the feature is set for user before "registering"
+            // the device
+            return (
+              webex.internal.device
+                .register()
+                .then(() =>
+                  webex.internal.feature.setFeature('developer', 'web-high-availability', true)
+                )
+                .then(() => webex.internal.device.unregister())
+                // start the test flow the device list
+                .then(() => webex.internal.device.register())
+                .then(() => {
+                  defaultWebSocketUrl = webex.internal.device.webSocketUrl;
+                })
+                .then(() => webex.internal.mercury.connect())
+                .then(() => webex.internal.device.getWebSocketUrl())
+                .then((wsUrl) => {
+                  assert.notEqual(defaultWebSocketUrl, webex.internal.mercury.socket.url);
+                  assert.include(webex.internal.mercury.socket.url, wsUrl);
+                })
+            );
+          }
+        );
+      });
+    });
+
+    it('emits messages that arrive before authorization completes', () => {
+      const spy = sinon.spy();
+
+      webex.internal.mercury.on('event:mercury.buffer_state', spy);
+
+      return webex.internal.mercury.connect().then(() => {
+        assert.calledOnce(spy);
+      });
+    });
+  });
+});

package/test/integration/spec/sharable-mercury.js

@@ -1,59 +1,59 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import '@webex/internal-plugin-mercury';
-
-import {assert} from '@webex/test-helper-chai';
-import sinon from 'sinon';
-import WebexCore from '@webex/webex-core';
-import testUsers from '@webex/test-helper-test-users';
-
-describe('plugin-mercury', function () {
-  this.timeout(30000);
-  describe('Sharable Mercury', () => {
-    let webex;
-
-    beforeEach(() =>
-      testUsers.create({count: 1}).then((users) => {
-        webex = new WebexCore({
-          credentials: {
-            supertoken: users[0].token,
-          },
-        });
-
-        return webex.internal.device
-          .register()
-          .then(() => webex.internal.feature.setFeature('developer', 'web-shared-mercury', true));
-      })
-    );
-
-    afterEach(() => webex && webex.internal.mercury.disconnect());
-
-    describe('#connect()', () => {
-      it('connects to mercury', () => webex.internal.mercury.connect());
-    });
-
-    it('emits messages that arrive before authorization completes', () => {
-      const spy1 = sinon.spy();
-      const spy2 = sinon.spy();
-
-      webex.internal.mercury.on('event:mercury.buffer_state', spy1);
-      webex.internal.mercury.on('event:mercury.registration_status', spy2);
-
-      return webex.internal.mercury.connect().then(() => {
-        assert.notCalled(spy1);
-        assert.calledOnce(spy2);
-        const {data} = spy2.args[0][0];
-
-        assert.property(data, 'bufferState');
-        assert.property(data, 'localClusterServiceUrls');
-
-        assert.deepEqual(
-          webex.internal.mercury.localClusterServiceUrls,
-          data.localClusterServiceUrls
-        );
-      });
-    });
-  });
-});
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import '@webex/internal-plugin-mercury';
+
+import {assert} from '@webex/test-helper-chai';
+import sinon from 'sinon';
+import WebexCore from '@webex/webex-core';
+import testUsers from '@webex/test-helper-test-users';
+
+describe('plugin-mercury', function () {
+  this.timeout(30000);
+  describe('Sharable Mercury', () => {
+    let webex;
+
+    beforeEach(() =>
+      testUsers.create({count: 1}).then((users) => {
+        webex = new WebexCore({
+          credentials: {
+            supertoken: users[0].token,
+          },
+        });
+
+        return webex.internal.device
+          .register()
+          .then(() => webex.internal.feature.setFeature('developer', 'web-shared-mercury', true));
+      })
+    );
+
+    afterEach(() => webex && webex.internal.mercury.disconnect());
+
+    describe('#connect()', () => {
+      it('connects to mercury', () => webex.internal.mercury.connect());
+    });
+
+    it('emits messages that arrive before authorization completes', () => {
+      const spy1 = sinon.spy();
+      const spy2 = sinon.spy();
+
+      webex.internal.mercury.on('event:mercury.buffer_state', spy1);
+      webex.internal.mercury.on('event:mercury.registration_status', spy2);
+
+      return webex.internal.mercury.connect().then(() => {
+        assert.notCalled(spy1);
+        assert.calledOnce(spy2);
+        const {data} = spy2.args[0][0];
+
+        assert.property(data, 'bufferState');
+        assert.property(data, 'localClusterServiceUrls');
+
+        assert.deepEqual(
+          webex.internal.mercury.localClusterServiceUrls,
+          data.localClusterServiceUrls
+        );
+      });
+    });
+  });
+});

package/test/integration/spec/webex.js

@@ -1,43 +1,43 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-import '@webex/internal-plugin-mercury';
-
-import {assert} from '@webex/test-helper-chai';
-import sinon from 'sinon';
-import WebexCore from '@webex/webex-core';
-import testUsers from '@webex/test-helper-test-users';
-
-describe('plugin-mercury', function () {
-  this.timeout(30000);
-
-  let webex;
-
-  beforeEach('create users', () =>
-    testUsers.create({count: 1}).then(async (users) => {
-      // Pause for 5 seconds for CI
-      await new Promise((done) => setTimeout(done, 5000));
-
-      webex = new WebexCore({
-        credentials: {
-          supertoken: users[0].token,
-        },
-      });
-      sinon.spy(webex.internal.mercury, 'disconnect');
-      sinon.spy(webex.internal.device, 'unregister');
-
-      return webex.internal.mercury.connect();
-    })
-  );
-
-  describe('onBeforeLogout()', () => {
-    it('disconnects the web socket', () =>
-      webex.logout({noRedirect: true}).then(() => {
-        assert.called(webex.internal.mercury.disconnect);
-        assert.isFalse(webex.internal.mercury.connected);
-        assert.called(webex.internal.device.unregister);
-        assert.isFalse(webex.internal.device.registered);
-      }));
-  });
-});
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+import '@webex/internal-plugin-mercury';
+
+import {assert} from '@webex/test-helper-chai';
+import sinon from 'sinon';
+import WebexCore from '@webex/webex-core';
+import testUsers from '@webex/test-helper-test-users';
+
+describe('plugin-mercury', function () {
+  this.timeout(30000);
+
+  let webex;
+
+  beforeEach('create users', () =>
+    testUsers.create({count: 1}).then(async (users) => {
+      // Pause for 5 seconds for CI
+      await new Promise((done) => setTimeout(done, 5000));
+
+      webex = new WebexCore({
+        credentials: {
+          supertoken: users[0].token,
+        },
+      });
+      sinon.spy(webex.internal.mercury, 'disconnect');
+      sinon.spy(webex.internal.device, 'unregister');
+
+      return webex.internal.mercury.connect();
+    })
+  );
+
+  describe('onBeforeLogout()', () => {
+    it('disconnects the web socket', () =>
+      webex.logout({noRedirect: true}).then(() => {
+        assert.called(webex.internal.mercury.disconnect);
+        assert.isFalse(webex.internal.mercury.connected);
+        assert.called(webex.internal.device.unregister);
+        assert.isFalse(webex.internal.device.registered);
+      }));
+  });
+});

package/test/unit/lib/promise-tick.js

@@ -1,19 +1,19 @@
-/*!
- * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
- */
-
-/**
- * Uses Promise#then to run some number of ticks
- * @param {number} count
- * @returns {Promise}
- */
-export default function promiseTick(count) {
-  let promise = Promise.resolve();
-
-  while (count > 1) {
-    promise = promise.then(() => promiseTick(1));
-    count -= 1;
-  }
-
-  return promise;
-}
+/*!
+ * Copyright (c) 2015-2020 Cisco Systems, Inc. See LICENSE file.
+ */
+
+/**
+ * Uses Promise#then to run some number of ticks
+ * @param {number} count
+ * @returns {Promise}
+ */
+export default function promiseTick(count) {
+  let promise = Promise.resolve();
+
+  while (count > 1) {
+    promise = promise.then(() => promiseTick(1));
+    count -= 1;
+  }
+
+  return promise;
+}