@splitsoftware/splitio 10.16.0 → 10.16.2-rc.0

package/lib/engine/transforms/matchers.js

@@ -48,52 +48,52 @@ function transform(matchers) {
         booleanMatcherData = matcher.booleanMatcherData,
         stringMatcherData = matcher.stringMatcherData;
     var attribute = keySelector && keySelector.attribute;
-    var type = (0, _types.mapper)(matcherType); // As default input data type we use string (even for ALL_KEYS)
+    var type = (0, _types.matcherTypesMapper)(matcherType); // As default input data type we use string (even for ALL_KEYS)
 
-    var dataType = _types.dataTypes.STRING;
+    var dataType = _types.matcherDataTypes.STRING;
     var value = undefined;
 
-    if (type === _types.types.SEGMENT) {
+    if (type === _types.matcherTypes.IN_SEGMENT) {
       value = (0, _segment.default)(segmentObject);
-    } else if (type === _types.types.WHITELIST) {
+    } else if (type === _types.matcherTypes.WHITELIST) {
       value = (0, _whitelist.default)(whitelistObject);
-    } else if (type === _types.types.EQUAL_TO) {
+    } else if (type === _types.matcherTypes.EQUAL_TO) {
       value = (0, _unaryNumeric.default)(unaryNumericObject);
-      dataType = _types.dataTypes.NUMBER;
+      dataType = _types.matcherDataTypes.NUMBER;
 
       if (unaryNumericObject.dataType === 'DATETIME') {
         value = (0, _convertions.zeroSinceHH)(value);
-        dataType = _types.dataTypes.DATETIME;
+        dataType = _types.matcherDataTypes.DATETIME;
       }
-    } else if (type === _types.types.GREATER_THAN_OR_EQUAL_TO || type === _types.types.LESS_THAN_OR_EQUAL_TO) {
+    } else if (type === _types.matcherTypes.GREATER_THAN_OR_EQUAL_TO || type === _types.matcherTypes.LESS_THAN_OR_EQUAL_TO) {
       value = (0, _unaryNumeric.default)(unaryNumericObject);
-      dataType = _types.dataTypes.NUMBER;
+      dataType = _types.matcherDataTypes.NUMBER;
 
       if (unaryNumericObject.dataType === 'DATETIME') {
         value = (0, _convertions.zeroSinceSS)(value);
-        dataType = _types.dataTypes.DATETIME;
+        dataType = _types.matcherDataTypes.DATETIME;
       }
-    } else if (type === _types.types.BETWEEN) {
+    } else if (type === _types.matcherTypes.BETWEEN) {
       value = betweenObject;
-      dataType = _types.dataTypes.NUMBER;
+      dataType = _types.matcherDataTypes.NUMBER;
 
       if (betweenObject.dataType === 'DATETIME') {
         value.start = (0, _convertions.zeroSinceSS)(value.start);
         value.end = (0, _convertions.zeroSinceSS)(value.end);
-        dataType = _types.dataTypes.DATETIME;
+        dataType = _types.matcherDataTypes.DATETIME;
       }
-    } else if (type === _types.types.EQUAL_TO_SET || type === _types.types.CONTAINS_ANY_OF_SET || type === _types.types.CONTAINS_ALL_OF_SET || type === _types.types.PART_OF_SET) {
+    } else if (type === _types.matcherTypes.EQUAL_TO_SET || type === _types.matcherTypes.CONTAINS_ANY_OF_SET || type === _types.matcherTypes.CONTAINS_ALL_OF_SET || type === _types.matcherTypes.PART_OF_SET) {
       value = (0, _set.default)(whitelistObject);
-      dataType = _types.dataTypes.SET;
-    } else if (type === _types.types.STARTS_WITH || type === _types.types.ENDS_WITH || type === _types.types.CONTAINS_STRING) {
+      dataType = _types.matcherDataTypes.SET;
+    } else if (type === _types.matcherTypes.STARTS_WITH || type === _types.matcherTypes.ENDS_WITH || type === _types.matcherTypes.CONTAINS_STRING) {
       value = (0, _set.default)(whitelistObject);
-    } else if (type === _types.types.IN_SPLIT_TREATMENT) {
+    } else if (type === _types.matcherTypes.IN_SPLIT_TREATMENT) {
       value = dependencyObject;
-      dataType = _types.dataTypes.NOT_SPECIFIED;
-    } else if (type === _types.types.EQUAL_TO_BOOLEAN) {
-      dataType = _types.dataTypes.BOOLEAN;
+      dataType = _types.matcherDataTypes.NOT_SPECIFIED;
+    } else if (type === _types.matcherTypes.EQUAL_TO_BOOLEAN) {
+      dataType = _types.matcherDataTypes.BOOLEAN;
       value = booleanMatcherData;
-    } else if (type === _types.types.MATCHES_STRING) {
+    } else if (type === _types.matcherTypes.MATCHES_STRING) {
       value = stringMatcherData;
     }
 
@@ -112,7 +112,7 @@ function transform(matchers) {
   });
 
   if ((0, _lang.findIndex)(parsedMatchers, function (m) {
-    return m.type === _types.types.UNDEFINED;
+    return m.type === _types.matcherTypes.UNDEFINED;
   }) === -1) {
     return parsedMatchers;
   } else {

package/lib/engine/value/sanitize.js

@@ -29,8 +29,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 **/
 var log = (0, _logger.default)('splitio-engine:sanitize');
-var MATCHERS = _types.types;
-var DATA_TYPES = _types.dataTypes;
 
 function sanitizeNumber(val) {
   var num = (0, _lang.toNumber)(val);
@@ -81,15 +79,15 @@ function dependencyProcessor(sanitizedValue, attributes) {
 
 function getProcessingFunction(matcherTypeID, dataType) {
   switch (matcherTypeID) {
-    case MATCHERS.EQUAL_TO:
+    case _types.matcherTypes.EQUAL_TO:
       return dataType === 'DATETIME' ? _convertions.zeroSinceHH : undefined;
 
-    case MATCHERS.GREATER_THAN_OR_EQUAL_TO:
-    case MATCHERS.LESS_THAN_OR_EQUAL_TO:
-    case MATCHERS.BETWEEN:
+    case _types.matcherTypes.GREATER_THAN_OR_EQUAL_TO:
+    case _types.matcherTypes.LESS_THAN_OR_EQUAL_TO:
+    case _types.matcherTypes.BETWEEN:
       return dataType === 'DATETIME' ? _convertions.zeroSinceSS : undefined;
 
-    case MATCHERS.IN_SPLIT_TREATMENT:
+    case _types.matcherTypes.IN_SPLIT_TREATMENT:
       return dependencyProcessor;
 
     default:
@@ -102,24 +100,24 @@ function sanitizeValue(matcherTypeID, value, dataType, attributes) {
   var sanitizedValue;
 
   switch (dataType) {
-    case DATA_TYPES.NUMBER:
-    case DATA_TYPES.DATETIME:
+    case _types.matcherDataTypes.NUMBER:
+    case _types.matcherDataTypes.DATETIME:
       sanitizedValue = sanitizeNumber(value);
       break;
 
-    case DATA_TYPES.STRING:
+    case _types.matcherDataTypes.STRING:
       sanitizedValue = sanitizeString(value);
       break;
 
-    case DATA_TYPES.SET:
+    case _types.matcherDataTypes.SET:
       sanitizedValue = sanitizeArray(value);
       break;
 
-    case DATA_TYPES.BOOLEAN:
+    case _types.matcherDataTypes.BOOLEAN:
       sanitizedValue = sanitizeBoolean(value);
       break;
 
-    case DATA_TYPES.NOT_SPECIFIED:
+    case _types.matcherDataTypes.NOT_SPECIFIED:
       sanitizedValue = value;
       break;
 

package/lib/impressions/hasher/hashImpression128.js

@@ -3,10 +3,10 @@
 exports.__esModule = true;
 exports.hashImpression128 = hashImpression128;
 
-var _murmur3_ = require("../../engine/engine/murmur3/murmur3_128");
+var _murmur3_128_x = require("../../engine/engine/murmur3/murmur3_128_x86");
 
 var _buildKey = require("./buildKey");
 
 function hashImpression128(impression) {
-  return (0, _murmur3_.hash128)((0, _buildKey.buildKey)(impression));
+  return (0, _murmur3_128_x.hash128)((0, _buildKey.buildKey)(impression));
 }

package/lib/impressions/observer/observer.js

@@ -16,7 +16,6 @@ var ImpressionObserver = /*#__PURE__*/function () {
   var _proto = ImpressionObserver.prototype;
 
   _proto.testAndSet = function testAndSet(impression) {
-    if (!impression) return null;
     var hash = this.hasher(impression);
     var previous = this.cache.get(hash);
     this.cache.set(hash, impression.time);

package/lib/producer/updater/SplitChangesFromObject.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = void 0;
 
+var _constants = require("../../utils/constants");
+
 var _lang = require("../../utils/lang");
 
 var _logger = _interopRequireDefault(require("../../utils/logger"));
@@ -61,13 +63,13 @@ function FromObjectUpdaterFactory(Fetcher, context) {
         })]);
       });
       return Promise.all([storage.splits.flush(), // required to sync removed splits from mock
-      storage.splits.setChangeNumber(Date.now()), storage.splits.addSplits(splits)]).then(function () {
+      storage.splits.addSplits(splits)]).then(function () {
         readiness.splits.emit(readiness.splits.SDK_SPLITS_ARRIVED);
 
         if (startingUp) {
           startingUp = false; // Emits SDK_READY_FROM_CACHE
 
-          if (storage.splits.checkCache()) readiness.splits.emit(readiness.splits.SDK_SPLITS_CACHE_LOADED); // Only emits SDK_SEGMENTS_ARRIVED the first time for SDK_READY
+          if (settings.storage.__originalType === _constants.STORAGE_LOCALSTORAGE) readiness.splits.emit(readiness.splits.SDK_SPLITS_CACHE_LOADED); // Only emits SDK_SEGMENTS_ARRIVED the first time for SDK_READY
 
           readiness.segments.emit(readiness.segments.SDK_SEGMENTS_ARRIVED);
         }

package/lib/storage/AttributesCache/InMemory.js

@@ -0,0 +1,92 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.default = void 0;
+
+var _objectAssign = _interopRequireDefault(require("object-assign"));
+
+var AttributesCacheInMemory = /*#__PURE__*/function () {
+  function AttributesCacheInMemory() {
+    this.attributesCache = {};
+  }
+  /**
+   * Create or update the value for the given attribute
+   * 
+   * @param {string} attributeName attribute name
+   * @param {Object} attributeValue attribute value
+   * @returns {boolean} the attribute was stored 
+   */
+
+
+  var _proto = AttributesCacheInMemory.prototype;
+
+  _proto.setAttribute = function setAttribute(attributeName, attributeValue) {
+    this.attributesCache[attributeName] = attributeValue;
+    return true;
+  }
+  /**
+   * Retrieves the value of a given attribute
+   * 
+   * @param {string} attributeName attribute name
+   * @returns {Object?} stored attribute value
+   */
+  ;
+
+  _proto.getAttribute = function getAttribute(attributeName) {
+    return this.attributesCache[attributeName];
+  }
+  /**
+   * Create or update all the given attributes
+   * 
+   * @param {[string, Object]} attributes attributes to create or update
+   * @returns {boolean} attributes were stored
+   */
+  ;
+
+  _proto.setAttributes = function setAttributes(attributes) {
+    this.attributesCache = (0, _objectAssign.default)(this.attributesCache, attributes);
+    return true;
+  }
+  /**
+   * Retrieve the full attributes map
+   * 
+   * @returns {Map<string, Object>} stored attributes
+   */
+  ;
+
+  _proto.getAll = function getAll() {
+    return this.attributesCache;
+  }
+  /**
+   * Removes a given attribute from the map
+   * 
+   * @param {string} attributeName attribute to remove
+   * @returns {boolean} attribute removed
+   */
+  ;
+
+  _proto.removeAttribute = function removeAttribute(attributeName) {
+    if (Object.keys(this.attributesCache).indexOf(attributeName) >= 0) {
+      delete this.attributesCache[attributeName];
+      return true;
+    }
+
+    return false;
+  }
+  /**
+   * Clears all attributes stored in the SDK
+   * 
+   */
+  ;
+
+  _proto.clear = function clear() {
+    this.attributesCache = {};
+  };
+
+  return AttributesCacheInMemory;
+}();
+
+var _default = AttributesCacheInMemory;
+exports.default = _default;

package/lib/sync/PushManager/index.js

@@ -257,21 +257,13 @@ function PushManagerFactory(context, clientContexts
             (0, _lang.forOwn)(clients, function (_ref3) {
               var hash64 = _ref3.hash64,
                   worker = _ref3.worker;
+              var add = added.has(hash64.dec) ? true : removed.has(hash64.dec) ? false : undefined;
 
-              if (added.has(hash64.dec)) {
+              if (add !== undefined) {
                 worker.put(parsedData.changeNumber, {
                   name: parsedData.segmentName,
-                  add: true
+                  add: add
                 });
-                return;
-              }
-
-              if (removed.has(hash64.dec)) {
-                worker.put(parsedData.changeNumber, {
-                  name: parsedData.segmentName,
-                  add: false
-                });
-                return;
               }
             });
             return;

package/lib/utils/inputValidation/attribute.js

@@ -0,0 +1,32 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.validateAttribute = validateAttribute;
+
+var _lang = require("../lang");
+
+var _logger = _interopRequireDefault(require("../logger"));
+
+var log = (0, _logger.default)('');
+
+function validateAttribute(attributeKey, attributeValue, method) {
+  if (!(0, _lang.isString)(attributeKey) || attributeKey.length === 0) {
+    log.warn(method + ": you passed an invalid attribute name, attribute name must be a non-empty string.");
+    return false;
+  }
+
+  var isStringVal = (0, _lang.isString)(attributeValue);
+  var isFiniteVal = (0, _lang.numberIsFinite)(attributeValue);
+  var isBoolVal = (0, _lang.isBoolean)(attributeValue);
+  var isArrayVal = Array.isArray(attributeValue);
+
+  if (!(isStringVal || isFiniteVal || isBoolVal || isArrayVal)) {
+    // If it's not of valid type.
+    log.warn(method + ": you passed an invalid attribute value for " + attributeKey + ". Acceptable types are: string, number, boolean and array of strings.");
+    return false;
+  }
+
+  return true;
+}

package/lib/utils/inputValidation/attributes.js

@@ -4,11 +4,14 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 exports.__esModule = true;
 exports.validateAttributes = validateAttributes;
+exports.validateAttributesDeep = validateAttributesDeep;
 
 var _lang = require("../lang");
 
 var _logger = _interopRequireDefault(require("../logger"));
 
+var _attribute = require("./attribute");
+
 var log = (0, _logger.default)('');
 
 function validateAttributes(maybeAttrs, method) {
@@ -17,4 +20,13 @@ function validateAttributes(maybeAttrs, method) {
     return maybeAttrs;
   log.error(method + ": attributes must be a plain object.");
   return false;
+}
+
+function validateAttributesDeep(maybeAttributes, method) {
+  if (!validateAttributes(maybeAttributes, method)) return false;
+  var result = true;
+  Object.keys(maybeAttributes).forEach(function (attributeKey) {
+    if (!(0, _attribute.validateAttribute)(attributeKey, maybeAttributes[attributeKey], method)) result = false;
+  });
+  return result;
 }

package/lib/utils/logger/LoggerFactory.js

@@ -14,13 +14,23 @@ var LogLevels = {
   'WARN': 'WARN',
   'ERROR': 'ERROR',
   'NONE': 'NONE'
+};
+exports.LogLevels = LogLevels;
+var LogLevelIndexes = {
+  DEBUG: 1,
+  INFO: 2,
+  WARN: 3,
+  ERROR: 4,
+  NONE: 5
 }; // DEBUG is the default. The log level is not specific to an SDK instance.
 
-exports.LogLevels = LogLevels;
-var GlobalLogLevel = LogLevels.DEBUG;
+var GlobalLogLevel = LogLevelIndexes.DEBUG;
+/**
+ * @param {'DEBUG'|'INFO'|'WARN'|'ERROR'|'NONE'} level
+ */
 
 var setLogLevel = function setLogLevel(level) {
-  GlobalLogLevel = level;
+  GlobalLogLevel = LogLevelIndexes[level];
 };
 
 exports.setLogLevel = setLogLevel;
@@ -38,19 +48,19 @@ var Logger = /*#__PURE__*/function () {
   var _proto = Logger.prototype;
 
   _proto.debug = function debug(msg) {
-    if (this._shouldLog(LogLevels.DEBUG)) this._log(LogLevels.DEBUG, msg);
+    if (this._shouldLog(LogLevelIndexes.DEBUG)) this._log(LogLevels.DEBUG, msg);
   };
 
   _proto.info = function info(msg) {
-    if (this._shouldLog(LogLevels.INFO)) this._log(LogLevels.INFO, msg);
+    if (this._shouldLog(LogLevelIndexes.INFO)) this._log(LogLevels.INFO, msg);
   };
 
   _proto.warn = function warn(msg) {
-    if (this._shouldLog(LogLevels.WARN)) this._log(LogLevels.WARN, msg);
+    if (this._shouldLog(LogLevelIndexes.WARN)) this._log(LogLevels.WARN, msg);
   };
 
   _proto.error = function error(msg) {
-    if (this.options.displayAllErrors || this._shouldLog(LogLevels.ERROR)) this._log(LogLevels.ERROR, msg);
+    if (this.options.displayAllErrors || this._shouldLog(LogLevelIndexes.ERROR)) this._log(LogLevels.ERROR, msg);
   };
 
   _proto._log = function _log(level, text) {
@@ -72,18 +82,14 @@ var Logger = /*#__PURE__*/function () {
     }
 
     return result += text;
-  };
+  }
+  /**
+   * @param {number} level
+   */
+  ;
 
   _proto._shouldLog = function _shouldLog(level) {
-    var logLevel = GlobalLogLevel;
-    var levels = Object.keys(LogLevels).map(function (f) {
-      return LogLevels[f];
-    });
-    var index = levels.indexOf(level); // What's the index of what it's trying to check if it should log
-
-    var levelIdx = levels.indexOf(logLevel); // What's the current log level index.
-
-    return index >= levelIdx;
+    return level >= GlobalLogLevel;
   };
 
   return Logger;

package/lib/utils/settings/index.js

@@ -44,7 +44,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 **/
-var version = '10.16.0';
+var version = '10.16.2-rc.0';
 var eventsEndpointMatcher = /^\/(testImpressions|metrics|events)/;
 var authEndpointMatcher = /^\/v2\/auth/;
 var streamingEndpointMatcher = /^\/(sse|event-stream)/;

package/lib/utils/settings/storage/browser.js

@@ -29,30 +29,45 @@ limitations under the License.
 var log = (0, _logger.default)('splitio-settings');
 
 var ParseStorageSettings = function ParseStorageSettings(settings) {
-  var _settings$storage = settings.storage,
+  var mode = settings.mode,
+      _settings$storage = settings.storage,
       _settings$storage$typ = _settings$storage.type,
       type = _settings$storage$typ === void 0 ? _constants.STORAGE_MEMORY : _settings$storage$typ,
       _settings$storage$opt = _settings$storage.options,
       options = _settings$storage$opt === void 0 ? {} : _settings$storage$opt,
       prefix = _settings$storage.prefix;
 
+  var __originalType;
+
   if (prefix) {
     prefix += '.SPLITIO';
   } else {
     prefix = 'SPLITIO';
+  }
+
+  var fallbackToMemory = function fallbackToMemory() {
+    __originalType = type;
+    type = _constants.STORAGE_MEMORY;
+  }; // In localhost mode, fallback to Memory storage and track original
+  // type to emit SDK_READY_FROM_CACHE if corresponds
+
+
+  if (mode === _constants.LOCALHOST_MODE && type === _constants.STORAGE_LOCALSTORAGE) {
+    fallbackToMemory();
   } // If an invalid storage type is provided OR we want to use LOCALSTORAGE and
   // it's not available, fallback into MEMORY
 
 
   if (type !== _constants.STORAGE_MEMORY && type !== _constants.STORAGE_LOCALSTORAGE || type === _constants.STORAGE_LOCALSTORAGE && !(0, _isAvailable.default)()) {
-    type = _constants.STORAGE_MEMORY;
+    fallbackToMemory();
     log.warn('Invalid or unavailable storage. Fallbacking into MEMORY storage');
   }
 
   return {
     type: type,
     options: options,
-    prefix: prefix
+    prefix: prefix,
+    __originalType: __originalType
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@splitsoftware/splitio",
-  "version": "10.16.0",
+  "version": "10.16.2-rc.0",
   "description": "Split SDK",
   "files": [
     "README.md",
@@ -35,7 +35,7 @@
     "@babel/runtime": "^7.13.10",
     "@types/google.analytics": "0.0.40",
     "events": "3.1.0",
-    "ioredis": "^4.26.0",
+    "ioredis": "^4.28.0",
     "ip": "1.1.5",
     "js-yaml": "3.13.1",
     "node-fetch": "^2.6.1",
@@ -46,7 +46,7 @@
     "eventsource": "^1.0.7"
   },
   "devDependencies": {
-    "@babel/cli": "^7.14.8",
+    "@babel/cli": "^7.15.7",
     "@babel/core": "^7.13.10",
     "@babel/plugin-transform-runtime": "^7.13.10",
     "@babel/preset-env": "^7.13.10",
@@ -55,8 +55,8 @@
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
     "csv-streamify": "4.0.0",
-    "eslint": "^6.8.0",
-    "eslint-plugin-compat": "^3.9.0",
+    "eslint": "^8.0.1",
+    "eslint-plugin-compat": "^3.13.0",
     "fetch-mock": "^9.11.0",
     "karma": "^6.3.2",
     "karma-chrome-launcher": "^3.1.0",
@@ -84,25 +84,27 @@
     "build-umd:stats": "webpack --progress --env production --json > ./stats/stat_results.json",
     "build-cjs": "rimraf lib && cross-env NODE_ENV=cjs babel ./src -d lib --ignore 'src/**/__tests__/*'",
     "postbuild-cjs": "cross-env NODE_ENV=cjs node scripts/copy.packages.json.js",
-    "build-umd:ci": "webpack --config webpack.ci.dev.js --env branch=$BUILD_BRANCH --env commit_hash=$BUILD_COMMIT && webpack --config webpack.ci.prod.js --env branch=$BUILD_BRANCH --env commit_hash=$BUILD_COMMIT && ./scripts/clean_umd_build.sh",
-    "build-umd": "webpack --config webpack.dev.js && webpack --config webpack.prod.js && ./scripts/clean_umd_build.sh",
-    "build": "rimraf lib umd es && npm run build-cjs && npm run build-es && npm run build-umd",
+    "build-umd": "webpack --config webpack.ci.dev.js --env branch=$BUILD_BRANCH --env commit_hash=$BUILD_COMMIT && webpack --config webpack.ci.prod.js --env branch=$BUILD_BRANCH --env commit_hash=$BUILD_COMMIT && ./scripts/clean_umd_build.sh",
+    "build-umd:local": "webpack --config webpack.dev.js && webpack --config webpack.prod.js && ./scripts/clean_umd_build.sh",
+    "build:local": "rimraf lib umd es && npm run build-cjs && npm run build-es && npm run build-umd:local",
     "build:npm": "rimraf lib es && npm run build-cjs && npm run build-es",
-    "build:ci": "rimraf lib umd es && npm run build-cjs && npm run build-es && npm run build-umd:ci",
-    "check": "npm run check:lint && npm run check:version ",
+    "build": "rimraf lib umd es && npm run build-cjs && npm run build-es && npm run build-umd",
+    "check": "npm run check:lint && npm run check:version",
     "check:lint": "eslint src",
     "check:version": "cross-env NODE_ENV=test tape -r @babel/register src/utils/__tests__/settings/index.spec.js",
     "test-browser-local": "cross-env NODE_ENV=test karma start karma/local.karma.conf.js",
     "test-browser-e2e-local": "cross-env NODE_ENV=test karma start karma/e2e.local.karma.conf.js",
-    "test-browser-ci": "cross-env NODE_ENV=test karma start karma/ci.karma.conf.js",
-    "test-browser-e2e-ci": "cross-env NODE_ENV=test karma start karma/e2e.ci.karma.conf.js",
+    "test-browser": "npm run test-browser-unit && npm run test-browser-online && npm run test-browser-offline && npm run test-browser-destroy && npm run test-browser-errors && npm run test-browser-push && npm run test-browser-gaintegration",
+    "test-browser-unit": "cross-env NODE_ENV=test karma start karma/ci.karma.conf.js",
+    "test-browser-online": "cross-env NODE_ENV=test karma start karma/e2e.ci.karma.conf.js",
     "test-browser-offline": "cross-env NODE_ENV=test karma start karma/offline.karma.conf.js",
     "test-browser-destroy": "cross-env NODE_ENV=test karma start karma/destroy.ci.karma.conf.js",
     "test-browser-errors": "cross-env NODE_ENV=test karma start karma/errors.ci.karma.conf.js",
     "test-browser-gaintegration": "cross-env NODE_ENV=test karma start karma/gaintegration.ci.karma.conf.js",
     "test-browser-push": "cross-env NODE_ENV=test karma start karma/push.ci.karma.conf.js",
-    "test-node": "cross-env NODE_ENV=test tape -r @babel/register \"src/*/**/__tests__/**/!(browser).spec.js\" | tap-min",
-    "test-node-e2e": "cross-env NODE_ENV=test tape -r @babel/register src/__tests__/node.spec.js | tap-min",
+    "test-node": "npm run test-node-unit && npm run test-node-online && npm run test-node-redis && npm run test-node-offline && npm run test-node-destroy && npm run test-node-errors && npm run test-node-push",
+    "test-node-unit": "cross-env NODE_ENV=test tape -r @babel/register \"src/*/**/__tests__/**/!(browser).spec.js\" | tap-min",
+    "test-node-online": "cross-env NODE_ENV=test tape -r @babel/register src/__tests__/node.spec.js | tap-min",
     "test-node-destroy": "cross-env NODE_ENV=test tape -r @babel/register src/__tests__/destroy/node.spec.js | tap-min",
     "test-node-errors": "cross-env NODE_ENV=test tape -r @babel/register src/__tests__/errorCatching/node.spec.js | tap-min",
     "test-node-offline": "cross-env NODE_ENV=test tape -r @babel/register src/__tests__/offline/node.spec.js | tap-min",
@@ -111,9 +113,7 @@
     "pretest-ts-decls": "npm run build-es && npm run build-cjs && npm link",
     "test-ts-decls": "./scripts/ts-tests.sh",
     "posttest-ts-decls": "npm unlink && npm install",
-    "browser-test-suite": "npm run test-browser-ci && npm run test-browser-e2e-ci && npm run test-browser-offline && npm run test-browser-destroy && npm run test-browser-errors && npm run test-browser-gaintegration",
-    "node-test-suite": "npm run test-node && npm run test-node-e2e && npm run test-node-destroy && npm run test-node-offline && npm run test-node-redis && npm run test-node-errors",
-    "test": "npm run browser-test-suite && npm run node-test-suite",
+    "test": "npm run test-node && npm run test-browser",
     "publish:rc": "npm run check && npm run build && npm publish --tag canary",
     "publish:stable": "npm run check && npm run build && npm publish"
   },