@netlify/edge-bundler 1.14.0 → 1.14.1

package/dist/downloader.d.ts

@@ -1,3 +1,3 @@
 import { Logger } from './logger.js';
-declare const download: (targetDirectory: string, versionRange: string, logger: Logger) => Promise<string>;
-export { download };
+declare const downloadWithRetry: (targetDirectory: string, versionRange: string, logger: Logger) => Promise<string>;
+export { downloadWithRetry as download };

package/dist/downloader.js

@@ -1,51 +1,59 @@
-import fs from 'fs';
+import { createWriteStream, promises as fs } from 'fs';
 import path from 'path';
+import { promisify } from 'util';
 import fetch from 'node-fetch';
 import StreamZip from 'node-stream-zip';
 import pRetry from 'p-retry';
 import semver from 'semver';
 import { getBinaryExtension, getPlatformTarget } from './platform.js';
-const download = async (targetDirectory, versionRange, logger) => {
+const downloadWithRetry = async (targetDirectory, versionRange, logger) => await pRetry(async () => await download(targetDirectory, versionRange), {
+    retries: 3,
+    onFailedAttempt: (error) => {
+        logger.system('Deno download with retry failed', error);
+    },
+});
+const download = async (targetDirectory, versionRange) => {
     const zipPath = path.join(targetDirectory, 'deno-cli-latest.zip');
-    const data = await downloadVersionWithRetry(versionRange, logger);
+    const data = await downloadVersion(versionRange);
     const binaryName = `deno${getBinaryExtension()}`;
     const binaryPath = path.join(targetDirectory, binaryName);
-    const file = fs.createWriteStream(zipPath);
-    await new Promise((resolve, reject) => {
-        data.pipe(file);
-        data.on('error', reject);
-        file.on('finish', resolve);
-    });
-    await extractBinaryFromZip(zipPath, binaryPath, binaryName);
+    const file = createWriteStream(zipPath);
     try {
-        await fs.promises.unlink(zipPath);
+        await new Promise((resolve, reject) => {
+            data.pipe(file);
+            data.on('error', reject);
+            file.on('finish', resolve);
+        });
+        await extractBinaryFromZip(zipPath, binaryPath, binaryName);
+        return binaryPath;
     }
-    catch {
-        // no-op
+    finally {
+        // Try closing and deleting the zip file in any case, error or not
+        await promisify(file.close.bind(file))();
+        try {
+            await fs.unlink(zipPath);
+        }
+        catch {
+            // no-op
+        }
     }
-    return binaryPath;
 };
 const downloadVersion = async (versionRange) => {
     const version = await getLatestVersionForRange(versionRange);
     const url = getReleaseURL(version);
     const res = await fetch(url);
-    if (res.body === null) {
-        throw new Error('Could not download Deno');
+    // eslint-disable-next-line no-magic-numbers
+    if (res.body === null || res.status < 200 || res.status > 299) {
+        throw new Error(`Download failed with status code ${res.status}`);
     }
     return res.body;
 };
-const downloadVersionWithRetry = async (versionRange, logger) => await pRetry(async () => await downloadVersion(versionRange), {
-    retries: 3,
-    onFailedAttempt: (error) => {
-        logger.system('Deno CLI download retry attempt error', error);
-    },
-});
 const extractBinaryFromZip = async (zipPath, binaryPath, binaryName) => {
     const { async: StreamZipAsync } = StreamZip;
     const zip = new StreamZipAsync({ file: zipPath });
     await zip.extract(binaryName, binaryPath);
     await zip.close();
-    await fs.promises.chmod(binaryPath, '755');
+    await fs.chmod(binaryPath, '755');
 };
 const getLatestVersion = async () => {
     try {
@@ -82,4 +90,4 @@ const getReleaseURL = (version) => {
     const target = getPlatformTarget();
     return `https://dl.deno.land/release/v${version}/deno-${target}.zip`;
 };
-export { download };
+export { downloadWithRetry as download };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/edge-bundler",
-  "version": "1.14.0",
+  "version": "1.14.1",
   "description": "Intelligently prepare Netlify Edge Functions for deployment",
   "type": "module",
   "main": "./dist/index.js",