jscrambler 8.4.1 → 8.5.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # jscrambler
 
+## 8.5.0
+
+### Minor Changes
+
+- [188894f]: Add new Mode option, validations and send it to mutations
+
+## 8.4.2
+
+### Patch Changes
+
+- [8e2ec8d]: bump http&https-proxy-agent libs
+
 ## 8.4.1
 
 ### Patch Changes

package/dist/bin/jscrambler.js

@@ -53,6 +53,15 @@ const validateForceAppEnvironment = env => {
   }
   return normalizeEnvironment;
 };
+const validateMode = mode => {
+  const availableModes = ['automatic', 'manual'];
+  const normalizedMode = mode.toLowerCase();
+  if (!availableModes.includes(normalizedMode)) {
+    console.error("*mode* requires one of the following modes: {".concat(availableModes.toString(), "}. Example: --mode ").concat(availableModes[0]));
+    process.exit(1);
+  }
+  return normalizedMode;
+};
 const validateBeforeProtection = function () {
   let beforeProtectionArray = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   if (beforeProtectionArray.length === 0) {
@@ -108,7 +117,7 @@ const validateBeforeProtection = function () {
   });
   return beforeProtectionArray;
 };
-_commander.default.version(require('../../package.json').version).usage('[options] <file ...>').option('-a, --access-key <accessKey>', 'Access key').option('-c, --config <config>', 'Jscrambler configuration options').option('-H, --host <host>', 'Hostname').option('-i, --application-id <id>', 'Application ID').option('-o, --output-dir <dir>', 'Output directory').option('-p, --port <port>', 'Port').option('--base-path <path>', 'Base Path').option('--protocol <protocol>', 'Protocol (http or https)').option('--cafile <path>', 'Internal certificate authority').option('-C, --cwd <dir>', 'Current Working Directory').option('-s, --secret-key <secretKey>', 'Secret key').option('-m, --source-maps <id>', 'Download source maps').option('-R, --randomization-seed <seed>', 'Set randomization seed').option('--instrument', 'Instrument file(s) before start profiling. ATTENTION: previous profiling information will be deleted').option('--start-profiling', 'Starts profiling (assumes an already instrumented application)').option('--stop-profiling', 'Stops profiling').option('--code-hardening-threshold <threshold>', 'Set code hardening file size threshold. Format: {value}{unit="b,kb,mb"}. Example: 200kb', validateCodeHardeningThreshold).option('--recommended-order <bool>', 'Use recommended order', validateBool('recommended-order')).option('-W, --werror <bool>', 'Set werror flag value (default: true)', validateBool('werror')).option('--utc <bool>', 'Set UTC as the request time zone. Otherwise it uses the local time zone (default: true)', validateBool('utc')).option('--tolerate-minification <bool>', "Don't detect minification as malicious tampering (default: true)", validateBool('tolerate-minification')).option('--use-profiling-data <bool>', "(version 6.2 only) Protection should use the existing profiling data (default: true)", validateBool('use-profiling-data')).option('--profiling-data-mode <mode>', "(version 6.3 and above) Select profiling mode (default: automatic)", validateProfilingDataMode).option('--remove-profiling-data', "Removes the current application profiling information").option('--use-app-classification <bool>', '(version 6.3 and above) Protection should use Application Classification metadata when protecting (default: true)', validateBool('--use-app-classification')).option('--input-symbol-table <file>', '(version 6.3 and above) Protection should use symbol table when protecting. (default: no file)').option('--output-symbol-table <id>', '(version 6.3 and above) Download output symbol table (json)').option('--jscramblerVersion <version>', 'Use a specific Jscrambler version').option('--debugMode', 'Protect in debug mode').option('--skip-sources', 'Prevent source files from being updated').option('--force-app-environment <environment>', "(version 7.1 and above) Override application's environment detected automatically. Possible values: ".concat(availableEnvironments.toString()), validateForceAppEnvironment).option('--ensure-code-annotation <bool>', "(version 7.3 and above) Fail protection if no annotations are found on the source code (default: false)", validateBool('ensure-code-annotation')).option('-n <number>', "(version 7.2 and above) Create multiple protections at once.").option('--delete-protection-on-success <bool>', 'Deletes the protection files after they have been protected and downloaded (default: false)', validateBool('--delete-protection-on-success')).parse(process.argv);
+_commander.default.version(require('../../package.json').version).usage('[options] <file ...>').option('-a, --access-key <accessKey>', 'Access key').option('-c, --config <config>', 'Jscrambler configuration options').option('-H, --host <host>', 'Hostname').option('-i, --application-id <id>', 'Application ID').option('-o, --output-dir <dir>', 'Output directory').option('-p, --port <port>', 'Port').option('--base-path <path>', 'Base Path').option('--protocol <protocol>', 'Protocol (http or https)').option('--cafile <path>', 'Internal certificate authority').option('-C, --cwd <dir>', 'Current Working Directory').option('-s, --secret-key <secretKey>', 'Secret key').option('-m, --source-maps <id>', 'Download source maps').option('-R, --randomization-seed <seed>', 'Set randomization seed').option('--instrument', 'Instrument file(s) before start profiling. ATTENTION: previous profiling information will be deleted').option('--start-profiling', 'Starts profiling (assumes an already instrumented application)').option('--stop-profiling', 'Stops profiling').option('--code-hardening-threshold <threshold>', 'Set code hardening file size threshold. Format: {value}{unit="b,kb,mb"}. Example: 200kb', validateCodeHardeningThreshold).option('--recommended-order <bool>', 'Use recommended order', validateBool('recommended-order')).option('-W, --werror <bool>', 'Set werror flag value (default: true)', validateBool('werror')).option('--utc <bool>', 'Set UTC as the request time zone. Otherwise it uses the local time zone (default: true)', validateBool('utc')).option('--tolerate-minification <bool>', "Don't detect minification as malicious tampering (default: true)", validateBool('tolerate-minification')).option('--use-profiling-data <bool>', "(version 6.2 only) Protection should use the existing profiling data (default: true)", validateBool('use-profiling-data')).option('--profiling-data-mode <mode>', "(version 6.3 and above) Select profiling mode (default: automatic)", validateProfilingDataMode).option('--remove-profiling-data', "Removes the current application profiling information").option('--use-app-classification <bool>', '(version 6.3 and above) Protection should use Application Classification metadata when protecting (default: true)', validateBool('--use-app-classification')).option('--input-symbol-table <file>', '(version 6.3 and above) Protection should use symbol table when protecting. (default: no file)').option('--output-symbol-table <id>', '(version 6.3 and above) Download output symbol table (json)').option('--jscramblerVersion <version>', 'Use a specific Jscrambler version').option('--debugMode', 'Protect in debug mode').option('--skip-sources', 'Prevent source files from being updated').option('--force-app-environment <environment>', "(version 7.1 and above) Override application's environment detected automatically. Possible values: ".concat(availableEnvironments.toString()), validateForceAppEnvironment).option('--ensure-code-annotation <bool>', "(version 7.3 and above) Fail protection if no annotations are found on the source code (default: false)", validateBool('ensure-code-annotation')).option('-n <number>', "(version 7.2 and above) Create multiple protections at once.").option('--delete-protection-on-success <bool>', 'Deletes the protection files after they have been protected and downloaded (default: false)', validateBool('--delete-protection-on-success')).option('--mode <mode>', "(version 8.4 and above) Define protection mode. Possible values: automatic, manual (default: manual)", validateMode).parse(process.argv);
 let globSrc, filesSrc, config;
 
 // If -c, --config file was provided
@@ -140,6 +149,7 @@ config.removeProfilingData = _commander.default.removeProfilingData;
 config.skipSources = _commander.default.skipSources;
 config.debugMode = _commander.default.debugMode || config.debugMode;
 config.instrument = _commander.default.instrument || config.instrument;
+config.mode = _commander.default.mode || config.mode;
 
 // handle codeHardening = 0
 if (typeof _commander.default.codeHardeningThreshold === 'undefined') {
@@ -267,7 +277,8 @@ const {
   ensureCodeAnnotation,
   forceAppEnvironment,
   beforeProtection,
-  deleteProtectionOnSuccess
+  deleteProtectionOnSuccess,
+  mode
 } = config;
 const params = config.params;
 const incompatibleOptions = ['sourceMaps', 'instrument', 'startProfiling', 'stopProfiling'];
@@ -281,6 +292,10 @@ if (usedIncompatibleOptions.length > 1) {
   console.error('Using mutually exclusive options:', usedIncompatibleOptions);
   process.exit(1);
 }
+if ((_commander.default.mode === 'automatic' || config.mode === 'automatic') && config.params) {
+  console.error('Cannot submit a Jscrambler configuration file in automatic mode with parameters.');
+  process.exit(1);
+}
 const clientSettings = {
   keys: {
     accessKey,
@@ -379,7 +394,8 @@ if (_commander.default.sourceMaps) {
       numberOfProtections,
       forceAppEnvironment,
       beforeProtection,
-      deleteProtectionOnSuccess
+      deleteProtectionOnSuccess,
+      mode
     });
     try {
       if (typeof werror !== 'undefined') {

package/dist/client.js

@@ -1,6 +1,5 @@
 "use strict";
 
-require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.string.replace.js");
@@ -13,18 +12,13 @@ var _zlib = require("zlib");
 var _url = _interopRequireDefault(require("url"));
 var _https = _interopRequireDefault(require("https"));
 var _http = _interopRequireDefault(require("http"));
-var _httpsProxyAgent = _interopRequireDefault(require("@jscrambler/https-proxy-agent"));
-var _httpProxyAgent = _interopRequireDefault(require("http-proxy-agent"));
+var _httpsProxyAgent = require("https-proxy-agent");
+var _httpProxyAgent = require("http-proxy-agent");
 var _config = _interopRequireDefault(require("./config"));
 var _generateSignedParams = _interopRequireDefault(require("./generate-signed-params"));
 var _constants = require("./constants");
 var _package = require("../package.json");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 const debug = !!process.env.DEBUG;
 const metrics = !!process.env.METRICS;
 const noCompression = !!process.env.NO_COMPRESSION;
@@ -183,26 +177,27 @@ JScramblerClient.prototype.request = function (method, path) {
     if (!host) {
       throw new Error('Required *proxy.host* not provided');
     }
-    let formattedAuth = undefined;
+    let username;
+    let password;
     if (auth) {
-      const {
+      ({
         username,
         password
-      } = auth;
+      } = auth);
       if (!username || !password) {
         throw new Error('Required *proxy.auth* username or/and password not provided');
       }
-      formattedAuth = "".concat(username, ":").concat(password);
     }
     settings.proxy = false;
-    const proxyConfig = _objectSpread({
+    const proxyConfig = {
       host,
       port,
-      auth: formattedAuth,
-      protocol: proxy.protocol || "http"
-    }, agentOptions);
-    settings.httpsAgent = new _httpsProxyAgent.default(proxyConfig);
-    settings.httpAgent = new _httpProxyAgent.default(proxyConfig);
+      username,
+      password,
+      protocol: "".concat(proxy.protocol || 'http', ":")
+    };
+    settings.httpsAgent = new _httpsProxyAgent.HttpsProxyAgent(proxyConfig, agentOptions);
+    settings.httpAgent = new _httpProxyAgent.HttpProxyAgent(proxyConfig, agentOptions);
   } else if (agentOptions) {
     settings.httpsAgent = new _https.default.Agent(agentOptions);
     settings.httpAgent = new _http.default.Agent(agentOptions);

package/dist/index.js

@@ -268,7 +268,8 @@ var _default = exports.default = {
       numberOfProtections,
       ensureCodeAnnotation,
       forceAppEnvironment,
-      deleteProtectionOnSuccess
+      deleteProtectionOnSuccess,
+      mode
     } = finalConfig;
     const {
       accessKey,
@@ -354,7 +355,8 @@ var _default = exports.default = {
       useAppClassification,
       ensureCodeAnnotation,
       useProfilingData,
-      useRecommendedOrder
+      useRecommendedOrder,
+      mode
     };
     for (const prop in dataToValidate) {
       const value = dataToValidate[prop];
@@ -386,7 +388,8 @@ var _default = exports.default = {
       source,
       tolerateMinification,
       numberOfProtections,
-      forceAppEnvironment
+      forceAppEnvironment,
+      mode
     });
     if (finalConfig.inputSymbolTable) {
       const inputSymbolTableContents = await _fs.default.promises.readFile(finalConfig.inputSymbolTable, 'utf-8');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jscrambler",
   "description": "Jscrambler API client.",
-  "version": "8.4.1",
+  "version": "8.5.0",
   "homepage": "https://github.com/jscrambler/jscrambler",
   "author": "Jscrambler <support@jscrambler.com>",
   "repository": {
@@ -21,13 +21,13 @@
     "node": ">= 12.17.0"
   },
   "dependencies": {
-    "@jscrambler/https-proxy-agent": "^5.0.1",
     "axios": "^1.4.0",
     "commander": "^2.8.1",
     "core-js": "^3.16.4",
     "filesize-parser": "1.5.0",
     "glob": "^8.1.0",
-    "http-proxy-agent": "^4.0.1",
+    "http-proxy-agent": "7.0.2",
+    "https-proxy-agent": "7.0.4",
     "jszip": "^3.7.1",
     "lodash.clone": "^4.0.3",
     "lodash.clonedeep": "^4.5.0",