Zip the same way as serverless itself does

Author: dschep

index.js

@@ -6,7 +6,7 @@ const _ = require('lodash');
 const path = require('path');
 const fse = require('fs-extra');
 const child_process = require('child_process');
-const Zip = require('adm-zip');
+const {zipDirectory} = require('./zipService');
 
 BbPromise.promisifyAll(fse);
 
@@ -60,15 +60,8 @@ class ServerlessPythonRequirements {
 
   packRequirements() {
     return this.installRequirements().then(() => {
-      return new BbPromise((resolve, reject) => {
-        if (this.custom.zipImport) {
-          this.serverless.cli.log('Zipping required Python packages...');
-          const zip = new Zip();
-          zip.addLocalFolder('.requirements', '');
-          zip.writeZip('.requirements.zip');
-          fse.remove('.requirements', (err) => err?reject():resolve());
-        } else resolve();
-      });
+      if (this.custom.zipImport)
+        return zipDirectory('.requirements', '.requirements.zip');
     });
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-python-requirements",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "engines": {
     "node": ">=4.0"
   },
@@ -29,6 +29,7 @@
   ],
   "files": [
     "index.js",
+    "zipService.js",
     "LICENSE",
     "package.json",
     "requirements.py",
@@ -39,9 +40,10 @@
   "scripts": {},
   "devDependencies": {},
   "dependencies": {
+    "archiver": "^1.3.0",
     "bluebird": "^3.0.6",
-    "adm-zip": "0.4.7",
     "fs-extra": "^0.26.7",
+    "glob-all": "^3.1.0",
     "lodash": "^4.13.1"
   }
 }

zipService.js

@@ -0,0 +1,53 @@
+'use strict';
+// ripped from serverless and adapted for simpler use
+// https://github.com/serverless/serverless/blob/b0df37673bd3a1fac11ccbfa3eb48e3626c0acb1/lib/plugins/package/lib/zipService.js
+
+const archiver = require('archiver');
+const BbPromise = require('bluebird');
+const path = require('path');
+const fs = require('fs');
+const glob = require('glob-all');
+
+module.exports = {
+  zipDirectory(dirPath, artifactFilePath) {
+    const patterns = ['**'];
+
+    const zip = archiver.create('zip');
+
+    const output = fs.createWriteStream(artifactFilePath);
+
+    output.on('open', () => {
+      zip.pipe(output);
+
+      const files = glob.sync(patterns, {
+        cwd: dirPath,
+        dot: true,
+        silent: true,
+        follow: true,
+      });
+
+      files.forEach((filePath) => {
+        const fullPath = path.resolve(
+          dirPath,
+          filePath
+        );
+
+        const stats = fs.statSync(fullPath);
+
+        if (!stats.isDirectory(fullPath)) {
+          zip.append(fs.createReadStream(fullPath), {
+            name: filePath,
+            mode: stats.mode,
+          });
+        }
+      });
+
+      zip.finalize();
+    });
+
+    return new BbPromise((resolve, reject) => {
+      output.on('close', () => resolve(artifactFilePath));
+      zip.on('error', (err) => reject(err));
+    });
+  },
+};