@ps-aux/nodebup 0.3.1 → 0.4.0

package/lib/bup/AggregateBackupController.js

@@ -7,8 +7,6 @@ exports.AggregateBackupController = void 0;
 
 var _FsSyncer = require("../fs/fssync/FsSyncer");
 
-var _Config = require("../config/Config");
-
 var _Gpg = require("../tools/gpg/Gpg");
 
 var _Fs = require("../fs/Fs");
@@ -25,13 +23,15 @@ 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 AggregateBackupController = (_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 AggregateBackupController {
+}, _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 AggregateBackupController {
   constructor(gpg, ssh, fs, fsSyncer, log, storageBackendProvider, cfg) {
     this.gpg = gpg;
     this.ssh = ssh;

package/lib/config/Config.js

@@ -17,7 +17,7 @@ const expandPaths = (cfg, exp, cwd) => {
   cfg.storage.filter(s => s.type === 'file').map(s => s).forEach(s => {
     s.path = exp(s.path);
   });
-  cfg.storage.filter(s => s.type === 'restic').map(s => s).forEach(s => {
+  cfg.storage.filter(s => s.type === 'restic' || s.type === 'rclone').map(s => s).forEach(s => {
     if (s.credentialsFile) s.credentialsFile = exp(s.credentialsFile);
     s.passwordFile = exp(s.passwordFile);
     if (s.repo.startsWith('local:')) s.repo = (0, _expandAndCreatePath.expandStrPath)(s.repo, cwd);

package/lib/config/index.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.StorageTypeConst = void 0;
+let StorageTypeConst;
+exports.StorageTypeConst = StorageTypeConst;
+
+(function (StorageTypeConst) {
+  StorageTypeConst["Restic"] = "restic";
+  StorageTypeConst["File"] = "file";
+  StorageTypeConst["RClone"] = "rclone";
+})(StorageTypeConst || (exports.StorageTypeConst = StorageTypeConst = {}));

package/lib/config/validateConfigAgainstSchema.js

@@ -7,6 +7,8 @@ exports.validateConfigAgainstSchema = void 0;
 
 var _joi = _interopRequireDefault(require("@hapi/joi"));
 
+var _index = require("./index");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const DirTaskSchema = _joi.default.object({
@@ -23,7 +25,7 @@ const KeyTaskSchema = _joi.default.object({
 
 const createStorageSchema = props => _joi.default.object({
   name: _joi.default.string(),
-  type: _joi.default.string(),
+  type: _joi.default.string().valid(_index.StorageTypeConst.Restic, _index.StorageTypeConst.File, _index.StorageTypeConst.RClone),
   ...props
 });
 

package/lib/ctx/Context.js

@@ -29,13 +29,17 @@ var _ResticClientFactory = require("../storage/restic/ResticClientFactory");
 
 var _ResticController = require("../storage/restic/ResticController");
 
+var _B2CredentialsProvider = require("../storage/b2/B2CredentialsProvider");
+
+var _RCloneClientFactory = require("../storage/rclone/RCloneClientFactory");
+
 const createContext = cfg => {
   const c = new _inversify.Container();
   c.bind(_ContextSymbols.AppConfig_).toConstantValue(cfg);
   const log = new _AppLogger.AppLogger();
   c.bind(_ContextSymbols.Log_).toConstantValue(log);
   c.bind(_AppLogger.AppLogger).toConstantValue(log);
-  const self = [_Gpg.Gpg, _Shell.Shell, _Fs.Fs, _FsSyncer.FsSyncer, _SshKeyManager.SshKeyManager, _StorageBackendProvider.StorageBackendProvider, _ResticClientFactory.ResticClientFactory, _AggregateBackupController.AggregateBackupController, _ResticController.ResticController];
+  const self = [_Gpg.Gpg, _Shell.Shell, _Fs.Fs, _FsSyncer.FsSyncer, _SshKeyManager.SshKeyManager, _StorageBackendProvider.StorageBackendProvider, _ResticClientFactory.ResticClientFactory, _AggregateBackupController.AggregateBackupController, _ResticController.ResticController, _B2CredentialsProvider.B2CredentialsProvider, _RCloneClientFactory.RCloneClientFactory];
   self.forEach(s => c.bind(s).toSelf());
   return c;
 };

package/lib/storage/BackupClient.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/storage/{restic/ResticStorageBackend.js → BackupClientStorageBackend.js}

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ResticStorageBackend = void 0;
+exports.BackupClientStorageBackend = void 0;
 
-var _Path = require("../../fs/path/Path");
+var _Path = require("../fs/path/Path");
 
 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; }
 
-class ResticStorageBackend {
+class BackupClientStorageBackend {
   constructor(client) {
     this.client = client;
 
@@ -20,4 +20,4 @@ class ResticStorageBackend {
 
 }
 
-exports.ResticStorageBackend = ResticStorageBackend;
+exports.BackupClientStorageBackend = BackupClientStorageBackend;

package/lib/storage/StorageBackendProvider.js

@@ -13,35 +13,59 @@ var _LocalFileStorageBackend = require("./local-file/LocalFileStorageBackend");
 
 var _ContextSymbols = require("../ctx/ContextSymbols");
 
-var _Config = require("../config/Config");
+var _config = require("../config");
 
 var _ResticClientFactory = require("./restic/ResticClientFactory");
 
-var _ResticStorageBackend = require("./restic/ResticStorageBackend");
+var _BackupClientStorageBackend = require("./BackupClientStorageBackend");
 
 var _Fs = require("../fs/Fs");
 
+var _RCloneClientFactory = require("./rclone/RCloneClientFactory");
+
 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 StorageBackendProvider = (_dec = (0, _inversify.injectable)(), _dec2 = function (target, key) {
-  return (0, _inversify.inject)(_ContextSymbols.AppConfig_)(target, undefined, 3);
-}, _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [typeof _FsSyncer.FsSyncer === "undefined" ? Object : _FsSyncer.FsSyncer, typeof _ResticClientFactory.ResticClientFactory === "undefined" ? Object : _ResticClientFactory.ResticClientFactory, typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _Config.Config === "undefined" ? Object : _Config.Config]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class StorageBackendProvider {
-  constructor(fsSyncer, resticFac, fs, cfg) {
+  return (0, _inversify.inject)(_ContextSymbols.AppConfig_)(target, undefined, 4);
+}, _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [typeof _FsSyncer.FsSyncer === "undefined" ? Object : _FsSyncer.FsSyncer, typeof _ResticClientFactory.ResticClientFactory === "undefined" ? Object : _ResticClientFactory.ResticClientFactory, typeof _RCloneClientFactory.RCloneClientFactory === "undefined" ? Object : _RCloneClientFactory.RCloneClientFactory, typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _config.Config === "undefined" ? Object : _config.Config]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class StorageBackendProvider {
+  constructor(fsSyncer, resticFac, rcloneFac, fs, cfg) {
     this.fsSyncer = fsSyncer;
     this.resticFac = resticFac;
+    this.rcloneFac = rcloneFac;
     this.fs = fs;
     this.cfg = cfg;
 
     _defineProperty(this, "provide", name => {
       const s = this.cfg.storage.find(s => s.name === name);
       if (!s) throw new Error(`No such storage '${name}'`);
-      if (s.type === 'restic') return this.restic(s);else if (s.type === 'file') return this.localFile(s);else throw new Error(`Unsupported storage type ${s.type}`);
+      let b;
+
+      switch (s.type) {
+        case _config.StorageTypeConst.File:
+          b = this.localFile(s);
+          break;
+
+        case _config.StorageTypeConst.Restic:
+          b = this.restic(s);
+          break;
+
+        case _config.StorageTypeConst.RClone:
+          b = this.rclone(s);
+          break;
+      }
+
+      if (!b) throw new Error(`Unsupported storage type ${s.type}`);
+      return b;
+    });
+
+    _defineProperty(this, "rclone", cfg => {
+      return new _BackupClientStorageBackend.BackupClientStorageBackend(this.rcloneFac.create(cfg));
     });
 
     _defineProperty(this, "restic", cfg => {
-      return new _ResticStorageBackend.ResticStorageBackend(this.resticFac.create(cfg));
+      return new _BackupClientStorageBackend.BackupClientStorageBackend(this.resticFac.create(cfg));
     });
 
     _defineProperty(this, "localFile", cfg => {

package/lib/storage/b2/B2CredentialsProvider.js

@@ -0,0 +1,55 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.B2CredentialsProvider = void 0;
+
+var _joi = _interopRequireDefault(require("@hapi/joi"));
+
+var _inversify = require("inversify");
+
+var _Fs = require("../../fs/Fs");
+
+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; }
+
+const CredentialsFileSchema = _joi.default.object({
+  keyID: _joi.default.string(),
+  keyName: _joi.default.string().optional(),
+  applicationKey: _joi.default.string()
+});
+
+const validateCredentials = obj => {
+  const r = CredentialsFileSchema.validate(obj, {
+    presence: 'required',
+    allowUnknown: false
+  });
+  return r.error ? JSON.stringify(r.error) : null;
+};
+
+let B2CredentialsProvider = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs]), _dec(_class = _dec2(_class = _dec3(_class = class B2CredentialsProvider {
+  constructor(fs) {
+    this.fs = fs;
+
+    _defineProperty(this, "fromFile", path => {
+      const credJson = this.fs.readJson(path);
+      const validationErr = validateCredentials(credJson);
+
+      if (validationErr) {
+        throw new Error(`Invalid B2 credential in ${path}: ${validationErr}`);
+      }
+
+      const creds = credJson;
+      return {
+        accountId: creds.keyID,
+        key: creds.applicationKey
+      };
+    });
+  }
+
+}) || _class) || _class) || _class);
+exports.B2CredentialsProvider = B2CredentialsProvider;

package/lib/storage/rclone/RCloneClientFactory.js

@@ -0,0 +1,69 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.RCloneClientFactory = void 0;
+
+var _inversify = require("inversify");
+
+var _Shell = require("../../tools/shell/Shell");
+
+var _AppLogger = require("../../log/AppLogger");
+
+var _Fs = require("../../fs/Fs");
+
+var _RcloneClient = require("./RcloneClient");
+
+var _B2CredentialsProvider = require("../b2/B2CredentialsProvider");
+
+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; }
+
+const parseRepoUrl = url => {
+  const split = url.split(':');
+  if (split.length !== 2) throw new Error(`Illegal rclone URL ${url}`);
+  const type = split[0];
+  if (!['b2', 'local'].includes(type)) throw new Error(`Unknown rclone repo type ${type}`);
+  return {
+    type: type,
+    location: split[1]
+  };
+};
+
+let RCloneClientFactory = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _B2CredentialsProvider.B2CredentialsProvider === "undefined" ? Object : _B2CredentialsProvider.B2CredentialsProvider]), _dec(_class = _dec2(_class = _dec3(_class = class RCloneClientFactory {
+  constructor(sh, log, fs, b2) {
+    this.sh = sh;
+    this.log = log;
+    this.fs = fs;
+    this.b2 = b2;
+
+    _defineProperty(this, "create", cfg => {
+      const {
+        type,
+        location
+      } = parseRepoUrl(cfg.repo);
+      const props = {
+        type,
+        location
+      };
+      const password = cfg.passwordFile && this.fs.readFile(cfg.passwordFile).trim();
+      if (password) props.encryption = {
+        password
+      };
+      const creds = cfg.credentialsFile && this.b2.fromFile(cfg.credentialsFile);
+
+      if (type === 'b2') {
+        if (!creds) throw new Error(`Credentials are required for '${cfg.name}'`);
+        props.creds = creds;
+      } else {
+        if (creds) throw new Error(`Credentials not supported for local rclone`);
+      }
+
+      return new _RcloneClient.RcloneClient(props, this.sh, this.log);
+    });
+  }
+
+}) || _class) || _class) || _class);
+exports.RCloneClientFactory = RCloneClientFactory;

package/lib/storage/rclone/RcloneClient.js

@@ -0,0 +1,87 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.RcloneClient = void 0;
+
+var _inversify = require("inversify");
+
+var _types = require("../../types");
+
+var _Shell = require("../../tools/shell/Shell");
+
+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; }
+
+/**
+ * Tested with:  rclone v1.57.0
+ * TODO forwarding stdout to the logger
+ */
+let RcloneClient = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof RcloneConfig === "undefined" ? Object : RcloneConfig, typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell, typeof _types.Log === "undefined" ? Object : _types.Log]), _dec(_class = _dec2(_class = _dec3(_class = class RcloneClient {
+  constructor(cfg, shell, log) {
+    this.cfg = cfg;
+    this.shell = shell;
+    this.log = log;
+
+    _defineProperty(this, "remoteName", 'my');
+
+    _defineProperty(this, "cryptRemoteName", 'crypt');
+
+    _defineProperty(this, "backup", from => {
+      this.log.debug('Running backup for ', this.cfg.type, this.cfg.location);
+      this.shell.exec(`rclone sync ${from.str()} ${this.actualRemoteName}:${this.cfg.location} --config=noconfig`, // Rclone logs error if the file is not set even though it supports env var interface
+      {
+        env: this.env()
+      });
+    });
+
+    _defineProperty(this, "restore", to => {
+      this.log.debug('Running restore for ', this.cfg.type, this.cfg.location);
+      this.shell.exec(`rclone sync ${this.actualRemoteName}:${this.cfg.location}  ${to.str()} --config=noconfig`, {
+        env: this.env()
+      });
+    });
+
+    _defineProperty(this, "env", () => {
+      const {
+        type,
+        creds
+      } = this.cfg;
+
+      const myKey = val => `RCLONE_CONFIG_${this.remoteName.toUpperCase()}_${val.toUpperCase()}`;
+
+      const res = {
+        [myKey('type')]: type,
+        [myKey('hard_delete')]: true + ''
+      };
+
+      if (type === 'b2') {
+        if (!creds) throw new Error('B2 Rclone remote has to have credentials');
+        res[myKey('account')] = creds.accountId;
+        res[myKey('key')] = creds.key;
+      }
+
+      if (this.cfg.encryption) {
+        const pass = this.cfg.encryption.password;
+
+        const cryptKey = val => `RCLONE_CONFIG_${this.cryptRemoteName.toUpperCase()}_${val.toUpperCase()}`;
+
+        res[cryptKey('type')] = 'crypt';
+        res[cryptKey('remote')] = this.remoteName + ':' + this.cfg.location;
+        res[cryptKey('password')] = this.obscure(pass);
+      }
+
+      return res;
+    });
+
+    _defineProperty(this, "obscure", str => this.shell.execAndReturnVal(`rclone obscure ${str}`));
+  }
+
+  get actualRemoteName() {
+    return this.cfg.encryption ? this.cryptRemoteName : this.remoteName;
+  }
+
+}) || _class) || _class) || _class);
+exports.RcloneClient = RcloneClient;

package/lib/storage/rclone/RcloneClient.spec.js

@@ -0,0 +1,85 @@
+"use strict";
+
+var _AppLogger = require("../../log/AppLogger");
+
+var _Shell = require("../../tools/shell/Shell");
+
+var _test = require("../../../test");
+
+var _Path = require("../../fs/path/Path");
+
+var _RcloneClient = require("./RcloneClient");
+
+var _dirCompare = require("dir-compare");
+
+var _b2TestConfig = require("../../../test/b2TestConfig");
+
+var _testHelper = require("../../../test/testHelper");
+
+describe('RcloneClient', () => {
+  const l = new _AppLogger.AppLogger();
+  const getRestoreDir = (0, _test.testdataDirBuilder)('b2/restore');
+  describe('local', () => {
+    const backupDir = (0, _test.testDir)('backup/1');
+    const restoreDir = getRestoreDir('local');
+    const storeDir = (0, _test.testdataDir)('b2/store');
+    const cfg = {
+      type: 'local',
+      location: (0, _test.testdataDir)(storeDir),
+      encryption: {
+        password: 'foo123'
+      }
+    };
+    afterEach(() => {
+      (0, _testHelper.cleanDir)(storeDir);
+      (0, _testHelper.cleanDir)(restoreDir);
+    });
+    it('backup & restore', () => {
+      const sut = new _RcloneClient.RcloneClient(cfg, new _Shell.Shell(l), l);
+      sut.backup(_Path.AbsPath.from(backupDir));
+      sut.restore(_Path.AbsPath.from(restoreDir));
+      const res = (0, _dirCompare.compareSync)(backupDir, restoreDir);
+      expect(res.same).toBeTrue();
+    });
+    it('backup & restore unencrypted', () => {
+      const sut = new _RcloneClient.RcloneClient({ ...cfg,
+        encryption: undefined
+      }, new _Shell.Shell(l), l);
+      sut.backup(_Path.AbsPath.from(backupDir));
+      sut.restore(_Path.AbsPath.from(restoreDir));
+      const res = (0, _dirCompare.compareSync)(backupDir, restoreDir);
+      expect(res.same).toBeTrue();
+    });
+  });
+  describe('b2', () => {
+    const backupDir = (0, _test.testDir)('backup/2');
+    const b2Cfg = (0, _b2TestConfig.getB2TestConfig)('rclone');
+
+    if (!b2Cfg) {
+      console.log('No B2 config - skipping');
+      return;
+    }
+
+    const sut = new _RcloneClient.RcloneClient({
+      type: 'b2',
+      location: b2Cfg.bucket,
+      creds: {
+        accountId: b2Cfg.accountId,
+        key: b2Cfg.key
+      },
+      encryption: {
+        password: 'foo123'
+      }
+    }, new _Shell.Shell(l), l);
+    const restoreDir = getRestoreDir('b2');
+    afterAll(() => {
+      (0, _testHelper.cleanDir)(restoreDir);
+    });
+    it('push adn restore data', () => {
+      sut.backup(_Path.AbsPath.from(backupDir));
+      sut.restore(_Path.AbsPath.from(restoreDir));
+      const res = (0, _dirCompare.compareSync)(backupDir, restoreDir);
+      expect(res.same).toBeTrue();
+    });
+  });
+});

package/lib/storage/restic/ResticClient.js

@@ -5,16 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ResticClient = void 0;
 
-var _inversify = require("inversify");
-
-var _types = require("../../types");
-
-var _ContextSymbols = require("../../ctx/ContextSymbols");
-
-var _Shell = require("../../tools/shell/Shell");
-
-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; }
 
 const normalizeUrl = url => {
@@ -30,9 +20,7 @@ const normalizeUrl = url => {
  */
 
 
-let ResticClient = (_dec = (0, _inversify.injectable)(), _dec2 = function (target, key) {
-  return (0, _inversify.inject)(_ContextSymbols.TaskConfig_)(target, undefined, 2);
-}, _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [typeof ResticConfig === "undefined" ? Object : ResticConfig, typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell, typeof _types.Log === "undefined" ? Object : _types.Log]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class ResticClient {
+class ResticClient {
   constructor(cfg, shell, log) {
     this.cfg = cfg;
     this.shell = shell;
@@ -48,6 +36,7 @@ let ResticClient = (_dec = (0, _inversify.injectable)(), _dec2 = function (targe
     });
 
     _defineProperty(this, "backup", (cwd, from) => {
+      this.log.debug(`Running backup for repo=${this.url}`);
       this.shell.exec(`restic backup ${from.str()}`, {
         cwd: cwd.str(),
         env: this.env()
@@ -55,6 +44,7 @@ let ResticClient = (_dec = (0, _inversify.injectable)(), _dec2 = function (targe
     });
 
     _defineProperty(this, "restore", to => {
+      this.log.debug('Running restore  for repo=', this.url);
       this.shell.exec(`restic restore latest --target ${to.str()}`, {
         env: this.env()
       });
@@ -72,7 +62,7 @@ let ResticClient = (_dec = (0, _inversify.injectable)(), _dec2 = function (targe
         if (!cfg) throw new Error(`Repo url ${url} refers to Backblaze but no Backblaze config provided`);
         return {
           B2_ACCOUNT_ID: cfg.accountId,
-          B2_ACCOUNT_KEY: cfg.accountKey
+          B2_ACCOUNT_KEY: cfg.key
         };
       }
 
@@ -82,5 +72,6 @@ let ResticClient = (_dec = (0, _inversify.injectable)(), _dec2 = function (targe
     this.url = normalizeUrl(cfg.repo.url);
   }
 
-}) || _class) || _class) || _class) || _class);
+}
+
 exports.ResticClient = ResticClient;

package/lib/storage/restic/ResticClient.spec.js

@@ -8,34 +8,19 @@ var _Shell = require("../../tools/shell/Shell");
 
 var _test = require("../../../test");
 
-var _fs = _interopRequireDefault(require("fs"));
-
-var _path = _interopRequireDefault(require("path"));
-
 var _Path = require("../../fs/path/Path");
 
 var _dirCompare = require("dir-compare");
 
 var _testHelper = require("../../../test/testHelper");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const getBackblazeConfig = () => {
-  const path = _path.default.resolve(__dirname, '../../../.keys.json');
-
-  if (!_fs.default.existsSync(path)) return undefined;
-  const data = JSON.parse(_fs.default.readFileSync(path).toString());
-  return {
-    accountId: data.restic.backblaze.keyID,
-    accountKey: data.restic.backblaze.applicationKey
-  };
-};
+var _b2TestConfig = require("../../../test/b2TestConfig");
 
 describe('ResticClient', () => {
   const l = new _AppLogger.AppLogger();
   const password = 'foo123';
-  const backupDir = (0, _test.testDir)('backup-me');
   describe('local', () => {
+    const backupDir = (0, _test.testDir)('backup/1');
     const repoDir = (0, _test.testdataDir)('my-repo');
     const restoreDir = (0, _test.testdataDir)('restore/local');
     const sut = new _ResticClient.ResticClient({
@@ -61,7 +46,8 @@ describe('ResticClient', () => {
     });
   });
   describe('b2', () => {
-    const b2Cfg = getBackblazeConfig();
+    const backupDir = (0, _test.testDir)('backup/2');
+    const b2Cfg = (0, _b2TestConfig.getB2TestConfig)('restic');
 
     if (!b2Cfg) {
       console.log('No B2 config - skipping');
@@ -69,7 +55,7 @@ describe('ResticClient', () => {
     }
 
     const restoreDir = (0, _test.testdataDir)('restore/b2');
-    const repoUrl = `b2:psaux-nodepub-test`;
+    const repoUrl = `b2:` + b2Cfg.bucket;
     const sut = new _ResticClient.ResticClient({
       repo: {
         password,
@@ -81,7 +67,7 @@ describe('ResticClient', () => {
       (0, _testHelper.cleanDir)(restoreDir);
     });
     it('push adn restore data', () => {
-      //     sut.prepareRepo(repoUrl, password)
+      // sut.prepareRepo()
       sut.backup(_Path.AbsPath.from(backupDir), _Path.RelativePath.from('.'));
       sut.restore(_Path.AbsPath.from(restoreDir));
       const res = (0, _dirCompare.compareSync)(backupDir, restoreDir);

package/lib/storage/restic/ResticClientFactory.js

@@ -15,33 +15,18 @@ var _AppLogger = require("../../log/AppLogger");
 
 var _Fs = require("../../fs/Fs");
 
-var _joi = _interopRequireDefault(require("@hapi/joi"));
+var _B2CredentialsProvider = require("../b2/B2CredentialsProvider");
 
 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; }
 
-const CredentialsFileSchema = _joi.default.object({
-  keyID: _joi.default.string(),
-  keyName: _joi.default.string().optional(),
-  applicationKey: _joi.default.string()
-});
-
-const validateCredentials = obj => {
-  const r = CredentialsFileSchema.validate(obj, {
-    presence: 'required',
-    allowUnknown: false
-  });
-  return r.error ? JSON.stringify(r.error) : null;
-};
-
-let ResticClientFactory = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs]), _dec(_class = _dec2(_class = _dec3(_class = class ResticClientFactory {
-  constructor(sh, log, fs) {
+let ResticClientFactory = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _B2CredentialsProvider.B2CredentialsProvider === "undefined" ? Object : _B2CredentialsProvider.B2CredentialsProvider]), _dec(_class = _dec2(_class = _dec3(_class = class ResticClientFactory {
+  constructor(sh, log, fs, b2) {
     this.sh = sh;
     this.log = log;
     this.fs = fs;
+    this.b2 = b2;
 
     _defineProperty(this, "create", cfg => {
       const password = this.fs.readFile(cfg.passwordFile).trim();
@@ -51,22 +36,13 @@ let ResticClientFactory = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.
           url: cfg.repo
         }
       };
+      const creds = cfg.credentialsFile && this.b2.fromFile(cfg.credentialsFile);
 
-      if (cfg.credentialsFile) {
-        if (!cfg.repo.startsWith('b2:')) throw new Error('Credentials can be supported only for the B2 restic backend');
-        const credJson = this.fs.readJson(cfg.credentialsFile); //
-
-        const validationErr = validateCredentials(credJson);
-
-        if (validationErr) {
-          throw new Error(`Invalid Restic credential in ${cfg.credentialsFile}: ${validationErr}`);
-        }
-
-        const creds = credJson;
-        props.backblaze = {
-          accountId: creds.keyID,
-          accountKey: creds.applicationKey
-        };
+      if (cfg.repo.startsWith('b2:')) {
+        if (!creds) throw new Error(`Credentials must be provided for b2 repo in '${cfg.name}'`);
+        props.backblaze = creds;
+      } else {
+        if (creds) throw new Error('Credentials can be supported only for the B2 restic backend');
       }
 
       return new _ResticClient.ResticClient(props, this.sh, this.log);

package/lib/storage/restic/ResticController.js

@@ -9,7 +9,7 @@ var _inversify = require("inversify");
 
 var _ContextSymbols = require("../../ctx/ContextSymbols");
 
-var _Config = require("../../config/Config");
+var _config = require("../../config");
 
 var _ResticClientFactory = require("./ResticClientFactory");
 
@@ -21,7 +21,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 let ResticController = (_dec = (0, _inversify.injectable)(), _dec2 = function (target, key) {
   return (0, _inversify.inject)(_ContextSymbols.AppConfig_)(target, undefined, 2);
-}, _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [typeof _ResticClientFactory.ResticClientFactory === "undefined" ? Object : _ResticClientFactory.ResticClientFactory, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _Config.Config === "undefined" ? Object : _Config.Config]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class ResticController {
+}, _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [typeof _ResticClientFactory.ResticClientFactory === "undefined" ? Object : _ResticClientFactory.ResticClientFactory, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _config.Config === "undefined" ? Object : _config.Config]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class ResticController {
   constructor(restFact, log, cfg) {
     this.restFact = restFact;
     this.log = log;

package/lib/tools/gpg/Gpg.js

@@ -17,8 +17,15 @@ let Gpg = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design
   constructor(sh) {
     this.sh = sh;
 
+    _defineProperty(this, "importKey", key => {
+      this.sh.execWithStdIn({
+        cmd: `gpg --import`,
+        stdin: key
+      });
+    });
+
     _defineProperty(this, "exportKey", id => {
-      const res = this.sh.execAndReturnVal(`gpg --export-secret-key --armor ${id}`);
+      const res = this.sh.execAndReturnVal(`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/gpg/Gpg.spec.js

@@ -6,9 +6,20 @@ var _Gpg = require("./Gpg");
 
 var _Shell = require("../shell/Shell");
 
-// TODO find a way hot to provide prompt via stdin
-it.skip('works', () => {
+var _test = require("../../../test");
+
+var _fs = _interopRequireDefault(require("fs"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+it('works', () => {
   const sut = new _Gpg.Gpg(new _Shell.Shell(new _AppLogger.AppLogger()));
-  const key = sut.exportKey('john.doe@foo.com');
-  console.log('key', key);
+
+  const key = _fs.default.readFileSync((0, _test.testDir)('gpg/john.doe@foo.com.key.asc')).toString();
+
+  sut.importKey(key);
+  const exportedKey = sut.exportKey('john.doe@foo.com');
+  expect(exportedKey).toStartWith('-----BEGIN PGP PRIVATE KEY BLOCK-----');
+  expect(exportedKey).toEndWith('-----END PGP PRIVATE KEY BLOCK-----'); // Wont' work
+  // expect(key).toBe(exportedKey)
 });

package/lib/tools/shell/Shell.js

@@ -32,7 +32,7 @@ let Shell = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("desi
       stdin,
       opts = {}
     }) => {
-      this.log.debug(`"${stdin}" > ${cmd}`);
+      this.log.debug(`<stdin> > ${cmd}`);
       (0, _shellCmd.shellCmd)(cmd, { ...opts,
         stdin,
         returnStdout: false

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@ps-aux/nodebup",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "",
   "module": "lib/index.js",
   "main": "lib/index.js",
   "scripts": {
-    "build": "rm -rf build && babel --extensions '.ts,.js' src -d lib src",
+    "build": "rm -rf build && babel --extensions '.ts,.js,.md' src -d lib src",
     "pub": "npm publish --access public",
     "test": "jest",
     "tc": "tsc --noEmit",
@@ -76,6 +76,7 @@
     "@types/hapi__joi": "^17.1.8",
     "axios": "^0.24.0",
     "handlebars": "^4.7.7",
+    "ini": "^2.0.0",
     "inversify": "^6.0.1",
     "js-yaml": "^4.1.0",
     "pino": "^7.6.2",