@ps-aux/nodebup 0.7.1 → 0.8.0

package/lib/bup/aggregate/AggregateBackupController.js

@@ -23,7 +23,7 @@ var _Path = require("../../fs/path/Path");
 
 var _config = require("../../config");
 
-var _StorageBackendProvider = require("../../storage/StorageBackendProvider");
+var _BackupStorageProvider = require("../../storage/BackupStorageProvider");
 
 var _dec, _dec2, _dec3, _dec4, _class;
 
@@ -31,7 +31,7 @@ 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 {
+}, _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 _BackupStorageProvider.BackupStorageProvider === "undefined" ? Object : _BackupStorageProvider.BackupStorageProvider, 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;

package/lib/bup/dir/DirBackupController.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DirBackupController = void 0;
+
+var _inversify = require("inversify");
+
+var _AppLogger = require("../../log/AppLogger");
+
+var _Path = require("../../fs/path/Path");
+
+var _BackupStorageProvider = require("../../storage/BackupStorageProvider");
+
+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 DirBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _BackupStorageProvider.BackupStorageProvider === "undefined" ? Object : _BackupStorageProvider.BackupStorageProvider]), _dec(_class = _dec2(_class = _dec3(_class = class DirBackupController {
+  constructor(log, storageProvider) {
+    this.log = log;
+    this.storageProvider = storageProvider;
+
+    _defineProperty(this, "backup", inp => {
+      const storage = this.storageProvider.provide();
+
+      const path = _Path.AbsPath.from(inp.path);
+
+      this.log.info(`Backing up from ${path} to '${storage}'`);
+      storage.store(path);
+    });
+
+    _defineProperty(this, "restore", inp => {
+      const storage = this.storageProvider.provide();
+
+      const path = _Path.AbsPath.from(inp.path);
+
+      this.log.info(`Restoring from '${storage}' to ${path}`);
+      storage.restore(path);
+    });
+  }
+
+}) || _class) || _class) || _class);
+exports.DirBackupController = DirBackupController;

package/lib/bup/pg/PgBackupController.js

@@ -15,7 +15,9 @@ var _Shell = require("../../tools/shell/Shell");
 
 var _Path = require("../../fs/path/Path");
 
-var _StorageBackendProvider = require("../../storage/StorageBackendProvider");
+var _BackupStorageProvider = require("../../storage/BackupStorageProvider");
+
+var _Zipper = require("../../tools/compression/Zipper");
 
 var _dec, _dec2, _dec3, _class, _class2, _temp;
 
@@ -35,16 +37,17 @@ const parseConnectionUrl = url => {
   };
 };
 
-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]), _dec(_class = _dec2(_class = _dec3(_class = (_temp = _class2 = class PgBackupController {
+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 _BackupStorageProvider.BackupStorageProvider === "undefined" ? Object : _BackupStorageProvider.BackupStorageProvider, 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) {
+  sh, zip) {
     this.fs = fs;
     this.log = log;
     this.storageBackendProvider = storageBackendProvider;
     this.sh = sh;
+    this.zip = zip;
 
     _defineProperty(this, "now", () => {
       const d = new Date();
@@ -54,6 +57,8 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
 
     _defineProperty(this, "getVersion", version => version || PgBackupController.defaultPgVersion);
 
+    _defineProperty(this, "outFileName", 'backup.sql');
+
     _defineProperty(this, "backup", ({
       pgUrl,
       pgVersion
@@ -68,15 +73,15 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
         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 bashCmds = [`echo "*:*:*:*:${pass}" > ~/.pgpass`, `chmod 400 ~/.pgpass`, `pg_dumpall -d ${pgUrl}`]; // Don't forget that this itself might be run in docker
+        // therefore volume mounts are not usable (will apply to the location at host)
 
         const b = this.sh.execAndReturnBuffer(`docker run --network host ` + `postgres:${version} ` + `bash -c '${bashCmds.join(' && ')}'`);
-        const outFileName = PgBackupController.outFileName;
-        const dumpOut = outputDir.resolve(outFileName);
+        const dumpOut = outputDir.resolve(this.outFileName);
         this.fs.writeFile(dumpOut, b);
         this.log.info('Compressing');
         const zipOutputName = `pg-backup-${this.now()}.zip`;
-        this.sh.exec(`cd ${outputDir.str()}; zip ${zipOutputName} ${outFileName}`);
+        this.zip.zipDir(outputDir, outputDir.resolve(zipOutputName));
         this.fs.rmFile(dumpOut);
         this.log.info('Uploading');
         storage.store(_Path.AbsPath.from(dir));
@@ -95,16 +100,19 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
       this.fs.inTmpDir('pg-restore', dirStr => {
         const dir = _Path.AbsPath.from(dirStr);
 
-        storage.restore(dir);
-        const zipFile = this.fs.listFiles(dir)[0]; //
+        storage.restore(dir); // TODO check if the dir contains the with the expected name
+        // TODO add e2e test for docker
 
-        this.sh.exec(`unzip ${zipFile.str()} -d ${dir.str()}`);
+        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`);
+        const outFile = this.fs.listFiles(dir)[0]; // Don't forget that this itself might be run in docker
+        // therefore volume mounts are not usable (will apply to the location at host)
+
+        this.sh.exec(`docker run --network host -i ` + `postgres:${version} ` + `psql ${pgUrl} -v ON_ERROR_STOP=0 < ${outFile.str()}`);
       });
     });
   }
 
-}, _defineProperty(_class2, "defaultPgVersion", '14.2'), _defineProperty(_class2, "outFileName", 'out.sql'), _temp)) || _class) || _class) || _class);
+}, _defineProperty(_class2, "defaultPgVersion", '14.2'), _temp)) || _class) || _class) || _class);
 exports.PgBackupController = PgBackupController;

package/lib/cli/app.js

@@ -17,7 +17,7 @@ var _AggregateBackupController = require("../bup/aggregate/AggregateBackupContro
 
 var _ResticController = require("../storage/restic/ResticController");
 
-var _DataBackupController = require("../bup/dir/DataBackupController");
+var _DirBackupController = require("../bup/dir/DirBackupController");
 
 var _PgBackupController = require("../bup/pg/PgBackupController");
 
@@ -43,27 +43,38 @@ const singleStorageOptions = [storageNameOpt, {
   convertCase: true,
   fromConfig: 'storage.credentials'
 }];
+const backupTagOption = {
+  name: 'backup-tag',
+  convertCase: true
+};
+const backupOptions = [backupTagOption];
+const restoreOptions = [backupTagOption, {
+  name: 'backup-snapshot-id',
+  convertCase: true
+}];
 
 const createApp = () => _nclif.CliApp.of({
   commands: {
-    data: (0, _nclif.cmdGroup)({
+    dir: (0, _nclif.cmdGroup)({
       options: singleStorageOptions,
       commands: {
         backup: (0, _nclif.cmd)({
           description: 'Backup a dir to the given storage',
+          options: backupOptions,
           positionals: [{
             name: 'path',
             required: true
           }],
-          run: (cmd, c) => c.get(_DataBackupController.DataBackupController).storage(cmd).backup()
+          run: (cmd, c) => c.get(_DirBackupController.DirBackupController).backup(cmd)
         }),
         restore: (0, _nclif.cmd)({
           description: 'Restore the storage to the given dir',
+          options: restoreOptions,
           positionals: [{
             name: 'path',
             required: true
           }],
-          run: (cmd, c) => c.get(_DataBackupController.DataBackupController).storage(cmd).restore()
+          run: (cmd, c) => c.get(_DirBackupController.DirBackupController).restore(cmd)
         })
       }
     }),
@@ -94,6 +105,10 @@ const restic = (0, _nclif.cmdGroup)({
     'init-repo': (0, _nclif.cmd)({
       options: singleStorageOptions,
       run: (_, c) => c.get(_ResticController.ResticController).initRepo()
+    }),
+    snapshots: (0, _nclif.cmd)({
+      options: singleStorageOptions,
+      run: (_, c, p) => c.get(_ResticController.ResticController).listSnapshots(p.stdout)
     })
   }
 });

package/lib/ctx/Context.js

@@ -23,22 +23,24 @@ var _AggregateBackupController = require("../bup/aggregate/AggregateBackupContro
 
 var _AppLogger = require("../log/AppLogger");
 
-var _StorageBackendProvider = require("../storage/StorageBackendProvider");
+var _BackupStorageProvider = require("../storage/BackupStorageProvider");
 
-var _ResticClientFactory = require("../storage/restic/ResticClientFactory");
+var _ResticFactory = require("../storage/restic/ResticFactory");
 
 var _ResticController = require("../storage/restic/ResticController");
 
 var _B2CredentialsProvider = require("../storage/b2/B2CredentialsProvider");
 
-var _RCloneClientFactory = require("../storage/rclone/RCloneClientFactory");
+var _RCloneFactory = require("../storage/rclone/RCloneFactory");
 
-var _DataBackupController = require("../bup/dir/DataBackupController");
+var _DirBackupController = require("../bup/dir/DirBackupController");
 
 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);
@@ -47,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, _DataBackupController.DataBackupController, _PgBackupController.PgBackupController];
+  const self = [_Gpg.Gpg, _Shell.Shell, _FsSyncer.FsSyncer, _SshKeyManager.SshKeyManager, _BackupStorageProvider.BackupStorageProvider, _StorageConfigProvider.StorageConfigProvider, _ResticFactory.ResticFactory, _AggregateBackupController.AggregateBackupController, _ResticController.ResticController, _B2CredentialsProvider.B2CredentialsProvider, _RCloneFactory.RCloneFactory, _DirBackupController.DirBackupController, _PgBackupController.PgBackupController, _Zipper.Zipper];
   self.forEach(s => c.bind(s).toSelf());
   return c;
 };

package/lib/log/AppLogger.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.AppLogger = void 0;
+exports.logger = exports.AppLogger = void 0;
 
 var _ConsoleLogger = require("./ConsoleLogger");
 
@@ -26,5 +26,10 @@ let AppLogger = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("
     if (mute) this.log.setEnabled(false);
   }
 
-}) || _class) || _class) || _class);
-exports.AppLogger = AppLogger;
+}) || _class) || _class) || _class); // TODO make use of the name for logging
+
+exports.AppLogger = AppLogger;
+
+const logger = name => new AppLogger();
+
+exports.logger = logger;

package/lib/storage/BackupStorage.js

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BackupStorage = void 0;
+
+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 BackupStorage {
+  constructor(backend, props) {
+    this.backend = backend;
+    this.props = props;
+
+    _defineProperty(this, "store", from => {
+      const {
+        tag
+      } = this.props;
+      const tags = tag ? [tag] : undefined;
+      this.backend.backup(from, tags);
+    });
+
+    _defineProperty(this, "restore", to => {
+      const {
+        snapshotId
+      } = this.props;
+      if (snapshotId) this.backend.restoreSnapshot(to, snapshotId);else this.backend.restoreLatest(to);
+    });
+  }
+
+}
+
+exports.BackupStorage = BackupStorage;

package/lib/storage/BackupStorageProvider.js

@@ -0,0 +1,50 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BackupStorageProvider = void 0;
+
+var _inversify = require("inversify");
+
+var _types = require("./types");
+
+var _ResticFactory = require("./restic/ResticFactory");
+
+var _RCloneFactory = require("./rclone/RCloneFactory");
+
+var _StorageConfigProvider = require("./StorageConfigProvider");
+
+var _BackupStorage = require("./BackupStorage");
+
+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 BackupStorageProvider = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _ResticFactory.ResticFactory === "undefined" ? Object : _ResticFactory.ResticFactory, typeof _RCloneFactory.RCloneFactory === "undefined" ? Object : _RCloneFactory.RCloneFactory, typeof _StorageConfigProvider.StorageConfigProvider === "undefined" ? Object : _StorageConfigProvider.StorageConfigProvider]), _dec(_class = _dec2(_class = _dec3(_class = class BackupStorageProvider {
+  constructor(resticFac, rcloneFac, cfgProvider) {
+    this.resticFac = resticFac;
+    this.rcloneFac = rcloneFac;
+    this.cfgProvider = cfgProvider;
+
+    _defineProperty(this, "provide", () => {
+      const cfg = this.cfgProvider.provide();
+      const back = this.getBackend(cfg);
+      return new _BackupStorage.BackupStorage(back, cfg.backup);
+    });
+
+    _defineProperty(this, "getBackend", cfg => {
+      switch (cfg.type) {
+        case _types.StorageType.Restic:
+          return this.resticFac.createBackupBackend(cfg);
+
+        case _types.StorageType.RClone:
+          return this.rcloneFac.createBackupBackend(cfg);
+      }
+
+      throw new Error(`Unsupported storage type ${cfg.type}`);
+    });
+  }
+
+}) || _class) || _class) || _class);
+exports.BackupStorageProvider = BackupStorageProvider;

package/lib/storage/StorageConfigProvider.js

@@ -52,7 +52,12 @@ let StorageConfigProvider = (_dec = (0, _inversify.injectable)(), _dec2 = functi
         res.repo = 'local:' + this.fs.expandStrPath(path);
       }
 
-      return res;
+      return { ...res,
+        backup: {
+          tag: this.inputs.backupTag,
+          snapshotId: this.inputs.backupSnapshotId
+        }
+      };
     });
 
     _defineProperty(this, "getByCliConfig", inp => {

package/lib/storage/rclone/{RCloneClientFactory.js → RCloneFactory.js}

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RCloneClientFactory = void 0;
+exports.RCloneFactory = void 0;
 
 var _inversify = require("inversify");
 
@@ -17,6 +17,8 @@ var _RcloneClient = require("./RcloneClient");
 
 var _B2CredentialsProvider = require("../b2/B2CredentialsProvider");
 
+var _RcloneBackupBackend = require("./RcloneBackupBackend");
+
 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; }
@@ -32,14 +34,16 @@ const parseRepoUrl = url => {
   };
 };
 
-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 {
+let RCloneFactory = (_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 RCloneFactory {
   constructor(sh, log, fs, b2) {
     this.sh = sh;
     this.log = log;
     this.fs = fs;
     this.b2 = b2;
 
-    _defineProperty(this, "create", cfg => {
+    _defineProperty(this, "createBackupBackend", cfg => new _RcloneBackupBackend.RcloneBackupBackend(this.createClient(cfg)));
+
+    _defineProperty(this, "createClient", cfg => {
       const {
         type,
         location
@@ -66,4 +70,4 @@ let RCloneClientFactory = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.
   }
 
 }) || _class) || _class) || _class);
-exports.RCloneClientFactory = RCloneClientFactory;
+exports.RCloneFactory = RCloneFactory;

package/lib/storage/rclone/RcloneBackupBackend.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.RcloneBackupBackend = void 0;
+
+var _AppLogger = require("../../log/AppLogger");
+
+var _nclif = require("@ps-aux/nclif");
+
+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 RcloneBackupBackend {
+  constructor(rclone) {
+    this.rclone = rclone;
+
+    _defineProperty(this, "log", (0, _AppLogger.logger)(RcloneBackupBackend.name));
+
+    _defineProperty(this, "backup", (from, tags) => {
+      if (tags) throw new _nclif.InvalidInputError(`Rclone does not support tags`);
+      this.log.info('Performing backup', {
+        from
+      });
+      this.rclone.backup(from);
+    });
+
+    _defineProperty(this, "restoreLatest", to => {
+      this.log.info('Restoring', {
+        to
+      });
+      this.rclone.restore(to);
+    });
+
+    _defineProperty(this, "restoreSnapshot", (to, snapshotId) => {
+      throw new _nclif.InvalidInputError(`Rclone does not support snaphosts`);
+    });
+  }
+
+}
+
+exports.RcloneBackupBackend = RcloneBackupBackend;

package/lib/storage/restic/ResticBackupBackend.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ResticBackupBackend = void 0;
+
+var _Path = require("../../fs/path/Path");
+
+var _AppLogger = require("../../log/AppLogger");
+
+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 ResticBackupBackend {
+  constructor(restic) {
+    this.restic = restic;
+
+    _defineProperty(this, "log", (0, _AppLogger.logger)(ResticBackupBackend.name));
+
+    _defineProperty(this, "backup", (from, tags = []) => {
+      this.log.info(`Performing backup from=${from}, tags=${tags}`);
+      this.restic.backup(from, _Path.RelativePath.from('.'), tags);
+      this.restic.forget();
+    });
+
+    _defineProperty(this, "restoreLatest", to => {
+      this.log.info(`Restoring latest snapshot to=${to}`);
+      this.restic.restore(to);
+    });
+
+    _defineProperty(this, "restoreSnapshot", (to, snapshotId) => {
+      this.log.info(`Restoring snapshot '${snapshotId}'`, {
+        to
+      });
+      this.restic.restore(to, snapshotId);
+    });
+  }
+
+}
+
+exports.ResticBackupBackend = ResticBackupBackend;

package/lib/storage/restic/ResticClient.js

@@ -14,12 +14,11 @@ const normalizeUrl = url => {
 
   return url;
 };
+
 /**
  * Tested with: restic 0.9.6 compiled with go1.12.12 on linux/amd64
  * TODO forwarding stdout to the logger
  */
-
-
 class ResticClient {
   constructor(cfg, shell, log) {
     this.cfg = cfg;
@@ -35,19 +34,50 @@ class ResticClient {
       });
     });
 
-    _defineProperty(this, "backup", (cwd, from) => {
+    _defineProperty(this, "backup", (cwd, from, tags = []) => {
       this.log.debug(`Running backup for repo=${this.url}`);
-      this.shell.exec(`restic backup ${from.str()}`, {
+      let cmd = `restic backup ${from.str()}`;
+      tags.forEach(t => {
+        cmd += ` --tag=${t}`;
+      });
+      this.shell.exec(cmd, {
         cwd: cwd.str(),
         env: this.env()
       });
     });
 
-    _defineProperty(this, "restore", to => {
+    _defineProperty(this, "restore", (to, snapshotId = 'latest') => {
       this.log.debug('Running restore  for repo=', this.url);
-      this.shell.exec(`restic restore latest --target ${to.str()}`, {
+      this.shell.exec(`restic restore ${snapshotId} --target ${to.str()}`, {
+        env: this.env()
+      });
+    });
+
+    _defineProperty(this, "forget", () => {
+      this.log.debug(`Pruning repo=${this.url}`);
+      const cfg = {
+        hourly: 12,
+        daily: 7,
+        weekly: 8,
+        monthly: 24
+      };
+      this.shell.exec(`restic forget --prune ` + `--tag '' ` + // Ignore the tagged snapshots
+      `--keep-hourly ${cfg.hourly}  --keep-daily ${cfg.daily} ` + `--keep-weekly ${cfg.weekly} --keep-monthly ${cfg.monthly}`, {
+        env: this.env()
+      });
+    });
+
+    _defineProperty(this, "snapshots", () => {
+      this.log.debug(`Listing snapshots of repo=${this.url}`);
+      const out = this.shell.execAndReturnString(`restic snapshots --json`, {
         env: this.env()
       });
+      const res = JSON.parse(out);
+      return res.map(r => ({
+        id: r.id,
+        time: new Date(r.time),
+        tags: r.tags
+      }));
     });
 
     _defineProperty(this, "env", () => ({

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

@@ -34,8 +34,21 @@ describe('ResticClient', () => {
     it('create repo', () => {
       sut.prepareRepo();
     });
-    it('push data', () => {
-      sut.backup(_Path.AbsPath.from(backupDir), _Path.RelativePath.from('.'));
+    it('push data & forget', () => {
+      const from = _Path.AbsPath.from(backupDir);
+
+      const to = _Path.RelativePath.from('.');
+
+      sut.backup(from, to);
+      sut.backup(from, to, ['foo', 'bar']);
+      sut.forget();
+      sut.backup(from, to);
+      const res = sut.snapshots();
+      expect(res).toBeArrayOfSize(3);
+      const tagged = res[1];
+      expect(tagged.id).toBeDefined();
+      expect(tagged.time).toBeDate();
+      expect(tagged.tags).toEqual(['foo', 'bar']);
     });
     it('restore data', () => {
       sut.restore(_Path.AbsPath.from(restoreDir));

package/lib/storage/restic/ResticController.js

@@ -11,7 +11,7 @@ var _ContextSymbols = require("../../ctx/ContextSymbols");
 
 var _config = require("../../config");
 
-var _ResticClientFactory = require("./ResticClientFactory");
+var _ResticFactory = require("./ResticFactory");
 
 var _AppLogger = require("../../log/AppLogger");
 
@@ -24,19 +24,29 @@ 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 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, typeof _StorageConfigProvider.StorageConfigProvider === "undefined" ? Object : _StorageConfigProvider.StorageConfigProvider]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class ResticController {
-  constructor(restFact, log, cfg, storageConfigProvider) {
+  return (0, _inversify.inject)(_ContextSymbols.AppConfig_)(target, undefined, 1);
+}, _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [typeof _ResticFactory.ResticFactory === "undefined" ? Object : _ResticFactory.ResticFactory, typeof _config.Config === "undefined" ? Object : _config.Config, typeof _StorageConfigProvider.StorageConfigProvider === "undefined" ? Object : _StorageConfigProvider.StorageConfigProvider]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class ResticController {
+  constructor(restFact, cfg, storageConfigProvider) {
     this.restFact = restFact;
-    this.log = log;
     this.cfg = cfg;
     this.storageConfigProvider = storageConfigProvider;
 
-    _defineProperty(this, "initRepo", () => {
+    _defineProperty(this, "log", (0, _AppLogger.logger)(ResticController.name));
+
+    _defineProperty(this, "client", () => {
       const props = this.storageConfigProvider.provide();
       if (props.type !== _types.StorageType.Restic) throw new Error('Storage is not Restic storage');
       this.log.info('Initializing repo', props.repo);
-      this.restFact.create(props).prepareRepo();
+      return this.restFact.createClient(props);
+    });
+
+    _defineProperty(this, "initRepo", () => {
+      this.client().prepareRepo();
+    });
+
+    _defineProperty(this, "listSnapshots", print => {
+      const res = this.client().snapshots();
+      print(JSON.stringify(res, null, 4));
     });
   }
 

package/lib/storage/restic/{ResticClientFactory.js → ResticFactory.js}

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ResticClientFactory = void 0;
+exports.ResticFactory = void 0;
 
 var _inversify = require("inversify");
 
@@ -17,18 +17,22 @@ var _Fs = require("../../fs/Fs");
 
 var _B2CredentialsProvider = require("../b2/B2CredentialsProvider");
 
+var _ResticBackupBackend = require("./ResticBackupBackend");
+
 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 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 {
+let ResticFactory = (_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 ResticFactory {
   constructor(sh, log, fs, b2) {
     this.sh = sh;
     this.log = log;
     this.fs = fs;
     this.b2 = b2;
 
-    _defineProperty(this, "create", cfg => {
+    _defineProperty(this, "createBackupBackend", cfg => new _ResticBackupBackend.ResticBackupBackend(this.createClient(cfg)));
+
+    _defineProperty(this, "createClient", cfg => {
       if (!cfg.encryptionPassword) throw new Error(`Restic needs encryptionPassword. Repo=${cfg.repo}`);
       const props = {
         repo: {
@@ -50,4 +54,4 @@ let ResticClientFactory = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.
   }
 
 }) || _class) || _class) || _class);
-exports.ResticClientFactory = ResticClientFactory;
+exports.ResticFactory = ResticFactory;

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ps-aux/nodebup",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "",
   "module": "lib/index.js",
   "main": "lib/index.js",
@@ -80,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/dir/DataBackupController.js

@@ -1,44 +0,0 @@
-"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/storage/BackupClientStorageBackend.js

@@ -1,27 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.BackupClientStorageBackend = void 0;
-
-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 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.BackupClientStorageBackend = BackupClientStorageBackend;

package/lib/storage/StorageBackendProvider.js

@@ -1,50 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.StorageBackendProvider = void 0;
-
-var _inversify = require("inversify");
-
-var _types = require("./types");
-
-var _ResticClientFactory = require("./restic/ResticClientFactory");
-
-var _BackupClientStorageBackend = require("./BackupClientStorageBackend");
-
-var _RCloneClientFactory = require("./rclone/RCloneClientFactory");
-
-var _StorageConfigProvider = require("./StorageConfigProvider");
-
-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 = 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.rcloneFac = rcloneFac;
-    this.cfgProvider = cfgProvider;
-
-    _defineProperty(this, "provide", () => {
-      const s = this.cfgProvider.provide();
-      let b = null;
-
-      switch (s.type) {
-        case _types.StorageType.Restic:
-          b = this.resticFac.create(s);
-          break;
-
-        case _types.StorageType.RClone:
-          b = this.rcloneFac.create(s);
-          break;
-      }
-
-      if (!b) throw new Error(`Unsupported storage type ${s.type}`);
-      return new _BackupClientStorageBackend.BackupClientStorageBackend(b);
-    });
-  }
-
-}) || _class) || _class) || _class);
-exports.StorageBackendProvider = StorageBackendProvider;