@ps-aux/nodebup 0.9.4 → 0.9.6

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,17 +105,17 @@ 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); // Don't forget that this itself might be run in docker
+        this.log.debug('Will run psql import from %s', outFile.str()); // 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()}`);

package/lib/ctx/ContextSymbols.js

@@ -3,13 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-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');
-exports.TaskConfig_ = TaskConfig_;
-const StorageConfig_ = Symbol.for('config.Storage');
-exports.StorageConfig_ = StorageConfig_;
+exports.Inputs_ = exports.AppConfig_ = void 0;
 const AppConfig_ = Symbol.for('config.app');
 exports.AppConfig_ = AppConfig_;
 const Inputs_ = Symbol.for('cmd.input');

package/lib/fs/Fs.test.js

@@ -7,12 +7,9 @@ var _Path = require("./path/Path");
 it.skip('withTmpDir', async () => {
   const fs = new _Fs.Fs(_Path.AbsPath.from(__dirname));
   await fs.inTmpDir('foo', async () => {
-    console.log('before');
     const wait = new Promise((res, rej) => {
       setTimeout(res, 1000);
     });
     await wait;
-    console.log('after');
   });
-  console.log('done');
 });

package/lib/log/logging.js

@@ -13,15 +13,19 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const level = process.env.NODEBUP_LOG_LEVEL || 'trace';
 const root = (0, _pino.default)({
   name: 'root',
-  transport: {
-    target: 'pino-pretty'
-  },
-  level
-});
+  level,
+  prettyPrint: true // TODO deprecated but other options don't work
+  // Must be used as string. For some reason does not work as transport.
+  // 1. No logging in Jest
+  // 2. Not logging when run as CLI app
+
+} // stream
+);
 
 const makeLog = name => {
   return root.child({
-    name
+    name,
+    level
   });
 }; // TODO make type narrower
 

package/lib/log/logging.spec.js

@@ -0,0 +1,10 @@
+"use strict";
+
+var _logging = require("./logging");
+
+it('test', () => {
+  class A {}
+
+  const log = (0, _logging.classObjLog)(new A());
+  log.info('test');
+});

package/lib/storage/restic/ResticClient.js

@@ -31,7 +31,7 @@ class ResticClient {
     _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
     _defineProperty(this, "prepareRepo", () => {
-      this.log.info(`Preparing a restic repo at '${this.url}`);
+      this.log.info('Preparing a restic repo at %s', this.url);
       this.shell.exec(`restic init`, {
         env: this.env()
       });
@@ -44,7 +44,7 @@ class ResticClient {
     });
 
     _defineProperty(this, "backup", (cwd, from, tags = []) => {
-      this.log.debug(`Running backup for repo=${this.url}`);
+      this.log.debug('Running backup for repo=%s', this.url);
       let cmd = `restic backup ${from.str()}`;
       tags.forEach(t => {
         cmd += ` --tag=${t}`;
@@ -56,14 +56,14 @@ class ResticClient {
     });
 
     _defineProperty(this, "restore", (to, snapshotId = 'latest') => {
-      this.log.debug('Running restore  for repo=', this.url);
+      this.log.debug('Running restore  for repo=%s', this.url);
       this.shell.exec(`restic restore ${snapshotId} --target ${to.str()}`, {
         env: this.env()
       });
     });
 
     _defineProperty(this, "forget", () => {
-      this.log.debug(`Pruning repo=${this.url}`);
+      this.log.debug('Pruning repo=%s', this.url);
       const cfg = {
         hourly: 6,
         daily: 7,
@@ -77,7 +77,7 @@ class ResticClient {
     });
 
     _defineProperty(this, "snapshots", () => {
-      this.log.debug(`Listing snapshots of repo=${this.url}`);
+      this.log.debug('Listing snapshots of repo=%', this.url);
       const out = this.shell.execAndReturnString(`restic snapshots --json`, {
         env: this.env()
       });

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.4",
+  "version": "0.9.6",
   "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"

package/lib/types.js

@@ -1,5 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});