@ps-aux/nodebup 0.3.0 → 0.6.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");
@@ -23,6 +21,8 @@ var _AppLogger = require("../log/AppLogger");
 
 var _Path = require("../fs/path/Path");
 
+var _config = require("../config");
+
 var _StorageBackendProvider = require("../storage/StorageBackendProvider");
 
 var _dec, _dec2, _dec3, _dec4, _class;
@@ -31,17 +31,17 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 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 {
-  constructor(gpg, ssh, fs, fsSyncer, log, storageBackendProvider, cfg) {
+}, _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, storageProvider, cfg) {
     this.gpg = gpg;
     this.ssh = ssh;
     this.fs = fs;
     this.fsSyncer = fsSyncer;
     this.log = log;
-    this.storageBackendProvider = storageBackendProvider;
+    this.storageProvider = storageProvider;
     this.cfg = cfg;
 
-    _defineProperty(this, "backup", async (aggrName, storage) => {
+    _defineProperty(this, "backup", async aggrName => {
       const aggrDir = this.cfg.pwd.resolve('.aggr');
       const aggr = this.cfg.aggregates.find(a => a.name === aggrName);
       if (!aggr) throw new Error(`No backup aggregate with name '${aggrName}'`);
@@ -56,7 +56,7 @@ let AggregateBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = fu
         file.forEach(f => this.runFileTask(f, aggrDir));
         sshKey.forEach(k => this.runSshKeyTask(k, aggrDir));
         gpgKey.forEach(k => this.runGpgKeyTask(k, aggrDir));
-        this.storageBackendProvider.provide(storage).store(aggrDir);
+        this.storageProvider.provide().store(aggrDir);
       } finally {
         this.log.debug();
         this.fs.rmDir(aggrDir);

package/lib/bup/BackupController.js

@@ -0,0 +1,63 @@
+"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;

package/lib/cli/InvalidInput.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.InvalidInput = void 0;
+
+class InvalidInput extends Error {}
+
+exports.InvalidInput = InvalidInput;

package/lib/cli/app.js

@@ -17,16 +17,50 @@ var _AggregateBackupController = require("../bup/AggregateBackupController");
 
 var _ResticController = require("../storage/restic/ResticController");
 
+var _BackupController = require("../bup/BackupController");
+
+const storageNameOpt = {
+  name: 'storage-name',
+  convertCase: true,
+  fromConfig: 'storage.name'
+};
+
 const createApp = () => _nclif.CliApp.of({
   commands: {
-    restic: (0, _nclif.cmdGroup)({
+    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'
+      }],
       commands: {
-        'init-repo': (0, _nclif.cmd)({
+        backup: (0, _nclif.cmd)({
+          description: 'Backup a dir to the given storage',
+          positionals: [{
+            name: 'path',
+            required: true
+          }],
+          run: (cmd, c) => c.get(_BackupController.BackupController).storage(cmd).backup()
+        }),
+        restore: (0, _nclif.cmd)({
+          description: 'Restore the storage to the given dir',
           positionals: [{
-            name: 'resticStorageName',
+            name: 'path',
             required: true
           }],
-          run: (arg, c) => c.get(_ResticController.ResticController).initRepo(arg.resticStorageName)
+          run: (cmd, c) => c.get(_BackupController.BackupController).storage(cmd).restore()
         })
       }
     }),
@@ -34,22 +68,28 @@ const createApp = () => _nclif.CliApp.of({
       commands: {
         backup: (0, _nclif.cmd)({
           description: 'Run backup',
+          options: [storageNameOpt],
           positionals: [{
             name: 'aggregateName',
-            type: 'string',
-            required: true
-          }, {
-            name: 'storageName',
-            type: 'string',
             required: true
           }],
-          run: (a, c) => c.get(_AggregateBackupController.AggregateBackupController).backup(a.aggregateName, a.storageName)
+          run: (a, c) => c.get(_AggregateBackupController.AggregateBackupController).backup(a.aggregateName)
         })
       }
-    })
+    }),
+    restic
   }
-}).addObjectConfig(pwd => (0, _Config.readConfig)(pwd)).context(({
-  config
-}) => (0, _Context.createContext)(config));
+}).envConfig('NODEBUP').addObjectConfig(pwd => (0, _Config.readConfig)(pwd)).context(({
+  config,
+  inputs
+}) => (0, _Context.createContext)(config, inputs));
 
-exports.createApp = createApp;
+exports.createApp = createApp;
+const restic = (0, _nclif.cmdGroup)({
+  commands: {
+    'init-repo': (0, _nclif.cmd)({
+      options: [storageNameOpt],
+      run: (arg, c) => c.get(_ResticController.ResticController).initRepo()
+    })
+  }
+});

package/lib/config/Config.js

@@ -13,15 +13,7 @@ var _validateConfigAgainstSchema = require("./validateConfigAgainstSchema");
 
 var _expandAndCreatePath = require("./expandAndCreatePath");
 
-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 => {
-    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);
-  });
+const expandPaths = (cfg, exp) => {
   cfg.aggregates.forEach(a => {
     a.sources.file.forEach(f => {
       f.from = exp(f.from);
@@ -57,7 +49,7 @@ const readConfig = pwdStr => {
     return p;
   };
 
-  expandPaths(cfg, expand, cwd);
+  expandPaths(cfg, expand);
   return cfg;
 };
 

package/lib/config/expandAndCreatePath.js

@@ -9,12 +9,14 @@ var _Path = require("../fs/path/Path");
 
 var _os = _interopRequireDefault(require("os"));
 
+var _path = _interopRequireDefault(require("path"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const expandStrPath = (path, pwd) => {
   path = path.replace('<cwd>', pwd.str());
   path = path.replace('~', _os.default.homedir());
-  return path;
+  return _path.default.resolve(path);
 };
 
 exports.expandStrPath = expandStrPath;

package/lib/config/validateConfigAgainstSchema.js

@@ -7,6 +7,8 @@ exports.validateConfigAgainstSchema = void 0;
 
 var _joi = _interopRequireDefault(require("@hapi/joi"));
 
+var _StoreConfig = require("../storage/StoreConfig");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const DirTaskSchema = _joi.default.object({
@@ -21,21 +23,6 @@ const KeyTaskSchema = _joi.default.object({
   to: _joi.default.string().optional()
 });
 
-const createStorageSchema = props => _joi.default.object({
-  name: _joi.default.string(),
-  type: _joi.default.string(),
-  ...props
-});
-
-const FileStorageSchema = createStorageSchema({
-  path: _joi.default.string()
-});
-const ResticStorageSchema = createStorageSchema({
-  repo: _joi.default.string(),
-  credentialsFile: _joi.default.string().optional(),
-  passwordFile: _joi.default.string()
-});
-
 const Sources = _joi.default.object({
   dir: _joi.default.array().items(DirTaskSchema).optional(),
   file: _joi.default.array().items(FileTaskSchema).optional(),
@@ -50,7 +37,7 @@ const Aggregate = _joi.default.object({
 
 const Schema = () => _joi.default.object({
   // TODO undescriptive error msg. Invalid config."storage[0]" does not match any of the allowed types
-  storage: _joi.default.array().items(FileStorageSchema, ResticStorageSchema),
+  storage: _joi.default.array().items((0, _StoreConfig.NamedStorageSchema)()),
   aggregates: _joi.default.array().items(Aggregate)
 });
 

package/lib/config/validateConfigAgainstSchema.spec.js

@@ -4,10 +4,6 @@ var _validateConfigAgainstSchema = require("./validateConfigAgainstSchema");
 
 const f1 = {
   storage: [{
-    name: 'fs',
-    type: 'file',
-    path: '~/tmp/nodepub/test-store'
-  }, {
     name: 'restic',
     type: 'restic',
     repo: 'b2:reo',

package/lib/ctx/Context.js

@@ -29,13 +29,23 @@ var _ResticClientFactory = require("../storage/restic/ResticClientFactory");
 
 var _ResticController = require("../storage/restic/ResticController");
 
-const createContext = cfg => {
+var _B2CredentialsProvider = require("../storage/b2/B2CredentialsProvider");
+
+var _RCloneClientFactory = require("../storage/rclone/RCloneClientFactory");
+
+var _BackupController = require("../bup/BackupController");
+
+var _StorageConfigProvider = require("../storage/StorageConfigProvider");
+
+const createContext = (cfg, inp) => {
   const c = new _inversify.Container();
   c.bind(_ContextSymbols.AppConfig_).toConstantValue(cfg);
+  c.bind(_ContextSymbols.Inputs_).toConstantValue(inp);
   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];
+  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];
   self.forEach(s => c.bind(s).toSelf());
   return c;
 };

package/lib/ctx/ContextSymbols.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TaskConfig_ = exports.StorageConfig_ = exports.Log_ = exports.AppConfig_ = void 0;
+exports.TaskConfig_ = exports.StorageConfig_ = exports.Log_ = exports.Inputs_ = exports.AppConfig_ = void 0;
 const Log_ = Symbol.for('Log');
 exports.Log_ = Log_;
 const TaskConfig_ = Symbol.for('config.Tasks');
@@ -11,4 +11,6 @@ exports.TaskConfig_ = TaskConfig_;
 const StorageConfig_ = Symbol.for('config.Storage');
 exports.StorageConfig_ = StorageConfig_;
 const AppConfig_ = Symbol.for('config.app');
-exports.AppConfig_ = AppConfig_;
+exports.AppConfig_ = AppConfig_;
+const Inputs_ = Symbol.for('cmd.input');
+exports.Inputs_ = Inputs_;

package/lib/fs/Fs.js

@@ -7,18 +7,23 @@ exports.Fs = void 0;
 
 var _fs = _interopRequireDefault(require("fs"));
 
+var _Path = require("./path/Path");
+
 var _inversify = require("inversify");
 
 var _AppLogger = require("../log/AppLogger");
 
+var _expandAndCreatePath = require("../config/expandAndCreatePath");
+
 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 Fs = (_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 Fs {
-  constructor(log) {
+let Fs = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Path.AbsPath === "undefined" ? Object : _Path.AbsPath, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger]), _dec(_class = _dec2(_class = _dec3(_class = class Fs {
+  constructor(cwd, log) {
+    this.cwd = cwd;
     this.log = log;
 
     _defineProperty(this, "writeFile", (path, content) => {
@@ -75,6 +80,10 @@ let Fs = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:
     });
 
     _defineProperty(this, "exists", path => _fs.default.existsSync(path.str()));
+
+    _defineProperty(this, "expand", strPath => (0, _expandAndCreatePath.expandAndCreatePath)(strPath, this.cwd));
+
+    _defineProperty(this, "expandStrPath", strPath => (0, _expandAndCreatePath.expandStrPath)(strPath, this.cwd));
   }
 
 }) || _class) || _class) || _class);

package/lib/fs/fssync/FsSync.spec.js

@@ -23,7 +23,7 @@ describe('FsSync', () => {
 
   it('syncs dir', () => {
     const l = new _AppLogger.AppLogger();
-    const sut = new _FsSyncer.FsSyncer(new _Shell.Shell(l), new _Fs.Fs(l), l);
+    const sut = new _FsSyncer.FsSyncer(new _Shell.Shell(l), new _Fs.Fs(_Path.AbsPath.from(__dirname), l), l);
     sut.syncDirs(from, to);
     expect((0, _areDirsSame.areDirsSame)(from, to)).toBe(true);
   });

package/lib/log/AppLogger.js

@@ -9,12 +9,12 @@ var _ConsoleLogger = require("./ConsoleLogger");
 
 var _inversify = require("inversify");
 
-var _dec, _class;
+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 AppLogger = (_dec = (0, _inversify.injectable)(), _dec(_class = class AppLogger {
-  constructor() {
+let AppLogger = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [void 0]), _dec(_class = _dec2(_class = _dec3(_class = class AppLogger {
+  constructor(mute = false) {
     _defineProperty(this, "log", new _ConsoleLogger.ConsoleLogger());
 
     _defineProperty(this, "debug", this.log.debug);
@@ -22,7 +22,9 @@ let AppLogger = (_dec = (0, _inversify.injectable)(), _dec(_class = class AppLog
     _defineProperty(this, "info", this.log.info);
 
     _defineProperty(this, "error", this.log.error);
+
+    if (mute) this.log.setEnabled(false);
   }
 
-}) || _class);
+}) || _class) || _class) || _class);
 exports.AppLogger = AppLogger;

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,21 +3,25 @@
 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;
 
     _defineProperty(this, "store", from => {
       this.client.backup(from, _Path.RelativePath.from('.'));
     });
+
+    _defineProperty(this, "restore", to => {
+      this.client.restore(to);
+    });
   }
 
 }
 
-exports.ResticStorageBackend = ResticStorageBackend;
+exports.BackupClientStorageBackend = BackupClientStorageBackend;

package/lib/storage/StorageBackendProvider.js

@@ -7,47 +7,44 @@ exports.StorageBackendProvider = void 0;
 
 var _inversify = require("inversify");
 
-var _FsSyncer = require("../fs/fssync/FsSyncer");
-
-var _LocalFileStorageBackend = require("./local-file/LocalFileStorageBackend");
-
-var _ContextSymbols = require("../ctx/ContextSymbols");
-
-var _Config = require("../config/Config");
+var _types = require("./types");
 
 var _ResticClientFactory = require("./restic/ResticClientFactory");
 
-var _ResticStorageBackend = require("./restic/ResticStorageBackend");
+var _BackupClientStorageBackend = require("./BackupClientStorageBackend");
+
+var _RCloneClientFactory = require("./rclone/RCloneClientFactory");
 
-var _Fs = require("../fs/Fs");
+var _StorageConfigProvider = require("./StorageConfigProvider");
 
-var _dec, _dec2, _dec3, _dec4, _class;
+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 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) {
-    this.fsSyncer = fsSyncer;
+let StorageBackendProvider = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _ResticClientFactory.ResticClientFactory === "undefined" ? Object : _ResticClientFactory.ResticClientFactory, typeof _RCloneClientFactory.RCloneClientFactory === "undefined" ? Object : _RCloneClientFactory.RCloneClientFactory, typeof _StorageConfigProvider.StorageConfigProvider === "undefined" ? Object : _StorageConfigProvider.StorageConfigProvider]), _dec(_class = _dec2(_class = _dec3(_class = class StorageBackendProvider {
+  constructor(resticFac, rcloneFac, cfgProvider) {
     this.resticFac = resticFac;
-    this.fs = fs;
-    this.cfg = cfg;
+    this.rcloneFac = rcloneFac;
+    this.cfgProvider = cfgProvider;
 
-    _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}`);
-    });
+    _defineProperty(this, "provide", () => {
+      const s = this.cfgProvider.provide();
+      let b = null;
 
-    _defineProperty(this, "restic", cfg => {
-      return new _ResticStorageBackend.ResticStorageBackend(this.resticFac.create(cfg));
-    });
+      switch (s.type) {
+        case _types.StorageType.Restic:
+          b = this.resticFac.create(s);
+          break;
+
+        case _types.StorageType.RClone:
+          b = this.rcloneFac.create(s);
+          break;
+      }
 
-    _defineProperty(this, "localFile", cfg => {
-      return new _LocalFileStorageBackend.LocalFileStorageBackend(this.fsSyncer, cfg.path);
+      if (!b) throw new Error(`Unsupported storage type ${s.type}`);
+      return new _BackupClientStorageBackend.BackupClientStorageBackend(b);
     });
   }
 
-}) || _class) || _class) || _class) || _class);
+}) || _class) || _class) || _class);
 exports.StorageBackendProvider = StorageBackendProvider;

package/lib/storage/StorageConfigProvider.js

@@ -0,0 +1,89 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.StorageConfigProvider = void 0;
+
+var _inversify = require("inversify");
+
+var _ContextSymbols = require("../ctx/ContextSymbols");
+
+var _config = require("../config");
+
+var _Fs = require("../fs/Fs");
+
+var _InvalidInput = require("../cli/InvalidInput");
+
+var _StoreConfig = require("./StoreConfig");
+
+var _dec, _dec2, _dec3, _dec4, _dec5, _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 StorageConfigProvider = (_dec = (0, _inversify.injectable)(), _dec2 = function (target, key) {
+  return (0, _inversify.inject)(_ContextSymbols.AppConfig_)(target, undefined, 1);
+}, _dec3 = function (target, key) {
+  return (0, _inversify.inject)(_ContextSymbols.Inputs_)(target, undefined, 2);
+}, _dec4 = Reflect.metadata("design:type", Function), _dec5 = Reflect.metadata("design:paramtypes", [typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _config.Config === "undefined" ? Object : _config.Config, typeof StorageInputs === "undefined" ? Object : StorageInputs]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = _dec5(_class = class StorageConfigProvider {
+  constructor(fs, cfg, inputs) {
+    this.fs = fs;
+    this.cfg = cfg;
+    this.inputs = inputs;
+
+    _defineProperty(this, "provide", () => {
+      const {
+        storageName,
+        storagePassword,
+        storageRepo,
+        storageType
+      } = this.inputs;
+      let res;
+
+      if (storageName) {
+        if (storageType || storageRepo || storagePassword) throw new _InvalidInput.InvalidInput('Storage config provided. Storage name is therefore invalid input');
+        res = this.getByName(storageName);
+      } else {
+        res = this.getByCliConfig(this.inputs);
+      }
+
+      if (res.repo.startsWith('local:')) {
+        const path = res.repo.split('local:')[1];
+        res.repo = 'local:' + this.fs.expandStrPath(path);
+      }
+
+      return res;
+    });
+
+    _defineProperty(this, "getByCliConfig", inp => {
+      // // TODO unify validation usage
+      const r = (0, _StoreConfig.CliStorageConfigSchema)().validate(inp, {
+        presence: 'required',
+        allowUnknown: true
+      });
+      if (r.error) throw new _InvalidInput.InvalidInput(r.error.toString());
+      const cfg = inp;
+      return {
+        type: cfg.storageType,
+        repo: cfg.storageRepo,
+        encryptionPassword: cfg.storagePassword,
+        credentials: cfg.storageCredentials
+      };
+    });
+
+    _defineProperty(this, "getByName", name => {
+      const cfg = this.cfg.storage.find(s => s.name === name);
+      if (!cfg) throw new Error(`No such storage '${name}'`);
+      const encryptionPassword = cfg.passwordFile ? this.fs.readFile(this.fs.expand(cfg.passwordFile)).trim() : undefined;
+      const credentials = cfg.credentialsFile ? this.fs.readFile(this.fs.expand(cfg.credentialsFile)).trim() : undefined;
+      return {
+        type: cfg.type,
+        repo: cfg.repo,
+        credentials,
+        encryptionPassword
+      };
+    });
+  }
+
+}) || _class) || _class) || _class) || _class) || _class);
+exports.StorageConfigProvider = StorageConfigProvider;