Merge pull request #3706 from github/koesie10/upgrade-node-fetch

Upgrade node-fetch to v3

Author: koesie10

extensions/ql-vscode/package-lock.json

@@ -1984,7 +1984,7 @@
     "js-yaml": "^4.1.0",
     "msw": "^2.2.13",
     "nanoid": "^5.0.7",
-    "node-fetch": "^2.6.7",
+    "node-fetch": "^3.3.2",
     "p-queue": "^8.0.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
@@ -2039,7 +2039,6 @@
     "@types/js-yaml": "^4.0.6",
     "@types/nanoid": "^3.0.0",
     "@types/node": "20.15.*",
-    "@types/node-fetch": "^2.5.2",
     "@types/react": "^18.3.1",
     "@types/react-dom": "^18.3.0",
     "@types/sarif": "^2.1.2",

extensions/ql-vscode/package.json

@@ -404,6 +404,11 @@ class ExtensionSpecificDistributionManager {
           signal,
         );
 
+      const body = assetStream.body;
+      if (!body) {
+        throw new Error("No body in asset stream");
+      }
+
       const archivePath = join(tmpDirectory, "distributionDownload.zip");
       archiveFile = createWriteStream(archivePath);
 
@@ -412,26 +417,23 @@ class ExtensionSpecificDistributionManager {
         ? parseInt(contentLength, 10)
         : undefined;
       reportStreamProgress(
-        assetStream.body,
+        body,
         `Downloading CodeQL CLI ${release.name}…`,
         totalNumBytes,
         progressCallback,
       );
 
-      assetStream.body.on("data", onData);
+      body.on("data", onData);
 
       await new Promise((resolve, reject) => {
         if (!archiveFile) {
           throw new Error("Invariant violation: archiveFile not set");
         }
 
-        assetStream.body
-          .pipe(archiveFile)
-          .on("finish", resolve)
-          .on("error", reject);
+        body.pipe(archiveFile).on("finish", resolve).on("error", reject);
 
         // If an error occurs on the body, we also want to reject the promise (e.g. during a timeout error).
-        assetStream.body.on("error", reject);
+        body.on("error", reject);
       });
 
       disposeTimeout();

extensions/ql-vscode/src/codeql-cli/distribution.ts

@@ -34,9 +34,9 @@ export class ReleasesApiConsumer {
     additionalCompatibilityCheck?: (release: GithubRelease) => boolean,
   ): Promise<Release> {
     const apiPath = `/repos/${this.repositoryNwo}/releases`;
-    const allReleases: GithubRelease[] = await (
+    const allReleases = (await (
       await this.makeApiCall(apiPath)
-    ).json();
+    ).json()) as GithubRelease[];
     const compatibleReleases = allReleases.filter((release) => {
       if (release.prerelease && !includePrerelease) {
         return false;

extensions/ql-vscode/src/codeql-cli/distribution/releases-api-consumer.ts

@@ -69,7 +69,7 @@ export interface GetVariantAnalysisRepoResultRequest {
   };
   response: {
     status: number;
-    body?: Buffer | string;
+    body?: ArrayBuffer | string;
     contentType: string;
   };
 }

extensions/ql-vscode/src/common/mock-gh-api/gh-api-request.ts

@@ -91,7 +91,14 @@ export class Recorder extends DisposableObject {
 
         let bodyFileLink = undefined;
         if (writtenRequest.response.body) {
-          await writeFile(bodyFilePath, writtenRequest.response.body);
+          if (typeof writtenRequest.response.body === "string") {
+            await writeFile(bodyFilePath, writtenRequest.response.body);
+          } else {
+            await writeFile(
+              bodyFilePath,
+              Buffer.from(writtenRequest.response.body),
+            );
+          }
           bodyFileLink = `file:${bodyFileName}`;
         }
 
@@ -226,7 +233,7 @@ async function createGitHubApiRequest(
         "x-vscode-codeql-msw-bypass": "true",
       },
     });
-    const responseBuffer = await response.buffer();
+    const responseBuffer = await response.arrayBuffer();
 
     return {
       request: {

extensions/ql-vscode/src/common/mock-gh-api/recorder.ts

@@ -545,30 +545,27 @@ export class DatabaseFetcher {
       throw e;
     }
 
+    const body = response.body;
+    if (!body) {
+      throw new Error("No response body found");
+    }
+
     const archiveFileStream = createWriteStream(archivePath);
 
     const contentLength = response.headers.get("content-length");
     const totalNumBytes = contentLength
       ? parseInt(contentLength, 10)
       : undefined;
-    reportStreamProgress(
-      response.body,
-      "Downloading database",
-      totalNumBytes,
-      progress,
-    );
+    reportStreamProgress(body, "Downloading database", totalNumBytes, progress);
 
-    response.body.on("data", onData);
+    body.on("data", onData);
 
     try {
       await new Promise((resolve, reject) => {
-        response.body
-          .pipe(archiveFileStream)
-          .on("finish", resolve)
-          .on("error", reject);
+        body.pipe(archiveFileStream).on("finish", resolve).on("error", reject);
 
         // If an error occurs on the body, we also want to reject the promise (e.g. during a timeout error).
-        response.body.on("error", reject);
+        body.on("error", reject);
       });
     } catch (e) {
       // Close and remove the file if an error occurs

extensions/ql-vscode/src/databases/database-fetcher.ts

@@ -99,6 +99,10 @@ export class VariantAnalysisResultsManager extends DisposableObject {
       responseSize = response.size;
     }
 
+    if (!response.body) {
+      throw new Error("No response body found");
+    }
+
     let amountDownloaded = 0;
     for await (const chunk of response.body) {
       await appendFile(zipFilePath, Buffer.from(chunk));

extensions/ql-vscode/src/variant-analysis/variant-analysis-results-manager.ts

@@ -5,10 +5,14 @@ const transformPackages = [
   "@vscode/webview-ui-toolkit",
   "before-after-hook",
   "d3",
+  "data-uri-to-buffer",
   "delaunator",
   "exenv-es6",
+  "fetch-blob",
+  "formdata-polyfill",
   "internmap",
   "nanoid",
+  "node-fetch",
   "p-queue",
   "p-timeout",
   "robust-predicates",

extensions/ql-vscode/test/jest-config.ts

@@ -12,7 +12,6 @@ import {
   remove,
 } from "fs-extra";
 import { join } from "path";
-import { Readable } from "stream";
 import * as fetchModule from "node-fetch";
 import { Response } from "node-fetch";
 
@@ -227,8 +226,7 @@ describe("Variant Analysis Manager", () => {
           "data/variant-analysis-results.zip",
         );
         const fileContents = await readFile(sourceFilePath);
-        const response = new Response(Readable.from(fileContents));
-        response.size = fileContents.length;
+        const response = new Response(fileContents);
         getVariantAnalysisRepoResultStub.mockResolvedValue(response);
       });