jscrambler 5.5.34 → 6.0.4

package/README.md

@@ -2,6 +2,7 @@
 Jscrambler Client for Browser and Node.js
 
 - [Jscrambler](https://jscrambler.com/?utm_source=github.com&utm_medium=referral)
+  - [Version Compatibility](#version-compatibility)
   - [Installation](#installation)
   - [RC configuration](#rc-configuration)
   - [CLI](#cli)
@@ -22,6 +23,16 @@ Jscrambler Client for Browser and Node.js
     - [Quick example](#quick-example)
   - [Jscrambler Parameters](#jscrambler-parameters)
 
+## Version Compatibility
+
+The version's compatibility table match your [Jscrambler Version](https://app.jscrambler.com/settings) with the Jscrambler Client.
+Please make sure you install the right version, otherwise some functionalities might not work properly.
+
+| _Jscrambler Version_   |      _Client and Integrations_      |
+|:----------:|:-------------:|
+| _<= 7.1_ |  _<= 5.x.x_ |
+| _\>= 7.2_ |   _\>= 6.0.0_ |
+
 ## Installation
 
 On your project:
@@ -36,6 +47,12 @@ Or globally:
 npm i -g jscrambler
 ```
 
+Or a specific version:
+
+```js
+npm i jscrambler@5
+```
+
 ## RC configuration
 You may put your access and secret keys into a config file if found in [these directories](https://github.com/dominictarr/rc#standards). Besides simplifying the command entry, this has the added benefit of not logging your Jscrambler credentials.
 

package/dist/bin/jscrambler.js

@@ -9,10 +9,6 @@ var _lodash = require('lodash.defaults');
 
 var _lodash2 = _interopRequireDefault(_lodash);
 
-var _glob = require('glob');
-
-var _glob2 = _interopRequireDefault(_glob);
-
 var _path = require('path');
 
 var _path2 = _interopRequireDefault(_path);
@@ -31,6 +27,8 @@ var _2 = _interopRequireDefault(_);
 
 var _cli = require('../cli');
 
+var _utils = require('../utils');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
@@ -171,7 +169,9 @@ if (_commander2.default.args.length > 0) {
 }
 
 if (globSrc && globSrc.length) {
-  filesSrc = [];
+  // this will be translated to real files in the updateApplicationSources method
+  filesSrc = globSrc;
+  var nSources = 0;
   // Iterate `globSrc` to build a list of source files into `filesSrc`
   for (var i = 0, l = globSrc.length; i < l; i += 1) {
     // Calling sync `glob` because async is pointless for the CLI use case
@@ -183,9 +183,7 @@ if (globSrc && globSrc.length) {
       process.exit(1);
     }
 
-    var tmpGlob = _glob2.default.sync(globSrc[i], {
-      dot: true
-    });
+    var tmpGlob = (0, _utils.getMatchedFiles)(globSrc[i]);
 
     if (config.werror && tmpGlob.length === 0) {
       console.error('Pattern "' + globSrc[i] + '" doesn\'t match any files.');
@@ -202,9 +200,9 @@ if (globSrc && globSrc.length) {
         });
       }
     }
-    filesSrc = filesSrc.concat(tmpGlob);
+    nSources += tmpGlob.length;
   }
-  if (filesSrc.length === 0) {
+  if (nSources === 0) {
     console.error('No files matched.');
     process.exit(1);
   }

package/dist/client.js

@@ -46,6 +46,10 @@ var _generateSignedParams = require('./generate-signed-params');
 
 var _generateSignedParams2 = _interopRequireDefault(_generateSignedParams);
 
+var _constants = require('./constants');
+
+var _package = require('../package.json');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -140,6 +144,8 @@ JScramblerClient.prototype.get = function (path, params) {
  * @param {Callback} callback
  */
 JScramblerClient.prototype.request = function (method, path) {
+  var _this2 = this;
+
   var params = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var isJSON = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
 
@@ -284,8 +290,16 @@ JScramblerClient.prototype.request = function (method, path) {
       errorMessage += err.response.status + ' ' + err.response.statusText;
       statusCode = err.response.status;
 
+      var incompatibleApi = false;
+      if (statusCode === _constants.HTTP_STATUS_CODES.UNAUTHORIZED) {
+        incompatibleApi = err.response.data.errorCode !== _constants.JSCRAMBLER_ERROR_CODES.INVALID_SIGNATURE;
+      }
+
+      if (incompatibleApi) {
+        errorMessage = 'Incompatible jscrambler CLI version (' + _package.version + '). Please downgrade to: \n\t$ npm install ' + _constants.CLIENT_PACKAGES[_this2.options.clientId] + '@5';
+      } else if (
       // For when we have API error messages
-      if (err.response.data && err.response.data.error && err.response.data.message) {
+      err.response.data && err.response.data.error && err.response.data.message) {
         errorMessage += ' - ' + err.response.data.message;
       } else if (err.response.data && err.response.data.errors && err.response.data.errors.length > 0) {
         errorMessage += ' - ' + err.response.data.errors;

package/dist/config.js

@@ -8,6 +8,8 @@ var _rc = require('rc');
 
 var _rc2 = _interopRequireDefault(_rc);
 
+var _constants = require('./constants');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Load RC configuration if present. Pass `[]` as last argument to avoid
@@ -18,7 +20,7 @@ var config = (0, _rc2.default)('jscrambler', {
   basePath: '',
   jscramblerVersion: 'stable',
   werror: true,
-  clientId: 0,
+  clientId: _constants.CLIENT_IDS.CLI,
   utc: true,
   maxRetries: 5
 }, []);

package/dist/constants.js

@@ -1,11 +1,33 @@
-"use strict";
+'use strict';
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+
+var _Object$freeze;
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 var HTTP_STATUS_CODES = exports.HTTP_STATUS_CODES = Object.freeze({
+  UNAUTHORIZED: 401,
   FORBIDDEN: 403,
   NOT_FOUND: 404,
   SERVICE_UNAVAILABLE: 503,
   GATEWAY_TIMEOUT: 504
-});
+});
+
+var JSCRAMBLER_ERROR_CODES = exports.JSCRAMBLER_ERROR_CODES = Object.freeze({
+  INVALID_SIGNATURE: '254'
+});
+
+var CLIENT_IDS = exports.CLIENT_IDS = Object.freeze({
+  CLI: 0,
+  APP: 1,
+  WEBPACK: 2,
+  GULP: 3,
+  GRUNT: 4,
+  EMBER: 5,
+  METRO: 6
+});
+
+var CLIENT_PACKAGES = exports.CLIENT_PACKAGES = Object.freeze((_Object$freeze = {}, _defineProperty(_Object$freeze, CLIENT_IDS.CLI, 'jscrambler'), _defineProperty(_Object$freeze, CLIENT_IDS.APP, 'app'), _defineProperty(_Object$freeze, CLIENT_IDS.WEBPACK, 'jscrambler-webpack-plugin'), _defineProperty(_Object$freeze, CLIENT_IDS.GULP, 'gulp-jscrambler'), _defineProperty(_Object$freeze, CLIENT_IDS.GRUNT, 'grunt-jscrambler'), _defineProperty(_Object$freeze, CLIENT_IDS.EMBER, 'ember-cli-jscrambler'), _defineProperty(_Object$freeze, CLIENT_IDS.METRO, 'jscrambler-metro-plugin'), _Object$freeze));

package/dist/generate-signed-params.js

@@ -3,6 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
 exports.default = signedParams;
 
 var _lodash = require('lodash.clone');
@@ -51,7 +54,8 @@ function buildSortedQuery(params) {
   var _keys = (0, _lodash6.default)(params).sort();
   var query = '';
   for (var i = 0, l = _keys.length; i < l; i++) {
-    query += encodeURIComponent(_keys[i]) + '=' + encodeURIComponent(params[_keys[i]]) + '&';
+    var value = _typeof(params[_keys[i]]) === 'object' ? JSON.stringify(params[_keys[i]]) : params[_keys[i]];
+    query += encodeURIComponent(_keys[i]) + '=' + encodeURIComponent(value) + '&';
   }
   query = query.replace(/\*/g, '%2A').replace(/[!'()]/g, escape).replace(/%7E/g, '~').replace(/\+/g, '%20');
   // Strip the last separator and return