Mcp rebased fixes

lib/prepareArchive.js

@@ -2,27 +2,33 @@ import fs from 'fs';
 import shell from 'shelljs';
 import archiver from 'archiver';
 import logger from './logger.js';
+import { fillInTemplateValues } from './templates.js';
 
 const prepareDestination = path => {
   shell.mkdir('-p', 'tmp');
   shell.rm('-rf', path);
 };
 
-const prepareArchive = (path, resolve, verbose = false) => {
+const prepareArchive = (outputPath, verbose = false) => {
   let numberOfFiles = 0;
-  prepareDestination(path);
-  const output = fs.createWriteStream(path);
-  const archive = archiver('zip', { zlib: { level: 6 }, zip64: false });
-
-  output.on('close', () => {
-    if (verbose) {
-      const sizeInMB = archive.pointer() / 1024 / 1024;
-      logger.Info(`Archive size: ${sizeInMB.toFixed(2)} MB at ${path}`);
-    }
-    resolve(numberOfFiles);
+  prepareDestination(outputPath);
+
+  const output = fs.createWriteStream(outputPath);
+  const zip = archiver('zip', { zlib: { level: 6 }, zip64: false });
+
+  const done = new Promise((resolve, reject) => {
+    output.on('close', () => {
+      if (verbose) {
+        const sizeInMB = zip.pointer() / 1024 / 1024;
+        logger.Info(`Archive size: ${sizeInMB.toFixed(2)} MB at ${outputPath}`);
+      }
+      resolve(numberOfFiles);
+    });
+    output.on('error', reject);
+    zip.on('error', reject);
   });
 
-  archive.on('warning', err => {
+  zip.on('warning', err => {
     if (err.code === 'ENOENT') {
       logger.Debug(err);
       logger.Error('Archive creation failed.');
@@ -31,17 +37,33 @@ const prepareArchive = (path, resolve, verbose = false) => {
     }
   });
 
-  archive.on('error', err => {
-    logger.Debug(err);
-  });
+  zip.pipe(output);
 
-  archive.on('entry', function(entry) {
-    if (entry.type == 'file') numberOfFiles++;
-  });
+  const addFile = (realPath, nameInArchive) => {
+    numberOfFiles++;
+    zip.file(realPath, { name: nameInArchive });
+  };
+
+  const addBuffer = (buffer, nameInArchive) => {
+    numberOfFiles++;
+    zip.append(buffer, { name: nameInArchive });
+  };
+
+  const appendTemplated = (realPath, nameInArchive, templateData) => {
+    const result = fillInTemplateValues(realPath, templateData);
+    if (typeof result === 'string') {
+      addBuffer(Buffer.from(result), nameInArchive);
+    } else {
+      result.destroy();
+      addFile(realPath, nameInArchive);
+    }
+  };
 
-  archive.pipe(output);
+  const finalize = () => {
+    zip.finalize();
+  };
 
-  return archive;
+  return { addFile, addBuffer, appendTemplated, finalize, done };
 };
 
 export default prepareArchive;