@automattic/vip 3.21.1 → 3.21.3-dev.0

package/assets/dev-env.lando.template.yml.ejs

@@ -160,6 +160,10 @@ services:
     services:
       image: elasticsearch:8.18.2
       command: /usr/local/bin/docker-entrypoint.sh
+      deploy:
+        resources:
+          limits:
+            memory: 1GB
       environment:
         ELASTICSEARCH_IS_DEDICATED_NODE: 'no'
         ELASTICSEARCH_CLUSTER_NAME: 'bespin'

package/dist/bin/vip-app-deploy.js

@@ -156,7 +156,7 @@ Processing the file for deployment to your environment...
       },
       checksum,
       result
-    } = await (0, _clientFileUploader.uploadImportSqlFileToS3)(uploadParams);
+    } = await (0, _clientFileUploader.uploadImportFileToS3)(uploadParams);
     startDeployVariables.input = {
       id: appId,
       environmentId: envId,

package/dist/bin/vip-dev-env-envvar-delete.js

@@ -7,12 +7,13 @@ var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _envVars = require("../lib/dev-environment/env-vars");
 var _logging = require("../lib/envvar/logging");
 var _tracker = require("../lib/tracker");
+var _utils = require("../lib/utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const exampleUsage = 'vip dev-env envvar delete';
-const usage = 'vip dev-env envvar delete -s vip-local';
+const exampleUsage = 'vip dev-env envvar delete --slug=example-site';
+const usage = 'vip dev-env envvar delete';
 const examples = [{
   usage: `${exampleUsage} MY_VARIABLE`,
-  description: 'Delete the environment variable "MY_VARIABLE" from the environment.'
+  description: 'Delete the environment variable "MY_VARIABLE" from the local environment.'
 }];
 async function deleteEnvVarCommand(args, opt) {
   (0, _logging.debug)('args: %o, opt: %o', args, opt);
@@ -26,7 +27,7 @@ async function deleteEnvVarCommand(args, opt) {
     const data = await (0, _envVars.readEnvFile)(slug);
     const envVars = [];
     data.forEach(line => {
-      const [key] = line.split('=', 2).map(part => part.trim());
+      const [key] = (0, _utils.splitKeyValueString)(line);
       if (key !== name) {
         envVars.push(line);
       } else {

package/dist/bin/vip-dev-env-envvar-get-all.js

@@ -8,15 +8,16 @@ var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _envVars = require("../lib/dev-environment/env-vars");
 var _logging = require("../lib/envvar/logging");
 var _tracker = require("../lib/tracker");
+var _utils = require("../lib/utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const exampleUsage = 'vip dev-env envvar get-all';
-const usage = 'vip dev-env envvar get-all -s vip-local';
+const exampleUsage = 'vip dev-env envvar get-all --slug=example-site';
+const usage = 'vip dev-env envvar get-all';
 const examples = [{
   usage: exampleUsage,
-  description: 'Retrieve a list of all environment variables in the default table format.'
+  description: 'Retrieve a list of all local environment variables in the default table format.'
 }, {
   usage: `${exampleUsage} --format=csv`,
-  description: 'Retrieve a list of all environment variables in CSV format.'
+  description: 'Retrieve a list of all local environment variables in CSV format.'
 }];
 async function getAllEnvVarsCommand(args, opt) {
   (0, _logging.debug)('args: %o, opt: %o', args, opt);
@@ -28,7 +29,7 @@ async function getAllEnvVarsCommand(args, opt) {
   try {
     const data = await (0, _envVars.readEnvFile)(slug);
     const envVars = data.map(line => {
-      const [key, value] = line.split('=', 2).map(part => part.trim());
+      const [key, value] = (0, _utils.splitKeyValueString)(line);
       return {
         name: key,
         value: (0, _envVars.parseEnvValue)(value)

package/dist/bin/vip-dev-env-envvar-get.js

@@ -7,12 +7,13 @@ var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _envVars = require("../lib/dev-environment/env-vars");
 var _logging = require("../lib/envvar/logging");
 var _tracker = require("../lib/tracker");
+var _utils = require("../lib/utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const exampleUsage = 'vip dev-env envvar get';
-const usage = 'vip dev-env envvar get -s vip-local';
+const exampleUsage = 'vip dev-env envvar get --slug=example-site';
+const usage = 'vip dev-env envvar get';
 const examples = [{
   usage: `${exampleUsage} MY_VARIABLE`,
-  description: 'Retrieve the value of the environment variable "MY_VARIABLE".'
+  description: 'Retrieve the value of the local environment variable "MY_VARIABLE".'
 }];
 async function getEnvVarsCommand(args, opt) {
   (0, _logging.debug)('args: %o, opt: %o', args, opt);
@@ -23,7 +24,7 @@ async function getEnvVarsCommand(args, opt) {
   await (0, _tracker.trackEvent)(`${trackingPrefix}execute`, trackingInfo);
   try {
     const data = await (0, _envVars.readEnvFile)(slug);
-    const envVar = data.map(line => line.split('=', 2)).find(([key]) => name === key.trim());
+    const envVar = data.map(line => (0, _utils.splitKeyValueString)(line)).find(([key]) => name === key.trim());
     if (undefined === envVar) {
       process.stderr.write(_chalk.default.yellow(`The environment variable "${name}" does not exist\n`));
       process.exitCode = 1;

package/dist/bin/vip-dev-env-envvar-list.js

@@ -8,11 +8,12 @@ var _devEnvironmentCli = require("../lib/dev-environment/dev-environment-cli");
 var _envVars = require("../lib/dev-environment/env-vars");
 var _logging = require("../lib/envvar/logging");
 var _tracker = require("../lib/tracker");
+var _utils = require("../lib/utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const usage = 'vip dev-env envvar list';
 const examples = [{
-  usage: 'vip dev-env envvar list -s vip-local',
-  description: 'List the names of all environment variables.'
+  usage: 'vip dev-env envvar list --slug=example-site',
+  description: 'List the names of all environment variables on the local environment in table format.'
 }];
 async function listEnvVarsCommand(args, opt) {
   (0, _logging.debug)('args: %o, opt: %o', args, opt);
@@ -24,7 +25,7 @@ async function listEnvVarsCommand(args, opt) {
   try {
     const data = await (0, _envVars.readEnvFile)(slug);
     const envVars = data.map(line => {
-      const [key] = line.split('=', 2);
+      const [key] = (0, _utils.splitKeyValueString)(line);
       return {
         name: key.trim()
       };

package/dist/bin/vip-dev-env-envvar-set.js

@@ -10,18 +10,19 @@ var _input = require("../lib/envvar/input");
 var _logging = require("../lib/envvar/logging");
 var _readFile = require("../lib/envvar/read-file");
 var _tracker = require("../lib/tracker");
+var _utils = require("../lib/utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const exampleUsage = 'vip dev-env envvar set';
-const usage = 'vip dev-env envvar set -s vip-local';
+const exampleUsage = 'vip dev-env envvar set --slug=example-site';
+const usage = 'vip dev-env envvar set';
 const examples = [{
   usage: `${exampleUsage} MY_VARIABLE`,
-  description: 'Add or update the environment variable "MY_VARIABLE" and assign its value at the prompt.'
+  description: 'Add or update the local environment variable "MY_VARIABLE" and assign its value at the prompt.'
 }, {
   usage: `${exampleUsage} MY_VARIABLE MY_VALUE`,
-  description: 'Add or update the environment variable "MY_VARIABLE" and assign its value to "MY_VALUE".'
+  description: 'Add or update the local environment variable "MY_VARIABLE" and assign its value to "MY_VALUE".'
 }, {
   usage: `${exampleUsage} MULTILINE_ENV_VAR --from-file=envvar-value.txt`,
-  description: 'Add or update the environment variable "MULTILINE_ENV_VAR" and assign the multiline contents of local file envvar-value.txt as its value.'
+  description: 'Add or update the local environment variable "MULTILINE_ENV_VAR" and assign the multiline contents of local file envvar-value.txt as its value.'
 }];
 async function deleteEnvVarCommand(args, opt) {
   (0, _logging.debug)('args: %o, opt: %o', args, opt);
@@ -51,7 +52,7 @@ async function deleteEnvVarCommand(args, opt) {
     newValue = (0, _envVars.quoteEnvValue)(newValue);
     let replaced = false;
     const envVars = data.map(line => {
-      const [key] = line.split('=', 2).map(part => part.trim());
+      const [key] = (0, _utils.splitKeyValueString)(line);
       if (key === name) {
         replaced = true;
         return `${key}=${newValue}`;

package/dist/bin/vip-dev-env-envvar.js

@@ -4,24 +4,24 @@
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const usage = 'vip dev-env envvar';
-const exampleUsage = 'vip dev-env envvar --slug vip-local';
+const exampleUsage = 'vip dev-env envvar';
 const examples = [{
-  usage: `${exampleUsage} set MY_VARIABLE`,
-  description: 'Add or update the environment variable "MY_VARIABLE" and assign its value at the prompt.'
+  usage: `${exampleUsage} set --slug=example-site MY_VARIABLE`,
+  description: 'Add or update the local environment variable "MY_VARIABLE" and assign its value at the prompt.'
 }, {
-  usage: `${exampleUsage} get MY_VARIABLE`,
-  description: 'Retrieve the value of the environment variable "MY_VARIABLE".'
+  usage: `${exampleUsage} get --slug=example-site MY_VARIABLE`,
+  description: 'Retrieve the value of the local environment variable "MY_VARIABLE".'
 }, {
-  usage: `${exampleUsage} get-all`,
-  description: 'Retrieve a list of all environment variables in the default table format.'
+  usage: `${exampleUsage} get-all --slug=example-site`,
+  description: 'Retrieve a list of all local environment variables in the default table format.'
 }, {
-  usage: `${exampleUsage} list`,
-  description: 'List the names of all environment variables.'
+  usage: `${exampleUsage} list --slug=example-site`,
+  description: 'List the names of all local environment variables.'
 }, {
-  usage: `${exampleUsage} delete MY_VARIABLE`,
-  description: 'Delete the environment variable "MY_VARIABLE" from the environment.'
+  usage: `${exampleUsage} delete --slug=example-site MY_VARIABLE`,
+  description: 'Delete the local environment variable "MY_VARIABLE" from the environment.'
 }];
 (0, _command.default)({
   requiredArgs: 0,
   usage
-}).command('delete', 'Delete an environment variable.').command('get', 'Retrieve the value of an environment variable.').command('get-all', 'Retrieve the names and values of all environment variables.').command('list', 'List the names of all environment variables.').command('set', 'Add or update an environment variable.').examples(examples).argv(process.argv);
+}).command('delete', 'Delete a local environment variable.').command('get', 'Retrieve the value of a local environment variable.').command('get-all', 'Retrieve the names and values of all local environment variables.').command('list', 'List the names of all local environment variables.').command('set', 'Add or update a local environment variable that begins with an uppercase letter and only includes the allowed characters A-Z, 0-9, or _.').examples(examples).argv(process.argv);

package/dist/bin/vip-dev-env-sync-sql.js

@@ -43,6 +43,7 @@ const appQuery = `
 		uniqueLabel
 		isMultisite
 		wpSitesSDS(first:500) {
+			total
 			nodes {
 				id
 				blogId

package/dist/bin/vip-import-media.js

@@ -7,8 +7,10 @@ var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _api = _interopRequireDefault(require("../lib/api"));
 var _command = _interopRequireDefault(require("../lib/cli/command"));
 var _format = require("../lib/cli/format");
+var _clientFileUploader = require("../lib/client-file-uploader");
 var _progress = require("../lib/media-import/progress");
 var _status = require("../lib/media-import/status");
+var _utils = require("../lib/media-import/utils");
 var _tracker = require("../lib/tracker");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // eslint-disable-next-line no-duplicate-imports
@@ -43,10 +45,18 @@ const START_IMPORT_MUTATION = (0, _graphqlTag.default)`
 const usage = 'vip import media';
 const debug = (0, _debug.default)('vip:vip-import-media');
 
+// Support legacy direct invocation: when users run the built binary directly
+// like `node ./dist/bin/vip-import-media.js @1234.production /path/to/archive.tar.gz --flag`
+// inject the `import media` subcommand into process.argv so the command parser
+// sees the same shape as the full CLI: `vip import media ...`.
+
 // Command examples for the `vip import media` help prompt
 const examples = [{
   usage: 'vip @example-app.production import media https://example.com/uploads.tar.gz',
   description: 'Import the archived file "uploads.tar.gz" from a publicly accessible URL to a production environment.'
+}, {
+  usage: 'vip @example-app.production import media /path/to/uploads.tar.gz',
+  description: 'Import a local archive file (e.g. .tar.gz, .tgz, .zip) from your machine into a production environment. The file will be uploaded temporarily and then imported.'
 },
 // Format error logs
 {
@@ -95,13 +105,58 @@ Are you sure you want to import the contents of the URL?
     overwriteExistingFiles,
     importIntermediateImages
   } = opts;
-  const [url] = args;
-  if (!isSupportedUrl(url)) {
-    console.log(_chalk.default.red(`
-Error:
-	Invalid URL provided: ${url}
-	Please make sure that it is a publicly accessible web URL containing an archive of the media files to import.`));
-    return;
+  const [fileNameOrURL] = args;
+  let url = '';
+  let sourceIsLocal = false;
+  if (String(fileNameOrURL).startsWith('http://') || String(fileNameOrURL).startsWith('https://')) {
+    url = fileNameOrURL;
+    // validate supported URL
+    if (!isSupportedUrl(url)) {
+      console.log(_chalk.default.red(`
+	 Error:
+	 Invalid URL provided: ${url}
+	 Please make sure that it is a publicly accessible web URL containing an archive of the media files to import.`));
+      return;
+    }
+  } else {
+    // treat as local archive path
+    if (!(await (0, _utils.isLocalArchive)(fileNameOrURL))) {
+      console.log(_chalk.default.red(`
+	 Error:
+	 Invalid local archive provided: ${fileNameOrURL}
+	 Please make sure the file exists and is one of: .tar.gz, .tgz, .zip`));
+      return;
+    }
+
+    // upload archive to S3 and get presigned URL for import
+    sourceIsLocal = true;
+    const fileMeta = await (0, _clientFileUploader.getFileMeta)(fileNameOrURL);
+    fileMeta.fileName = fileNameOrURL;
+    const {
+      fileMeta: {
+        basename
+      },
+      checksum: uploadedMD5,
+      result
+    } = await (0, _clientFileUploader.uploadImportFileToS3)({
+      app,
+      env,
+      fileMeta,
+      progressCallback: percentage => console.log(`Upload progress: ${percentage}%`)
+    });
+
+    // small debug info to keep variables used
+    debug('Uploaded file basename:', basename);
+    debug('Uploaded checksum:', uploadedMD5);
+    debug('Upload result:', result && typeof result === 'object' ? Object.keys(result) : result);
+    ({
+      url
+    } = await (0, _clientFileUploader.getSignedUploadRequestData)({
+      appId: app.id,
+      envId: env.id,
+      basename,
+      action: 'GetObject'
+    }));
   }
   const track = _tracker.trackEventWithEnv.bind(null, app.id, env.id);
   const api = (0, _api.default)();
@@ -114,7 +169,11 @@ Error:
 Importing Media into your App...
 `;
   console.log();
-  console.log(`Importing archive from: ${url}`);
+  if (sourceIsLocal) {
+    console.log(`Importing local archive: ${fileNameOrURL} (uploaded to temporary URL)`);
+  } else {
+    console.log(`Importing archive from: ${url}`);
+  }
   console.log(`to: ${env.primaryDomain.name} (${(0, _format.formatEnvironment)(env.type)})`);
   try {
     await api.mutate({

package/dist/bin/vip-import-sql.js

@@ -591,7 +591,7 @@ Processing the SQL import for your environment...
         },
         checksum: uploadedMD5,
         result
-      } = await (0, _clientFileUploader.uploadImportSqlFileToS3)({
+      } = await (0, _clientFileUploader.uploadImportFileToS3)({
         app,
         env,
         fileMeta,

package/dist/commands/dev-env-sync-sql.js

@@ -8,9 +8,11 @@ var _vipSearchReplace = require("@automattic/vip-search-replace");
 var _chalk = _interopRequireDefault(require("chalk"));
 var _debug = _interopRequireDefault(require("debug"));
 var _fs = _interopRequireDefault(require("fs"));
+var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 var _promises = require("node:stream/promises");
 var _devEnvImportSql = require("./dev-env-import-sql");
 var _exportSql = require("./export-sql");
+var _api = _interopRequireDefault(require("../lib/api"));
 var _backupStorageAvailability = require("../lib/backup-storage-availability/backup-storage-availability");
 var exit = _interopRequireWildcard(require("../lib/cli/exit"));
 var _clientFileUploader = require("../lib/client-file-uploader");
@@ -83,6 +85,24 @@ async function extractSiteUrls(sqlFile) {
     readInterface.on('error', reject);
   });
 }
+const SITE_URLS_QUERY = (0, _graphqlTag.default)`
+	query SiteUrlsQuery($appId: Int!, $environmentId: Int!, $after: String, $first: Int!) {
+		app(id: $appId) {
+			environments(id: $environmentId) {
+				wpSitesSDS(after: $after, first: $first) {
+					total
+					nextCursor
+					nodes {
+						id
+						blogId
+						homeUrl
+						siteUrl
+					}
+				}
+			}
+		}
+	}
+`;
 class DevEnvSyncSQLCommand {
   tmpDir;
   siteUrls = [];
@@ -90,6 +110,7 @@ class DevEnvSyncSQLCommand {
   liveBackupCopyCLIOptions;
   _track;
   _sqlDumpType;
+  sdsSiteUrls = [];
 
   /**
    * Creates a new instance of the command
@@ -167,13 +188,51 @@ class DevEnvSyncSQLCommand {
     await (0, _promises.pipeline)(streams);
     _fs.default.renameSync(outputFile, this.sqlFile);
   }
+  async getSiteUrlsFromSDS() {
+    if (this.env.isMultisite && (!this.env.wpSitesSDS?.nodes || !this.env.wpSitesSDS?.total || this.env.wpSitesSDS.nodes.length < this.env.wpSitesSDS.total)) {
+      return this.fetchAllSites(Number(this.app.id), Number(this.env.id));
+    }
+    return this.env.wpSitesSDS?.nodes?.filter(node => Boolean(node)) ?? [];
+  }
+  fetchSitesPage(api, appId, environmentId, after) {
+    return api.query({
+      query: SITE_URLS_QUERY,
+      variables: {
+        first: 100,
+        after,
+        appId,
+        environmentId
+      }
+    });
+  }
+  async fetchAllSites(appId, environmentId) {
+    const api = (0, _api.default)();
+    let after = null;
+    const allSites = [];
+    let total;
+    console.log('Fetching list of sites for database sync...');
+    do {
+      // eslint-disable-next-line no-await-in-loop
+      const res = await this.fetchSitesPage(api, appId, environmentId, after);
+      if (res.data.app?.environments?.[0]?.wpSitesSDS?.nodes) {
+        const wpSitesSDS = res.data.app.environments[0].wpSitesSDS;
+        allSites.push(...res.data.app.environments[0].wpSitesSDS.nodes.filter(node => Boolean(node)));
+        after = wpSitesSDS.nextCursor;
+        total = Number(wpSitesSDS.total);
+        console.log(`Fetched ${allSites.length} of ${total} sites...`);
+      } else {
+        after = null;
+      }
+    } while (after);
+    return allSites;
+  }
   generateSearchReplaceMap() {
     this.searchReplaceMap = {};
     for (const url of this.siteUrls) {
       this.searchReplaceMap[stripProtocol(url)] = stripProtocol(replaceDomain(url, this.landoDomain));
     }
-    const networkSites = this.env.wpSitesSDS?.nodes;
-    if (!networkSites) return;
+    const networkSites = this.sdsSiteUrls;
+    if (!networkSites.length) return;
     const primaryUrl = networkSites.find(site => site?.blogId === 1)?.homeUrl;
     const primaryDomain = primaryUrl ? new URL(primaryUrl).hostname : '';
     debug('Network sites: %j, primary URL: %s, primary domain: %s', networkSites.map(site => ({
@@ -218,8 +277,8 @@ class DevEnvSyncSQLCommand {
     await importCommand.run();
   }
   fixBlogsTableQuery() {
-    const networkSites = this.env.wpSitesSDS?.nodes;
-    if (!networkSites) {
+    const networkSites = this.sdsSiteUrls;
+    if (!networkSites.length) {
       return '';
     }
     const prologue = `
@@ -301,6 +360,17 @@ DROP PROCEDURE vip_sync_update_blog_domains;
       });
       exit.withError(`Error extracting site URLs: ${error.message}`);
     }
+    try {
+      this.sdsSiteUrls = await this.getSiteUrlsFromSDS();
+    } catch (err) {
+      const error = err;
+      await this.track('error', {
+        error_type: 'get_site_urls_from_sds',
+        error_message: error.message,
+        stack: error.stack
+      });
+      exit.withError(`Error getting site URLs from SDS: ${error.message}`);
+    }
     console.log('Generating search-replace configuration...');
     this.generateSearchReplaceMap();
     try {

package/dist/commands/export-sql.js

@@ -335,7 +335,7 @@ class ExportSQLCommand {
     if (this.liveBackupCopyCLIOptions?.useLiveBackupCopy) {
       const result = await this.generateLiveBackupCopy();
       url = result.url;
-      size = result.size;
+      size = Number(result.size);
     } else {
       url = await this.runBackup();
       const exportJob = await this.getExportJob();
@@ -349,7 +349,7 @@ class ExportSQLCommand {
       size = Number(bytesWrittenMeta.value);
     }
     const storageConfirmed = await this.progressTracker.handleContinuePrompt(async setPromptShown => {
-      const status = await this.confirmEnoughStorage(size);
+      const status = await this.confirmEnoughStorage(Number(size));
       if (status.isPromptShown) {
         setPromptShown();
       }

package/dist/lib/api.js

@@ -5,11 +5,15 @@ exports.PRODUCTION_API_HOST = exports.API_URL = exports.API_HOST = void 0;
 exports.default = API;
 exports.disableGlobalGraphQLErrorHandling = disableGlobalGraphQLErrorHandling;
 exports.enableGlobalGraphQLErrorHandling = enableGlobalGraphQLErrorHandling;
+exports.shouldRetryRequest = shouldRetryRequest;
 var _core = require("@apollo/client/core");
 var _context = require("@apollo/client/link/context");
 var _core2 = require("@apollo/client/link/core");
 var _error = require("@apollo/client/link/error");
+var _retry = require("@apollo/client/link/retry");
 var _chalk = _interopRequireDefault(require("chalk"));
+var _debug = _interopRequireDefault(require("debug"));
+var _nodeFetch = require("node-fetch");
 var _http = _interopRequireDefault(require("./api/http"));
 var _env = _interopRequireDefault(require("./env"));
 var _token = _interopRequireDefault(require("./token"));
@@ -21,12 +25,39 @@ const PRODUCTION_API_HOST = exports.PRODUCTION_API_HOST = 'https://api.wpvip.com
 const API_HOST = exports.API_HOST = process.env.API_HOST || PRODUCTION_API_HOST; // NOSONAR
 const API_URL = exports.API_URL = `${API_HOST}/graphql`;
 let globalGraphQLErrorHandlingEnabled = true;
+const RETRY_LINK_MAX_ATTEMPTS = 5;
+const RETRY_LINK_INITIAL_DELAY_MS = 1000; // 1 second
+const RETRY_LINK_MAX_DELAY_MS = 5000; // 5 seconds
+
+const debug = (0, _debug.default)('@automattic/vip:http:graphql');
 function disableGlobalGraphQLErrorHandling() {
   globalGraphQLErrorHandlingEnabled = false;
 }
 function enableGlobalGraphQLErrorHandling() {
   globalGraphQLErrorHandlingEnabled = true;
 }
+function shouldRetryRequest(attempt, operation, error) {
+  const debugSuffix = `Operation: ${operation.operationName}. Attempt: ${attempt}.`;
+  if (!error || operation.query.definitions.some(def => def.kind === 'OperationDefinition' && def.operation !== 'query')) {
+    debug(`Request failed. ${debugSuffix}`);
+    return false;
+  }
+  if (attempt > RETRY_LINK_MAX_ATTEMPTS) {
+    debug(`Request failed and max retry attempts reached. ${debugSuffix}`, error);
+    return false;
+  }
+  if (error instanceof _nodeFetch.FetchError && error.code === 'ECONNREFUSED') {
+    debug(`Request failed. Retrying request due to connection refused error. ${debugSuffix}`);
+    return true;
+  }
+  const statusCode = error?.statusCode;
+  if (statusCode && statusCode !== 429 && statusCode < 500) {
+    debug(`Request failed. Status code: ${statusCode}. ${debugSuffix}`, error);
+    return false;
+  }
+  debug(`Request failed. Retrying request due to server error. ${debugSuffix}`, error);
+  return true;
+}
 function isServerError(networkError) {
   if (!networkError) {
     return false;
@@ -35,7 +66,8 @@ function isServerError(networkError) {
 }
 function API({
   exitOnError = true,
-  silenceAuthErrors = false
+  silenceAuthErrors = false,
+  customRetryLink
 } = {}) {
   const errorLink = (0, _error.onError)(({
     networkError,
@@ -90,8 +122,15 @@ function API({
       agent: proxyAgent
     }
   });
+  const retryLink = new _retry.RetryLink({
+    delay: {
+      initial: RETRY_LINK_INITIAL_DELAY_MS,
+      max: RETRY_LINK_MAX_DELAY_MS
+    },
+    attempts: shouldRetryRequest
+  });
   return new _core.ApolloClient({
-    link: _core2.ApolloLink.from([withToken, errorLink, authLink, httpLink]),
+    link: _core2.ApolloLink.from([withToken, errorLink, customRetryLink ? customRetryLink : retryLink, authLink, httpLink]),
     cache: new _core.InMemoryCache({
       typePolicies: {
         WPSite: {

package/dist/lib/client-file-uploader.js

@@ -8,9 +8,10 @@ exports.getFileHash = void 0;
 exports.getFileMeta = getFileMeta;
 exports.getFileSize = getFileSize;
 exports.getPartBoundaries = getPartBoundaries;
+exports.getSignedUploadRequestData = getSignedUploadRequestData;
 exports.isFile = isFile;
 exports.unzipFile = void 0;
-exports.uploadImportSqlFileToS3 = uploadImportSqlFileToS3;
+exports.uploadImportFileToS3 = uploadImportFileToS3;
 exports.uploadParts = uploadParts;
 var _chalk = _interopRequireDefault(require("chalk"));
 var _crypto = require("crypto");
@@ -121,7 +122,7 @@ async function getFileMeta(fileName) {
     isCompressed
   };
 }
-async function uploadImportSqlFileToS3({
+async function uploadImportFileToS3({
   app,
   env,
   fileMeta,

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/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/media-import/utils.js

@@ -0,0 +1,18 @@
+"use strict";
+
+exports.__esModule = true;
+exports.isLocalArchive = isLocalArchive;
+var _promises = require("node:fs/promises");
+async function isLocalArchive(filePath) {
+  const lower = filePath.toLowerCase();
+  const isArchive = lower.endsWith('.tar.gz') || lower.endsWith('.tgz') || lower.endsWith('.zip');
+  if (!isArchive) {
+    return false;
+  }
+  try {
+    const fileStat = await (0, _promises.stat)(filePath);
+    return fileStat.isFile();
+  } catch {
+    return false;
+  }
+}

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];
 }