Merge pull request #45 from reinaldorauch/fix-old-unzip-dep

Fix old unzip dep

Author: Fatme

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-- '6'
+- '8'
 git:
   submodules: false
 before_script:

lib/wrappers/file-system.ts

@@ -1,16 +1,53 @@
 import * as fs from "fs";
-import { Extract } from "unzip";
+import * as path from "path";
+import * as yauzl from "yauzl";
+import * as util from "util";
+
+const access = util.promisify(fs.access);
+const mkdir = util.promisify(fs.mkdir);
 
 export class FileSystem {
 	public exists(path: string): boolean {
 		return fs.existsSync(path);
 	}
 
 	public extractZip(pathToZip: string, outputDir: string): Promise<void> {
-		return new Promise<void>((resolve, reject) => {
-			const stream = fs.createReadStream(pathToZip).pipe(Extract({ path: outputDir }));
-			stream.on("close", resolve);
-			stream.on("error", reject);
+		return new Promise((resolve, reject) => {
+			yauzl.open(pathToZip, { autoClose: true, lazyEntries: true }, (openError, zipFile) => {
+				if (openError) {
+					return reject(openError);
+				}
+
+				zipFile.on('entry', entry => {
+					const fn = <string>entry.fileName;
+					if (/\/$/.test(fn)) {
+						return zipFile.readEntry();
+					}
+
+					zipFile.openReadStream(entry, (openStreamError, stream) => {
+						if(openStreamError) {
+							return reject(openStreamError);
+						};
+
+						const filePath = `${outputDir}/${fn}`;
+
+						return createParentDirsIfNeeded(filePath)
+							.catch(createParentDirError => reject(createParentDirError))
+							.then(() => {
+								const outfile = fs.createWriteStream(filePath);
+								stream.once('end', () => {
+									zipFile.readEntry();
+									outfile.close();
+								});
+								stream.pipe(outfile);
+							});
+					});
+				});
+
+				zipFile.once('end', () => resolve());
+
+				zipFile.readEntry();
+			});
 		});
 	}
 
@@ -23,3 +60,14 @@ export class FileSystem {
 		return JSON.parse(content.toString());
 	}
 }
+
+function createParentDirsIfNeeded(filePath: string) {
+	const dirs = path.dirname(filePath).split(path.sep);
+	return dirs.reduce((p, dir) => p.then(parent => {
+		const current = `${parent}${path.sep}${dir}`;
+
+		return access(current)
+			.catch(e => mkdir(current))
+			.then(() => current);
+	}), Promise.resolve(''));
+}