@automattic/vip 2.32.2 → 2.32.3

package/dist/lib/app-slowlogs/app-slowlogs.js

@@ -0,0 +1,63 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.LIMIT_MAX = void 0;
+exports.getRecentSlowlogs = getRecentSlowlogs;
+var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
+var _api = _interopRequireDefault(require("../../lib/api"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// @format
+
+/**
+ * External dependencies
+ */
+
+/**
+ * Internal dependencies
+ */
+
+const LIMIT_MAX = 5000;
+exports.LIMIT_MAX = LIMIT_MAX;
+const QUERY_ENVIRONMENT_SLOWLOGS = (0, _graphqlTag.default)`
+	query GetAppLogs($appId: Int, $envId: Int, $limit: Int, $after: String) {
+		app(id: $appId) {
+			environments(id: $envId) {
+				id
+				slowlogs(limit: $limit, after: $after) {
+					nodes {
+						timestamp
+						rowsSent
+						rowsExamined
+						queryTime
+						requestUri
+						query
+					}
+					nextCursor
+					pollingDelaySeconds
+				}
+			}
+		}
+	}
+`;
+async function getRecentSlowlogs(appId, envId, limit, after) {
+  var _response$data$app;
+  const api = await (0, _api.default)({
+    exitOnError: false
+  });
+  const response = await api.query({
+    query: QUERY_ENVIRONMENT_SLOWLOGS,
+    variables: {
+      appId,
+      envId,
+      limit,
+      after
+    }
+  });
+  const slowlogs = (_response$data$app = response.data.app) === null || _response$data$app === void 0 || (_response$data$app = _response$data$app.environments) === null || _response$data$app === void 0 || (_response$data$app = _response$data$app[0]) === null || _response$data$app === void 0 ? void 0 : _response$data$app.slowlogs;
+  if (!(slowlogs !== null && slowlogs !== void 0 && slowlogs.nodes)) {
+    throw new Error('Unable to query slowlogs');
+  }
+  return slowlogs;
+}

package/dist/lib/app-slowlogs/types.js

@@ -0,0 +1 @@
+"use strict";

package/dist/lib/cli/apiConfig.js

@@ -34,7 +34,7 @@ async function checkFeatureEnabled(featureName, exitOnFalse = false) {
   try {
     var _res$data$me;
     const res = await featureFlags.get();
-    if ((res === null || res === void 0 ? void 0 : (_res$data$me = res.data.me) === null || _res$data$me === void 0 ? void 0 : _res$data$me.isVIP) !== undefined) {
+    if ((res === null || res === void 0 || (_res$data$me = res.data.me) === null || _res$data$me === void 0 ? void 0 : _res$data$me.isVIP) !== undefined) {
       isVIP = res.data.me.isVIP;
     } else {
       isVIP = false;

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

@@ -39,6 +39,18 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * Internal dependencies
  */
 
+// Need to use CommonJS imports here as the `fetch-retry` typedefs are messed up and throwing TypeJS errors when using `import`
+// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+const fetchWithRetry =
+// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+require('fetch-retry')(_nodeFetch.default, {
+  // Set default retry options
+  retries: 3,
+  retryDelay: (attempt, error, response) => {
+    return Math.pow(2, attempt) * 1000; // 1000, 2000, 4000
+  }
+});
+
 const debug = (0, _debug.default)('vip:lib/client-file-uploader');
 
 // Files smaller than COMPRESS_THRESHOLD will not be compressed before upload
@@ -66,6 +78,8 @@ const getFileMD5Hash = async fileName => {
     return dst.digest().toString('hex');
   } catch (err) {
     throw new Error(`could not generate file hash: ${err.message}`);
+  } finally {
+    src.close();
   }
 };
 exports.getFileMD5Hash = getFileMD5Hash;
@@ -197,7 +211,7 @@ async function uploadUsingPutObject({
       progressCallback(percentage);
     }
   });
-  const response = await (0, _nodeFetch.default)(presignedRequest.url, {
+  const response = await fetchWithRetry(presignedRequest.url, {
     ...fetchOptions,
     body: fileContent ? fileContent : (0, _fs.createReadStream)(fileName).pipe(progressPassThrough)
   });
@@ -247,7 +261,7 @@ async function uploadUsingMultipart({
     basename,
     action: 'CreateMultipartUpload'
   });
-  const multipartUploadResponse = await (0, _nodeFetch.default)(presignedCreateMultipartUpload.url, presignedCreateMultipartUpload.options);
+  const multipartUploadResponse = await fetchWithRetry(presignedCreateMultipartUpload.url, presignedCreateMultipartUpload.options);
   const multipartUploadResult = await multipartUploadResponse.text();
 
   // TODO is any hardening needed here?
@@ -343,6 +357,7 @@ async function detectCompressedMimeType(fileName) {
     buffer
   } = await file.read(Buffer.alloc(4), 0, 4, 0);
   const fileHeader = buffer.toString('hex');
+  await file.close();
   if (ZIP_MAGIC_NUMBER === fileHeader.slice(0, ZIP_MAGIC_NUMBER.length)) {
     return 'application/zip';
   }
@@ -476,7 +491,7 @@ async function uploadPart({
       start,
       end
     }).pipe(progressPassThrough);
-    const fetchResponse = await (0, _nodeFetch.default)(partUploadRequestData.url, fetchOptions);
+    const fetchResponse = await fetchWithRetry(partUploadRequestData.url, fetchOptions);
     if (fetchResponse.status === 200) {
       const responseHeaders = fetchResponse.headers.raw();
       const [etag] = responseHeaders.etag;
@@ -524,7 +539,7 @@ async function completeMultipartUpload({
     uploadId,
     etagResults
   });
-  const completeMultipartUploadResponse = await (0, _nodeFetch.default)(completeMultipartUploadRequestData.url, completeMultipartUploadRequestData.options);
+  const completeMultipartUploadResponse = await fetchWithRetry(completeMultipartUploadRequestData.url, completeMultipartUploadRequestData.options);
   if (completeMultipartUploadResponse.status !== 200) {
     throw await completeMultipartUploadResponse.text();
   }

package/dist/lib/config/software.js

@@ -264,7 +264,7 @@ const triggerUpdate = async variables => {
 };
 exports.triggerUpdate = triggerUpdate;
 const _getLatestJob = async (appId, envId) => {
-  var _result$data$app$envi, _result$data$app, _result$data$app$envi2, _result$data$app$envi3;
+  var _result$data$app;
   const api = await (0, _api.default)();
   const result = await api.query({
     query: updateJobQuery,
@@ -274,7 +274,7 @@ const _getLatestJob = async (appId, envId) => {
     },
     fetchPolicy: 'network-only'
   });
-  const jobs = (_result$data$app$envi = (_result$data$app = result.data.app) === null || _result$data$app === void 0 ? void 0 : (_result$data$app$envi2 = _result$data$app.environments) === null || _result$data$app$envi2 === void 0 ? void 0 : (_result$data$app$envi3 = _result$data$app$envi2[0]) === null || _result$data$app$envi3 === void 0 ? void 0 : _result$data$app$envi3.jobs) !== null && _result$data$app$envi !== void 0 ? _result$data$app$envi : [];
+  const jobs = ((_result$data$app = result.data.app) === null || _result$data$app === void 0 || (_result$data$app = _result$data$app.environments) === null || _result$data$app === void 0 || (_result$data$app = _result$data$app[0]) === null || _result$data$app === void 0 ? void 0 : _result$data$app.jobs) ?? [];
   if (jobs.length) {
     return jobs.reduce((prev, current) => ((prev === null || prev === void 0 ? void 0 : prev.createdAt) || '') > ((current === null || current === void 0 ? void 0 : current.createdAt) || '') ? prev : current);
   }
@@ -291,7 +291,7 @@ const _getCompletedJob = async (appId, envId) => {
   return _getCompletedJob(appId, envId);
 };
 const getUpdateResult = async (appId, envId) => {
-  var _completedJob$progres, _completedJob$progres2, _completedJob$progres3;
+  var _completedJob$progres, _completedJob$progres2;
   debug('Getting update result', {
     appId,
     envId
@@ -303,7 +303,7 @@ const getUpdateResult = async (appId, envId) => {
       ok: true
     };
   }
-  const failedStep = (_completedJob$progres2 = completedJob.progress) === null || _completedJob$progres2 === void 0 ? void 0 : (_completedJob$progres3 = _completedJob$progres2.steps) === null || _completedJob$progres3 === void 0 ? void 0 : _completedJob$progres3.find(step => (step === null || step === void 0 ? void 0 : step.status) === 'failed');
+  const failedStep = (_completedJob$progres2 = completedJob.progress) === null || _completedJob$progres2 === void 0 || (_completedJob$progres2 = _completedJob$progres2.steps) === null || _completedJob$progres2 === void 0 ? void 0 : _completedJob$progres2.find(step => (step === null || step === void 0 ? void 0 : step.status) === 'failed');
   const error = failedStep ? `Failed during step: ${failedStep.name}` : 'Software update failed';
   return {
     ok: false,

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL = exports.DEV_ENVIRONMENT_WORDPRESS_VERSIONS_URI = exports.DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY = exports.DEV_ENVIRONMENT_SUBCOMMAND = exports.DEV_ENVIRONMENT_RAW_GITHUB_HOST = exports.DEV_ENVIRONMENT_PROMPT_INTRO = exports.DEV_ENVIRONMENT_PHP_VERSIONS = exports.DEV_ENVIRONMENT_NOT_FOUND = exports.DEV_ENVIRONMENT_FULL_COMMAND = exports.DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_COMPONENTS = void 0;
+exports.DEV_ENVIRONMENT_WORDPRESS_VERSION_TTL = exports.DEV_ENVIRONMENT_WORDPRESS_VERSIONS_URI = exports.DEV_ENVIRONMENT_WORDPRESS_CACHE_KEY = exports.DEV_ENVIRONMENT_VERSION = exports.DEV_ENVIRONMENT_SUBCOMMAND = exports.DEV_ENVIRONMENT_RAW_GITHUB_HOST = exports.DEV_ENVIRONMENT_PROMPT_INTRO = exports.DEV_ENVIRONMENT_PHP_VERSIONS = exports.DEV_ENVIRONMENT_NOT_FOUND = exports.DEV_ENVIRONMENT_FULL_COMMAND = exports.DEV_ENVIRONMENT_DEFAULTS = exports.DEV_ENVIRONMENT_COMPONENTS_WITH_WP = exports.DEV_ENVIRONMENT_COMPONENTS = void 0;
 const DEV_ENVIRONMENT_SUBCOMMAND = 'dev-env';
 exports.DEV_ENVIRONMENT_SUBCOMMAND = DEV_ENVIRONMENT_SUBCOMMAND;
 const DEV_ENVIRONMENT_FULL_COMMAND = `vip ${DEV_ENVIRONMENT_SUBCOMMAND}`;
@@ -18,8 +18,10 @@ const DEV_ENVIRONMENT_PROMPT_INTRO = 'This is a wizard to help you set up your l
 exports.DEV_ENVIRONMENT_PROMPT_INTRO = DEV_ENVIRONMENT_PROMPT_INTRO;
 const DEV_ENVIRONMENT_NOT_FOUND = 'Environment not found.';
 exports.DEV_ENVIRONMENT_NOT_FOUND = DEV_ENVIRONMENT_NOT_FOUND;
-const DEV_ENVIRONMENT_COMPONENTS = ['wordpress', 'muPlugins', 'appCode'];
+const DEV_ENVIRONMENT_COMPONENTS = ['muPlugins', 'appCode'];
 exports.DEV_ENVIRONMENT_COMPONENTS = DEV_ENVIRONMENT_COMPONENTS;
+const DEV_ENVIRONMENT_COMPONENTS_WITH_WP = ['wordpress', ...DEV_ENVIRONMENT_COMPONENTS];
+exports.DEV_ENVIRONMENT_COMPONENTS_WITH_WP = DEV_ENVIRONMENT_COMPONENTS_WITH_WP;
 const DEV_ENVIRONMENT_RAW_GITHUB_HOST = 'raw.githubusercontent.com';
 exports.DEV_ENVIRONMENT_RAW_GITHUB_HOST = DEV_ENVIRONMENT_RAW_GITHUB_HOST;
 const DEV_ENVIRONMENT_WORDPRESS_VERSIONS_URI = '/Automattic/vip-container-images/master/wordpress/versions.json';
@@ -34,4 +36,6 @@ const DEV_ENVIRONMENT_PHP_VERSIONS = {
   8.1: 'ghcr.io/automattic/vip-container-images/php-fpm:8.1',
   7.4: 'ghcr.io/automattic/vip-container-images/php-fpm:7.4'
 };
-exports.DEV_ENVIRONMENT_PHP_VERSIONS = DEV_ENVIRONMENT_PHP_VERSIONS;
+exports.DEV_ENVIRONMENT_PHP_VERSIONS = DEV_ENVIRONMENT_PHP_VERSIONS;
+const DEV_ENVIRONMENT_VERSION = '2.0.0';
+exports.DEV_ENVIRONMENT_VERSION = DEV_ENVIRONMENT_VERSION;