@ps-aux/nodebup 0.9.9 → 0.10.0

package/lib/bup/pg/PgBackupController.js

@@ -76,21 +76,13 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
       await this.fs.inTmpDir('pg-backup', async dir => {
         const outputDir = _Path.AbsPath.from(dir);
 
-        this.log.info('Dumping database to a file');
+        this.log.info('Processing Postgres backup');
         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 dumpOut = outputDir.resolve(this.outFileName);
-        const f = this.fs.writeStream(dumpOut);
-        await this.sh.asyncExec(`docker run --rm --network host ` + `postgres:${version} ` + `bash -c '${bashCmds.join(' && ')}'`, // f.write
-        data => {
-          f.write(data);
-        });
-        f.end();
-        this.log.info('Compressing');
-        const zipOutputName = `pg-backup-${this.now()}.zip`;
-        await this.zip.zipDir(outputDir, outputDir.resolve(zipOutputName));
-        this.fs.rmFile(dumpOut);
+        const zipOutPath = outputDir.resolve(`pg-backup-${this.now()}.sql.gz`);
+        this.log.info(`Dumping database to ${zipOutPath.str()}`);
+        await this.sh.exec(`docker run --rm --network host ` + `postgres:${version} ` + `bash -c '${bashCmds.join(' && ')}' | gzip> ${zipOutPath.str()}`);
         this.log.info('Uploading');
         storage.store(_Path.AbsPath.from(dir));
       });
@@ -112,16 +104,13 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
         // TODO add e2e test for docker
 
         const zipFile = this.fs.listFiles(dir)[0];
-        await this.zip.unzipDir(zipFile, dir);
-        this.fs.rmFile(zipFile);
-        const outFile = this.fs.listFiles(dir)[0];
-        this.log.debug('Will run psql import from %s', outFile.str()); // Database is set to 'postgres' so that also users which don't have db created can use db-less URL
+        this.log.debug('Will run psql import from %s', zipFile.str()); // Database is set to 'postgres' so that also users which don't have db created can use db-less URL
         // Restoring user needs to have the admin access anyway
 
         const connectionArgs = `-h ${con.host} -p ${con.port} -U ${con.username} -d postgres`; // 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 ` + `-e PGPASSWORD=${con.password} ` + `postgres:${version} ` + `psql ${connectionArgs} -v ON_ERROR_STOP=0 < ${outFile.str()}`);
+        this.sh.exec(`gzip --decompress --stdout ${zipFile.str()} | docker run --network host -i ` + `-e PGPASSWORD=${con.password} ` + `postgres:${version} ` + `psql ${connectionArgs} -v ON_ERROR_STOP=0`);
       });
     });
   }

package/lib/tools/compression/Zipper.js

@@ -19,31 +19,46 @@ var _path = _interopRequireDefault(require("path"));
 
 var _promises = _interopRequireDefault(require("stream/promises"));
 
-var _dec, _class;
+var _Shell = require("../shell/Shell");
+
+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)(), _dec(_class = class Zipper {
-  constructor() {
+let Zipper = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell]), _dec(_class = _dec2(_class = _dec3(_class = class Zipper {
+  constructor(sh) {
+    this.sh = sh;
+
     _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
     _defineProperty(this, "zipDir", async (dirPath, to) => {
-      const srcDir = dirPath.str();
+      const src = dirPath.str();
       const dst = to.str();
 
       const dstDir = _path.default.dirname(dst);
 
-      this.log.trace(`Zipping %s to %s`, srcDir, dst);
-      const zip = new _jszip.default();
-      buildZipFromDirectory(srcDir, zip);
-      const r = await zip.generateNodeStream();
+      this.log.trace(`Zipping %s to %s`, src, dst);
 
       if (!_nodeFs.default.existsSync(dstDir)) {
         _nodeFs.default.mkdirSync(dstDir);
       }
 
+      await this.doDirZipInShell(src, dst);
+    });
+
+    _defineProperty(this, "doDirZipInShell", async (src, dst) => {
+      await this.sh.exec(`zip ${dst} -r .`, {
+        cwd: src
+      });
+    });
+
+    _defineProperty(this, "doDirZipInNodeJs", async (src, dst) => {
+      const zip = new _jszip.default();
+      buildZipFromDirectory(src, zip);
+      const r = await zip.generateNodeStream();
+
       const ws = _nodeFs.default.createWriteStream(dst);
 
       await _promises.default.pipeline(r, ws);
@@ -68,7 +83,7 @@ let Zipper = (_dec = (0, _inversify.injectable)(), _dec(_class = class Zipper {
     });
   }
 
-}) || _class);
+}) || _class) || _class) || _class);
 exports.Zipper = Zipper;
 
 const buildZipFromDirectory = (dir, zip, root = dir) => {

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

@@ -8,12 +8,15 @@ var _testHelper = require("../../../test/testHelper");
 
 var _test = require("../../../test");
 
+var _Shell = require("../shell/Shell");
+
 describe('zip', () => {
   afterEach(() => {
     (0, _testHelper.cleanTestDataDir)();
   });
   it('zip and unzip', async () => {
-    const z = new _Zipper.Zipper();
+    const sh = new _Shell.Shell();
+    const z = new _Zipper.Zipper(sh);
     const out = (0, _test.testdataDirPath)('out.zip');
 
     const dir = _Path.AbsPath.from(__dirname).resolve('../../../test/foo');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ps-aux/nodebup",
-  "version": "0.9.9",
+  "version": "0.10.0",
   "description": "",
   "module": "lib/index.js",
   "main": "lib/index.js",