chore: Replace httpreq by axios

Author: megahertz

e2e/appimage/server/index.js

@@ -11,24 +11,25 @@ app.use('/updates', express.static(
 ));
 
 app.get('/finish', (req, res) => {
-  console.log('v2 is going to quit, pid', req.query.pid);
-  console.log('Successfully updated, test is finished.');
+  console.log('e2e: v2 is going to quit, pid', req.query.pid);
+  console.log('e2e: Successfully updated, test is finished.');
   res.send('ok');
   process.exit();
 });
 
 // eslint-disable-next-line func-names
 app.listen(3003, function () {
-  console.log(`Listening on port ${this.address().port}.`);
+  console.log(`e2e: Listening on port ${this.address().port}.`);
   startAppImageV1();
 });
 
 function startAppImageV1() {
+  console.log('e2e: Starting v1 process');
   const v1 = spawn('../v0.0.1/dist/appimage-0.0.1.AppImage', [], {
     stdio: 'inherit',
   });
 
   v1.on('exit', () => console.log('v1 process is killed'));
 
-  console.log('v1 process is started, pid', v1.pid);
+  console.log('e2e: v1 process is started, pid', v1.pid);
 }

e2e/appimage/start

@@ -3,19 +3,15 @@
 set -e
 
 main() {
-  local start_step=1
+  local step="${1:-1}"
 
-  while [ $# -gt 0 ]; do case "$1" in
-    -s2) start_step=2;;
-    -s3) start_step=3;;
-  esac; shift; done
-
-  [ "${start_step}" -lt 2 ] && step1
-  [ "${start_step}" -lt 3 ] && step2
+  [ "${step}" -lt 2 ] && step1
+  [ "${step}" -lt 3 ] && step2
   step3
 }
 
 step1() {
+  echo "e2e: step1"
   npm ci
   npm ci --prefix server --production -s
   npm ci --prefix v0.0.1 --production -s
@@ -24,10 +20,12 @@ step1() {
 }
 
 step2() {
+  echo "e2e: step2"
   npm run build --prefix v0.0.1 -s
 }
 
 step3() {
+  echo "e2e: step3"
   npm start -s --prefix server
 }
 

e2e/appimage/v0.0.1/package.json

@@ -10,7 +10,7 @@
     "linux": {
       "category": "Development"
     },
-    "electronVersion": "7.1.7"
+    "electronVersion": "15.3.1"
   },
   "updater": {
     "url": "http://127.0.0.1:3003/updates/updates.json"

e2e/appimage/v0.0.2/main.js

@@ -5,6 +5,8 @@ const { request } = require('http');
 
 const SHOW_WINDOW = false;
 
+console.log('e2e: v2 started');
+
 request(`http://localhost:3003/finish?pid=${process.pid}`, (res) => {
   res.on('data', () => SHOW_WINDOW || app.quit());
 }).end();

e2e/appimage/v0.0.2/package-lock.json

@@ -10,7 +10,7 @@
     "linux": {
       "category": "Development"
     },
-    "electronVersion": "7.1.7"
+    "electronVersion": "15.3.1"
   },
   "updater": {
     "url": "http://127.0.0.1:3003/updates/updates.json"

e2e/appimage/v0.0.2/package.json

@@ -5,4 +5,4 @@ set -e
 readonly __root="$(cd "$(dirname "$(dirname "$BASH_SOURCE")")"; pwd)"
 
 cd "${__root}/e2e/appimage"
-"${__root}/e2e/appimage/start"
+"${__root}/e2e/appimage/start" $@

e2e/start

@@ -47,7 +47,7 @@
     "typescript": "^3.7.4"
   },
   "dependencies": {
-    "httpreq": "0.4.24",
+    "axios": "^0.24.0",
     "semver": "^7.1.1"
   }
 }

package.json

@@ -56,14 +56,15 @@ class Linux extends Platform {
         ...process.env,
         APP_IMAGE: this.getAppImagePath(),
         OLD_PID: process.pid,
-        RESTART_REQUIRED: restartRequired === true ? 'true' : 'false',
+        RESTART_REQUIRED: String(restartRequired),
         UPDATE_FILE: this.lastUpdatePath,
       },
     });
     proc.unref();
 
     if (restartRequired === true) {
       electronApi.quit();
+      process.exit();
     }
   }
 

src/platform/Linux.js

@@ -1,7 +1,11 @@
 'use strict';
 
-const request = require('httpreq');
+const axios = require('axios');
 const fs = require('fs');
+const stream = require('stream');
+const util = require('util');
+
+const pipeline = util.promisify(stream.pipeline);
 
 class HttpClient {
   /**
@@ -12,47 +16,16 @@ class HttpClient {
   }
 
   async getJson(url) {
-    return new Promise((resolve, reject) => {
-      request.get(url, this.getHttpOptions(), (err, response) => {
-        if (err) {
-          reject(err);
-          return;
-        }
-
-        try {
-          resolve(JSON.parse(response.body));
-        } catch (e) {
-          reject(new Error(
-            `Error while parsing '${url}'. ${e}. Data:\\n ${response.body}`
-          ));
-        }
-      });
-    });
+    const { data } = await axios.get(url, this.getHttpOptions());
+    return data;
   }
 
   async downloadFile(url, savePath) {
-    return new Promise((resolve, reject) => {
-      const options = {
-        ...this.getHttpOptions(),
-        url,
-        method: 'GET',
-        downloadlocation: savePath,
-        allowRedirects: true,
-      };
-
-      request.doRequest(options, async (err, res) => {
-        if (err) {
-          return reject(err);
-        }
-
-        if (res.statusCode !== 200) {
-          await fs.promises.unlink(savePath);
-          return reject(new Error(`Wrong HTTP status: ${res.statusCode}`));
-        }
-
-        resolve(savePath);
-      });
+    const { data: httpRequest } = await axios.get(url, {
+      ...this.getHttpOptions(),
+      responseType: 'stream',
     });
+    return pipeline(httpRequest, fs.createWriteStream(savePath));
   }
 
   /**
@@ -64,7 +37,7 @@ class HttpClient {
     return {
       ...options,
       headers: {
-        'User-Agent': 'electron-simple-updater',
+        'User-Agent': 'electron-simple-updater 1.0',
         ...options.headers,
       },
     };