jscrambler 8.8.5 → 8.9.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # jscrambler
 
+## 8.9.0
+
+### Minor Changes
+
+- [f1f886e]: Option to retrieve the balance of the user
+
+## 8.8.6
+
+### Patch Changes
+
+- [8818c8e]: Use max/min file size instead ao file size threshold
+
 ## 8.8.5
 
 ### Patch Changes

package/dist/bin/jscrambler.js

@@ -106,7 +106,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')).option('--mode <mode>', "(version 8.4 and above) Define protection mode. Possible values: automatic, manual (default: manual)", validateMode).option('--save-src <bool>', 'Protection should save application sources (default: true)', validateBool('--save-src')).option('--protection-report <string>', '(version 8.4 and above) Protection id for the metadata report').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).option('--save-src <bool>', 'Protection should save application sources (default: true)', validateBool('--save-src')).option('--protection-report <string>', '(version 8.4 and above) Protection id for the metadata report').option('--balance', '(version 8.4 and above) Gets the balance of the user').parse(process.argv);
 let globSrc, filesSrc, config;
 
 // If -c, --config file was provided
@@ -307,7 +307,21 @@ const clientSettings = {
   utc,
   jscramblerVersion
 };
-if (_commander.default.sourceMaps) {
+if (_commander.default.balance) {
+  (async () => {
+    try {
+      await _.default.getBalance(clientSettings);
+      process.exit(0);
+    } catch (error) {
+      if (error.statusCode === 404) {
+        console.error('Not found: Ensure you are using version 8.4 or above.');
+      } else {
+        console.error(debug ? error : error.message || error);
+      }
+      process.exit(1);
+    }
+  })();
+} else if (_commander.default.sourceMaps) {
   // Go, go, go download
   (async () => {
     try {

package/dist/index.js

@@ -79,6 +79,15 @@ function printSourcesErrors(errors) {
   }
   console.error();
 }
+function normalizeFileSizeFilter(parameters, fileSizeOption) {
+  const validateFileSizeThreshold = (0, _utils.validateThresholdFn)(fileSizeOption);
+  parameters.filter(parameter => typeof parameter[fileSizeOption] === 'string').forEach(parameter => {
+    // change from "1kb" to 1024 bytes
+
+    // eslint-disable-next-line no-param-reassign
+    parameter[fileSizeOption] = validateFileSizeThreshold(parameter[fileSizeOption]);
+  });
+}
 function normalizeParameters(parameters) {
   let result;
   if (!Array.isArray(parameters)) {
@@ -92,18 +101,8 @@ function normalizeParameters(parameters) {
   } else {
     result = parameters;
   }
-  const validateFileSizeThreshold = (0, _utils.validateThresholdFn)('fileSizeThreshold');
-  result.filter(_ref => {
-    let {
-      fileSizeThreshold
-    } = _ref;
-    return typeof fileSizeThreshold === 'string';
-  }).forEach(parameter => {
-    // change from "1kb" to 1024 bytes
-
-    // eslint-disable-next-line no-param-reassign
-    parameter.fileSizeThreshold = validateFileSizeThreshold(parameter.fileSizeThreshold);
-  });
+  normalizeFileSizeFilter(result, 'minFileSize');
+  normalizeFileSizeFilter(result, 'maxFileSize');
   return result;
 }
 function buildFinalConfig(configPathOrObject) {
@@ -129,7 +128,7 @@ var _default = exports.default = {
    * }} opts
    * @returns {Promise<{extension: string, filename: string, content: *}>}
    */
-  async updateApplicationSources(client, applicationId, _ref2) {
+  async updateApplicationSources(client, applicationId, _ref) {
     let {
       sources,
       filesSrc,
@@ -137,7 +136,7 @@ var _default = exports.default = {
       appProfiling,
       saveSrc = true,
       runBeforeProtection = []
-    } = _ref2;
+    } = _ref;
     if (sources || filesSrc && filesSrc.length) {
       // prevent removing sources if profiling state is READY
       if (appProfiling && appProfiling.data && appProfiling.data.state === 'READY') {
@@ -416,10 +415,10 @@ var _default = exports.default = {
     }
     const createApplicationProtectionRes = await this.createApplicationProtections(client, applicationId, protectionOptions);
     errorHandler(createApplicationProtectionRes);
-    const protectionIds = createApplicationProtectionRes.data.protections.map(_ref3 => {
+    const protectionIds = createApplicationProtectionRes.data.protections.map(_ref2 => {
       let {
         _id
-      } = _ref3;
+      } = _ref2;
       return _id;
     });
     const onExitCancelProtection = async () => {
@@ -867,26 +866,26 @@ var _default = exports.default = {
         console.log('Error polling protection', applicationProtections.errors);
         throw new Error("Protection failed. For more information visit: ".concat(APP_URL, "."));
       } else {
-        const ended = applicationProtections.data.applicationProtections.filter(_ref4 => {
+        const ended = applicationProtections.data.applicationProtections.filter(_ref3 => {
           let {
             state
-          } = _ref4;
+          } = _ref3;
           return state === 'finished' || state === 'errored' || state === 'canceled';
         });
         // print progress
-        ended.filter(_ref5 => {
+        ended.filter(_ref4 => {
           let {
             _id,
             state
-          } = _ref5;
+          } = _ref4;
           return !seen[_id] && state !== 'canceled';
-        }).forEach(_ref6 => {
+        }).forEach(_ref5 => {
           let {
             _id,
             startedAt,
             finishedAt,
             state
-          } = _ref6;
+          } = _ref5;
           seen[_id] = true;
           console.log("[".concat(Object.keys(seen).length, "/").concat(protectionIds.length, "] Protection=").concat(_id, ", state=").concat(state, ", build-time=").concat(Math.round((new Date(finishedAt) - new Date(startedAt)) / 1000), "s"));
         });
@@ -1157,10 +1156,10 @@ var _default = exports.default = {
       clientId
     });
     const appSource = await (0, _getProtectionDefaultFragments.getIntrospection)(client, 'ApplicationSource');
-    if (!appSource.fields.some(_ref7 => {
+    if (!appSource.fields.some(_ref6 => {
       let {
         name
-      } = _ref7;
+      } = _ref6;
       return name === 'transformedContentHash';
     })) {
       console.error("\"Protection report\" it's only available on Jscrambler version 8.4 and above.");
@@ -1200,6 +1199,41 @@ var _default = exports.default = {
     } else {
       console.log(metadataJson);
     }
+  },
+  async getBalance(conf) {
+    const finalConfig = buildFinalConfig(conf);
+    const {
+      host,
+      port,
+      basePath,
+      protocol,
+      cafile,
+      keys,
+      jscramblerVersion,
+      proxy,
+      utc,
+      clientId
+    } = finalConfig;
+    const {
+      accessKey,
+      secretKey
+    } = keys;
+    const client = new this.Client({
+      accessKey,
+      secretKey,
+      host,
+      port,
+      basePath,
+      protocol,
+      cafile,
+      jscramblerVersion,
+      proxy,
+      utc,
+      clientId
+    });
+    const balance = await client.get('/balance');
+    console.log(balance);
+    return balance;
   }
 };
 function getFileFromUrl(client, url) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jscrambler",
   "description": "Jscrambler Code Integrity API client.",
-  "version": "8.8.5",
+  "version": "8.9.0",
   "homepage": "https://github.com/jscrambler/jscrambler",
   "author": "Jscrambler <support@jscrambler.com>",
   "repository": {