@automattic/vip 2.31.1-dev4 → 2.31.1-dev5

package/dist/commands/backup-db.js

@@ -80,7 +80,7 @@ async function getBackupJob(appId, envId) {
     }
   } = response;
   const job = environments[0].jobs[0];
-  return job;
+  return job || null;
 }
 async function createBackupJob(appId, envId) {
   // Disable global error handling so that we can handle errors ourselves
@@ -138,11 +138,11 @@ class BackupDBCommand {
     this.progressTracker.stopPrinting();
   }
   async loadBackupJob() {
-    var _this$job$metadata$fi, _this$job$metadata$fi2, _this$job$progress;
+    var _this$job, _this$job$metadata$fi, _this$job2, _this$job2$progress, _this$job3;
     this.job = await getBackupJob(this.app.id, this.env.id);
-    this.backupName = (_this$job$metadata$fi = (_this$job$metadata$fi2 = this.job.metadata.find(meta => meta.name === 'backupName')) === null || _this$job$metadata$fi2 === void 0 ? void 0 : _this$job$metadata$fi2.value) !== null && _this$job$metadata$fi !== void 0 ? _this$job$metadata$fi : 'Unknown';
-    this.jobStatus = (_this$job$progress = this.job.progress) === null || _this$job$progress === void 0 ? void 0 : _this$job$progress.status;
-    if (this.job.completedAt) {
+    this.backupName = ((_this$job = this.job) === null || _this$job === void 0 ? void 0 : (_this$job$metadata$fi = _this$job.metadata.find(meta => meta.name === 'backupName')) === null || _this$job$metadata$fi === void 0 ? void 0 : _this$job$metadata$fi.value) || 'Unknown';
+    this.jobStatus = (_this$job2 = this.job) === null || _this$job2 === void 0 ? void 0 : (_this$job2$progress = _this$job2.progress) === null || _this$job2$progress === void 0 ? void 0 : _this$job2$progress.status;
+    if ((_this$job3 = this.job) !== null && _this$job3 !== void 0 && _this$job3.completedAt) {
       this.jobAge = (new Date().getTime() - new Date(this.job.completedAt).getTime()) / 1000 / 60;
     } else {
       this.jobAge = undefined;
@@ -150,14 +150,14 @@ class BackupDBCommand {
     return this.job;
   }
   async run(silent = false) {
-    var _this$job;
+    var _this$job4;
     this.silent = silent;
     let noticeMessage = `\n${_chalk.default.yellow('NOTICE: ')}`;
     noticeMessage += 'If a recent database backup does not exist, a new one will be generated for this environment. ';
     noticeMessage += 'Learn more about this: https://docs.wpvip.com/technical-references/vip-dashboard/backups/#2-download-a-full-database-backup \n';
     this.log(noticeMessage);
     await this.loadBackupJob();
-    if ((_this$job = this.job) !== null && _this$job !== void 0 && _this$job.inProgressLock) {
+    if ((_this$job4 = this.job) !== null && _this$job4 !== void 0 && _this$job4.inProgressLock) {
       this.log('Database backup already in progress...');
     } else {
       try {
@@ -165,15 +165,16 @@ class BackupDBCommand {
         this.progressTracker.stepRunning(this.steps.PREPARE);
         this.progressTracker.startPrinting();
         await createBackupJob(this.app.id, this.env.id);
-      } catch (stepErr) {
-        const err = stepErr;
+      } catch (e) {
+        var _err$message;
+        const err = e;
         this.progressTracker.stepFailed(this.steps.PREPARE);
         this.stopProgressTracker();
-        if (err.message.includes('Database backups limit reached')) {
+        if ((_err$message = err.message) !== null && _err$message !== void 0 && _err$message.includes('Database backups limit reached')) {
           await this.track('error', {
             error_type: 'rate_limit_exceeded',
-            error_message: `Couldn't create a new database backup job: ${err.message}`,
-            stack: err.stack
+            error_message: `Couldn't create a new database backup job: ${err === null || err === void 0 ? void 0 : err.message}`,
+            stack: err === null || err === void 0 ? void 0 : err.stack
           });
           let errMessage = err.message.replace('Database backups limit reached', 'A new database backup was not generated because a recently generated backup already exists.');
           errMessage = errMessage.replace('Retry after', '\nIf you would like to run the same command, you can retry on or after:');
@@ -183,26 +184,26 @@ class BackupDBCommand {
         }
         await this.track('error', {
           error_type: 'db_backup_job_creation_failed',
-          error_message: `Database Backup job creation failed: ${err.message}`,
-          stack: err.stack
+          error_message: `Database Backup job creation failed: ${err === null || err === void 0 ? void 0 : err.message}`,
+          stack: err === null || err === void 0 ? void 0 : err.stack
         });
-        exit.withError(`Couldn't create a new database backup job: ${err.message}`);
+        exit.withError(`Couldn't create a new database backup job: ${err === null || err === void 0 ? void 0 : err.message}`);
       }
     }
     this.progressTracker.stepSuccess(this.steps.PREPARE);
     this.progressTracker.stepRunning(this.steps.GENERATE);
     try {
       await (0, _utils.pollUntil)(this.loadBackupJob.bind(this), DB_BACKUP_PROGRESS_POLL_INTERVAL, this.isDone.bind(this));
-    } catch (pollErr) {
-      const err = pollErr;
+    } catch (e) {
+      const err = e;
       this.progressTracker.stepFailed(this.steps.GENERATE);
       this.stopProgressTracker();
       await this.track('error', {
         error_type: 'db_backup_job_failed',
-        error_message: `Database Backup job failed: ${err.message}`,
-        stack: err.stack
+        error_message: `Database Backup job failed: ${err === null || err === void 0 ? void 0 : err.message}`,
+        stack: err === null || err === void 0 ? void 0 : err.stack
       });
-      exit.withError(`Failed to create new database backup: ${err.message}`);
+      exit.withError(`Failed to create new database backup: ${err === null || err === void 0 ? void 0 : err.message}`);
     }
     this.progressTracker.stepSuccess(this.steps.GENERATE);
     this.stopProgressTracker();

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@automattic/vip",
-  "version": "2.31.1-dev4",
+  "version": "2.31.1-dev5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@automattic/vip",
-      "version": "2.31.1-dev4",
+      "version": "2.31.1-dev5",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automattic/vip",
-  "version": "2.31.1-dev4",
+  "version": "2.31.1-dev5",
   "description": "The VIP Javascript library & CLI",
   "main": "index.js",
   "bin": {