pusher-js 7.0.2 → 7.0.6

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "pusher-js",
-  "version": "7.0.2",
+  "version": "7.0.6",
   "description": "Pusher Channels JavaScript library for browsers, React Native, NodeJS and web workers",
   "main": "dist/node/pusher.js",
   "browser": "dist/web/pusher.js",
+  "react-native": "dist/react-native/pusher.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "format": "prettier --config .prettierrc --write 'src/**/*.ts' 'webpack/**/*.js'",
@@ -30,34 +31,35 @@
   },
   "homepage": "https://github.com/pusher/pusher-js",
   "devDependencies": {
-    "@react-native-community/netinfo": "^4.1.1",
+    "@react-native-community/netinfo": "^5.9.7",
     "@stablelib/base64": "^1.0.0",
     "@stablelib/utf8": "^1.0.0",
     "buffer": "^5.6.0",
-    "faye-websocket": "^0.9.4",
+    "faye-websocket": "^0.11.3",
     "fetch-mock": "git+https://git@github.com/jpatel531/fetch-mock.git",
-    "isomorphic-fetch": "^2.2.1",
-    "jasmine-node": "^3.0.0",
-    "jasmine-spec-reporter": "^1.2.0",
-    "karma": "^4.1.0",
-    "karma-browserstack-launcher": "^1.5.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-firefox-launcher": "^1.1.0",
-    "karma-jasmine": "~0.1.0",
+    "isomorphic-fetch": "^3.0.0",
+    "jasmine": "^3.8.0",
+    "jasmine-spec-reporter": "^7.0.0",
+    "karma": "^6.3.4",
+    "karma-browserstack-launcher": "^1.6.0",
+    "karma-chrome-launcher": "^3.1.0",
+    "karma-firefox-launcher": "^2.1.1",
+    "karma-jasmine": "^4.0.1",
     "karma-jasmine-web-worker": "^0.1.2",
     "karma-opera-launcher": "^1.0.0",
     "karma-safari-launcher": "^1.0.0",
     "karma-spec-reporter": "0.0.32",
     "karma-verbose-reporter": "0.0.6",
     "karma-webpack": "^4.0.2",
-    "object-assign-deep": "0.0.4",
     "prettier": "^1.19.1",
+    "source-map-loader": "^1.1.3",
     "ts-loader": "^6.0.4",
     "typescript": "^3.4.5",
     "uglify-js": "^2.6.2",
-    "webpack": "^4.41.5",
-    "webpack-cli": "^3.3.5",
-    "webpack-dev-server": "^3.11.0",
+    "webpack": "^4.46.0",
+    "webpack-cli": "^3.3.12",
+    "webpack-dev-server": "^3.11.2",
+    "webpack-merge": "^5.8.0",
     "xmlhttprequest": "^1.8.0"
   },
   "dependencies": {

package/spec/config/jasmine/helpers/reporter.js

@@ -0,0 +1,14 @@
+const SpecReporter = require('jasmine-spec-reporter').SpecReporter;
+
+jasmine.getEnv().clearReporters();
+
+jasmine.getEnv().addReporter(
+  new SpecReporter({
+    spec: {
+      displayPending: true
+    },
+    summary: {
+      displayDuration: false
+    }
+  })
+);

package/spec/config/jasmine/integration.json

@@ -0,0 +1,13 @@
+{
+  "spec_dir": "./tmp/node_integration",
+  "spec_files": [
+    "**/*spec.js"
+  ],
+  "helpers": [
+    "../../spec/config/jasmine/helpers/**/*.js"
+  ],
+  "failSpecWithNoExpectations": false,
+  "stopSpecOnExpectationFailure": false,
+  "stopOnSpecFailure": false,
+  "random": false
+}

package/spec/config/jasmine/unit.json

@@ -0,0 +1,13 @@
+{
+  "spec_dir": "./tmp/node_unit",
+  "spec_files": [
+    "**/*spec.js"
+  ],
+  "helpers": [
+    "../../spec/config/jasmine/helpers/**/*.js"
+  ],
+  "failSpecWithNoExpectations": false,
+  "stopSpecOnExpectationFailure": false,
+  "stopOnSpecFailure": false,
+  "random": false
+}

package/spec/config/{jasmine-node → jasmine}/webpack.integration.js

@@ -1,8 +1,8 @@
-var objectAssign = require('object-assign-deep');
-var baseConfig = require('../../../webpack/config.node');
-var path = require('path');
+const { merge } = require('webpack-merge');
+const path = require('path');
+const baseConfig = require('../../../webpack/config.node');
 
-module.exports = objectAssign({}, baseConfig, {
+module.exports = merge({}, baseConfig, {
   entry: {
     pusher: path.join(
       __dirname,

package/spec/config/{jasmine-node → jasmine}/webpack.unit.js

@@ -1,10 +1,8 @@
-var objectAssign = require("object-assign-deep");
-var webpack = require("webpack");
-var baseConfig = require("../../../webpack/config.node");
-var path = require("path");
-var dummyDependencies = {};
+const { merge } = require('webpack-merge');
+const path = require('path');
+const baseConfig = require('../../../webpack/config.node');
 
-module.exports =  objectAssign({}, baseConfig, {
+module.exports =  merge({}, baseConfig, {
   entry: {
     pusher: path.join(
       __dirname,

package/spec/config/karma/config.common.js

@@ -1,5 +1,5 @@
-var webpackConfig = require('../../../webpack/config.shared');
-var objectAssign = require('object-assign-deep');
+const { merge } = require('webpack-merge');
+const webpackConfig = require('../../../webpack/config.shared');
 
 var browserList;
 if (process.env.MINIMAL_INTEGRATION_TESTS) {
@@ -14,7 +14,7 @@ module.exports = {
 
   reporters: ['verbose'],
 
-  webpack: objectAssign({}, webpackConfig, {
+  webpack: merge({}, webpackConfig, {
     mode: 'development',
     resolve: {
       modules: [
@@ -40,6 +40,12 @@ module.exports = {
   singleRun: true,
   client: {
     captureConsole: false,
+    jasmine: {
+      // This new behaviour in jasmine is enabled by default but, some of our
+      // old tests rely on sequential execution.
+      // @todo Enable random order execution (i.e. remove this flag) and fix tests that are broken
+      random: false
+    }
   }
-}
+};
 

package/spec/config/karma/config.integration.js

@@ -1,8 +1,8 @@
-var objectAssign = require('object-assign-deep');
-var webpack = require('webpack');
-var commonConfig = require('./config.common');
+const { merge } = require('webpack-merge');
+const webpack = require('webpack');
+const commonConfig = require('./config.common');
 
-module.exports = objectAssign({}, commonConfig, {
+module.exports = merge({}, commonConfig, {
   files: [
     '**/spec/javascripts/integration/index.web.js'
   ],

package/spec/config/karma/config.unit.js

@@ -1,11 +1,9 @@
-var objectAssign = require('object-assign-deep');
-var webpackConfig = require('../../../webpack/config.shared');
-var commonConfig = require('./config.common');
+const { merge } = require('webpack-merge');
+const commonConfig = require('./config.common');
 
-module.exports = objectAssign(commonConfig,{
-  files: [
-    '**/spec/javascripts/unit/index.web.js'
-  ],
+
+module.exports = merge(commonConfig, {
+  files: ['**/spec/javascripts/unit/index.web.js'],
   preprocessors: {
     '**/spec/javascripts/unit/index.web.js': ['webpack']
   },

package/spec/config/karma/integration.js

@@ -1,9 +1,9 @@
-var objectAssign = require('object-assign-deep');
+const { merge } = require('webpack-merge');
 var config = require('./config.integration');
 
 if (process.env.CI) {
   var ci = require('./config.ci');
-  config = objectAssign(config, ci);
+  config = merge(config, ci);
   config.browsers = ci.browsers;
 }
 
@@ -12,7 +12,7 @@ if (process.env.WORKER === 'true') {
   config.webpack.resolve.alias = {
     pusher_integration: 'core/pusher',
     integration: 'node/integration'
-  }
+  };
   if (process.env.CI) config.browsers = ['bs_chrome_74'];
 }
 

package/spec/config/karma/unit.js

@@ -1,9 +1,9 @@
-var objectAssign = require('object-assign-deep');
+const { merge } = require('webpack-merge');
 var config = require('./config.unit');
 
 if (process.env.CI) {
   var ci = require('./config.ci');
-  config = objectAssign(config, ci);
+  config = merge(config, ci);
   config.browsers = ci.browsers;
 }
 

package/spec/javascripts/helpers/mocks.js

@@ -94,17 +94,17 @@ var Mocks = {
     var transport = new EventsDispatcher();
 
     transport.handlesActivityChecks = jasmine.createSpy("handlesActivityChecks")
-      .andReturn(false);
+      .and.returnValue(false);
     transport.supportsPing = jasmine.createSpy("supportsPing")
-      .andReturn(false);
+      .and.returnValue(false);
     transport.initialize = jasmine.createSpy("initialize")
-      .andCallFake(function() {
+      .and.callFake(function() {
         transport.state = "initializing";
         transport.emit("initializing");
       });
     transport.connect = jasmine.createSpy("connect");
     transport.send = jasmine.createSpy("send")
-      .andReturn(true);
+      .and.returnValue(true);
     transport.ping = jasmine.createSpy("ping");
     transport.close = jasmine.createSpy("close");
     transport.state = undefined;
@@ -114,7 +114,7 @@ var Mocks = {
 
   getTransportManager: function(alive) {
     return {
-      isAlive: jasmine.createSpy("isAlive").andReturn(alive !== false),
+      isAlive: jasmine.createSpy("isAlive").and.returnValue(alive !== false),
       reportDeath: jasmine.createSpy("reportDeath")
     };
   },
@@ -122,9 +122,9 @@ var Mocks = {
   getAssistantToTheTransportManager: function(transport) {
     return {
       createConnection: jasmine.createSpy("createConnection")
-        .andReturn(transport || this.getTransport()),
+        .and.returnValue(transport || this.getTransport()),
       isSupported: jasmine.createSpy("isSupported")
-        .andReturn(true)
+        .and.returnValue(true)
     };
   },
 
@@ -132,9 +132,9 @@ var Mocks = {
     var klass = {};
 
     klass.isSupported = jasmine.createSpy("isSupported")
-      .andReturn(supported);
+      .and.returnValue(supported);
     klass.createConnection = jasmine.createSpy("createConnection")
-      .andReturn(transport || this.getTransport());
+      .and.returnValue(transport || this.getTransport());
 
     return klass;
   },
@@ -156,9 +156,9 @@ var Mocks = {
     strategy._callback = null;
 
     strategy.isSupported = jasmine.createSpy("isSupported")
-      .andReturn(isSupported);
+      .and.returnValue(isSupported);
     strategy.connect = jasmine.createSpy("connect")
-      .andCallFake(function(minPriority, callback) {
+      .and.callFake(function(minPriority, callback) {
         strategy._callback = callback;
         return {
           abort: strategy._abort,
@@ -183,15 +183,15 @@ var Mocks = {
     connection.initialize = jasmine.createSpy("initialize");
     connection.connect = jasmine.createSpy("connect");
     connection.handlesActivityChecks = jasmine.createSpy("handlesActivityChecks")
-      .andReturn(false);
+      .and.returnValue(false);
     connection.supportsPing = jasmine.createSpy("supportsPing")
-      .andReturn(false);
+      .and.returnValue(false);
     connection.send = jasmine.createSpy("send")
-      .andReturn(true);
+      .and.returnValue(true);
     connection.ping = jasmine.createSpy("ping")
-      .andReturn(true);
+      .and.returnValue(true);
     connection.send_event = jasmine.createSpy("send_event")
-      .andReturn(true);
+      .and.returnValue(true);
     connection.close = jasmine.createSpy("close");
 
     return connection;
@@ -203,7 +203,7 @@ var Mocks = {
     manager.connect = jasmine.createSpy("connect");
     manager.disconnect = jasmine.createSpy("disconnect");
     manager.send_event = jasmine.createSpy("send_event");
-    manager.isUsingTLS = jasmine.createSpy("isUsingTLS").andReturn(false);
+    manager.isUsingTLS = jasmine.createSpy("isUsingTLS").and.returnValue(false);
     return manager;
   },
 
@@ -231,7 +231,7 @@ var Mocks = {
   getAuthorizer: function() {
     var authorizer = {};
     authorizer._callback = null;
-    authorizer.authorize = jasmine.createSpy("authorize").andCallFake(function(_, callback) {
+    authorizer.authorize = jasmine.createSpy("authorize").and.callFake(function(_, callback) {
       authorizer._callback = callback;
     });
     return authorizer;

package/spec/javascripts/helpers/waitsFor.js

@@ -0,0 +1,37 @@
+let interval = 50;
+
+/**
+ * waitsFor backports the jasmine@1.x.x waitsFor feature to keep old tests working
+ *
+ * @deprecated You shouldn't use this for writing new tests
+ *
+ * @param {Function} condition
+ * @param {string} reason
+ * @param {number} timeout
+ * @returns
+ */
+module.exports = async (condition, reason, timeout) => {
+  if (typeof condition !== 'function') {
+    throw new Error('Condition is not a function');
+  }
+
+  if (typeof reason !== 'string') {
+    throw new Error('Reason is not a string');
+  }
+
+  if (typeof timeout !== 'number') {
+    throw new Error('Timeout is not a number');
+  }
+
+  while (timeout >= 0) {
+    if (condition()) {
+      return;
+    }
+
+    await new Promise(r => setTimeout(r, interval));
+
+    timeout -= interval;
+  }
+
+  throw new Error(`waitsFor on "${reason}" timed out`);
+};

package/spec/javascripts/integration/core/cluster_config_spec.js

@@ -1,7 +1,8 @@
-var TestEnv = require('testenv');
-var Pusher = require('pusher_integration');
-var DependenciesModule = require('dom/dependencies');
-var DependenciesReceiversModule = require('dom/dependency_loader');
+const TestEnv = require('testenv');
+const Pusher = require('pusher_integration');
+const DependenciesModule = require('dom/dependencies');
+const DependenciesReceiversModule = require('dom/dependency_loader');
+const waitsFor = require('../../helpers/waitsFor');
 
 if (TestEnv === "web") {
   window.Pusher = Pusher;
@@ -10,12 +11,11 @@ if (TestEnv === "web") {
   var DependencyLoader = DependenciesReceiversModule.default;
 }
 
-var Integration = require("integration");
-var Collections = require("core/utils/collections");
-var util = require("core/util").default;
-var Runtime = require('runtime').default;
-var Defaults = require('core/defaults').default;
-var TRANSPORTS = Runtime.Transports;
+const Integration = require("integration");
+const Collections = require("core/utils/collections");
+const Runtime = require('runtime').default;
+const Defaults = require('core/defaults').default;
+const TRANSPORTS = Runtime.Transports;
 
 
 module.exports = function(testConfigs) {
@@ -38,16 +38,25 @@ module.exports = function(testConfigs) {
       }
 
       describe("with " + options.transport + ", forceTLS=" + options.forceTLS, function() {
+        var jasmineDefaultTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
+
+        beforeAll(() => {
+          jasmine.DEFAULT_TIMEOUT_INTERVAL = 21000;
+        });
+
+        afterAll(() => {
+          jasmine.DEFAULT_TIMEOUT_INTERVAL = jasmineDefaultTimeout;
+        });
+
         beforeEach(function() {
           Collections.objectApply(TRANSPORTS, function(transport, name) {
-            spyOn(transport, "isSupported").andReturn(false);
+            spyOn(transport, "isSupported").and.returnValue(false);
           });
-          TRANSPORTS[options.transport].isSupported.andReturn(true);
-          spyOn(Runtime, "getLocalStorage").andReturn({});
+          TRANSPORTS[options.transport].isSupported.and.returnValue(true);
+          spyOn(Runtime, "getLocalStorage").and.returnValue({});
         });
 
-        it("should open a connection to the 'eu' cluster", function() {
-
+        it("should open a connection to the 'eu' cluster", async function() {
           var authTransport = (TestEnv === "web") ? 'jsonp' : 'ajax';
 
           pusher = new Pusher("4d31fbea7080e3b4bf6d", {
@@ -56,12 +65,15 @@ module.exports = function(testConfigs) {
             cluster: "eu",
             forceTLS: options.forceTLS,
           });
-          waitsFor(function() {
+
+          await waitsFor(function() {
             return pusher.connection.state === "connected";
           }, "connection to be established", 20000);
+
+          expect(pusher.connection.state).toEqual('connected');
         });
 
-        it("should subscribe and receive a message sent via REST API", function() {
+        it("should subscribe and receive a message sent via REST API", async function() {
           var channelName = Integration.getRandomName("private-integration");
 
           var onSubscribed = jasmine.createSpy("onSubscribed");
@@ -71,27 +83,26 @@ module.exports = function(testConfigs) {
           var data = { x: 1, y: "z" };
           var received = null;
 
-          waitsFor(function() {
-            return onSubscribed.calls.length;
+          await waitsFor(function() {
+            return onSubscribed.calls.count();
           }, "subscription to succeed", 10000);
-          runs(function() {
-            channel.bind(eventName, function(message) {
-              received = message;
-            });
-            Integration.sendAPIMessage({
-              url: Integration.API_EU_URL + "/v2/send",
-              channel: channelName,
-              event: eventName,
-              data: data
-            });
+
+          channel.bind(eventName, function(message) {
+            received = message;
+          });
+          Integration.sendAPIMessage({
+            url: Integration.API_EU_URL + "/v2/send",
+            channel: channelName,
+            event: eventName,
+            data: data
           });
-          waitsFor(function() {
+
+          await waitsFor(function() {
             return received !== null;
           }, "message to get delivered", 10000);
-          runs(function() {
-            expect(received).toEqual(data);
-            pusher.unsubscribe(channelName);
-          });
+
+          expect(received).toEqual(data);
+          pusher.unsubscribe(channelName);
         });
 
         it("should disconnect the connection", function() {