jscrambler 8.9.2 → 8.9.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # jscrambler
 
+## 8.9.4
+
+### Patch Changes
+
+- [5deff47]: Fixed jscrambler cli single protection
+
+## 8.9.3
+
+### Patch Changes
+
+- [3f1a05c]: When doing multiple protections at the same time using the option -n, start downloading whenever protections finish, instead of waiting for all to finish
+
 ## 8.9.2
 
 ### Patch Changes

package/dist/index.js

@@ -241,7 +241,6 @@ var _default = exports.default = {
   // Jscrambler or if you're provided access to beta features of our product.
   //
   async protectAndDownload(configPathOrObject, destCallback) {
-    var _this = this;
     const start = Date.now();
     const finalConfig = buildFinalConfig(configPathOrObject);
     const {
@@ -308,6 +307,9 @@ var _default = exports.default = {
     let filesSrc = finalConfig.filesSrc;
     let filesDest = finalConfig.filesDest;
     let runBeforeProtection = finalConfig.beforeProtection;
+    if (finalConfig.numberOfProtections && finalConfig.numberOfProtections > 1) {
+      console.log("Protections will be stored in ".concat(filesDest).concat(filesDest.slice(-1) === '/' ? '' : '/', "[protection-id]"));
+    }
     if (sources) {
       filesSrc = undefined;
     }
@@ -438,13 +440,16 @@ var _default = exports.default = {
       process.exit(1);
     };
     process.once('SIGINT', onExitCancelProtection).once('SIGTERM', onExitCancelProtection);
-    const processedProtections = await this.pollProtections(client, applicationId, protectionIds, await (0, _getProtectionDefaultFragments.default)(client));
+    const downloadOptions = {
+      filesDest,
+      destCallback,
+      stream,
+      multiple: protectionOptions.numberOfProtections && protectionOptions.numberOfProtections > 1,
+      deleteProtectionOnSuccess
+    };
+    const processedProtections = await this.pollProtections(client, applicationId, protectionIds, await (0, _getProtectionDefaultFragments.default)(client), downloadOptions);
     process.removeListener('SIGINT', onExitCancelProtection).removeListener('SIGTERM', onExitCancelProtection);
-    const handleProtection = async function (protection) {
-      let {
-        outPrefix = '',
-        printProtectionId = true
-      } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    const handleProtection = async protection => {
       if (protection.growthWarning) {
         console.warn("Warning: Your protected application has surpassed a reasonable file growth.\nFor more information on what might have caused this, please see the Protection Report.\nLink: ".concat(APP_URL, "."));
       }
@@ -452,7 +457,7 @@ var _default = exports.default = {
         console.warn("Warning: Since your plan is a Trial, your protected files will stop working on ".concat(protection.parameters.find(p => p.name === 'dateLock' && p.options.endDate).options.endDate));
       }
       if (debug) {
-        console.log('Finished protecting');
+        console.log("Finished protecting".concat(downloadOptions.multiple ? ": ".concat(protection._id) : ''));
       }
       if (protection.deprecations) {
         protection.deprecations.forEach(deprecation => {
@@ -487,43 +492,18 @@ var _default = exports.default = {
           sourcesErrors.forEach(e => console.warn("Non-fatal error: \"".concat(e.message, "\" in ").concat(e.filename)));
         }
       }
-      if (debug) {
-        console.log('Downloading protection result');
-      }
-      const download = await _this.downloadApplicationProtection(client, protection._id);
-      errorHandler(download);
-      if (debug) {
-        console.log('Unzipping files');
-      }
-      await (0, _zip.unzip)(download, (filesDest ? "".concat(filesDest).concat(outPrefix) : filesDest) || destCallback, stream);
-      if (debug) {
-        console.log('Finished unzipping files');
-      }
-      if (printProtectionId) {
-        console.log(protection._id);
-      }
-
-      // change this to have the variable that checks if the protection is to be removed
-      if (deleteProtectionOnSuccess) {
-        await _this.removeProtection(client, protection._id, applicationId).then(() => {
-          if (debug) {
-            console.log('Protection has been successful and will now be deleted');
-          }
-        }).catch(error => console.error(error));
+      if (!protectionOptions.numberOfProtections || protectionOptions.numberOfProtections === 1) {
+        await this.handleApplicationProtectionDownload(client, protection._id, applicationId, downloadOptions);
       }
       return protection._id;
     };
     if (processedProtections.length === 1) {
       return handleProtection(processedProtections[0]);
     }
-    console.log("Protections stored in ".concat(filesDest, "/[protection-id]"));
     for (let i = 0; i < processedProtections.length; i++) {
       const protection = processedProtections[i];
       try {
-        await handleProtection(protection, {
-          outPrefix: "/".concat(protection._id, "/"),
-          printProtectionId: false
-        });
+        await handleProtection(protection);
       } catch (e) {
         console.error(e);
       }
@@ -531,6 +511,47 @@ var _default = exports.default = {
     console.log("Runtime: ".concat(processedProtections.length, " protections in ").concat(Math.round((Date.now() - start) / 1000), "s"));
     return protectionIds;
   },
+  /**
+   * Handle the download, unzipping, and possible deletion of protections
+   * @param {object} client
+   * @param {string} protectionId
+   * @param {string} applicationId
+   * @param {object} downloadOptions
+   * @returns {Promise<object>}
+   */
+  async handleApplicationProtectionDownload(client, protectionId, applicationId, downloadOptions) {
+    const {
+      filesDest,
+      destCallback,
+      stream,
+      multiple,
+      deleteProtectionOnSuccess
+    } = downloadOptions;
+    if (debug) {
+      console.log("Downloading protection ".concat(multiple ? "".concat(protectionId, " ") : '', "result"));
+    }
+    const download = await this.downloadApplicationProtection(client, protectionId);
+    errorHandler(download);
+    if (debug) {
+      console.log("Unzipping files".concat(multiple ? " from protection ".concat(protectionId) : ''));
+    }
+    await (0, _zip.unzip)(download, (filesDest ? "".concat(filesDest).concat(multiple ? "/".concat(protectionId, "/") : '') : filesDest) || destCallback, stream);
+    if (debug) {
+      console.log("Finished unzipping files for protection".concat(multiple ? " ".concat(protectionId) : ''));
+    }
+    if (!multiple) {
+      console.log(protectionId);
+    }
+
+    // change this to have the variable that checks if the protection is to be removed
+    if (deleteProtectionOnSuccess) {
+      await this.removeProtection(client, protectionId, applicationId).then(() => {
+        if (debug) {
+          console.log('Protection has been successful and will now be deleted');
+        }
+      }).catch(error => console.error(error));
+    }
+  },
   /**
    * Instrument and download application sources for profiling purposes
    * @param {object} configPathOrObject
@@ -857,7 +878,7 @@ var _default = exports.default = {
     };
     return poll();
   },
-  async pollProtections(client, applicationId, protectionIds, fragments) {
+  async pollProtections(client, applicationId, protectionIds, fragments, downloadOptions) {
     if (protectionIds.length === 1) {
       return [await this.pollProtection(client, applicationId, protectionIds[0], fragments)];
     }
@@ -884,7 +905,7 @@ var _default = exports.default = {
             state
           } = _ref4;
           return !seen[_id] && state !== 'canceled';
-        }).forEach(_ref5 => {
+        }).forEach(async _ref5 => {
           let {
             _id,
             startedAt,
@@ -893,6 +914,8 @@ var _default = exports.default = {
           } = _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"));
+          await this.handleApplicationProtectionDownload(client, _id, applicationId, downloadOptions);
+          console.log("Downloaded: ".concat(_id));
         });
         if (ended.length < protectionIds.length) {
           await new Promise(resolve => setTimeout(resolve, getPollingInterval(start)));

package/package.json

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