do headless zip on exit

Author: sjanuary

headless_zip.js

@@ -80,19 +80,27 @@ module.exports.headlessZip = function headlessZip(dirToZip) {
 	}
 
 	var zip = new JSZip();
-	fs.readdir(dirToZip, function(error, files) {
-		if (error) {
-				onError(error)
-				return
-		}
-		for (var i = 0, len = files.length; i < len; i++) {
-			zip.file(files[i], fs.readFileSync(path.join(dirToZip, files[i])), {compression : "DEFLATE"})
+	var files = fs.readdirSync(dirToZip)
+	for (var i = 0, len = files.length; i < len; i++) {
+		zip.file(files[i], fs.readFileSync(path.join(dirToZip, files[i])), {compression : "DEFLATE"})
+	}
+	fs.writeFileSync(outputFileName, zip.generate({type:"nodebuffer", compression:'DEFLATE'}));
+	deleteDir(dirToZip)
+}
+
+module.exports.tryZipOnExit = function tryZipOnExit() {
+	var outputDir = dirToWriteTo;
+	if(!outputDir) {
+		ouputDir = process.cwd().toString()
+	}
+	var files = fs.readdirSync(outputDir);
+	// Search for temporary output directory using pattern matching
+	for (var i = 0, len = files.length; i < len; i++) {
+		if(/tmp_(\w+)/.test(files[i].toString())) {
+			var dirToZip = path.join(outputDir, files[i])
+			this.headlessZip(dirToZip)
+			return;
 		}
-	
-		zip.generateNodeStream({type:'nodebuffer',streamFiles:true})
-		.pipe(fs.createWriteStream(outputFileName))
-		.on('finish', function () {
-			deleteDir(dirToZip)
-		})
-	})
-} 
+	}
+}
+

index.js

@@ -301,7 +301,11 @@ module.exports.start = function start () {
   var am = this;
   agent.start();
   process.on('exit', function () {
+    var headlessMode = agent.getOption('com.ibm.diagnostics.healthcenter.headless');
     am.stop();
+    if(headlessMode == 'on') {
+      headlessZip.tryZipOnExit();
+    }
   });
 }
 

package.json

@@ -8,7 +8,7 @@
   "dependencies": {
     "nan": "2.x",
     "tar": "2.x",
-    "jszip": "3.0.x"
+    "jszip": "2.5.x"
   },
   "bundleDependencies": [
     "tar"