@automattic/vip 3.21.0 → 3.21.2

package/dist/commands/wp-ssh.js

@@ -1,7 +1,8 @@
 "use strict";
 
 exports.__esModule = true;
-exports.WPCliCommandOverSSH = exports.NonZeroExitCodeError = void 0;
+exports.WPCliCommandOverSSH = exports.NonZeroExitCodeError = exports.APIError = void 0;
+var _core = require("@apollo/client/core");
 var _chalk = _interopRequireDefault(require("chalk"));
 var _debug = _interopRequireDefault(require("debug"));
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
@@ -41,13 +42,17 @@ const TRIGGER_WP_CLI_COMMAND_MUTATION = (0, _graphqlTag.default)`
 	}
 `;
 class NonZeroExitCodeError extends Error {
+  guid;
   exitCode;
-  constructor(message, exitCode) {
+  constructor(message, guid, exitCode) {
     super(message);
+    this.guid = guid;
     this.exitCode = exitCode;
   }
 }
 exports.NonZeroExitCodeError = NonZeroExitCodeError;
+class APIError extends Error {}
+exports.APIError = APIError;
 class WPCliCommandOverSSH {
   track;
   constructor(app, env) {
@@ -69,23 +74,23 @@ class WPCliCommandOverSSH {
       throw new Error('No app ID or environment ID provided');
     }
     debug("Requesting SSH authentication for command '%s'", command);
-    const sshAuth = await this.getSSHAuthForCommand(command, extraTrackingInfo);
-    const data = sshAuth.data?.triggerWPCLICommandOnAppEnvironment;
-    if (!data) {
-      await this.track('error', {
-        error: 'no_ssh_auth_data',
-        message: 'No SSH authentication data received',
-        ...extraTrackingInfo
-      });
-      throw new Error('WP-CLI SSH Authentication failed');
-    }
-    debug('Connecting to SSH', {
-      host: data.sshAuthentication.host,
-      port: data.sshAuthentication.port,
-      username: data.sshAuthentication.username,
-      guid: data.command.guid
-    });
     try {
+      const sshAuth = await this.getSSHAuthForCommand(command, extraTrackingInfo);
+      const data = sshAuth.data?.triggerWPCLICommandOnAppEnvironment;
+      if (!data) {
+        await this.track('error', {
+          error: 'no_ssh_auth_data',
+          message: 'No SSH authentication data received',
+          ...extraTrackingInfo
+        });
+        throw new Error('WP-CLI SSH Authentication failed');
+      }
+      debug('Connecting to SSH', {
+        host: data.sshAuthentication.host,
+        port: data.sshAuthentication.port,
+        username: data.sshAuthentication.username,
+        guid: data.command.guid
+      });
       await this.executeCommandOverSSH({
         host: data.sshAuthentication.host,
         port: data.sshAuthentication.port,
@@ -101,19 +106,26 @@ class WPCliCommandOverSSH {
     } catch (err) {
       if (err instanceof NonZeroExitCodeError) {
         await this.track('error', {
-          guid: data?.command.guid,
+          guid: err.guid,
           error: 'non_zero_exit_code',
           message: `Command failed with exit code ${err.exitCode}`,
           ...extraTrackingInfo
         });
         process.exit(err.exitCode);
+      } else if (err instanceof APIError) {
+        console.error(`${_chalk.default.red('Error:')} ${err.message}`);
+        await this.track('error', {
+          error: 'api_error',
+          message: `API Error: ${err.message}`,
+          ...extraTrackingInfo
+        });
+        process.exit(1);
       }
       const message = err instanceof Error ? err.message : String(err);
       console.error(`${_chalk.default.red('Error:')} ${message}`);
       await this.track('error', {
-        guid: data?.command.guid,
         error: 'ssh_command_failed',
-        message: 'Error executing command over SSH',
+        message: `Error executing command over SSH: ${message}`,
         ...extraTrackingInfo
       });
       process.exit(1);
@@ -142,7 +154,7 @@ class WPCliCommandOverSSH {
           }
           stream.on('exit', exitCode => {
             if (exitCode !== 0) {
-              reject(new NonZeroExitCodeError(`Command failed`, exitCode));
+              reject(new NonZeroExitCodeError(`Command failed`, guid, exitCode));
             }
           });
           commandStarted = true;
@@ -197,6 +209,12 @@ class WPCliCommandOverSSH {
         }
       });
     } catch (error) {
+      if (error instanceof _core.ApolloError) {
+        const message = error.graphQLErrors.map(err => {
+          return err.message;
+        }).join('; ');
+        throw new APIError(message);
+      }
       const message = error instanceof Error ? error.message : String(error);
       await this.track('error', {
         error: 'trigger_failed',

package/dist/lib/constants/dev-environment.js

@@ -28,7 +28,7 @@ const DEV_ENVIRONMENT_PHP_VERSIONS = exports.DEV_ENVIRONMENT_PHP_VERSIONS = {
   },
   8.4: {
     image: 'ghcr.io/automattic/vip-container-images/php-fpm:8.4',
-    label: '8.4 (experimental)'
+    label: '8.4'
   }
 };
 const DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_DEFAULTS = {
@@ -36,4 +36,4 @@ const DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_DEFAULTS = {
   multisite: false,
   phpVersion: Object.keys(DEV_ENVIRONMENT_PHP_VERSIONS)[0]
 };
-const DEV_ENVIRONMENT_VERSION = exports.DEV_ENVIRONMENT_VERSION = '2.3.0';
+const DEV_ENVIRONMENT_VERSION = exports.DEV_ENVIRONMENT_VERSION = '2.3.1';

package/dist/lib/dev-environment/dev-environment-core.js

@@ -30,11 +30,11 @@ var _enquirer = require("enquirer");
 var _graphql = require("graphql");
 var _utils = require("lando/lib/utils");
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
+var _nodeCrypto = require("node:crypto");
 var _nodeFs = _interopRequireDefault(require("node:fs"));
 var _promises = require("node:fs/promises");
 var _nodePath = _interopRequireDefault(require("node:path"));
 var _semver = _interopRequireDefault(require("semver"));
-var _uuid = require("uuid");
 var _devEnvironmentCli = require("./dev-environment-cli");
 var _devEnvironmentLando = require("./dev-environment-lando");
 var _app = _interopRequireDefault(require("../api/app"));
@@ -137,7 +137,7 @@ function preProcessInstanceData(instanceData) {
     cron: Boolean(instanceData.cron),
     mailpit: Boolean(instanceData.mailpit),
     pullAfter: instanceData.pullAfter ?? 0,
-    autologinKey: (0, _uuid.v4)(),
+    autologinKey: (0, _nodeCrypto.randomUUID)(),
     adminPassword: instanceData.adminPassword ?? 'password',
     version: _devEnvironment.DEV_ENVIRONMENT_VERSION,
     overrides: instanceData.overrides ?? ''
@@ -863,7 +863,7 @@ ${Object.entries(pathMappings).map(([serverPath, localPath]) => `      <mapping
   </component>
   <component name="PhpServers">
     <servers>
-      <server host="localhost" id="${(0, _uuid.v4)()}" name="localhost" use_path_mappings="true">
+      <server host="localhost" id="${(0, _nodeCrypto.randomUUID)()}" name="localhost" use_path_mappings="true">
         <path_mappings>
           <mapping local-root="$PROJECT_DIR$/wordpress" remote-root="/wp" />
           ${Object.entries(pathMappings).map(([serverPath, localPath]) => `<mapping local-root="${localPath}" remote-root="${serverPath}" />`).join('\n')}

package/dist/lib/live-backup-copy.js

@@ -137,7 +137,7 @@ async function getDownloadURL({
     }
     return {
       url: result.data.generateLiveBackupCopyDownloadURL.url,
-      size: result.data.generateLiveBackupCopyDownloadURL.size
+      size: Number(result.data.generateLiveBackupCopyDownloadURL.size)
     };
   } catch (error) {
     if (error instanceof _utils.PollingTimeoutError) {

package/dist/lib/token.js

@@ -3,7 +3,7 @@
 exports.__esModule = true;
 exports.default = exports.SERVICE = void 0;
 var _jwtDecode = require("jwt-decode");
-var _uuid2 = require("uuid");
+var _nodeCrypto = require("node:crypto");
 var _api = require("./api");
 var _keychain = _interopRequireDefault(require("./keychain"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -64,7 +64,7 @@ class Token {
     const service = Token.getServiceName('-uuid');
     let _uuid = await _keychain.default.getPassword(service);
     if (!_uuid) {
-      _uuid = (0, _uuid2.v4)();
+      _uuid = (0, _nodeCrypto.randomUUID)();
       await _keychain.default.setPassword(service, _uuid);
     }
     return _uuid;

package/dist/lib/utils.js

@@ -6,6 +6,7 @@ exports.getAbsolutePath = getAbsolutePath;
 exports.makeTempDir = makeTempDir;
 exports.parseApiError = parseApiError;
 exports.pollUntil = pollUntil;
+exports.splitKeyValueString = splitKeyValueString;
 var _debug = _interopRequireDefault(require("debug"));
 var _fs = _interopRequireDefault(require("fs"));
 var _promises = require("node:timers/promises");
@@ -95,4 +96,13 @@ function parseApiError(err) {
     return err?.message;
   }
   return null;
+}
+function splitKeyValueString(str, delimiter = '=') {
+  const delimiterIndex = str.indexOf(delimiter);
+  if (delimiterIndex === -1) {
+    return [str.trim(), ''];
+  }
+  const key = str.slice(0, delimiterIndex).trim();
+  const value = str.slice(delimiterIndex + delimiter.length).trim();
+  return [key, value];
 }