@automattic/vip 3.5.1 → 3.7.0

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

@@ -50,7 +50,7 @@ cmd.argv(process.argv, async (arg, opt) => {
     slug = await (0, _devEnvironmentCli.getEnvironmentName)(environmentNameOptions);
   }
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   debug('Args: ', arg, 'Options: ', opt);
   const trackingInfo = {
     slug,

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

@@ -24,7 +24,7 @@ const examples = [{
 }).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).option('soft', 'Preserve an environment’s configuration files; allows an environment to be regenerated with the start command.').examples(examples).argv(process.argv, async (arg, opt) => {
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_destroy_command_execute', trackingInfo);
   debug('Args: ', arg, 'Options: ', opt);

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

@@ -26,7 +26,7 @@ const examples = [{
 }).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).option('force', 'Skip validation for a local environment to be in a running state.', undefined, _devEnvironmentCli.processBooleanOption).option('quiet', 'Suppress informational messages.', undefined, _devEnvironmentCli.processBooleanOption).examples(examples).argv(process.argv, async (unmatchedArgs, opt) => {
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_exec_command_execute', trackingInfo);
   try {

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

@@ -36,7 +36,7 @@ const examples = [{
     slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
     trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   }
-  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   await (0, _tracker.trackEvent)('dev_env_info_command_execute', trackingInfo);
   debug('Args: ', arg, 'Options: ', opt);
   try {

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

@@ -18,7 +18,7 @@ const examples = [{
 }).examples(examples).argv(process.argv, async () => {
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
   lando.events.constructor.prototype.setMaxListeners(1024);
-  await (0, _devEnvironmentCli.validateDependencies)(lando, '');
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   const trackingInfo = {
     all: true
   };

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

@@ -26,7 +26,7 @@ const examples = [{
 }).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).option(['f', 'follow'], 'Continually output logs as they are generated.').option('service', 'Restrict to a single service.').examples(examples).argv(process.argv, async (arg, opt) => {
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_logs_command_execute', trackingInfo);
   debug('Args: ', arg, 'Options: ', opt);

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

@@ -49,7 +49,7 @@ const examples = [{
     all: true
   };
   await (0, _tracker.trackEvent)('dev_env_purge_command_execute', trackingInfo);
-  await (0, _devEnvironmentCli.validateDependencies)(lando, '');
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   const removeFiles = !(opt.soft || false);
   try {
     for (const slug of allEnvNames) {

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

@@ -58,7 +58,7 @@ function getCommand(args) {
 }).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).option('root', 'Create with root privileges.').option('service', 'Restrict to a single service.').examples(examples).argv(process.argv, async (args, opt) => {
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-  await (0, _devEnvironmentCli.validateDependencies)(lando, '');
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_shell_command_execute', trackingInfo);
   debug('Args: ', args, 'Options: ', opt);

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

@@ -29,7 +29,7 @@ const examples = [{
 }).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).option('skip-rebuild', 'Only start services that are not in a running state.').option(['w', 'skip-wp-versions-check'], 'Skip the prompt to update WordPress; occurs if the last major release version is not configured.').option('vscode', 'Generate a Visual Studio Code Workspace file.').examples(examples).argv(process.argv, async (arg, opt) => {
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   const startProcessing = new Date();
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   trackingInfo.vscode = Boolean(opt.vscode);

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

@@ -23,7 +23,7 @@ const examples = [{
   usage
 }).option('slug', 'A unique name for a local environment. Default is "vip-local".', undefined, _devEnvironmentCli.processSlug).option('all', 'Stop all local environments.').examples(examples).argv(process.argv, async (arg, opt) => {
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-  await (0, _devEnvironmentCli.validateDependencies)(lando, '');
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   debug('Args: ', arg, 'Options: ', opt);
 
   /** @type {Record< string, unknown >} */

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

@@ -32,7 +32,7 @@ cmd.examples(examples);
 cmd.argv(process.argv, async (arg, opt) => {
   const slug = await (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-  await (0, _devEnvironmentCli.validateDependencies)(lando, slug);
+  (0, _devEnvironmentCli.validateDependencies)(lando);
   const trackingInfo = (0, _devEnvironmentCli.getEnvTrackingInfo)(slug);
   await (0, _tracker.trackEvent)('dev_env_update_command_execute', trackingInfo);
   try {

package/dist/bin/vip-import-validate-files.js

@@ -1,18 +1,24 @@
 #!/usr/bin/env node
+
+/**
+ * External dependencies
+ */
 "use strict";
 
 var _chalk = _interopRequireDefault(require("chalk"));
-var _fs = _interopRequireDefault(require("fs"));
-var _path = _interopRequireDefault(require("path"));
 var _url = _interopRequireDefault(require("url"));
 var _command = _interopRequireDefault(require("../lib/cli/command"));
+var _config = require("../lib/media-import/config");
 var _tracker = require("../lib/tracker");
 var _vipImportValidateFiles = require("../lib/vip-import-validate-files");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+/**
+ * Internal dependencies
+ */
 (0, _command.default)({
   requiredArgs: 1,
   format: true
-}).example('vip import validate-files <file>', 'Run the import validation against the file').argv(process.argv, async arg => {
+}).example('vip import validate-files <folder_name>', 'Run the import validation against the folder of media files').argv(process.argv, async arg => {
   await (0, _tracker.trackEvent)('import_validate_files_command_execute');
   /**
    * File manipulation
@@ -56,90 +62,64 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
   }
 
   /**
-   * Media file extension validation
-   *
-   * Ensure that prohibited media file types are not used
+   * Get Media Import configuration
    */
-
-  // Collect invalid files for error logging
-  let intermediateImagesTotal = 0;
-  const errorFileTypes = [];
-  const errorFileNames = [];
-  const intermediateImages = {};
-
-  // Iterate through each file to isolate the extension name
-  for (const file of files) {
-    // Check if file is a directory
-    // eslint-disable-next-line no-await-in-loop
-    const stats = await _fs.default.promises.stat(file);
-    const isFolder = stats.isDirectory();
-    const extension = _path.default.extname(file); // Extract the extension of the file
-    const ext = extension.substr(1); // We only want the ext name minus the period (e.g- .jpg -> jpg)
-    const extLowerCase = ext.toLowerCase(); // Change any uppercase extensions to lowercase
-
-    // Check for any invalid file extensions
-    // Returns true if ext is valid; false if invalid
-    const validExtensions = _vipImportValidateFiles.acceptedExtensions.includes(extLowerCase);
-
-    // Collect files that have no extension, have invalid extensions,
-    // or are directories for error logging
-    if (!extension || !validExtensions || isFolder) {
-      errorFileTypes.push(file);
-    }
-
-    /**
-     * Filename validation
-     *
-     * Ensure that filenames don't contain prohibited characters
-     */
-
-    // Collect files that have invalid file names for error logging
-    if ((0, _vipImportValidateFiles.isFileSanitized)(file)) {
-      errorFileNames.push(file);
-    }
-
-    /**
-     * Intermediate image validation
-     *
-     * Detect any intermediate images.
-     *
-     * Intermediate images are copies of images that are resized, so you may have multiples of the same image.
-     * You can resize an image directly on VIP so intermediate images are not necessary.
-     */
-    const original = (0, _vipImportValidateFiles.doesImageHaveExistingSource)(file);
-
-    // If an image is an intermediate image, increment the total number and
-    // populate key/value pairs of the original image and intermediate image(s)
-    if (original) {
-      intermediateImagesTotal++;
-      if (intermediateImages[original]) {
-        // Key: original image, value: intermediate image(s)
-        intermediateImages[original] = `${intermediateImages[original]}, ${file}`;
-      } else {
-        intermediateImages[original] = file;
-      }
-    }
+  const mediaImportConfig = await (0, _config.getMediaImportConfig)();
+  if (!mediaImportConfig) {
+    console.error(_chalk.default.red('✕ Error:'), 'Could not retrieve validation metadata. Please contact VIP Support.');
+    return;
   }
 
+  /**
+   * File Validation
+   * Collect all errors from file validation
+   */
+  const {
+    intermediateImagesTotal,
+    errorFileTypes,
+    errorFileNames,
+    errorFileSizes,
+    errorFileNamesCharCount,
+    intermediateImages
+  } = await (0, _vipImportValidateFiles.validateFiles)(files, mediaImportConfig);
+
   /**
    * Error logging
+   * Not sure if the changes made to the error logging better
    */
-  if (errorFileTypes.length > 0) {
-    (0, _vipImportValidateFiles.logErrorsForInvalidFileTypes)(errorFileTypes);
-  }
-  if (errorFileNames.length > 0) {
-    (0, _vipImportValidateFiles.logErrorsForInvalidFilenames)(errorFileNames);
-  }
-  if (Object.keys(intermediateImages).length > 0) {
-    (0, _vipImportValidateFiles.logErrorsForIntermediateImages)(intermediateImages);
-  }
+  (0, _vipImportValidateFiles.logErrors)({
+    errorType: _vipImportValidateFiles.ValidateFilesErrors.INVALID_TYPES,
+    invalidFiles: errorFileTypes,
+    limit: Object.keys(mediaImportConfig.allowedFileTypes)
+  });
+  (0, _vipImportValidateFiles.logErrors)({
+    errorType: _vipImportValidateFiles.ValidateFilesErrors.INVALID_SIZES,
+    invalidFiles: errorFileSizes,
+    limit: mediaImportConfig.fileSizeLimitInBytes
+  });
+  (0, _vipImportValidateFiles.logErrors)({
+    errorType: _vipImportValidateFiles.ValidateFilesErrors.INVALID_NAME_CHARACTER_COUNTS,
+    invalidFiles: errorFileNamesCharCount,
+    limit: mediaImportConfig.fileNameCharCount
+  });
+  (0, _vipImportValidateFiles.logErrors)({
+    errorType: _vipImportValidateFiles.ValidateFilesErrors.INVALID_NAMES,
+    invalidFiles: errorFileNames
+  });
+  (0, _vipImportValidateFiles.logErrors)({
+    errorType: _vipImportValidateFiles.ValidateFilesErrors.INTERMEDIATE_IMAGES,
+    invalidFiles: Object.keys(intermediateImages),
+    invalidFilesObj: intermediateImages
+  });
 
   // Log a summary of all errors
   (0, _vipImportValidateFiles.summaryLogs)({
     folderErrorsLength: folderValidation.length,
     intImagesErrorsLength: intermediateImagesTotal,
     fileTypeErrorsLength: errorFileTypes.length,
+    fileErrorFileSizesLength: errorFileSizes.length,
     filenameErrorsLength: errorFileNames.length,
+    fileNameCharCountErrorsLength: errorFileNamesCharCount.length,
     totalFiles: files.length,
     totalFolders: nestedDirectories.length
   });

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

@@ -26,7 +26,7 @@ class DevEnvImportSQLCommand {
   }
   async run() {
     const lando = await (0, _devEnvironmentLando.bootstrapLando)();
-    await (0, _devEnvironmentCli.validateDependencies)(lando, this.slug);
+    (0, _devEnvironmentCli.validateDependencies)(lando);
     (0, _sql.validateImportFileExtension)(this.fileName);
 
     // Check if file is compressed and if so, extract the

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

@@ -33,7 +33,6 @@ var _child_process = require("child_process");
 var _debug = _interopRequireDefault(require("debug"));
 var _enquirer = require("enquirer");
 var _formatters = _interopRequireDefault(require("lando/lib/formatters"));
-var _promises = require("node:dns/promises");
 var _nodeFs = require("node:fs");
 var _nodeOs = require("node:os");
 var _path = _interopRequireDefault(require("path"));
@@ -98,38 +97,9 @@ async function handleCLIException(exception, trackKey, trackBaseInfo = {}) {
     debug(exception);
   }
 }
-const verifyDNSResolution = async (slug, domain) => {
-  const expectedIP = '127.0.0.1';
-  const testDomain = `${slug}.${domain}`;
-  const advice = `Please add following line to hosts file on your system:\n\n${expectedIP} ${testDomain}\n\nLearn more: https://docs.wpvip.com/vip-local-development-environment/troubleshooting-dev-env/#h-resolve-networking-configuration-issues\n`;
-  debug(`Verifying DNS resolution for ${testDomain}`);
-  try {
-    let address;
-    try {
-      address = await (0, _promises.lookup)(testDomain, 4);
-      debug(`Got DNS response ${address.address}`);
-    } catch (error) {
-      throw new _userError.default(`DNS resolution for ${testDomain} failed.`, {
-        cause: error
-      });
-    }
-    if (address.address !== expectedIP) {
-      throw new _userError.default(`DNS resolution for ${testDomain} returned unexpected IP ${address.address}. Expected value is ${expectedIP}.`);
-    }
-  } catch (error) {
-    if (error instanceof _userError.default) {
-      console.warn(_chalk.default.yellow.bold('Warning:'), `${error.message}\n\n${advice}`);
-    } else {
-      throw error;
-    }
-  }
-};
-const validateDependencies = async (lando, slug) => {
+const validateDependencies = lando => {
   const now = new Date();
   (0, _devEnvironmentLando.validateDockerInstalled)(lando);
-  if (slug) {
-    await verifyDNSResolution(slug, lando.config.domain ?? 'vipdev.lndo.site');
-  }
   const duration = new Date().getTime() - now.getTime();
   debug('Validation checks completed in %d ms', duration);
 };

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

@@ -390,6 +390,36 @@ async function getExtraServicesConnections(lando, app) {
   }
   return extraServices;
 }
+async function tryResolveDomains(urls) {
+  const domains = [...new Set(urls.filter(url => url.toLowerCase().startsWith('http')).map(url => {
+    try {
+      return new URL(url).hostname;
+    } catch (err) {
+      return undefined;
+    }
+  }).filter(domain => domain !== undefined))];
+  const domainsToFix = [];
+  for (const domain of domains) {
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      const address = await (0, _promises.lookup)(domain, 4);
+      debug('%s resolves to %s', domain, address.address);
+      if (address.address !== '127.0.0.1') {
+        domainsToFix.push(domain);
+        console.warn(_chalk.default.yellow.bold('WARNING:'), `${domain} resolves to ${address.address} instead of 127.0.0.1. Things may not work as expected.`);
+      }
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : 'Unknown error';
+      domainsToFix.push(domain);
+      console.warn(_chalk.default.yellow.bold('WARNING:'), `Failed to resolve ${domain}: ${msg}`);
+    }
+  }
+  if (domainsToFix.length) {
+    console.warn(_chalk.default.yellow('Please add the following lines to the hosts file on your system:\n'));
+    console.warn(domainsToFix.map(domain => `127.0.0.1 ${domain}`).join('\n'));
+    console.warn(_chalk.default.yellow('\nLearn more: https://docs.wpvip.com/vip-local-development-environment/troubleshooting-dev-env/#h-resolve-networking-configuration-issues\n'));
+  }
+}
 async function checkEnvHealth(lando, instancePath) {
   const urls = {};
   const now = new Date();
@@ -400,10 +430,17 @@ async function checkEnvHealth(lando, instancePath) {
     });
   });
   const urlsToScan = Object.keys(urls).filter(url => !url.includes('*'));
+  await tryResolveDomains(urlsToScan);
   let scanResults = [];
   if (Array.isArray(app.urls)) {
     scanResults = app.urls;
-    app.urls.forEach(entry => urlsToScan.splice(urlsToScan.indexOf(entry.url), 1));
+    app.urls.forEach(entry => {
+      // We use different status codes to see if the service is up.
+      // We may consider the service is up when Lando considers it is down.
+      if (entry.color !== 'red') {
+        urlsToScan.splice(urlsToScan.indexOf(entry.url), 1);
+      }
+    });
   }
   if (urlsToScan.length) {
     scanResults = scanResults.concat(await app.scanUrls(urlsToScan, {
@@ -424,8 +461,10 @@ async function isEnvUp(lando, instancePath) {
   const app = await getLandoApplication(lando, instancePath);
   const reachableServices = app.info.filter(service => service.urls.length);
   const webUrls = reachableServices.map(service => service.urls).flat().filter(url => !/^https?:\/\/(localhost|127\.0\.0\.1):/.exec(url));
+  await tryResolveDomains(webUrls);
   const scanResult = await app.scanUrls(webUrls, {
-    max: 1
+    max: 1,
+    waitCodes: [502, 504]
   });
   const duration = new Date().getTime() - now.getTime();
   debug('isEnvUp took %d ms', duration);

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

@@ -0,0 +1,25 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getMediaImportConfig = getMediaImportConfig;
+var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
+var _api = _interopRequireDefault(require("../api"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const IMPORT_MEDIA_CONFIG_QUERY = (0, _graphqlTag.default)`
+	{
+		mediaImportConfig {
+			fileNameCharCount
+			fileSizeLimitInBytes
+			allowedFileTypes
+		}
+	}
+`;
+async function getMediaImportConfig() {
+  const api = (0, _api.default)();
+  const response = await api.query({
+    query: IMPORT_MEDIA_CONFIG_QUERY,
+    variables: {},
+    fetchPolicy: 'network-only'
+  });
+  return response?.data?.mediaImportConfig;
+}