@heronlabs/terminal-cli 2.0.1 → 2.0.3

package/bin/src/core/interfaces/backup-service.js

@@ -2,9 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BackupService = void 0;
 const fs_1 = require("fs");
+const luxon_1 = require("luxon");
 class BackupService {
     logger;
     s3StorageService;
+    resolveBackupFileName(filename, defaultBaseName, extension) {
+        const timestamp = luxon_1.DateTime.utc().toFormat("yyyy-MM-dd'T'HH-mm-ss'Z'");
+        return filename ?? `${defaultBaseName}-${timestamp}.${extension}`;
+    }
     async run(local, filename) {
         const result = await this.dump(filename);
         if (!result.ok) {

package/bin/src/core/services/easy-panel/easypanel-backup-service.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EasypanelBackupService = void 0;
 const common_1 = require("@nestjs/common");
 const child_process_1 = require("child_process");
-const luxon_1 = require("luxon");
 const s3_storage_service_1 = require("../../../infrastructure/storage/services/s3-storage-service");
 const backup_service_1 = require("../../interfaces/backup-service");
 const script_loader_service_1 = require("../script-loader-service");
@@ -27,8 +26,7 @@ let EasypanelBackupService = class EasypanelBackupService extends backup_service
                 error: new Error('easypanel-backup must run as root (needs systemctl + /var/lib/docker access)'),
             };
         }
-        const timestamp = luxon_1.DateTime.utc().toFormat("yyyy-MM-dd'T'HH-mm-ss'Z'");
-        const backupFileName = filename ?? `easypanel-${timestamp}.tar.gz`;
+        const backupFileName = this.resolveBackupFileName(filename, 'easypanel', 'tar.gz');
         try {
             (0, child_process_1.execSync)(this.scriptLoader.load('easy-panel', 'easypanel-backup'), {
                 env: {

package/bin/src/core/services/mysql/mysql-backup-service.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlBackupService = void 0;
 const common_1 = require("@nestjs/common");
 const child_process_1 = require("child_process");
-const luxon_1 = require("luxon");
 const environment_service_1 = require("../../../infrastructure/environment/services/environment-service");
 const s3_storage_service_1 = require("../../../infrastructure/storage/services/s3-storage-service");
 const backup_service_1 = require("../../interfaces/backup-service");
@@ -28,8 +27,7 @@ let MysqlBackupService = class MysqlBackupService extends backup_service_1.Backu
             return { ok: false, error: db.error };
         }
         const { host, port, name, user, password } = db.connection;
-        const timestamp = luxon_1.DateTime.utc().toFormat("yyyy-MM-dd'T'HH-mm-ss'Z'");
-        const backupFileName = filename ?? `${name}-${timestamp}.sql.gz`;
+        const backupFileName = this.resolveBackupFileName(filename, name, 'sql.gz');
         try {
             (0, child_process_1.execSync)(this.scriptLoader.load('mysql', 'mysql-backup'), {
                 env: {

package/bin/src/core/services/psql/psql-backup-service.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PsqlBackupService = void 0;
 const common_1 = require("@nestjs/common");
 const child_process_1 = require("child_process");
-const luxon_1 = require("luxon");
 const environment_service_1 = require("../../../infrastructure/environment/services/environment-service");
 const s3_storage_service_1 = require("../../../infrastructure/storage/services/s3-storage-service");
 const backup_service_1 = require("../../interfaces/backup-service");
@@ -28,8 +27,7 @@ let PsqlBackupService = class PsqlBackupService extends backup_service_1.BackupS
             return { ok: false, error: db.error };
         }
         const { host, port, name, user, password } = db.connection;
-        const timestamp = luxon_1.DateTime.utc().toFormat("yyyy-MM-dd'T'HH-mm-ss'Z'");
-        const backupFileName = filename ?? `${name}-${timestamp}.sql.gz`;
+        const backupFileName = this.resolveBackupFileName(filename, name, 'sql.gz');
         try {
             (0, child_process_1.execSync)(this.scriptLoader.load('psql', 'psql-backup'), {
                 env: {

package/package.json

@@ -96,5 +96,5 @@
     "test:mutation": "stryker run stryker.conf.json",
     "test:unit": "vitest run"
   },
-  "version": "2.0.1"
+  "version": "2.0.3"
 }