@oclif/plugin-update 4.4.14 → 4.4.16

package/README.md

@@ -55,7 +55,7 @@ EXAMPLES
     $ oclif-example update --available
 ```
 
-_See code: [src/commands/update.ts](https://github.com/oclif/plugin-update/blob/v4.4.14/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/oclif/plugin-update/blob/v4.4.16/src/commands/update.ts)_
 <!-- commandsstop -->
 
 # Contributing

package/dist/update.js

@@ -2,10 +2,11 @@ import { Config, ux } from '@oclif/core';
 import { green, yellow } from 'ansis';
 import makeDebug from 'debug';
 import fileSize from 'filesize';
-import { got } from 'got';
+import { HTTPError, got } from 'got';
 import { existsSync } from 'node:fs';
 import { mkdir, readFile, readdir, rm, stat, symlink, utimes, writeFile } from 'node:fs/promises';
 import { basename, dirname, join } from 'node:path';
+import { ProxyAgent } from 'proxy-agent';
 import { Extractor } from './tar.js';
 import { ls, wait } from './util.js';
 const debug = makeDebug('oclif:update');
@@ -13,6 +14,23 @@ const filesize = (n) => {
     const [num, suffix] = fileSize(n, { output: 'array' });
     return Number.parseFloat(num).toFixed(1) + ` ${suffix}`;
 };
+async function httpGet(url) {
+    debug(`[${url}] GET`);
+    return got
+        .get(url, {
+        agent: { https: new ProxyAgent() },
+    })
+        .then((res) => {
+        debug(`[${url}] ${res.statusCode}`);
+        return res;
+    })
+        .catch((error) => {
+        debug(`[${url}] ${error.response?.statusCode ?? error.code}`);
+        // constructing a new HTTPError here will produce a more actionable stack trace
+        debug(new HTTPError(error.response));
+        throw error;
+    });
+}
 export class Updater {
     config;
     clientBin;
@@ -25,7 +43,7 @@ export class Updater {
     async fetchVersionIndex() {
         const newIndexUrl = this.config.s3Url(s3VersionIndexKey(this.config));
         try {
-            const { body } = await got.get(newIndexUrl);
+            const { body } = await httpGet(newIndexUrl);
             return typeof body === 'string' ? JSON.parse(body) : body;
         }
         catch {
@@ -243,7 +261,7 @@ const composeS3SubDir = (config) => {
 const fetchManifest = async (s3Key, config) => {
     ux.action.status = 'fetching manifest';
     const url = config.s3Url(s3Key);
-    const { body } = await got.get(url);
+    const { body } = await httpGet(url);
     if (typeof body === 'string') {
         return JSON.parse(body);
     }
@@ -309,7 +327,10 @@ const downloadAndExtract = async (output, manifest, channel, config) => {
             platform: determinePlatform(config),
             version,
         }));
-    const stream = got.stream(gzUrl);
+    debug(`Streaming ${gzUrl} to ${output}`);
+    const stream = got.stream(gzUrl, {
+        agent: { https: new ProxyAgent() },
+    });
     stream.pause();
     const baseDir = manifest.baseDir ??
         config.s3Key('baseDir', {
@@ -339,7 +360,7 @@ const determineChannel = async ({ config, version }) => {
         return channel;
     }
     try {
-        const { body } = await got.get(`${config.npmRegistry ?? 'https://registry.npmjs.org'}/${config.pjson.name}`);
+        const { body } = await httpGet(`${config.npmRegistry ?? 'https://registry.npmjs.org'}/${config.pjson.name}`);
         const tags = body['dist-tags'];
         const tag = Object.keys(tags).find((v) => tags[v] === version) ?? channel;
         // convert from npm style tag defaults to OCLIF style

package/oclif.manifest.json

@@ -96,5 +96,5 @@
       ]
     }
   },
-  "version": "4.4.14"
+  "version": "4.4.16"
 }

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@oclif/plugin-update",
-  "version": "4.4.14",
+  "version": "4.4.16",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/plugin-update/issues",
   "dependencies": {
-    "@inquirer/select": "^2.4.1",
+    "@inquirer/select": "^2.4.2",
     "@oclif/core": "^4",
     "ansis": "^3.3.2",
     "debug": "^4.3.6",
     "filesize": "^6.1.0",
     "got": "^13",
+    "proxy-agent": "^6.4.0",
     "semver": "^7.6.3",
     "tar-fs": "^2.1.1",
     "tty-table": "^4.2.3"