@automattic/vip 2.21.0 → 2.23.0

package/dist/lib/http/proxy-agent.js

@@ -1,25 +1,24 @@
 "use strict";
 
 var _socksProxyAgent = require("socks-proxy-agent");
-
 var _httpsProxyAgent = require("https-proxy-agent");
-
 var _proxyFromEnv = require("proxy-from-env");
-
 var _debug = _interopRequireDefault(require("debug"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * External dependencies
  */
+
 const debug = (0, _debug.default)('vip:proxy-agent');
+
 /**
  * Internal dependencies
  */
+
 // Note: This module requires the use of a special environment variable "VIP_USE_SYSTEM_PROXY"
 // The setting of it to any value allows this module to create a proxy agent based on proxy environment variables
 // If not set, this module will revert back to the previous functionality (hence being fully backward compatible and non-breaking for users)
+
 // This function returns a proxy given a few scenarios (in order of precedence):
 // 1. VIP_PROXY is set: a SOCKS proxy is returned same as the previous version of this module
 // 2. No applicable variables are set: null is returned (thus, no proxy agent is returned)
@@ -27,34 +26,33 @@ const debug = (0, _debug.default)('vip:proxy-agent');
 // 4. VIP_USE_SYSTEM_PROXY and HTTPS_PROXY are set: an HTTPS_PROXY is returned
 // 5. NO_PROXY is set along with VIP_USE_SYSTEM_PROXY and any system proxy: null is returned if the no proxy applies, otherwise the first active proxy is used
 // This allows near full customization by the client of what proxy should be used, instead of making assumptions based on the URL string
-
 function createProxyAgent(url) {
   const VIP_PROXY = process.env.VIP_PROXY || process.env.vip_proxy || null;
   const SOCKS_PROXY = process.env.SOCKS_PROXY || process.env.socks_proxy || null;
   const HTTPS_PROXY = process.env.HTTPS_PROXY || process.env.https_proxy || null;
-  const NO_PROXY = process.env.NO_PROXY || process.env.no_proxy || null; // VIP Socks Proxy should take precedence and should be fully backward compatible
+  const NO_PROXY = process.env.NO_PROXY || process.env.no_proxy || null;
 
+  // VIP Socks Proxy should take precedence and should be fully backward compatible
   if (VIP_PROXY) {
     debug(`Enabling VIP_PROXY proxy support using config: ${VIP_PROXY}`);
     return new _socksProxyAgent.SocksProxyAgent(VIP_PROXY);
-  } // Now check for any system proxy usage
-
-
+  }
+  // Now check for any system proxy usage
   if (process.env.VIP_USE_SYSTEM_PROXY && !coveredInNoProxy(url, NO_PROXY)) {
     if (SOCKS_PROXY) {
       debug(`Enabling SOCKS proxy support using config: ${SOCKS_PROXY}`);
       return new _socksProxyAgent.SocksProxyAgent(SOCKS_PROXY);
     }
-
     if (HTTPS_PROXY) {
       debug(`Enabling HTTPS proxy support using config: ${HTTPS_PROXY}`);
       return new _httpsProxyAgent.HttpsProxyAgent(HTTPS_PROXY);
     }
-  } // If no environment variables are set, the no proxy is in effect, or if the proxy enable is not set return null (equivilant of no Proxy agent)
-
-
+  }
+  // If no environment variables are set, the no proxy is in effect, or if the proxy enable is not set return null (equivilant of no Proxy agent)
   return null;
-} // Determine if a NO_PROXY variable is applicable to a given URL
+}
+
+// Determine if a NO_PROXY variable is applicable to a given URL
 // Parameters:
 //	- url (string): absolute desintation URL (including the protocol)
 //	- noProxyString (string | null): string representation of the environments current NO_PROXY or no_proxy variable (NO_PROXY takes precedence)
@@ -66,20 +64,17 @@ function createProxyAgent(url) {
 //		Example: '.api' does NOT match wp.api.org, but '.api.org' does (see tests)
 // 3. abc.com: do not proxy www.abc.com, abc.com, etc.
 // See proxy-from-env on npmjs.org for full "ruleset"
-
-
 function coveredInNoProxy(url, noProxyString) {
   // If the NO_PROXY env variable is not set, then the URL is not covered in the NO_PROXY (utility below does not handle this case)
   if (!noProxyString) {
     return false;
-  } // If getProxyForUrl returns an empty string, then the host should not be proxied
+  }
+  // If getProxyForUrl returns an empty string, then the host should not be proxied
   // This isn't the most straight forward way to determine if a NO_PROXY is applicable, but the only package I could find that is relatively new and maintained
-
-
   return (0, _proxyFromEnv.getProxyForUrl)(url) === '';
-} // Exports
-
+}
 
+// Exports
 module.exports = {
   createProxyAgent
 };

package/dist/lib/keychain/browser.js

@@ -8,6 +8,7 @@ exports.default = void 0;
 /**
  * Internal dependencies
  */
+
 class Secure {
   getPassword(service) {
     return new Promise(resolve => {
@@ -15,21 +16,17 @@ class Secure {
       return resolve(password);
     });
   }
-
   setPassword(service, password) {
     return new Promise(resolve => {
       const set = !!window.localStorage.setItem(service, password);
       return resolve(set);
     });
   }
-
   deletePassword(service) {
     return new Promise(resolve => {
       const del = !!window.localStorage.removeItem(service);
       return resolve(del);
     });
   }
-
 }
-
 exports.default = Secure;

package/dist/lib/keychain/insecure.js

@@ -9,31 +9,27 @@ exports.default = void 0;
  * External dependencies
  */
 const Configstore = require('configstore');
+
 /**
  * Internal dependencies
  */
 
-
 class Insecure {
   constructor(file) {
     this.file = file;
     this.configstore = new Configstore(this.file);
   }
-
   getPassword(service) {
     return new Promise((resolve, reject) => {
       let password = null;
-
       try {
         password = this.configstore.get(service);
       } catch (err) {
         return reject(err);
       }
-
       return resolve(password);
     });
   }
-
   setPassword(service, password) {
     return new Promise((resolve, reject) => {
       try {
@@ -41,11 +37,9 @@ class Insecure {
       } catch (err) {
         return reject(err);
       }
-
       resolve(true);
     });
   }
-
   deletePassword(service) {
     return new Promise((resolve, reject) => {
       try {
@@ -53,11 +47,8 @@ class Insecure {
       } catch (err) {
         return reject(err);
       }
-
       resolve(true);
     });
   }
-
 }
-
 exports.default = Insecure;

package/dist/lib/keychain/secure.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _keytar = _interopRequireDefault(require("keytar"));
-
 var _keychain = _interopRequireDefault(require("./keychain"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * External dependencies
  */
@@ -18,19 +14,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Internal dependencies
  */
+
 class Secure {
   getPassword(service) {
     return _keytar.default.getPassword(service, service);
   }
-
   setPassword(service, password) {
     return _keytar.default.setPassword(service, service, password);
   }
-
   deletePassword(service) {
     return _keytar.default.deletePassword(service, service);
   }
-
 }
-
 exports.default = Secure;

package/dist/lib/keychain.js

@@ -1,36 +1,32 @@
 "use strict";
 
 var _insecure = _interopRequireDefault(require("./keychain/insecure"));
-
 var _browser = _interopRequireDefault(require("./keychain/browser"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * External dependencies
  */
 const debug = require('debug')('@automattic/vip:keychain');
+
 /**
  * Internal dependencies
  */
 
-
 let exportValue = {};
-
 if (typeof window === 'undefined' || typeof window.localStorage === 'undefined') {
   // node
+
   try {
     // Try using Secure keychain ("keytar") first
     const Secure = require("./keychain/secure");
-
     exportValue = new Secure();
   } catch (error) {
-    debug('Cannot use Secure keychain; falling back to Insecure keychain (Details: %o)', error); // Fallback to Insecure keychain if we can't
+    debug('Cannot use Secure keychain; falling back to Insecure keychain (Details: %o)', error);
 
+    // Fallback to Insecure keychain if we can't
     exportValue = new _insecure.default('vip-go-cli');
   }
 } else {
   exportValue = new _browser.default();
 }
-
 module.exports = exportValue;

package/dist/lib/logout.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _token = _interopRequireDefault(require("./token"));
-
 var _tracker = require("./tracker");
-
 var _http = _interopRequireDefault(require("./api/http"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * Internal dependencies
  */
@@ -23,5 +18,4 @@ var _default = async () => {
   await _token.default.purge();
   await (0, _tracker.trackEvent)('logout_command_execute');
 };
-
 exports.default = _default;

package/dist/lib/media-import/media-file-import.js

@@ -3,11 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.SUPPORTED_MEDIA_FILE_IMPORT_SITE_TYPES = exports.MEDIA_IMPORT_FILE_SIZE_LIMIT = void 0;
 exports.currentUserCanImportForApp = currentUserCanImportForApp;
-exports.isSupportedApp = exports.SUPPORTED_MEDIA_FILE_IMPORT_SITE_TYPES = exports.MEDIA_IMPORT_FILE_SIZE_LIMIT = void 0;
-
+exports.isSupportedApp = void 0;
 var _fileSize = require("../constants/file-size");
-
 /**
  * 
  * @format
@@ -16,19 +15,16 @@ var _fileSize = require("../constants/file-size");
 /**
  * Internal dependencies
  */
+
 const MEDIA_IMPORT_FILE_SIZE_LIMIT = 30 * _fileSize.GB_IN_BYTES;
 exports.MEDIA_IMPORT_FILE_SIZE_LIMIT = MEDIA_IMPORT_FILE_SIZE_LIMIT;
-
 function currentUserCanImportForApp(app) {
   // TODO: implement
   return !!app;
 }
-
 const SUPPORTED_MEDIA_FILE_IMPORT_SITE_TYPES = ['WordPress'];
 exports.SUPPORTED_MEDIA_FILE_IMPORT_SITE_TYPES = SUPPORTED_MEDIA_FILE_IMPORT_SITE_TYPES;
-
 const isSupportedApp = ({
   type
 }) => SUPPORTED_MEDIA_FILE_IMPORT_SITE_TYPES.includes(type);
-
 exports.isSupportedApp = isSupportedApp;

package/dist/lib/media-import/progress.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MediaImportProgressTracker = void 0;
-
 var _singleLineLog = require("single-line-log");
-
 var _status = require("./status");
-
 var _format = require("../cli/format");
-
 /** @format */
 
 /**
@@ -20,12 +16,16 @@ var _format = require("../cli/format");
 /**
  * Internal dependencies
  */
+
 const PRINT_INTERVAL = process.env.DEBUG ? 5000 : 200; // How often the report is printed. Mainly affects the "spinner" animation.
 
 class MediaImportProgressTracker {
   // Spinnerz go brrrr
+
   // This gets printed before the step status
+
   // This gets printed after the step status
+
   constructor(status) {
     this.runningSprite = new _format.RunningSprite();
     this.hasFailure = false;
@@ -33,54 +33,43 @@ class MediaImportProgressTracker {
     this.prefix = '';
     this.suffix = '';
   }
-
   setStatus(status) {
     if ('FAILED' === status.status) {
       this.hasFailure = true;
     }
-
     this.status = Object.assign({}, status);
   }
-
   startPrinting(prePrintCallback = () => {}) {
     this.printInterval = setInterval(() => {
       prePrintCallback();
       this.print();
     }, PRINT_INTERVAL);
   }
-
   stopPrinting() {
     if (this.printInterval) {
       clearInterval(this.printInterval);
     }
   }
-
   print({
     clearAfter = false
   } = {}) {
     if (!this.hasPrinted) {
       this.hasPrinted = true;
-
       _singleLineLog.stdout.clear();
     }
-
     const statusIcon = (0, _status.getGlyphForStatus)(this.status.status, this.runningSprite);
     let logs;
-
     if (this.status.filesProcessed && this.status.filesTotal) {
       const progressPercentage = Math.floor(this.status.filesProcessed / this.status.filesTotal * 100);
       logs = `Imported Files: ${this.status.filesProcessed}/${this.status.filesTotal} - ${progressPercentage}% ${statusIcon}`;
-    } // Output the logs
-
+    }
 
+    // Output the logs
     (0, _singleLineLog.stdout)(`${this.prefix || ''}${logs || ''}${this.suffix || ''}`);
-
     if (clearAfter) {
       // Break out of the "Single log line" buffer
       _singleLineLog.stdout.clear();
     }
   }
-
 }
-
 exports.MediaImportProgressTracker = MediaImportProgressTracker;

package/dist/lib/media-import/status.js

@@ -3,32 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.default = void 0;
 exports.getGlyphForStatus = getGlyphForStatus;
 exports.mediaImportCheckStatus = mediaImportCheckStatus;
-exports.default = void 0;
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
-
 var _fs = require("fs");
-
 var path = _interopRequireWildcard(require("path"));
-
 var _api = _interopRequireDefault(require("../api"));
-
 var _mediaFileImport = require("./media-file-import");
-
 var _progress = require("./progress");
-
 var _format = require("../cli/format");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * 
  * @format
@@ -41,6 +29,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Internal dependencies
  */
+
 const IMPORT_MEDIA_PROGRESS_POLL_INTERVAL = 1000;
 const ONE_MINUTE_IN_MILLISECONDS = 1000 * 60;
 const TWO_MINUTES_IN_MILLISECONDS = 2 * ONE_MINUTE_IN_MILLISECONDS;
@@ -71,7 +60,6 @@ const IMPORT_MEDIA_PROGRESS_QUERY = (0, _graphqlTag.default)`
 	}
 }
 `;
-
 async function getStatus(api, appId, envId) {
   const response = await api.query({
     query: IMPORT_MEDIA_PROGRESS_QUERY,
@@ -88,23 +76,19 @@ async function getStatus(api, appId, envId) {
       }
     }
   } = response;
-
   if (!(environments !== null && environments !== void 0 && environments.length)) {
     throw new Error('Unable to determine import status from environment');
   }
-
   const [environment] = environments;
   const {
     mediaImportStatus
   } = environment;
   return mediaImportStatus;
 }
-
 function getGlyphForStatus(status, runningSprite) {
   switch (status) {
     case 'INITIALIZING':
       return '○';
-
     case 'INITIALIZED':
     case 'RUNNING':
     case 'COMPLETING':
@@ -112,28 +96,21 @@ function getGlyphForStatus(status, runningSprite) {
     case 'VALIDATING':
     case 'VALIDATED':
       return _chalk.default.blueBright(runningSprite);
-
     case 'COMPLETED':
       return _chalk.default.green('✓');
-
     case 'FAILED':
       return _chalk.default.red('✕');
-
     case 'ABORTED':
     case 'ABORTING':
       return _chalk.default.yellow('⚠️');
-
     default:
       return '';
   }
 }
-
 function buildErrorMessage(importFailed) {
   let message = '';
-
   if ('FAILED' === importFailed.status) {
     const globalFailureDetails = importFailed.failureDetails;
-
     if (globalFailureDetails) {
       message += `${_chalk.default.red('Import failed at status: ')}`;
       message += `${_chalk.default.redBright.bold(globalFailureDetails.previousStatus)}\n`;
@@ -144,13 +121,11 @@ function buildErrorMessage(importFailed) {
       return message;
     }
   }
-
   message += _chalk.default.red(importFailed.error ? importFailed.error : importFailed);
   message += '\n\nPlease check the status of your Import using `vip import media status @mysite.production`';
   message += '\n\nIf this error persists and you are not sure on how to fix, please contact support\n';
   return message;
 }
-
 function buildFileErrors(fileErrors, exportFileErrorsToJson) {
   if (exportFileErrorsToJson) {
     const fileErrorsToExport = fileErrors.map(fileError => {
@@ -161,17 +136,13 @@ function buildFileErrors(fileErrors, exportFileErrorsToJson) {
     });
     return (0, _format.formatData)(fileErrorsToExport, 'json');
   }
-
   let errorString = '';
-
   for (const fileError of fileErrors) {
     errorString += `File Name: ${fileError.fileName}`;
     errorString += `\n\nErrors:\n\t- ${fileError.errors}\n\n\n\n`;
   }
-
   return errorString;
 }
-
 async function mediaImportCheckStatus({
   app,
   env,
@@ -179,34 +150,28 @@ async function mediaImportCheckStatus({
   exportFileErrorsToJson
 }) {
   // Stop printing so we can pass our callback
-  progressTracker.stopPrinting(); // NO `console.log` in this function (until results are final)! It will break the progress printing.
+  progressTracker.stopPrinting();
 
+  // NO `console.log` in this function (until results are final)! It will break the progress printing.
   const api = await (0, _api.default)();
-
   if (!(0, _mediaFileImport.currentUserCanImportForApp)(app)) {
     throw new Error('The currently authenticated account does not have permission to view Media Import status.');
   }
-
   let overallStatus = 'Checking...';
-
   const setProgressTrackerSuffix = () => {
     const sprite = getGlyphForStatus(overallStatus, progressTracker.runningSprite);
     const exitPrompt = '(Press ^C to hide progress. The import will continue in the background.)';
     let statusMessage;
-
     switch (overallStatus) {
       case 'INITIALIZING':
         statusMessage = `INITIALIZING ${sprite} : We're downloading the files to be imported...`;
         break;
-
       case 'COMPLETED':
         statusMessage = `COMPLETED ${sprite} : The imported files should be visible on your App`;
         break;
-
       default:
         statusMessage = `${(0, _format.capitalize)(overallStatus)} ${sprite}`;
     }
-
     const maybeExitPrompt = ['COMPLETED', 'ABORTED', 'FAILED'].includes(overallStatus) ? '' : exitPrompt;
     const suffix = `
 =============================================================
@@ -217,24 +182,18 @@ ${maybeExitPrompt}
 `;
     progressTracker.suffix = suffix;
   };
-
   const setSuffixAndPrint = () => {
     setProgressTrackerSuffix();
     progressTracker.print();
   };
-
   progressTracker.startPrinting(setSuffixAndPrint);
-
   const getResults = () => new Promise((resolve, reject) => {
     let startDate = Date.now();
     let pollIntervalDecreasing = false;
-
     const checkStatus = async pollInterval => {
       let mediaImportStatus;
-
       try {
         mediaImportStatus = await getStatus(api, app.id, env.id);
-
         if (!mediaImportStatus) {
           return reject({
             error: 'Requested app/environment is not available for this operation. If you think this is not correct, please contact Support.'
@@ -245,75 +204,66 @@ ${maybeExitPrompt}
           error
         });
       }
-
       const {
         status
       } = mediaImportStatus;
       const failedMediaImport = 'FAILED' === status;
-
       if (failedMediaImport) {
         progressTracker.setStatus(mediaImportStatus);
         overallStatus = 'FAILED';
         setSuffixAndPrint();
-        return reject({ ...mediaImportStatus,
+        return reject({
+          ...mediaImportStatus,
           error: 'Import FAILED'
         });
       }
-
       progressTracker.setStatus(mediaImportStatus);
       setSuffixAndPrint();
-
       if (['COMPLETED', 'ABORTED'].includes(status)) {
         return resolve(mediaImportStatus);
       }
+      overallStatus = status;
 
-      overallStatus = status; // after two minutes, we'll start decreasing the pollInterval
-
-      pollIntervalDecreasing = pollIntervalDecreasing || startDate < Date.now() - TWO_MINUTES_IN_MILLISECONDS; // decrease poll interval by a second, every minute
+      // after two minutes, we'll start decreasing the pollInterval
+      pollIntervalDecreasing = pollIntervalDecreasing || startDate < Date.now() - TWO_MINUTES_IN_MILLISECONDS;
 
+      // decrease poll interval by a second, every minute
       if (pollIntervalDecreasing && startDate < Date.now() - ONE_MINUTE_IN_MILLISECONDS) {
         pollInterval = pollInterval + IMPORT_MEDIA_PROGRESS_POLL_INTERVAL;
         startDate = Date.now();
       }
-
       setTimeout(() => {
         checkStatus(pollInterval);
       }, pollInterval);
-    }; // Kick off the check
-
+    };
 
+    // Kick off the check
     checkStatus(IMPORT_MEDIA_PROGRESS_POLL_INTERVAL);
   });
-
   try {
     var _results$failureDetai;
-
     const results = await getResults();
     overallStatus = (results === null || results === void 0 ? void 0 : results.status) || 'unknown';
     progressTracker.stopPrinting();
     setProgressTrackerSuffix();
     progressTracker.print();
     const fileErrors = (_results$failureDetai = results.failureDetails) === null || _results$failureDetai === void 0 ? void 0 : _results$failureDetai.fileErrors;
-
     if (!!fileErrors && fileErrors.length > 0) {
       progressTracker.suffix += `${_chalk.default.yellow(`⚠️  ${fileErrors.length} file error(s) have been extracted`)}`;
-
       if (results.filesTotal - results.filesProcessed !== fileErrors.length) {
         progressTracker.suffix += `. ${_chalk.default.italic.yellow('File-errors report size threshold reached.')}`;
       }
-
       const formattedData = buildFileErrors(fileErrors, exportFileErrorsToJson);
       const errorsFile = `media-import-${app.name}-${Date.now()}${!!exportFileErrorsToJson ? '.json' : '.txt'}`;
-
       try {
         await _fs.promises.writeFile(errorsFile, formattedData);
         progressTracker.suffix += `\n\n${_chalk.default.yellow(`All errors have been exported to ${_chalk.default.bold(path.resolve(errorsFile))}`)}\n\n`;
       } catch (writeFileErr) {
         progressTracker.suffix += `\n\n${_chalk.default.red(`Could not export errors to file\n${writeFileErr}`)}\n\n`;
       }
-    } // Print one final time
-
+    }
 
+    // Print one final time
     progressTracker.print({
       clearAfter: true
     });
@@ -328,7 +278,6 @@ ${maybeExitPrompt}
     process.exit(1);
   }
 }
-
 var _default = {
   mediaImportCheckStatus
 };