@ps-aux/nodebup 0.9.5 → 0.9.7

package/lib/bup/pg/PgBackupController.js

@@ -89,7 +89,7 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
         f.end();
         this.log.info('Compressing');
         const zipOutputName = `pg-backup-${this.now()}.zip`;
-        this.zip.zipDir(outputDir, outputDir.resolve(zipOutputName));
+        await this.zip.zipDir(outputDir, outputDir.resolve(zipOutputName));
         this.fs.rmFile(dumpOut);
         this.log.info('Uploading');
         storage.store(_Path.AbsPath.from(dir));
@@ -105,14 +105,14 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
 
       parseConnectionUrl(pgUrl);
       this.log.info(`Restoring Postgres database, version=${version}`);
-      await this.fs.inTmpDir('pg-restore', dirStr => {
+      await this.fs.inTmpDir('pg-restore', async dirStr => {
         const dir = _Path.AbsPath.from(dirStr);
 
         storage.restore(dir); // TODO check if the dir contains the with the expected name
         // TODO add e2e test for docker
 
         const zipFile = this.fs.listFiles(dir)[0];
-        this.zip.unzipDir(zipFile, dir);
+        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()); // Don't forget that this itself might be run in docker

package/lib/log/logging.js

@@ -7,19 +7,20 @@ exports.makeLog = exports.classObjLog = void 0;
 
 var _pino = _interopRequireDefault(require("pino"));
 
+var _pinoPretty = _interopRequireDefault(require("pino-pretty"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// TODO set from config
+// TODO set from the config
 const level = process.env.NODEBUP_LOG_LEVEL || 'trace';
+const sync = process.env.TS_JEST === '1';
+const stream = (0, _pinoPretty.default)({
+  sync
+});
 const root = (0, _pino.default)({
   name: 'root',
-  prettyPrint: true,
-  // - This will lead to problems with logging to stdout
-  // 1. No logging in Jest
-  // 2. Not logging when run as CLI app
-  // transport: { target: 'pino-pretty' },
   level
-});
+}, stream);
 
 const makeLog = name => {
   return root.child({

package/lib/tools/compression/Zipper.js

@@ -11,6 +11,10 @@ var _inversify = require("inversify");
 
 var _logging = require("../../log/logging");
 
+var _unzipper = _interopRequireDefault(require("unzipper"));
+
+var _nodeFs = _interopRequireDefault(require("node:fs"));
+
 var _dec, _class;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -21,17 +25,22 @@ let Zipper = (_dec = (0, _inversify.injectable)(), _dec(_class = class Zipper {
   constructor() {
     _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
-    _defineProperty(this, "zipDir", (dir, to) => {
-      this.log.debug(`Zipping %s to %s`, dir.str(), to.str());
+    _defineProperty(this, "zipDir", async (dir, to) => {
+      this.log.trace(`Zipping %s to %s`, dir.str(), to.str());
       const z = new _admZip.default();
       z.addLocalFolder(dir.str());
       z.writeZip(to.str());
     });
 
-    _defineProperty(this, "unzipDir", (zipFile, toDir) => {
-      this.log.debug(`Unzipping %s to %s`, zipFile.str(), toDir.str());
-      const z = new _admZip.default(zipFile.str());
-      z.extractAllTo(toDir.str());
+    _defineProperty(this, "unzipDir", async (zipFile, toDir) => {
+      this.log.trace(`Unzipping %s to %s`, zipFile.str(), toDir.str());
+      return new Promise((res, rej) => {
+        _nodeFs.default.createReadStream(zipFile.str()).pipe(_unzipper.default.Extract({
+          path: toDir.str()
+        })).on('close', () => {
+          res();
+        }).on('error', rej);
+      });
     });
   }
 

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

@@ -6,17 +6,21 @@ var _Path = require("../../fs/path/Path");
 
 var _testHelper = require("../../../test/testHelper");
 
-it('zip', () => {
-  const z = new _Zipper.Zipper();
-
-  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());
+var _test = require("../../../test");
+
+describe('zip', () => {
+  afterEach(() => {
+    (0, _testHelper.cleanTestDataDir)();
+  });
+  it('zip and unzip', async () => {
+    const z = new _Zipper.Zipper();
+    const out = (0, _test.testdataDirPath)('out.zip');
+
+    const dir = _Path.AbsPath.from(__dirname).resolve('../../../test/foo');
+
+    await z.zipDir(dir, out);
+    const extDir = (0, _test.testdataDirPath)('foo-out');
+    await z.unzipDir(out, extDir);
+    (0, _testHelper.expectDirsToBeTheSame)(dir.str(), extDir.str());
+  });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ps-aux/nodebup",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "description": "",
   "module": "lib/index.js",
   "main": "lib/index.js",
@@ -90,6 +90,7 @@
     "pino-pretty": "^9.1.1",
     "ramda": "^0.27.1",
     "reflect-metadata": "^0.1.13",
+    "unzipper": "^0.10.11",
     "wait-on": "^6.0.0",
     "yaml": "^1.10.2",
     "yargs": "^17.3.1"