Migrate to "got" library from "request"

Author: ivankravets

src/home.js

@@ -11,10 +11,10 @@ import { getCoreDir, runPIOCommand } from './core';
 
 import crypto from 'crypto';
 import fs from 'fs';
+import got from 'got';
 import jsonrpc from 'jsonrpc-lite';
 import path from 'path';
 import qs from 'querystringify';
-import request from 'request';
 import tcpPortUsed from 'tcp-port-used';
 import ws from 'ws';
 
@@ -59,20 +59,11 @@ export function getFrontendUrl(options) {
 }
 
 export async function getFrontendVersion() {
-  return await new Promise((resolve) => {
-    request(
-      constructServerUrl({ path: '/package.json' }),
-      function (error, response, body) {
-        if (error || !response || response.statusCode !== 200) {
-          return resolve(undefined);
-        }
-        try {
-          return resolve(JSON.parse(body).version);
-        } catch (err) {}
-        return resolve(undefined);
-      }
-    );
-  });
+  try {
+    return (
+      await got(constructServerUrl({ path: '/package.json' }), { timeout: 1000 }).json()
+    ).version;
+  } catch (err) {}
 }
 
 async function listenIDECommands(callback) {
@@ -206,21 +197,24 @@ async function _ensureServerStarted(options = {}) {
   return true;
 }
 
-export function shutdownServer() {
+export async function shutdownServer() {
   if (!_HTTP_PORT) {
     return;
   }
-  return request.post(constructServerUrl({ path: '/__shutdown__' }));
+  return await got.post(constructServerUrl({ path: '/__shutdown__' }), {
+    timeout: 1000,
+  });
 }
 
 export async function shutdownAllServers() {
   let port = HTTP_PORT_BEGIN;
   while (port < HTTP_PORT_END) {
-    request
-      .get(
-        constructServerUrl({ port, includeSID: false, query: { __shutdown__: '1' } })
-      )
-      .on('error', () => {});
+    try {
+      got(
+        constructServerUrl({ port, includeSID: false, query: { __shutdown__: '1' } }),
+        { timeout: 1000, throwHttpErrors: false }
+      );
+    } catch (err) {}
     port++;
   }
   await misc.sleep(2000); // wait for 2 secs while server stops

src/misc.js

@@ -7,28 +7,14 @@
  */
 
 import { promises as fs } from 'fs';
+import got from 'got';
 import os from 'os';
 import qs from 'querystringify';
-import request from 'request';
 
 export function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
-export function processHTTPRequest(url, callback, options) {
-  options = options || {};
-  options.url = url;
-  if (!options.headers) {
-    options.headers = {
-      'User-Agent': 'PlatformIO',
-    };
-  }
-  console.info('processHTTPRequest', options);
-  return request(options, (err, response, body) => {
-    return callback(err, response, body);
-  });
-}
-
 export async function loadJSON(filePath) {
   try {
     await fs.access(filePath);
@@ -61,7 +47,7 @@ function uuid() {
   return `${s4()}${s4()}-${s4()}-${s4()}-${s4()}-${s4()}${s4()}${s4()}`;
 }
 
-export function reportError(err) {
+export async function reportError(err) {
   const data = {
     v: 1,
     tid: 'UA-1768265-13',
@@ -76,8 +62,9 @@ export function reportError(err) {
   if (process.env.PLATFORMIO_CALLER) {
     data['cd1'] = process.env.PLATFORMIO_CALLER;
   }
-  request.post('https://www.google-analytics.com/collect', {
+  await got.post('https://www.google-analytics.com/collect', {
     body: qs.stringify(data),
+    timeout: 2000,
   });
 }
 

src/proc.js

@@ -6,6 +6,7 @@
  * the root directory of this source tree.
  */
 
+import { bootstrap } from 'global-agent';
 import fs from 'fs';
 import path from 'path';
 import spawn from 'cross-spawn';
@@ -77,6 +78,10 @@ export function patchOSEnviron({ caller, extraPath, extraVars }) {
   // Configure NO_PROXY for PIO Home
   process.env.NO_PROXY =
     '127.0.0.1' + (process.env.NO_PROXY ? `,${process.env.NO_PROXY}` : '');
+  if (process.env.HTTP_PROXY || process.env.HTTPS_PROXY) {
+    process.env.GLOBAL_AGENT_ENVIRONMENT_VARIABLE_NAMESPACE = '';
+    bootstrap();
+  }
 }
 
 export function extendOSEnvironPath(name, items, prepend = true) {