@automattic/vip 2.21.0 → 2.23.0

package/dist/bin/vip-wp.js

@@ -6,43 +6,24 @@
 "use strict";
 
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
-
 var _socket = _interopRequireDefault(require("socket.io-client"));
-
 var _socket2 = _interopRequireDefault(require("socket.io-stream"));
-
 var _readline = _interopRequireDefault(require("readline"));
-
 var _stream = require("stream");
-
 var _debug = _interopRequireDefault(require("debug"));
-
 var _api = _interopRequireWildcard(require("../lib/api"));
-
 var _command = _interopRequireWildcard(require("../lib/cli/command"));
-
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
-
 var _format = require("../lib/cli/format");
-
 var _prompt = require("../lib/cli/prompt");
-
 var _tracker = require("../lib/tracker");
-
 var _token = _interopRequireDefault(require("../lib/token"));
-
 var _rollbar = require("../lib/rollbar");
-
 var _proxyAgent = require("../lib/http/proxy-agent");
-
 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 }; }
-
 /**
  * Internal dependencies
  */
@@ -67,7 +48,6 @@ const cancelCommandChar = '\x03';
 let currentJob = null;
 let currentOffset = 0;
 let commandRunning = false;
-
 const pipeStreamsToProcess = ({
   stdin,
   stdout: outStream
@@ -75,7 +55,6 @@ const pipeStreamsToProcess = ({
   process.stdin.pipe(stdin);
   outStream.pipe(process.stdout);
 };
-
 const unpipeStreamsFromProcess = ({
   stdin,
   stdout: outStream
@@ -83,7 +62,6 @@ const unpipeStreamsFromProcess = ({
   process.stdin.unpipe(stdin);
   outStream.unpipe(process.stdout);
 };
-
 const bindStreamEvents = ({
   subShellRl,
   commonTrackingParams,
@@ -91,34 +69,34 @@ const bindStreamEvents = ({
   stdoutStream
 }) => {
   stdoutStream.on('error', err => {
-    commandRunning = false; // TODO handle this better
+    commandRunning = false;
 
+    // TODO handle this better
     console.error('Error: ' + err.message);
   });
   stdoutStream.on('end', async () => {
     subShellRl.clearLine();
     commandRunning = false;
-    await (0, _tracker.trackEvent)('wpcli_command_end', commonTrackingParams); // Tell socket.io to stop trying to connect
+    await (0, _tracker.trackEvent)('wpcli_command_end', commonTrackingParams);
 
+    // Tell socket.io to stop trying to connect
     currentJob.socket.close();
     unpipeStreamsFromProcess({
       stdin: currentJob.stdinStream,
       stdout: currentJob.stdoutStream
-    }); // Reset offset
+    });
 
+    // Reset offset
     currentOffset = 0;
-
     if (!isSubShell) {
       subShellRl.close();
       process.exit();
       return;
     }
-
     subShellRl.resume();
     subShellRl.prompt();
   });
 };
-
 const getTokenForCommand = async (appId, envId, command) => {
   const api = await (0, _api.default)();
   return api.mutate({
@@ -141,9 +119,9 @@ const getTokenForCommand = async (appId, envId, command) => {
       }
     }
   });
-}; // eslint-disable-next-line no-unused-vars
-
+};
 
+// eslint-disable-next-line no-unused-vars
 const cancelCommand = async guid => {
   const api = await (0, _api.default)();
   return api.mutate({
@@ -164,7 +142,6 @@ const cancelCommand = async guid => {
     }
   });
 };
-
 const launchCommandAndGetStreams = async ({
   socket,
   guid,
@@ -172,12 +149,12 @@ const launchCommandAndGetStreams = async ({
   offset = 0
 }) => {
   const stdoutStream = _socket2.default.createStream();
-
   const stdinStream = _socket2.default.createStream();
-
   stdoutStream.on('data', data => {
     currentOffset = data.length + currentOffset;
-  }); // TODO handle all arguments
+  });
+
+  // TODO handle all arguments
   // TODO handle disconnect - does IOStream correctly buffer stdin?
   // TODO stderr - currently server doesn't support it, so errors don't terminate process
 
@@ -199,7 +176,6 @@ const launchCommandAndGetStreams = async ({
   (0, _socket2.default)(socket).on('error', err => {
     // This returns the error so it can be catched by the socket.on('error')
     _rollbar.rollbar.error(err);
-
     return err;
   });
   socket.on('error', err => {
@@ -207,9 +183,7 @@ const launchCommandAndGetStreams = async ({
       console.log(_chalk.default.red('\nError:'), 'Rate limit exceeded: Please wait a moment and try again.');
       return;
     }
-
     _rollbar.rollbar.error(err);
-
     console.log(err);
   });
   return {
@@ -218,7 +192,6 @@ const launchCommandAndGetStreams = async ({
     socket
   };
 };
-
 const bindReconnectEvents = ({
   cliCommand,
   inputToken,
@@ -232,15 +205,14 @@ const bindReconnectEvents = ({
   currentJob.socket.removeAllListeners('connect_error');
   currentJob.socket.io.on('reconnect', async () => {
     debug('socket.io: reconnect');
-
     _rollbar.rollbar.info('WP-CLI socket.io.on( \'reconnect\' )', {
       custom: {
         code: 'wp-cli-on-reconnect',
         commandGuid: cliCommand.guid
       }
-    }); // Close old streams
-
+    });
 
+    // Close old streams
     unpipeStreamsFromProcess({
       stdin: currentJob.stdinStream,
       stdout: currentJob.stdoutStream
@@ -251,8 +223,9 @@ const bindReconnectEvents = ({
       guid: cliCommand.guid,
       inputToken: inputToken,
       offset: currentOffset
-    }); // Rebind new streams
+    });
 
+    // Rebind new streams
     pipeStreamsToProcess({
       stdin: currentJob.stdinStream,
       stdout: currentJob.stdoutStream
@@ -269,36 +242,34 @@ const bindReconnectEvents = ({
       subShellRl,
       commonTrackingParams,
       isSubShell
-    }); // Resume readline interface
+    });
 
+    // Resume readline interface
     subShellRl.resume();
   });
   currentJob.socket.on('retry', async () => {
     debug('socket: retry');
-
     _rollbar.rollbar.info('WP-CLI socket.io.on( \'retry\' )', {
       custom: {
         code: 'wp-cli-on-retry',
         commandGuid: cliCommand.guid
       }
     });
-
     setTimeout(() => {
       currentJob.socket.io.engine.close();
     }, 5000);
   });
   currentJob.socket.on('connect_error', () => {
     debug('socket: connect_error; forcing the preference for websocket');
-
     _rollbar.rollbar.info('WP-CLI socket.on( \'connect_error\' )', {
       custom: {
         code: 'wp-cli-on-connect_error',
         commandGuid: cliCommand.guid
       }
-    }); // Force the preference for WebSocket in case we see an error during connection
-    // https://socket.io/docs/v3/client-initialization/#low-level-engine-options
-
+    });
 
+    // Force the preference for WebSocket in case we see an error during connection
+    // https://socket.io/docs/v3/client-initialization/#low-level-engine-options
     currentJob.socket.io.opts.transports = ['websocket', 'polling'];
   });
   currentJob.socket.on('exit', async ({
@@ -306,11 +277,9 @@ const bindReconnectEvents = ({
     message
   }) => {
     debug('socket: exit. Code: %d. Message: %s', exitCode, message);
-
     if (message) {
       console.log(message);
     }
-
     currentJob.stdinStream.destroy();
     currentJob.stdoutStream.destroy();
     currentJob.socket.close();
@@ -318,16 +287,14 @@ const bindReconnectEvents = ({
   });
   currentJob.socket.io.on('reconnect_attempt', attempt => {
     console.error('There was an error connecting to the server. Retrying...');
-
     if (attempt > 1) {
       return;
-    } // create a new input stream so that we can still catch things like SIGINT while reconnecting
-
+    }
 
+    // create a new input stream so that we can still catch things like SIGINT while reconnecting
     if (currentJob.stdinStream) {
       process.stdin.unpipe(currentJob.stdinStream);
     }
-
     process.stdin.pipe(_socket2.default.createStream());
     currentJob.stdoutStream = _socket2.default.createStream();
     bindStreamEvents({
@@ -338,18 +305,19 @@ const bindReconnectEvents = ({
     });
   });
 };
-
 (0, _command.default)({
   wildcardCommand: true,
   appContext: true,
   envContext: true,
   appQuery
 }).option('yes', 'Run the command in production without a confirmation prompt').argv(process.argv, async (args, opts) => {
-  const isSubShell = 0 === args.length; // Have to re-quote anything that needs it before we pass it on
+  const isSubShell = 0 === args.length;
 
+  // Have to re-quote anything that needs it before we pass it on
   const quotedArgs = (0, _format.requoteArgs)(args);
-  const cmd = quotedArgs.join(' '); // Store only the first 2 parts of command to avoid recording secrets. Can be tweaked
+  const cmd = quotedArgs.join(' ');
 
+  // Store only the first 2 parts of command to avoid recording secrets. Can be tweaked
   const commandForAnalytics = quotedArgs.slice(0, 2).join(' ');
   const {
     id: appId,
@@ -362,8 +330,8 @@ const bindReconnectEvents = ({
     id: envId,
     type: envName
   } = opts.env;
-  /* eslint-disable camelcase */
 
+  /* eslint-disable camelcase */
   const commonTrackingParams = {
     command: commandForAnalytics,
     app_id: appId,
@@ -374,7 +342,6 @@ const bindReconnectEvents = ({
   /* eslint-enable camelcase */
 
   (0, _tracker.trackEvent)('wpcli_command_execute', commonTrackingParams);
-
   if (isSubShell) {
     // Reset the cursor (can get messed up with enquirer)
     process.stdout.write('\u001b[?25h');
@@ -384,15 +351,14 @@ const bindReconnectEvents = ({
       key: 'command',
       value: `wp ${cmd}`
     }], `Are you sure you want to run this command on ${(0, _format.formatEnvironment)(envName)} for site ${appName}?`));
-
     if (!yes) {
       (0, _tracker.trackEvent)('wpcli_confirm_cancel', commonTrackingParams);
       console.log('Command cancelled');
       process.exit();
     }
-  } // We'll handle our own errors, thank you
-
+  }
 
+  // We'll handle our own errors, thank you
   (0, _api.disableGlobalGraphQLErrorHandling)();
   const promptIdentifier = `${appName}.${(0, _command.getEnvIdentifier)(opts.env)}`;
   let countSIGINT = 0;
@@ -401,7 +367,6 @@ const bindReconnectEvents = ({
       if (!this.muted) {
         process.stdout.write(chunk, encoding);
       }
-
       callback();
     }
   });
@@ -413,44 +378,37 @@ const bindReconnectEvents = ({
     prompt: '',
     historySize: 0
   };
-
   if (isSubShell) {
     subShellSettings.prompt = (0, _chalk.default)`{bold.yellowBright ${promptIdentifier}:}{blue ~}$ `;
     subShellSettings.historySize = 200;
   }
-
   const subShellRl = _readline.default.createInterface(subShellSettings);
-
   subShellRl.on('line', async line => {
     if (commandRunning) {
       return;
-    } // Handle plain return / newline
-
+    }
 
+    // Handle plain return / newline
     if (!line) {
       subShellRl.prompt();
       return;
-    } // Check for exit, like SSH (handles both `exit` and `exit;`)
-
+    }
 
+    // Check for exit, like SSH (handles both `exit` and `exit;`)
     if (line.startsWith('exit')) {
       subShellRl.close();
       process.exit();
     }
-
     const startsWithWp = line.startsWith('wp ');
     const empty = 0 === line.length;
     const userCmdCancelled = line === cancelCommandChar;
-
     if ((empty || !startsWithWp) && !userCmdCancelled) {
       console.log(_chalk.default.red('Error:'), 'invalid command, please pass a valid WP CLI command.');
       subShellRl.prompt();
       return;
     }
-
     subShellRl.pause();
     let result;
-
     try {
       result = await getTokenForCommand(appId, envId, line.replace('wp ', ''));
     } catch (error) {
@@ -462,19 +420,15 @@ const bindReconnectEvents = ({
       } else {
         // Else, other type of error, just dump it
         _rollbar.rollbar.error(error);
-
         console.log(error);
       }
-
       if (!isSubShell) {
         subShellRl.close();
         process.exit(1);
       }
-
       subShellRl.prompt();
       return;
     }
-
     const {
       data: {
         triggerWPCLICommandOnAppEnvironment: {
@@ -483,7 +437,6 @@ const bindReconnectEvents = ({
         }
       }
     } = result;
-
     if (line.includes("'")) {
       _rollbar.rollbar.info('WP-CLI Command containing single quotes', {
         custom: {
@@ -492,7 +445,6 @@ const bindReconnectEvents = ({
         }
       });
     }
-
     const token = await _token.default.get();
     const extraHeaders = {
       Authorization: `Bearer ${token.raw}`
@@ -531,8 +483,9 @@ const bindReconnectEvents = ({
       commonTrackingParams,
       isSubShell
     });
-  }); // Fix to re-add the \n character that readline strips when terminal == true
+  });
 
+  // Fix to re-add the \n character that readline strips when terminal == true
   process.stdin.on('data', data => {
     // only run this in interactive mode for prompts from WP commands
     if (commandRunning && 0 === Buffer.compare(data, Buffer.from('\r'))) {
@@ -546,29 +499,26 @@ const bindReconnectEvents = ({
     if (countSIGINT >= 1) {
       process.exit();
     }
+    countSIGINT += 1;
 
-    countSIGINT += 1; // write out CTRL-C/SIGINT
-
+    // write out CTRL-C/SIGINT
     process.stdin.write(cancelCommandChar);
-
     if (currentJob && currentJob.stdoutStream) {
       currentJob.stdoutStream.end();
     }
-
     await (0, _tracker.trackEvent)('wpcli_cancel_command', commonTrackingParams);
-    console.log('Command cancelled by user'); // if no command running (.e.g. interactive shell, exit only after doing cleanup)
+    console.log('Command cancelled by user');
 
+    // if no command running (.e.g. interactive shell, exit only after doing cleanup)
     if (commandRunning === false) {
       process.exit();
     }
   });
-
   if (!isSubShell) {
     mutableStdout.muted = true;
     subShellRl.write(`wp ${cmd}\n`);
     mutableStdout.muted = false;
     return;
   }
-
   subShellRl.prompt();
 });

package/dist/bin/vip.js

@@ -6,53 +6,37 @@
 "use strict";
 
 var _opn = _interopRequireDefault(require("opn"));
-
 var _enquirer = require("enquirer");
-
 var _chalk = _interopRequireDefault(require("chalk"));
-
 var _debug = _interopRequireDefault(require("debug"));
-
 var _config = _interopRequireDefault(require("../lib/cli/config"));
-
 var _command = _interopRequireWildcard(require("../lib/cli/command"));
-
 var _token = _interopRequireDefault(require("../lib/token"));
-
 var _tracker = require("../lib/tracker");
-
 var _rollbar = require("../lib/rollbar");
-
 var _logout = _interopRequireDefault(require("../lib/logout"));
-
 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 }; }
-
 /**
  * Internal dependencies
  */
 const debug = (0, _debug.default)('@automattic/vip:bin:vip');
-
 if (_config.default && _config.default.environment !== 'production') {
   debug(`${_chalk.default.bgYellow('WARNING:')} RUNNING DEV VERSION OF @automattic/vip`);
   debug('You should `npm link` your locally checked out copy of this repo as part of your development setup.');
-} // Config
-
+}
 
+// Config
 const tokenURL = 'https://dashboard.wpvip.com/me/cli/token';
-
 const runCmd = async function () {
   const cmd = (0, _command.default)();
   cmd.command('logout', 'Logout from your current session', async () => {
     await (0, _logout.default)();
     console.log('You are successfully logged out.');
-  }).command('app', 'List and modify your VIP applications').command('cache', 'Manage page cache for your VIP applications').command('config', 'Set configuration for your VIP applications').command('dev-env', 'Use local dev-environment').command('import', 'Import media or SQL files into your VIP applications').command('logs', 'Get logs from your VIP applications').command('search-replace', 'Perform search and replace tasks on files').command('sync', 'Sync production to a development environment').command('whoami', 'Display details about the currently logged-in user').command('wp', 'Run WP CLI commands against an environment');
+  }).command('app', 'List and modify your VIP applications').command('cache', 'Manage page cache for your VIP applications').command('config', 'Set configuration for your VIP applications').command('dev-env', 'Use local dev-environment').command('import', 'Import media or SQL files into your VIP applications').command('logs', 'Get logs from your VIP applications').command('search-replace', 'Perform search and replace tasks on files').command('sync', 'Sync production to a development environment').command('whoami', 'Display details about the currently logged-in user').command('validate', 'Validate your VIP application and environment').command('wp', 'Run WP CLI commands against an environment');
   cmd.argv(process.argv);
 };
-
 const rootCmd = async function () {
   let token = await _token.default.get();
   const isHelpCommand = process.argv.some(arg => arg === 'help' || arg === '-h' || arg === '--help');
@@ -60,7 +44,6 @@ const rootCmd = async function () {
   const isLoginCommand = process.argv.some(arg => arg === 'login');
   const isDevEnvCommandWithoutEnv = process.argv.some(arg => arg === 'dev-env') && !(0, _command.containsAppEnvArgument)(process.argv);
   debug('Argv:', process.argv);
-
   if (!isLoginCommand && (isLogoutCommand || isHelpCommand || isDevEnvCommandWithoutEnv || token && token.valid())) {
     runCmd();
   } else {
@@ -81,12 +64,10 @@ const rootCmd = async function () {
       name: 'continue',
       message: 'Ready to authenticate?'
     });
-
     if (!answer.continue) {
       await (0, _tracker.trackEvent)('login_command_browser_cancelled');
       return;
     }
-
     (0, _opn.default)(tokenURL, {
       wait: false
     });
@@ -98,20 +79,16 @@ const rootCmd = async function () {
       name: 'token',
       message: 'Access Token:'
     });
-
     try {
       token = new _token.default(tokenInput);
     } catch (err) {
       console.log('The token provided is malformed. Please check the token and try again.');
-
       _rollbar.rollbar.error(err);
-
       await (0, _tracker.trackEvent)('login_command_token_submit_error', {
         error: err.message
       });
       return;
     }
-
     if (token.expired()) {
       console.log('The token provided is expired. Please log in again to refresh the token.');
       await (0, _tracker.trackEvent)('login_command_token_submit_error', {
@@ -119,7 +96,6 @@ const rootCmd = async function () {
       });
       return;
     }
-
     if (!token.valid()) {
       console.log('The provided token is not valid. Please log in again to refresh the token.');
       await (0, _tracker.trackEvent)('login_command_token_submit_error', {
@@ -127,30 +103,24 @@ const rootCmd = async function () {
       });
       return;
     }
-
     try {
       _token.default.set(token.raw);
     } catch (err) {
       await (0, _tracker.trackEvent)('login_command_token_submit_error', {
         error: err.message
       });
-
       _rollbar.rollbar.error(err);
-
       throw err;
-    } // De-anonymize user for tracking
-
+    }
 
+    // De-anonymize user for tracking
     await (0, _tracker.aliasUser)(token.id);
     await (0, _tracker.trackEvent)('login_command_token_submit_success');
-
     if (isLoginCommand) {
       console.log('You are now logged in - see `vip -h` for a list of available commands.');
       process.exit();
     }
-
     runCmd();
   }
 };
-
 rootCmd();

package/dist/lib/analytics/clients/pendo.js

@@ -4,67 +4,60 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _http = _interopRequireDefault(require("../../api/http"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 /**
  * External dependencies
  */
 const debug = require('debug')('@automattic/vip:analytics:clients:pendo');
+
 /**
  * Internal dependencies
  */
 
-
 /**
  * Pendo analytics client.
  */
+
 class Pendo {
+  context = {};
   static get ENDPOINT() {
     return '/pendo';
   }
-
   constructor({
     userId,
     eventPrefix,
     env
   }) {
-    _defineProperty(this, "context", {});
-
     this.eventPrefix = eventPrefix;
     this.userAgent = env.userAgent;
     this.userId = userId;
-    this.context = { ...env
+    this.context = {
+      ...env
     };
   }
-
   async trackEvent(eventName, eventProps = {}) {
     if (!eventName.startsWith(this.eventPrefix)) {
       eventName = this.eventPrefix + eventName;
     }
-
     debug('trackEvent()', eventProps);
-    this.context = { ...this.context,
+    this.context = {
+      ...this.context,
       org_id: eventProps.org_slug,
       org_slug: eventProps.org_slug,
       userAgent: this.userAgent,
       userId: this.userId
     };
-
     try {
       return await this.send(eventName, eventProps);
     } catch (error) {
       debug(error);
-    } // Resolve to false instead of rejecting
-
+    }
 
+    // Resolve to false instead of rejecting
     return Promise.resolve(false);
   }
-
   async send(eventName, eventProps) {
     const body = {
       context: this.context,
@@ -83,7 +76,5 @@ class Pendo {
     debug('response', responseText);
     return responseText;
   }
-
 }
-
 exports.default = Pendo;