@automattic/vip 3.21.2 → 3.21.3-dev.0

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-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/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/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/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "3.21.2",
+  "version": "3.21.3-dev.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "3.21.2",
+      "version": "3.21.3-dev.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -3989,9 +3989,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "24.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.0.tgz",
-      "integrity": "sha512-qzQZRBqkFsYyaSWXuEHc2WR9c0a0CXwiE5FWUvn7ZM+vdy1uZLfCunD38UzhuB7YN/J11ndbDBcTmOdxJo9Q7A==",
+      "version": "24.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~7.16.0"
@@ -10913,9 +10913,10 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -17112,9 +17113,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "24.10.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.0.tgz",
-      "integrity": "sha512-qzQZRBqkFsYyaSWXuEHc2WR9c0a0CXwiE5FWUvn7ZM+vdy1uZLfCunD38UzhuB7YN/J11ndbDBcTmOdxJo9Q7A==",
+      "version": "24.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "requires": {
         "undici-types": "~7.16.0"
       }
@@ -21845,9 +21846,9 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
       "requires": {
         "argparse": "^2.0.1"
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "3.21.2",
+  "version": "3.21.3-dev.0",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {