jscrambler 8.8.3 → 8.8.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # jscrambler
 
+## 8.8.5
+
+### Patch Changes
+
+- [c4e79f4]: Add support for file size threshold with string value
+
+## 8.8.4
+
+### Patch Changes
+
+- [7415ef5]: Prepend multiple file in jscrambler-cli
+
 ## 8.8.3
 
 ### Patch Changes

package/dist/bin/jscrambler.js

@@ -6,7 +6,6 @@ require("core-js/modules/web.dom-collections.iterator.js");
 var _commander = _interopRequireDefault(require("commander"));
 var _lodash = _interopRequireDefault(require("lodash.defaults"));
 var _path = _interopRequireDefault(require("path"));
-var _filesizeParser = _interopRequireDefault(require("filesize-parser"));
 var _config2 = _interopRequireDefault(require("../config"));
 var _ = _interopRequireDefault(require("../"));
 var _utils = require("../utils");
@@ -24,16 +23,7 @@ const validateBool = option => val => {
   }
   return val.toLowerCase();
 };
-const validateCodeHardeningThreshold = val => {
-  let inBytes;
-  try {
-    inBytes = (0, _filesizeParser.default)(val);
-  } catch (e) {
-    console.error('*code-hardening-threshold* requires a valid <threshold> value. Format: {number}{unit="b,kb,mb"}. Example: --code-hardening-threshold 200kb');
-    process.exit(1);
-  }
-  return inBytes;
-};
+const validateCodeHardeningThreshold = (0, _utils.validateThresholdFn)('code-hardening-threshold');
 const validateProfilingDataMode = mode => {
   const availableModes = ['automatic', 'annotations', 'off'];
   const normalizedMode = mode.toLowerCase();

package/dist/index.js

@@ -92,6 +92,18 @@ 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);
+  });
   return result;
 }
 function buildFinalConfig(configPathOrObject) {
@@ -117,7 +129,7 @@ var _default = exports.default = {
    * }} opts
    * @returns {Promise<{extension: string, filename: string, content: *}>}
    */
-  async updateApplicationSources(client, applicationId, _ref) {
+  async updateApplicationSources(client, applicationId, _ref2) {
     let {
       sources,
       filesSrc,
@@ -125,7 +137,7 @@ var _default = exports.default = {
       appProfiling,
       saveSrc = true,
       runBeforeProtection = []
-    } = _ref;
+    } = _ref2;
     if (sources || filesSrc && filesSrc.length) {
       // prevent removing sources if profiling state is READY
       if (appProfiling && appProfiling.data && appProfiling.data.state === 'READY') {
@@ -404,10 +416,10 @@ var _default = exports.default = {
     }
     const createApplicationProtectionRes = await this.createApplicationProtections(client, applicationId, protectionOptions);
     errorHandler(createApplicationProtectionRes);
-    const protectionIds = createApplicationProtectionRes.data.protections.map(_ref2 => {
+    const protectionIds = createApplicationProtectionRes.data.protections.map(_ref3 => {
       let {
         _id
-      } = _ref2;
+      } = _ref3;
       return _id;
     });
     const onExitCancelProtection = async () => {
@@ -855,26 +867,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(_ref3 => {
+        const ended = applicationProtections.data.applicationProtections.filter(_ref4 => {
           let {
             state
-          } = _ref3;
+          } = _ref4;
           return state === 'finished' || state === 'errored' || state === 'canceled';
         });
         // print progress
-        ended.filter(_ref4 => {
+        ended.filter(_ref5 => {
           let {
             _id,
             state
-          } = _ref4;
+          } = _ref5;
           return !seen[_id] && state !== 'canceled';
-        }).forEach(_ref5 => {
+        }).forEach(_ref6 => {
           let {
             _id,
             startedAt,
             finishedAt,
             state
-          } = _ref5;
+          } = _ref6;
           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"));
         });
@@ -1145,10 +1157,10 @@ var _default = exports.default = {
       clientId
     });
     const appSource = await (0, _getProtectionDefaultFragments.getIntrospection)(client, 'ApplicationSource');
-    if (!appSource.fields.some(_ref6 => {
+    if (!appSource.fields.some(_ref7 => {
       let {
         name
-      } = _ref6;
+      } = _ref7;
       return name === 'transformedContentHash';
     })) {
       console.error("\"Protection report\" it's only available on Jscrambler version 8.4 and above.");

package/dist/utils.js

@@ -8,9 +8,11 @@ exports.concatenate = concatenate;
 exports.getMatchedFiles = getMatchedFiles;
 exports.isJavascriptFile = isJavascriptFile;
 exports.validateNProtections = validateNProtections;
+exports.validateThresholdFn = void 0;
 var _glob = require("glob");
 var _fs = _interopRequireDefault(require("fs"));
 var _path = require("path");
+var _filesizeParser = _interopRequireDefault(require("filesize-parser"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Return the list of matched files for minimatch patterns.
@@ -75,7 +77,7 @@ function concatenate(scriptObject, cwd, path, buffer) {
     if (!_fs.default.existsSync(source)) {
       throw new Error('Provided script file does not exist');
     }
-    const fileContent = _fs.default.readFileSync(target);
+    const fileContent = buffer.toString('utf-8');
     const scriptContent = _fs.default.readFileSync(source);
     const concatContent = type === APPEND_JS_TYPE ? handleScriptConcatenation(fileContent, scriptContent) : handleScriptConcatenation(scriptContent, fileContent);
     buffer = Buffer.from(concatContent, 'utf-8');
@@ -86,4 +88,15 @@ function isJavascriptFile(filename) {
   const fileExtension = (0, _path.extname)(filename);
   const validJsFileExtensions = ['.js', '.mjs', '.cjs'];
   return validJsFileExtensions.includes(fileExtension);
-}
+}
+const validateThresholdFn = optionName => val => {
+  let inBytes;
+  try {
+    inBytes = (0, _filesizeParser.default)(val);
+  } catch (e) {
+    console.error("*".concat(optionName, "* requires a valid <threshold> value. Format: {number}{unit=\"b,kb,mb\"}. Example: 200kb"));
+    process.exit(1);
+  }
+  return inBytes;
+};
+exports.validateThresholdFn = validateThresholdFn;

package/dist/zip.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.unzip = unzip;
 exports.zip = zip;
 exports.zipSources = zipSources;
+require("core-js/modules/es.array.reverse.js");
 require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _lodash = _interopRequireDefault(require("lodash.size"));
@@ -66,8 +67,8 @@ async function zip(files, cwd, runBeforeProtection) {
       } else {
         name = files[i];
       }
-      buffer = fs.readFile(sPath);
-      runBeforeProtection.map(element => {
+      buffer = await fs.readFile(sPath);
+      runBeforeProtection.reverse().map(element => {
         buffer = (0, _utils.concatenate)(element, cwd, sPath, buffer);
       });
     } else {

package/package.json

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