Simplify build

package.json

@@ -6,7 +6,7 @@
   "gypfile": true,
   "scripts": {
     "preinstall": "node scripts/get-dist.js",
-    "install": "node-gyp --nodedir=${npm_config_tmp}/sslkeylog-node-v${npm_config_node_version} rebuild",
+    "install": "node-gyp --tarball=${npm_config_tmp}/sslkeylog-node-v${npm_config_node_version}.tar.gz rebuild",
     "test": "node node_modules/mocha/bin/mocha",
     "clean": "node-gyp clean && (cd examples; make clean)"
   },

scripts/get-dist.js

@@ -1,9 +1,8 @@
 'use strict';
 const https = require('https');
-const execFileSync = require('child_process').execFileSync;
-const url = require('url');
 const path = require('path');
 const fs = require('fs');
+const pipeline = require('util').promisify(require('stream').pipeline);
 const TMPDIR = process.env.npm_config_tmp||process.env.TMPDIR||'/tmp';
 
 const mkdirp = dir=>{
@@ -14,46 +13,36 @@ const mkdirp = dir=>{
         fs.mkdirSync(dir);
 };
 
-const download = (src_url, dest)=>new Promise((resolve, reject)=>{
+const download = async (src_url, dest)=>{
     mkdirp(path.dirname(dest));
-    https.get({...url.parse(src_url), encoding: null}, resp=>{
-        let fsize = parseInt(resp.headers['content-length']);
-        if (!fsize)
-            throw new Error('Got invalid content-length');
-        if (fs.existsSync(dest) && fs.statSync(dest).size==fsize)
-        {
-            resp.req.abort();
-            return void resolve();
-        }
-        resp.pipe(fs.createWriteStream(dest))
-            .on('close', ()=>resolve())
-            .on('error', err=>{ fs.unlink(dest); reject(err); });
+    const resp = await new Promise((resolve, reject)=>
+        https.get(src_url, resolve).on('error', reject));
+    const fsize = parseInt(resp.headers['content-length']);
+    if (!fsize)
+        throw new Error('Got invalid content-length');
+    if (fs.existsSync(dest) && fs.statSync(dest).size==fsize) {
+        resp.req.abort();
+        return;
+    }
+    await pipeline(resp, fs.createWriteStream(dest)).catch(e=>{
+        fs.unlink(dest);
+        throw e;
     });
-});
+};
 
 const download_node = async ()=>{
     const ver = process.version;
-    const node_url = `https://nodejs.org/download/release/${ver}/node-${ver}.tar.gz`;
-    const tarball = `${TMPDIR}/sslkeylog-node-${ver}.tar.gz`;
-    const dest_dir = `${TMPDIR}/sslkeylog-node-${ver}`;
+    const major_ver = parseInt(/^v(\d+)/.exec(ver)[1]);
 
-    if (!/^v1[01]/.test(ver))
+    if (major_ver < 10)
         throw new Error('Node.js v10+ is required');
 
-    console.log(`Checking Node.js source in ${dest_dir}`);
-    let files = ['src/tls_wrap.h', 'src/node_version.h'];
-    if (files.every(f=>fs.existsSync(`${dest_dir}/${f}`)))
-        return void console.log('Found');
-
-    console.log(`Downloading ${tarball}`);
+    const node_url = `https://nodejs.org/download/release/${ver}/node-${ver}.tar.gz`;
+    const tarball = `${TMPDIR}/sslkeylog-node-${ver}.tar.gz`;
+
+    console.log(`Downloading Node.JS source into ${tarball}`);
     await download(node_url, tarball);
     console.log('Download finished');
-
-    // TODO: add windows support
-    console.log(`Unpacking to ${dest_dir}`);
-    mkdirp(dest_dir);
-    execFileSync('tar', ['xzf', tarball, '--strip', '1', '-C', dest_dir]);
-    console.log('Unpacking done');
 };
 
 const main = async ()=>{