Use electron fetch API.

Signed-off-by: Anders Kaseorg <[email protected]>

Author: andersk

app/main/linuxupdater.ts

@@ -1,15 +1,13 @@
 import type {Session} from "electron/main";
-import {Notification, app, net} from "electron/main";
+import {Notification, app} from "electron/main";
 
-import getStream from "get-stream";
 import * as semver from "semver";
 import {z} from "zod";
 
 import * as ConfigUtil from "../common/config-util.js";
 import Logger from "../common/logger-util.js";
 
 import * as LinuxUpdateUtil from "./linux-update-util.js";
-import {fetchResponse} from "./request.js";
 
 const logger = new Logger({
   file: "linux-update-util.log",
@@ -20,13 +18,13 @@ export async function linuxUpdateNotification(session: Session): Promise<void> {
   url = ConfigUtil.getConfigItem("betaUpdate", false) ? url : url + "/latest";
 
   try {
-    const response = await fetchResponse(net.request({url, session}));
-    if (response.statusCode !== 200) {
-      logger.log("Linux update response status: ", response.statusCode);
+    const response = await session.fetch(url);
+    if (!response.ok) {
+      logger.log("Linux update response status: ", response.status);
       return;
     }
 
-    const data: unknown = JSON.parse(await getStream(response));
+    const data: unknown = await response.json();
     /* eslint-disable @typescript-eslint/naming-convention */
     const latestVersion = ConfigUtil.getConfigItem("betaUpdate", false)
       ? z.array(z.object({tag_name: z.string()})).parse(data)[0].tag_name

app/main/request.ts

@@ -1,33 +1,18 @@
-import type {ClientRequest, IncomingMessage, Session} from "electron/main";
-import {app, net} from "electron/main";
+import type {Session} from "electron/main";
+import {app} from "electron/main";
 import fs from "node:fs";
 import path from "node:path";
-import stream from "node:stream";
-import util from "node:util";
+import {Readable} from "node:stream";
+import {pipeline} from "node:stream/promises";
+import type {ReadableStream} from "node:stream/web";
 
 import * as Sentry from "@sentry/electron";
-import getStream from "get-stream";
 import {z} from "zod";
 
 import Logger from "../common/logger-util.js";
 import * as Messages from "../common/messages.js";
 import type {ServerConf} from "../common/types.js";
 
-export async function fetchResponse(
-  request: ClientRequest,
-): Promise<IncomingMessage> {
-  return new Promise((resolve, reject) => {
-    request.on("response", resolve);
-    request.on("abort", () => {
-      reject(new Error("Request aborted"));
-    });
-    request.on("error", reject);
-    request.end();
-  });
-}
-
-const pipeline = util.promisify(stream.pipeline);
-
 /* Request: domain-util */
 
 const logger = new Logger({
@@ -59,17 +44,12 @@ export const _getServerSettings = async (
   domain: string,
   session: Session,
 ): Promise<ServerConf> => {
-  const response = await fetchResponse(
-    net.request({
-      url: domain + "/api/v1/server_settings",
-      session,
-    }),
-  );
-  if (response.statusCode !== 200) {
+  const response = await session.fetch(domain + "/api/v1/server_settings");
+  if (!response.ok) {
     throw new Error(Messages.invalidZulipServerError(domain));
   }
 
-  const data: unknown = JSON.parse(await getStream(response));
+  const data: unknown = await response.json();
   /* eslint-disable @typescript-eslint/naming-convention */
   const {
     realm_name,
@@ -104,14 +84,17 @@ export const _saveServerIcon = async (
   session: Session,
 ): Promise<string | null> => {
   try {
-    const response = await fetchResponse(net.request({url, session}));
-    if (response.statusCode !== 200) {
+    const response = await session.fetch(url);
+    if (!response.ok) {
       logger.log("Could not get server icon.");
       return null;
     }
 
     const filePath = generateFilePath(url);
-    await pipeline(response, fs.createWriteStream(filePath));
+    await pipeline(
+      Readable.fromWeb(response.body as ReadableStream<Uint8Array>),
+      fs.createWriteStream(filePath),
+    );
     return filePath;
   } catch (error: unknown) {
     logger.log("Could not get server icon.");
@@ -128,16 +111,10 @@ export const _isOnline = async (
   session: Session,
 ): Promise<boolean> => {
   try {
-    const response = await fetchResponse(
-      net.request({
-        method: "HEAD",
-        url: `${url}/api/v1/server_settings`,
-        session,
-      }),
-    );
-    const isValidResponse =
-      response.statusCode >= 200 && response.statusCode < 400;
-    return isValidResponse;
+    const response = await session.fetch(`${url}/api/v1/server_settings`, {
+      method: "HEAD",
+    });
+    return response.ok;
   } catch (error: unknown) {
     logger.log(error);
     return false;

package-lock.json

@@ -165,7 +165,6 @@
     "electron-updater": "^6.1.4",
     "electron-window-state": "^5.0.3",
     "escape-goat": "^4.0.0",
-    "get-stream": "^8.0.1",
     "htmlhint": "^1.1.2",
     "i18n": "^0.15.1",
     "iso-639-1": "^3.1.0",

package.json

@@ -1,9 +1,3 @@
-declare namespace Electron {
-  // https://github.com/electron/typescript-definitions/issues/170
-  // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-  interface IncomingMessage extends NodeJS.ReadableStream {}
-}
-
 declare module "zulip:remote" {
   export const {
     app,