@ps-aux/nodebup 0.9.8 → 0.9.10

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,35 +13,97 @@ var _unzipper = _interopRequireDefault(require("unzipper"));
 
 var _nodeFs = _interopRequireDefault(require("node:fs"));
 
-var _dec, _class;
+var _jszip = _interopRequireDefault(require("jszip"));
+
+var _path = _interopRequireDefault(require("path"));
+
+var _promises = _interopRequireDefault(require("stream/promises"));
+
+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 (dir, to) => {
-      this.log.trace(`Zipping %s to %s`, dir.str(), to.str()); // TODO replace with unzipper
+    _defineProperty(this, "zipDir", async (dirPath, to) => {
+      const src = dirPath.str();
+      const dst = to.str();
+
+      const dstDir = _path.default.dirname(dst);
+
+      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);
 
-      const z = new _admZip.default();
-      z.addLocalFolder(dir.str());
-      z.writeZip(to.str());
+      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);
       });
     });
   }
 
-}) || _class);
-exports.Zipper = Zipper;
+}) || _class) || _class) || _class);
+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/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.8",
+  "version": "0.9.10",
   "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",