@ps-aux/nodebup 0.6.0 → 0.7.2

package/README.md

@@ -0,0 +1 @@
+

package/lib/bup/{AggregateBackupController.js → aggregate/AggregateBackupController.js}

@@ -5,25 +5,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.AggregateBackupController = void 0;
 
-var _FsSyncer = require("../fs/fssync/FsSyncer");
+var _FsSyncer = require("../../fs/fssync/FsSyncer");
 
-var _Gpg = require("../tools/gpg/Gpg");
+var _Gpg = require("../../tools/gpg/Gpg");
 
-var _Fs = require("../fs/Fs");
+var _Fs = require("../../fs/Fs");
 
-var _SshKeyManager = require("../tools/ssh/SshKeyManager");
+var _SshKeyManager = require("../../tools/ssh/SshKeyManager");
 
 var _inversify = require("inversify");
 
-var _ContextSymbols = require("../ctx/ContextSymbols");
+var _ContextSymbols = require("../../ctx/ContextSymbols");
 
-var _AppLogger = require("../log/AppLogger");
+var _AppLogger = require("../../log/AppLogger");
 
-var _Path = require("../fs/path/Path");
+var _Path = require("../../fs/path/Path");
 
-var _config = require("../config");
+var _config = require("../../config");
 
-var _StorageBackendProvider = require("../storage/StorageBackendProvider");
+var _StorageBackendProvider = require("../../storage/StorageBackendProvider");
 
 var _dec, _dec2, _dec3, _dec4, _class;
 

package/lib/bup/dir/DataBackupController.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DataBackupController = void 0;
+
+var _inversify = require("inversify");
+
+var _AppLogger = require("../../log/AppLogger");
+
+var _Path = require("../../fs/path/Path");
+
+var _StorageBackendProvider = require("../../storage/StorageBackendProvider");
+
+var _dec, _dec2, _dec3, _class;
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+let DataBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _StorageBackendProvider.StorageBackendProvider === "undefined" ? Object : _StorageBackendProvider.StorageBackendProvider]), _dec(_class = _dec2(_class = _dec3(_class = class DataBackupController {
+  constructor(log, storageBackendProvider) {
+    this.log = log;
+    this.storageBackendProvider = storageBackendProvider;
+
+    _defineProperty(this, "storage", inp => {
+      const storage = this.storageBackendProvider.provide();
+
+      const path = _Path.AbsPath.from(inp.path);
+
+      return {
+        backup: () => {
+          this.log.info(`Backing up from ${path} to '${storage}'`);
+          storage.store(path);
+        },
+        restore: () => {
+          this.log.info(`Restoring from '${storage}' to ${path}`);
+          storage.restore(path);
+        }
+      };
+    });
+  }
+
+}) || _class) || _class) || _class);
+exports.DataBackupController = DataBackupController;

package/lib/bup/pg/PgBackupController.js

@@ -0,0 +1,114 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PgBackupController = void 0;
+
+var _Fs = require("../../fs/Fs");
+
+var _inversify = require("inversify");
+
+var _AppLogger = require("../../log/AppLogger");
+
+var _Shell = require("../../tools/shell/Shell");
+
+var _Path = require("../../fs/path/Path");
+
+var _StorageBackendProvider = require("../../storage/StorageBackendProvider");
+
+var _Zipper = require("../../tools/compression/Zipper");
+
+var _dec, _dec2, _dec3, _class, _class2, _temp;
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+const parseConnectionUrl = url => {
+  var _url$match;
+
+  const regex = /postgres:\/\/(?<username>.*):(?<password>.*)@(?<host>.*):(?<port>\d*)$/;
+  const match = (_url$match = url.match(regex)) === null || _url$match === void 0 ? void 0 : _url$match.groups;
+  if (!match || !match.username || !match.password || !match.host || !match.port) throw new Error(`The Postgres connection URL does not match required regex: ${regex.toString()}`);
+  return {
+    username: match.username,
+    password: match.password,
+    host: match.host,
+    port: parseInt(match.port, 10)
+  };
+};
+
+let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _StorageBackendProvider.StorageBackendProvider === "undefined" ? Object : _StorageBackendProvider.StorageBackendProvider, typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell, typeof _Zipper.Zipper === "undefined" ? Object : _Zipper.Zipper]), _dec(_class = _dec2(_class = _dec3(_class = (_temp = _class2 = class PgBackupController {
+  constructor( // private gpg: Gpg,
+  // private ssh: SshKeyManager,
+  fs, // private fsSyncer: FsSyncer,
+  log, storageBackendProvider, // @inject(AppConfig_) private cfg: Config,
+  sh, zip) {
+    this.fs = fs;
+    this.log = log;
+    this.storageBackendProvider = storageBackendProvider;
+    this.sh = sh;
+    this.zip = zip;
+
+    _defineProperty(this, "now", () => {
+      const d = new Date();
+      const fields = [d.getFullYear(), d.getMonth(), d.getDay(), d.getUTCHours(), d.getMinutes(), d.getSeconds()];
+      return fields.join('-');
+    });
+
+    _defineProperty(this, "getVersion", version => version || PgBackupController.defaultPgVersion);
+
+    _defineProperty(this, "outFileName", 'backup.sql');
+
+    _defineProperty(this, "backup", ({
+      pgUrl,
+      pgVersion
+    }) => {
+      const storage = this.storageBackendProvider.provide();
+      const version = this.getVersion(pgVersion); // TODO validate url
+
+      this.log.info(`Backing up Postgres database, version=${version}`);
+      const connParams = parseConnectionUrl(pgUrl);
+      const pass = connParams.password;
+      this.fs.inTmpDir('pg-backup', dir => {
+        const outputDir = _Path.AbsPath.from(dir);
+
+        this.log.info('Dumping database to a file');
+        const bashCmds = [`echo "*:*:*:*:${pass}" > ~/.pgpass`, `chmod 400 ~/.pgpass`, `pg_dumpall -d ${pgUrl}`]; // TODO improve sh logging to avoid showing secrets
+
+        const b = this.sh.execAndReturnBuffer(`docker run --network host ` + `postgres:${version} ` + `bash -c '${bashCmds.join(' && ')}'`);
+        const dumpOut = outputDir.resolve(this.outFileName);
+        this.fs.writeFile(dumpOut, b);
+        this.log.info('Compressing');
+        const zipOutputName = `pg-backup-${this.now()}.zip`;
+        this.zip.zipDir(outputDir, outputDir.resolve(zipOutputName));
+        this.fs.rmFile(dumpOut);
+        this.log.info('Uploading');
+        storage.store(_Path.AbsPath.from(dir));
+      });
+    });
+
+    _defineProperty(this, "restore", ({
+      pgUrl,
+      pgVersion
+    }) => {
+      const version = this.getVersion(pgVersion);
+      const storage = this.storageBackendProvider.provide(); // To validate
+
+      parseConnectionUrl(pgUrl);
+      this.log.info(`Restoring Postgres database, version=${version}`);
+      this.fs.inTmpDir('pg-restore', dirStr => {
+        const dir = _Path.AbsPath.from(dirStr);
+
+        storage.restore(dir); // TODO check if the dir contains the with the expected name
+
+        const zipFile = this.fs.listFiles(dir)[0];
+        this.zip.unzipDir(zipFile, dir);
+        this.fs.rmFile(zipFile);
+        const outFile = this.fs.listFiles(dir)[0];
+        this.sh.exec(`docker run --network host ` + `-v "${outFile.str()}":/pg/import.sql -w /pg ` + `postgres:${version} ` + `psql ${pgUrl} -v ON_ERROR_STOP=0 -f import.sql`);
+      });
+    });
+  }
+
+}, _defineProperty(_class2, "defaultPgVersion", '14.2'), _temp)) || _class) || _class) || _class);
+exports.PgBackupController = PgBackupController;

package/lib/cli/app.js

@@ -13,38 +13,41 @@ var _Config = require("../config/Config");
 
 var _Context = require("../ctx/Context");
 
-var _AggregateBackupController = require("../bup/AggregateBackupController");
+var _AggregateBackupController = require("../bup/aggregate/AggregateBackupController");
 
 var _ResticController = require("../storage/restic/ResticController");
 
-var _BackupController = require("../bup/BackupController");
+var _DataBackupController = require("../bup/dir/DataBackupController");
+
+var _PgBackupController = require("../bup/pg/PgBackupController");
 
 const storageNameOpt = {
   name: 'storage-name',
   convertCase: true,
   fromConfig: 'storage.name'
 };
+const singleStorageOptions = [storageNameOpt, {
+  name: 'storage-type',
+  convertCase: true,
+  fromConfig: 'storage.type'
+}, {
+  name: 'storage-repo',
+  convertCase: true,
+  fromConfig: 'storage.repo'
+}, {
+  name: 'storage-password',
+  convertCase: true,
+  fromConfig: 'storage.password'
+}, {
+  name: 'storage-credentials',
+  convertCase: true,
+  fromConfig: 'storage.credentials'
+}];
 
 const createApp = () => _nclif.CliApp.of({
   commands: {
     data: (0, _nclif.cmdGroup)({
-      options: [storageNameOpt, {
-        name: 'storage-type',
-        convertCase: true,
-        fromConfig: 'storage.type'
-      }, {
-        name: 'storage-repo',
-        convertCase: true,
-        fromConfig: 'storage.repo'
-      }, {
-        name: 'storage-password',
-        convertCase: true,
-        fromConfig: 'storage.password'
-      }, {
-        name: 'storage-credentials',
-        convertCase: true,
-        fromConfig: 'storage.credentials'
-      }],
+      options: singleStorageOptions,
       commands: {
         backup: (0, _nclif.cmd)({
           description: 'Backup a dir to the given storage',
@@ -52,7 +55,7 @@ const createApp = () => _nclif.CliApp.of({
             name: 'path',
             required: true
           }],
-          run: (cmd, c) => c.get(_BackupController.BackupController).storage(cmd).backup()
+          run: (cmd, c) => c.get(_DataBackupController.DataBackupController).storage(cmd).backup()
         }),
         restore: (0, _nclif.cmd)({
           description: 'Restore the storage to the given dir',
@@ -60,7 +63,7 @@ const createApp = () => _nclif.CliApp.of({
             name: 'path',
             required: true
           }],
-          run: (cmd, c) => c.get(_BackupController.BackupController).storage(cmd).restore()
+          run: (cmd, c) => c.get(_DataBackupController.DataBackupController).storage(cmd).restore()
         })
       }
     }),
@@ -77,7 +80,8 @@ const createApp = () => _nclif.CliApp.of({
         })
       }
     }),
-    restic
+    restic,
+    pg
   }
 }).envConfig('NODEBUP').addObjectConfig(pwd => (0, _Config.readConfig)(pwd)).context(({
   config,
@@ -88,8 +92,29 @@ exports.createApp = createApp;
 const restic = (0, _nclif.cmdGroup)({
   commands: {
     'init-repo': (0, _nclif.cmd)({
-      options: [storageNameOpt],
-      run: (arg, c) => c.get(_ResticController.ResticController).initRepo()
+      options: singleStorageOptions,
+      run: (_, c) => c.get(_ResticController.ResticController).initRepo()
+    })
+  }
+});
+const pg = (0, _nclif.cmdGroup)({
+  options: [...singleStorageOptions, {
+    name: 'pg-url',
+    convertCase: true,
+    fromConfig: 'pg.url',
+    required: true
+  }, {
+    name: 'pg-version',
+    convertCase: true,
+    fromConfig: 'pg.version',
+    description: `Postgres version - default is ${_PgBackupController.PgBackupController.defaultPgVersion}`
+  }],
+  commands: {
+    backup: (0, _nclif.cmd)({
+      run: (inp, c) => c.get(_PgBackupController.PgBackupController).backup(inp)
+    }),
+    restore: (0, _nclif.cmd)({
+      run: (inp, c) => c.get(_PgBackupController.PgBackupController).restore(inp)
     })
   }
 });

package/lib/config/Config.js

@@ -13,6 +13,10 @@ var _validateConfigAgainstSchema = require("./validateConfigAgainstSchema");
 
 var _expandAndCreatePath = require("./expandAndCreatePath");
 
+var _Fs = require("../fs/Fs");
+
+var _AppLogger = require("../log/AppLogger");
+
 const expandPaths = (cfg, exp) => {
   cfg.aggregates.forEach(a => {
     a.sources.file.forEach(f => {
@@ -26,15 +30,27 @@ const expandPaths = (cfg, exp) => {
       if (f.to) f.to = _Path.RelativePath.from(f.to);
     });
   });
+}; // TODO
+
+
+const readFromFile = cwd => {
+  // TODO get from the context, maybe move FS to CLI framework later?
+  const fs = new _Fs.Fs(cwd, new _AppLogger.AppLogger());
+  const cfgPath = cwd.resolve('bup.yaml');
+  const cfg = fs.exists(cfgPath) ? (0, _readYaml.readYaml)(cfgPath.str()) : {
+    aggregates: [],
+    storage: []
+  };
+  (0, _validateConfigAgainstSchema.validateConfigAgainstSchema)(cfg);
+  return cfg;
 };
 
 const readConfig = pwdStr => {
   const cwd = _Path.AbsPath.from(pwdStr);
 
-  const cfgFile = (0, _readYaml.readYaml)(cwd.resolve('bup.yaml').str());
-  (0, _validateConfigAgainstSchema.validateConfigAgainstSchema)(cfgFile);
-  const cfg = cfgFile;
-  cfg.pwd = cwd;
+  const cfg = { ...readFromFile(cwd),
+    pwd: cwd
+  };
   cfg.aggregates.forEach(t => {
     const {
       sources

package/lib/ctx/Context.js

@@ -19,7 +19,7 @@ var _inversify = require("inversify");
 
 var _ContextSymbols = require("./ContextSymbols");
 
-var _AggregateBackupController = require("../bup/AggregateBackupController");
+var _AggregateBackupController = require("../bup/aggregate/AggregateBackupController");
 
 var _AppLogger = require("../log/AppLogger");
 
@@ -33,10 +33,14 @@ var _B2CredentialsProvider = require("../storage/b2/B2CredentialsProvider");
 
 var _RCloneClientFactory = require("../storage/rclone/RCloneClientFactory");
 
-var _BackupController = require("../bup/BackupController");
+var _DataBackupController = require("../bup/dir/DataBackupController");
 
 var _StorageConfigProvider = require("../storage/StorageConfigProvider");
 
+var _PgBackupController = require("../bup/pg/PgBackupController");
+
+var _Zipper = require("../tools/compression/Zipper");
+
 const createContext = (cfg, inp) => {
   const c = new _inversify.Container();
   c.bind(_ContextSymbols.AppConfig_).toConstantValue(cfg);
@@ -45,7 +49,7 @@ const createContext = (cfg, inp) => {
   c.bind(_ContextSymbols.Log_).toConstantValue(log);
   c.bind(_AppLogger.AppLogger).toConstantValue(log);
   c.bind(_Fs.Fs).toConstantValue(new _Fs.Fs(cfg.pwd, log));
-  const self = [_Gpg.Gpg, _Shell.Shell, _FsSyncer.FsSyncer, _SshKeyManager.SshKeyManager, _StorageBackendProvider.StorageBackendProvider, _StorageConfigProvider.StorageConfigProvider, _ResticClientFactory.ResticClientFactory, _AggregateBackupController.AggregateBackupController, _ResticController.ResticController, _B2CredentialsProvider.B2CredentialsProvider, _RCloneClientFactory.RCloneClientFactory, _BackupController.BackupController];
+  const self = [_Gpg.Gpg, _Shell.Shell, _FsSyncer.FsSyncer, _SshKeyManager.SshKeyManager, _StorageBackendProvider.StorageBackendProvider, _StorageConfigProvider.StorageConfigProvider, _ResticClientFactory.ResticClientFactory, _AggregateBackupController.AggregateBackupController, _ResticController.ResticController, _B2CredentialsProvider.B2CredentialsProvider, _RCloneClientFactory.RCloneClientFactory, _DataBackupController.DataBackupController, _PgBackupController.PgBackupController, _Zipper.Zipper];
   self.forEach(s => c.bind(s).toSelf());
   return c;
 };

package/lib/fs/Fs.js

@@ -7,6 +7,8 @@ exports.Fs = void 0;
 
 var _fs = _interopRequireDefault(require("fs"));
 
+var _path = _interopRequireDefault(require("path"));
+
 var _Path = require("./path/Path");
 
 var _inversify = require("inversify");
@@ -15,6 +17,8 @@ var _AppLogger = require("../log/AppLogger");
 
 var _expandAndCreatePath = require("../config/expandAndCreatePath");
 
+var _os = _interopRequireDefault(require("os"));
+
 var _dec, _dec2, _dec3, _class;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -47,6 +51,30 @@ let Fs = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:
       });
     });
 
+    _defineProperty(this, "rmFile", path => {
+      _fs.default.rmSync(path.str());
+    });
+
+    _defineProperty(this, "listFiles", path => {
+      return _fs.default.readdirSync(path.str()).map(f => path.resolve(f));
+    });
+
+    _defineProperty(this, "inTmpDir", (name, withDir) => {
+      const dir = this.mkTmpDir(name);
+
+      try {
+        withDir(dir);
+      } finally {
+        this.rmDir(_Path.AbsPath.from(dir));
+      }
+    });
+
+    _defineProperty(this, "mkTmpDir", name => {
+      const dir = _fs.default.mkdtempSync(_path.default.resolve(_os.default.tmpdir(), name));
+
+      return dir;
+    });
+
     _defineProperty(this, "ensureIsDir", p => {
       if (!this.isDir(p)) throw new Error(`${p} is not a dir`);
     });

package/lib/fs/path/Path.js

@@ -24,7 +24,11 @@ class AbsPath {
       return AbsPath.from(_path.default.resolve(this.path, '..'));
     });
 
-    _defineProperty(this, "str", () => this.path);
+    _defineProperty(this, "basename", () => {
+      return _path.default.basename(this.path);
+    });
+
+    _defineProperty(this, "str", () => _path.default.resolve(this.path));
 
     if (!_path.default.isAbsolute(path)) throw new Error(`Path ${path} must be absolute`);
   }

package/lib/storage/StoreConfig.js

@@ -25,8 +25,8 @@ exports.StorageSchema = StorageSchema;
 const CliStorageConfigSchema = () => _joi.default.object({
   storageType: _joi.default.string().valid(_types.StorageType.Restic, _types.StorageType.RClone),
   storageRepo: _joi.default.string(),
-  storageCredentials: _joi.default.string().optional(),
-  storagePassword: _joi.default.string().optional()
+  storageCredentials: _joi.default.string().allow(null).optional(),
+  storagePassword: _joi.default.string().allow(null).optional()
 });
 
 exports.CliStorageConfigSchema = CliStorageConfigSchema;

package/lib/storage/rclone/RcloneClient.js

@@ -76,7 +76,7 @@ let RcloneClient = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadat
       return res;
     });
 
-    _defineProperty(this, "obscure", str => this.shell.execAndReturnVal(`rclone obscure ${str}`));
+    _defineProperty(this, "obscure", str => this.shell.execAndReturnString(`rclone obscure ${str}`));
   }
 
   get actualRemoteName() {

package/lib/storage/restic/ResticClientFactory.js

@@ -42,7 +42,7 @@ let ResticClientFactory = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.
         if (!creds) throw new Error(`Credentials must be provided for b2 repo in '${props.repo.url}'`);
         props.backblaze = this.b2.fromString(creds);
       } else {
-        if (creds) throw new Error('Credentials can be supported only for the B2 restic backend');
+        if (creds) throw new Error('Credentials can be set only for the B2 restic backend');
       }
 
       return new _ResticClient.ResticClient(props, this.sh, this.log);

package/lib/tools/compression/Zipper.js

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Zipper = void 0;
+
+var _admZip = _interopRequireDefault(require("adm-zip"));
+
+var _inversify = require("inversify");
+
+var _AppLogger = require("../../log/AppLogger");
+
+var _dec, _dec2, _dec3, _class;
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+let Zipper = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger]), _dec(_class = _dec2(_class = _dec3(_class = class Zipper {
+  constructor(log) {
+    this.log = log;
+
+    _defineProperty(this, "zipDir", (dir, to) => {
+      this.log.debug(`Zipping ${dir} to ${to}`);
+      const z = new _admZip.default();
+      z.addLocalFolder(dir.str());
+      z.writeZip(to.str());
+    });
+
+    _defineProperty(this, "unzipDir", (zipFile, toDir) => {
+      this.log.debug(`Unzipping ${zipFile} to ${toDir}`);
+      const z = new _admZip.default(zipFile.str());
+      z.extractAllTo(toDir.str());
+    });
+  }
+
+}) || _class) || _class) || _class);
+exports.Zipper = Zipper;

package/lib/tools/compression/Zipper.test.js

@@ -0,0 +1,24 @@
+"use strict";
+
+var _Zipper = require("./Zipper");
+
+var _Path = require("../../fs/path/Path");
+
+var _testHelper = require("../../../test/testHelper");
+
+var _AppLogger = require("../../log/AppLogger");
+
+it('zip', () => {
+  const z = new _Zipper.Zipper(new _AppLogger.AppLogger());
+
+  const out = _Path.AbsPath.from(__dirname).resolve('../../test-data/out.zip');
+
+  const dir = _Path.AbsPath.from(__dirname).resolve('../../../test/foo');
+
+  z.zipDir(dir, out);
+
+  const extDir = _Path.AbsPath.from(__dirname).resolve('../../test-data/foo-out');
+
+  z.unzipDir(out, extDir);
+  (0, _testHelper.expectDirsToBeTheSame)(dir.str(), extDir.str());
+});

package/lib/tools/gpg/Gpg.js

@@ -25,7 +25,7 @@ let Gpg = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design
     });
 
     _defineProperty(this, "exportKey", id => {
-      const res = this.sh.execAndReturnVal(`gpg --batch --pinentry-mode=loopback  --pinentry-mode=loopback --yes --passphrase foo123 --export-secret-key --armor ${id}`);
+      const res = this.sh.execAndReturnString(`gpg --batch --pinentry-mode=loopback  --pinentry-mode=loopback --yes --passphrase foo123 --export-secret-key --armor ${id}`);
       if (!res) throw new Error(`Key '${id}' not in  keyring`);
       return res;
     });

package/lib/tools/shell/Shell.js

@@ -22,8 +22,7 @@ let Shell = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("desi
 
     _defineProperty(this, "exec", (cmd, opts = {}) => {
       this.log.debug(cmd);
-      (0, _shellCmd.shellCmd)(cmd, { ...opts,
-        returnStdout: false
+      (0, _shellCmd.shellCmd)(cmd, { ...opts
       });
     });
 
@@ -34,15 +33,22 @@ let Shell = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("desi
     }) => {
       this.log.debug(`<stdin> > ${cmd}`);
       (0, _shellCmd.shellCmd)(cmd, { ...opts,
-        stdin,
-        returnStdout: false
+        stdin
+      });
+    });
+
+    _defineProperty(this, "execAndReturnString", (cmd, ops = {}) => {
+      this.log.debug(cmd, '[stdout consumed]');
+      return (0, _shellCmd.shellCmd)(cmd, {
+        returnStdout: 'string',
+        ...ops
       });
     });
 
-    _defineProperty(this, "execAndReturnVal", (cmd, ops = {}) => {
+    _defineProperty(this, "execAndReturnBuffer", (cmd, ops = {}) => {
       this.log.debug(cmd, '[stdout consumed]');
       return (0, _shellCmd.shellCmd)(cmd, {
-        returnStdout: true,
+        returnStdout: 'buffer',
         ...ops
       });
     });

package/lib/tools/shell/shellCmd.js

@@ -16,10 +16,16 @@ const shellCmd = (cmd, {
   const res = (0, _child_process.execSync)(cmd, {
     cwd,
     input: stdin,
-    stdio: [stdin ? undefined : 'inherit', returnStdout ? undefined : 'inherit', 'inherit'],
+    stdio: [stdin ? undefined : 'inherit', returnStdout ? undefined : 'inherit', 'pipe' // TODO changed from 'inherit' as the message is not shown in the console - find out how to catch the stderr output
+    ],
     env
   });
-  if (returnStdout) return res.toString().trim();
+
+  if (returnStdout) {
+    if (returnStdout === 'string') return res.toString().trim();
+    return res;
+  }
+
   return null;
 };
 

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@ps-aux/nodebup",
-  "version": "0.6.0",
+  "version": "0.7.2",
   "description": "",
   "module": "lib/index.js",
   "main": "lib/index.js",
   "scripts": {
     "build": "rm -rf build && babel --extensions '.ts,.js,.md' src -d lib src",
+    "publish:local": "npm run build && chmod +x lib/cli/bin.js && npm link",
     "pub": "npm publish --access public",
     "test": "jest",
+    "test:ci": "jest --group=-no-ci",
     "tc": "tsc --noEmit",
     "format": "prettier \"**/*.{js,ts,tsx}\" --write",
     "build-n-run": "npm run build && ",
@@ -41,12 +43,14 @@
     "@types/jest": "^27.4.0",
     "@types/jest-when": "^2.7.4",
     "@types/node": "^17.0.6",
+    "@types/pg": "^8.6.5",
     "@types/ramda": "^0.27.62",
     "@typescript-eslint/eslint-plugin": "^5.8.1",
     "@typescript-eslint/parser": "^5.8.1",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
     "dir-compare": "^4.0.0",
+    "docker-compose": "^0.23.17",
     "eslint": "^8.6.0",
     "eslint-config-standard": "^16.0.3",
     "eslint-plugin-import": "^2.25.3",
@@ -57,9 +61,11 @@
     "husky": "^7.0.4",
     "jest": "^27.4.5",
     "jest-extended": "^1.2.0",
+    "jest-runner-groups": "^2.2.0",
     "jest-when": "^3.5.0",
     "lint-staged": "^12.1.4",
     "npm-check-updates": "^12.0.5",
+    "pg": "^8.7.3",
     "prettier": "^2.5.1",
     "ts-jest": "^27.1.2",
     "typescript": "^4.5.4"
@@ -74,6 +80,7 @@
     "@hapi/joi": "^17.1.1",
     "@ps-aux/nclif": "^0.0.7-alpha.1",
     "@types/hapi__joi": "^17.1.8",
+    "adm-zip": "^0.5.9",
     "axios": "^0.24.0",
     "handlebars": "^4.7.7",
     "ini": "^2.0.0",

package/lib/bup/BackupController.js

@@ -1,63 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.BackupController = void 0;
-
-var _FsSyncer = require("../fs/fssync/FsSyncer");
-
-var _Gpg = require("../tools/gpg/Gpg");
-
-var _Fs = require("../fs/Fs");
-
-var _SshKeyManager = require("../tools/ssh/SshKeyManager");
-
-var _inversify = require("inversify");
-
-var _ContextSymbols = require("../ctx/ContextSymbols");
-
-var _AppLogger = require("../log/AppLogger");
-
-var _Path = require("../fs/path/Path");
-
-var _StorageBackendProvider = require("../storage/StorageBackendProvider");
-
-var _config = require("../config");
-
-var _dec, _dec2, _dec3, _dec4, _class;
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-let BackupController = (_dec = (0, _inversify.injectable)(), _dec2 = function (target, key) {
-  return (0, _inversify.inject)(_ContextSymbols.AppConfig_)(target, undefined, 6);
-}, _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [typeof _Gpg.Gpg === "undefined" ? Object : _Gpg.Gpg, typeof _SshKeyManager.SshKeyManager === "undefined" ? Object : _SshKeyManager.SshKeyManager, typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _FsSyncer.FsSyncer === "undefined" ? Object : _FsSyncer.FsSyncer, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _StorageBackendProvider.StorageBackendProvider === "undefined" ? Object : _StorageBackendProvider.StorageBackendProvider, typeof _config.Config === "undefined" ? Object : _config.Config]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class BackupController {
-  constructor(gpg, ssh, fs, fsSyncer, log, storageBackendProvider, cfg) {
-    this.gpg = gpg;
-    this.ssh = ssh;
-    this.fs = fs;
-    this.fsSyncer = fsSyncer;
-    this.log = log;
-    this.storageBackendProvider = storageBackendProvider;
-    this.cfg = cfg;
-
-    _defineProperty(this, "storage", inp => {
-      const storage = this.storageBackendProvider.provide();
-
-      const path = _Path.AbsPath.from(inp.path);
-
-      return {
-        backup: () => {
-          this.log.info(`Backing up from ${path} to '${storage}'`);
-          storage.store(path);
-        },
-        restore: () => {
-          this.log.info(`Restoring from '${storage}' to ${path}`);
-          storage.restore(path);
-        }
-      };
-    });
-  }
-
-}) || _class) || _class) || _class) || _class);
-exports.BackupController = BackupController;