@ps-aux/nodebup 0.9.6 → 0.9.8

package/lib/bup/pg/PgBackupController.js

@@ -27,7 +27,7 @@ const parseConnectionUrl = url => {
   var _url$match;
 
   // TODO what if there are query params in the end?
-  const regex = /postgres:\/\/(?<username>.*):(?<password>.*)@(?<host>.*):(?<port>\d*)(\/(?<database>.*))?$/;
+  const regex = /postgres:\/\/(?<username>.*):(?<password>.*)@(?<host>.*):(?<port>\d*)$/;
   const match = (_url$match = url.match(regex)) === null || _url$match === void 0 ? void 0 : _url$match.groups;
   if (!match || !match.username || !match.password || !match.host || !match.port) throw new Error(`The Postgres connection URL does not match required regex: ${regex.toString()}`);
   return {
@@ -103,7 +103,7 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
       const version = this.getVersion(pgVersion);
       const storage = this.storageBackendProvider.provide(); // To validate
 
-      parseConnectionUrl(pgUrl);
+      const con = parseConnectionUrl(pgUrl);
       this.log.info(`Restoring Postgres database, version=${version}`);
       await this.fs.inTmpDir('pg-restore', async dirStr => {
         const dir = _Path.AbsPath.from(dirStr);
@@ -115,10 +115,13 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
         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
+        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
+        // 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 ` + `postgres:${version} ` + `psql ${pgUrl} -v ON_ERROR_STOP=0 < ${outFile.str()}`);
+        this.sh.exec(`docker run --network host -i ` + `-e PGPASSWORD=${con.password} ` + `postgres:${version} ` + `psql ${connectionArgs} -v ON_ERROR_STOP=0 < ${outFile.str()}`);
       });
     });
   }

package/lib/log/logging.js

@@ -7,20 +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',
-  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
-);
+  level
+}, stream);
 
 const makeLog = name => {
   return root.child({

package/lib/tools/compression/Zipper.js

@@ -26,7 +26,8 @@ let Zipper = (_dec = (0, _inversify.injectable)(), _dec(_class = class Zipper {
     _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
     _defineProperty(this, "zipDir", async (dir, to) => {
-      this.log.trace(`Zipping %s to %s`, dir.str(), to.str());
+      this.log.trace(`Zipping %s to %s`, dir.str(), to.str()); // TODO replace with unzipper
+
       const z = new _admZip.default();
       z.addLocalFolder(dir.str());
       z.writeZip(to.str());

package/package.json

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