@ps-aux/nodebup 0.7.0 → 0.7.3

package/lib/bup/pg/PgBackupController.js

@@ -17,6 +17,8 @@ var _Path = require("../../fs/path/Path");
 
 var _StorageBackendProvider = require("../../storage/StorageBackendProvider");
 
+var _Zipper = require("../../tools/compression/Zipper");
+
 var _dec, _dec2, _dec3, _class, _class2, _temp;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -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 _StorageBackendProvider.StorageBackendProvider === "undefined" ? Object : _StorageBackendProvider.StorageBackendProvider, typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell, typeof _Zipper.Zipper === "undefined" ? Object : _Zipper.Zipper]), _dec(_class = _dec2(_class = _dec3(_class = (_temp = _class2 = class PgBackupController {
   constructor( // private gpg: Gpg,
   // private ssh: SshKeyManager,
   fs, // private fsSyncer: FsSyncer,
   log, storageBackendProvider, // @inject(AppConfig_) private cfg: Config,
-  sh) {
+  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
@@ -71,12 +76,11 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
         const bashCmds = [`echo "*:*:*:*:${pass}" > ~/.pgpass`, `chmod 400 ~/.pgpass`, `pg_dumpall -d ${pgUrl}`]; // TODO improve sh logging to avoid showing secrets
 
         const b = this.sh.execAndReturnBuffer(`docker run --network host ` + `postgres:${version} ` + `bash -c '${bashCmds.join(' && ')}'`);
-        const 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 +99,16 @@ 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
 
-        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`);
+        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/ctx/Context.js

@@ -39,6 +39,8 @@ 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, _StorageBackendProvider.StorageBackendProvider, _StorageConfigProvider.StorageConfigProvider, _ResticClientFactory.ResticClientFactory, _AggregateBackupController.AggregateBackupController, _ResticController.ResticController, _B2CredentialsProvider.B2CredentialsProvider, _RCloneClientFactory.RCloneClientFactory, _DataBackupController.DataBackupController, _PgBackupController.PgBackupController, _Zipper.Zipper];
   self.forEach(s => c.bind(s).toSelf());
   return c;
 };

package/lib/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.0",
+  "version": "0.7.3",
   "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",