@ps-aux/nodebup 0.9.7 → 0.9.9

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/tools/compression/Zipper.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Zipper = void 0;
-
-var _admZip = _interopRequireDefault(require("adm-zip"));
+exports.buildZipFromDirectory = exports.Zipper = void 0;
 
 var _inversify = require("inversify");
 
@@ -15,6 +13,12 @@ var _unzipper = _interopRequireDefault(require("unzipper"));
 
 var _nodeFs = _interopRequireDefault(require("node:fs"));
 
+var _jszip = _interopRequireDefault(require("jszip"));
+
+var _path = _interopRequireDefault(require("path"));
+
+var _promises = _interopRequireDefault(require("stream/promises"));
+
 var _dec, _class;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -25,19 +29,39 @@ let Zipper = (_dec = (0, _inversify.injectable)(), _dec(_class = class Zipper {
   constructor() {
     _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
-    _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, "zipDir", async (dirPath, to) => {
+      const srcDir = 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();
+
+      if (!_nodeFs.default.existsSync(dstDir)) {
+        _nodeFs.default.mkdirSync(dstDir);
+      }
+
+      const ws = _nodeFs.default.createWriteStream(dst);
+
+      await _promises.default.pipeline(r, ws);
     });
 
     _defineProperty(this, "unzipDir", async (zipFile, toDir) => {
+      // TODO can be replaced with JsZip ?
       this.log.trace(`Unzipping %s to %s`, zipFile.str(), toDir.str());
+
+      const input = _nodeFs.default.createReadStream(zipFile.str());
+
+      const out = _unzipper.default.Extract({
+        path: toDir.str()
+      }); // Cannot use Streams.pipeline bcs it sometimes resolves before the file exists
+
+
       return new Promise((res, rej) => {
-        _nodeFs.default.createReadStream(zipFile.str()).pipe(_unzipper.default.Extract({
-          path: toDir.str()
-        })).on('close', () => {
+        input.pipe(out).on('close', () => {
           res();
         }).on('error', rej);
       });
@@ -45,4 +69,26 @@ let Zipper = (_dec = (0, _inversify.injectable)(), _dec(_class = class Zipper {
   }
 
 }) || _class);
-exports.Zipper = Zipper;
+exports.Zipper = Zipper;
+
+const buildZipFromDirectory = (dir, zip, root = dir) => {
+  const list = _nodeFs.default.readdirSync(dir);
+
+  for (let file of list) {
+    file = _path.default.resolve(dir, file);
+
+    const stat = _nodeFs.default.statSync(file);
+
+    if (stat && stat.isDirectory()) {
+      buildZipFromDirectory(file, zip, root);
+    } else {
+      const filedata = _nodeFs.default.createReadStream(file);
+
+      const p = _path.default.relative(root, file);
+
+      zip.file(p, filedata);
+    }
+  }
+};
+
+exports.buildZipFromDirectory = buildZipFromDirectory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ps-aux/nodebup",
-  "version": "0.9.7",
+  "version": "0.9.9",
   "description": "",
   "module": "lib/index.js",
   "main": "lib/index.js",
@@ -80,12 +80,12 @@
     "@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",
     "inversify": "^6.0.1",
     "js-yaml": "^4.1.0",
+    "jszip": "^3.10.1",
     "pino": "^7.11.0",
     "pino-pretty": "^9.1.1",
     "ramda": "^0.27.1",