@apollo/rover 0.36.2 → 0.38.0

package/README.md

@@ -47,10 +47,14 @@ Commands:
           Cloud configuration commands
   connector
           Work with Apollo Connectors
+  completion
+          Generate shell completion scripts
   config
           Configuration profile commands
   contract
           Contract configuration commands
+  schema
+          Schema inspection commands
   dev
           Run a supergraph locally to develop and test subgraph changes
   supergraph
@@ -69,6 +73,8 @@ Commands:
           Commands related to updating rover
   persisted-queries
           Commands for persisted queries [aliases: pq]
+  install
+          Installs Rover
   explain
           Explain error codes
   license
@@ -82,7 +88,7 @@ Options:
 
       --format <FORMAT_KIND>
           Specify Rover's format type
-          
+
           [default: plain]
           [possible values: plain, json]
 
@@ -91,21 +97,21 @@ Options:
 
       --insecure-accept-invalid-certs
           Accept invalid certificates when performing HTTPS requests.
-          
+
           You should think very carefully before using this flag.
-          
+
           If invalid certificates are trusted, any certificate for any site will be trusted for use. This includes expired certificates. This introduces significant vulnerabilities, and should only be used as a last resort.
 
       --insecure-accept-invalid-hostnames
           Accept invalid hostnames when performing HTTPS requests.
-          
+
           You should think very carefully before using this flag.
-          
+
           If hostname verification is not used, any valid certificate for any site will be trusted for use from any other. This introduces a significant vulnerability to man-in-the-middle attacks.
 
       --client-timeout <CLIENT_TIMEOUT>
           Configure the timeout length (in seconds) when performing HTTP(S) requests
-          
+
           [default: 30]
 
       --skip-update-check
@@ -120,7 +126,7 @@ Options:
 
 
 ** Getting Started with Rover **
-    
+
 Run the following command to authenticate with GraphOS:
 
     $ rover config auth
@@ -209,7 +215,10 @@ If you'd like to call `rover` from any directory on your machine, you can run `n
 
 Note: Unfortunately if you've installed `npm` without a version manager such as `nvm`, you may have trouble with global installs. If you encounter an `EACCES` permission-related error while trying to install globally, DO NOT run the install command with `sudo`. [This support page](https://docs.npmjs.com/resolving-eacces-permissions-errors-when-installing-packages-globally) has information that should help to resolve this issue.
 
-#### Without curl
+#### Homebrew
+While we recommend using one of the other installation methods above, we do have a homebrew recipe `brew install rover`. The code for this recipe is in the [homebrew-core repo](https://github.com/Homebrew/homebrew-core/blob/master/Formula/r/rover.rb).
+
+#### Manual binary download
 
 You can also [download the binary for your operating system](https://github.com/apollographql/rover/releases) and manually add its location to your `PATH`.
 

package/binary.js

@@ -1,14 +1,14 @@
 "use strict";
 
-const axios = require("axios");
-const cTable = require("console.table");
 const libc = require("detect-libc");
 const os = require("os");
 const tar = require("tar");
-const { configureProxy } = require("axios-proxy-builder");
+const { Console } = require("node:console");
 const { existsSync, mkdirSync, rmSync } = require("fs");
 const { join } = require("path");
 const { spawnSync } = require("child_process");
+const { Readable } = require("stream");
+const { ProxyAgent, fetch } = require("undici");
 
 const error = (msg) => {
   console.error(msg);
@@ -25,35 +25,35 @@ const supportedPlatforms = [
     ARCHITECTURE: "x64",
     RUST_TARGET: "x86_64-pc-windows-msvc",
     BINARY_NAME: `${name}-${version}.exe`,
-    RAW_NAME: `${name}.exe`
+    RAW_NAME: `${name}.exe`,
   },
   {
     TYPE: "Linux",
     ARCHITECTURE: "x64",
     RUST_TARGET: "x86_64-unknown-linux-gnu",
     BINARY_NAME: `${name}-${version}`,
-    RAW_NAME: `${name}`
+    RAW_NAME: `${name}`,
   },
   {
     TYPE: "Linux",
     ARCHITECTURE: "arm64",
     RUST_TARGET: "aarch64-unknown-linux-gnu",
     BINARY_NAME: `${name}-${version}`,
-    RAW_NAME: `${name}`
+    RAW_NAME: `${name}`,
   },
   {
     TYPE: "Darwin",
     ARCHITECTURE: "x64",
     RUST_TARGET: "x86_64-apple-darwin",
     BINARY_NAME: `${name}-${version}`,
-    RAW_NAME: `${name}`
+    RAW_NAME: `${name}`,
   },
   {
     TYPE: "Darwin",
     ARCHITECTURE: "arm64",
     RUST_TARGET: "aarch64-apple-darwin",
     BINARY_NAME: `${name}-${version}`,
-    RAW_NAME: `${name}`
+    RAW_NAME: `${name}`,
   },
 ];
 
@@ -68,7 +68,7 @@ const getPlatform = (type = os.type(), architecture = os.arch()) => {
           "Downloading musl binary that does not include `rover supergraph compose`.";
         if (libc.isNonGlibcLinuxSync()) {
           console.warn(
-            "This operating system does not support dynamic linking to glibc."
+            "This operating system does not support dynamic linking to glibc.",
           );
           console.warn(musl_warning);
           supportedPlatform.RUST_TARGET = "x86_64-unknown-linux-musl";
@@ -84,7 +84,7 @@ const getPlatform = (type = os.type(), architecture = os.arch()) => {
             libc_minor_version < min_minor_version
           ) {
             console.warn(
-              `This operating system needs glibc >= ${min_major_version}.${min_minor_version}, but only has ${libc_version} installed.`
+              `This operating system needs glibc >= ${min_major_version}.${min_minor_version}, but only has ${libc_version} installed.`,
             );
             console.warn(musl_warning);
             supportedPlatform.RUST_TARGET = "x86_64-unknown-linux-musl";
@@ -95,11 +95,61 @@ const getPlatform = (type = os.type(), architecture = os.arch()) => {
     }
   }
 
-  error(
-    `Platform with type "${type}" and architecture "${architecture}" is not supported by ${name}.\nYour system must be one of the following:\n\n${cTable.getTable(
-      supportedPlatforms
-    )}`
+  const stderr = new Console(process.stderr);
+  stderr.log(
+    `Platform with type "${type}" and architecture "${architecture}" is not supported by ${name}.`,
   );
+  stderr.table(supportedPlatforms);
+  process.exit(1);
+};
+
+/*! Copyright (c) 2022 Mitchell Alderson - MIT License */
+const getProxyEnv = (requestURL) => {
+  const noProxy = process.env.NO_PROXY || process.env.no_proxy || "";
+
+  // if the noProxy is a wildcard then return null
+  if (noProxy === "*") {
+    return null;
+  }
+
+  // if the noProxy is not empty and the uri is found, return null
+  if (noProxy !== "" && urlInNoProxy(requestURL, noProxy)) {
+    return null;
+  }
+
+  // get proxy based on request url's protocol
+  if (requestURL.protocol == "http:") {
+    return process.env.HTTP_PROXY || process.env.http_proxy || null;
+  }
+
+  if (requestURL.protocol == "https:") {
+    return process.env.HTTPS_PROXY || process.env.https_proxy || null;
+  }
+
+  // not a supported protocol...
+  return null;
+};
+
+/*! Copyright (c) 2022 Mitchell Alderson - MIT License */
+const urlInNoProxy = (requestURL, noProxy) => {
+  const port =
+    requestURL.port || (requestURL.protocol === "https:" ? "443" : "80");
+  const hostname = formatHostName(requestURL.hostname);
+  //testing: internal.example.com,internal2.example.com
+  const noProxyList = noProxy.split(",");
+
+  return noProxyList.map(parseNoProxyZone).some((noProxyZone) => {
+    const isMatchedAt = hostname.indexOf(noProxyZone.hostname);
+    const hostnameMatched =
+      isMatchedAt > -1 &&
+      isMatchedAt === hostname.length - noProxyZone.hostname.length;
+
+    if (noProxyZone.hasPort) {
+      return port === noProxyZone.port && hostnameMatched;
+    }
+
+    return hostnameMatched;
+  });
 };
 
 /*! Copyright (c) 2019 Avery Harnish - MIT License */
@@ -125,7 +175,7 @@ class Binary {
     if (errors.length > 0) {
       let errorMsg =
         "One or more of the parameters you passed to the Binary constructor are invalid:\n";
-      errors.forEach(error => {
+      errors.forEach((error) => {
         errorMsg += error;
       });
       errorMsg +=
@@ -148,11 +198,11 @@ class Binary {
     return existsSync(this.binaryPath);
   }
 
-  install(fetchOptions, suppressLogs = false) {
+  install(suppressLogs = false) {
     if (this.exists()) {
       if (!suppressLogs) {
         console.error(
-          `${this.name} is already installed, skipping installation.`
+          `${this.name} is already installed, skipping installation.`,
         );
       }
       return Promise.resolve();
@@ -168,31 +218,43 @@ class Binary {
       console.error(`Downloading release from ${this.url}`);
     }
 
-    return axios({ ...fetchOptions, url: this.url, responseType: "stream" })
-      .then(res => {
+    const proxyUrl = getProxyEnv(this.url);
+
+    const agent = proxyUrl ? new ProxyAgent(proxyUrl) : null;
+    const fetchPromise = fetch(this.url, agent ? { dispatcher: agent } : {});
+
+    return fetchPromise
+      .then((res) => {
+        if (!res.ok) {
+          throw new Error(
+            `Failed to download binary: HTTP ${res.status} ${res.statusText}`,
+          );
+        }
         return new Promise((resolve, reject) => {
-          const sink = res.data.pipe(
-            tar.x({ strip: 1, C: this.installDirectory })
+          const sink = Readable.fromWeb(res.body).pipe(
+            tar.x({ strip: 1, C: this.installDirectory }),
           );
           sink.on("finish", () => resolve());
-          sink.on("error", err => reject(err));
+          sink.on("error", (err) => reject(err));
         });
       })
       .then(() => {
-        fs.renameSync(join(this.installDirectory, this.raw_name), this.binaryPath);
+        fs.renameSync(
+          join(this.installDirectory, this.raw_name),
+          this.binaryPath,
+        );
         if (!suppressLogs) {
           console.error(`${this.name} has been installed!`);
         }
       })
-      .catch(e => {
+      .finally(() => agent && agent.close())
+      .catch((e) => {
         error(`Error fetching release: ${e.message}`);
       });
   }
 
-  run(fetchOptions) {
-    const promise = !this.exists()
-      ? this.install(fetchOptions, true)
-      : Promise.resolve();
+  run() {
+    const promise = !this.exists() ? this.install(true) : Promise.resolve();
 
     promise
       .then(() => {
@@ -208,7 +270,7 @@ class Binary {
 
         process.exit(result.status);
       })
-      .catch(e => {
+      .catch((e) => {
         error(e.message);
         process.exit(1);
       });
@@ -216,17 +278,25 @@ class Binary {
 }
 
 const getBinary = (overrideInstallDirectory, platform = getPlatform()) => {
-  const download_host = process.env.npm_config_apollo_rover_download_host || process.env.APOLLO_ROVER_DOWNLOAD_HOST || 'https://rover.apollo.dev'
+  const download_host =
+    process.env.npm_config_apollo_rover_download_host ||
+    process.env.APOLLO_ROVER_DOWNLOAD_HOST ||
+    "https://rover.apollo.dev";
   // the url for this binary is constructed from values in `package.json`
-  // https://rover.apollo.dev/tar/rover/x86_64-unknown-linux-gnu/v0.4.8
+  // https://rover.apollo.dev/tar/rover/x86_64-unknown-linux-gnu/vx.x.x
   const url = `${download_host}/tar/${name}/${platform.RUST_TARGET}/v${version}`;
-  const { dirname } = require('path');
+  const { dirname } = require("path");
   const appDir = dirname(require.main.filename);
   let installDirectory = join(appDir, "binary");
   if (overrideInstallDirectory != null && overrideInstallDirectory !== "") {
-    installDirectory = overrideInstallDirectory
+    installDirectory = overrideInstallDirectory;
   }
-  let binary = new Binary(platform.BINARY_NAME, platform.RAW_NAME, url, installDirectory);
+  let binary = new Binary(
+    platform.BINARY_NAME,
+    platform.RAW_NAME,
+    url,
+    installDirectory,
+  );
 
   // setting this allows us to extract supergraph plugins to the proper directory
   // the variable itself is read in Rust code
@@ -236,19 +306,18 @@ const getBinary = (overrideInstallDirectory, platform = getPlatform()) => {
 
 const install = (suppressLogs = false) => {
   const binary = getBinary();
-  const proxy = configureProxy(binary.url);
   // these messages are duplicated in `src/command/install/mod.rs`
   // for the curl installer.
   if (!suppressLogs) {
     console.error(
-      "If you would like to disable Rover's anonymized usage collection, you can set APOLLO_TELEMETRY_DISABLED=true"
+      "If you would like to disable Rover's anonymized usage collection, you can set APOLLO_TELEMETRY_DISABLED=true",
     );
     console.error(
-      "You can check out our documentation at https://go.apollo.dev/r/docs."
+      "You can check out our documentation at https://go.apollo.dev/r/docs.",
     );
   }
 
-  return binary.install(proxy, suppressLogs);
+  return binary.install(suppressLogs);
 };
 
 const run = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo/rover",
-  "version": "0.36.2",
+  "version": "0.38.0",
   "description": "The new Apollo CLI",
   "main": "index.js",
   "bin": {
@@ -13,7 +13,10 @@
     "fmt:check": "prettier --check **/*.js",
     "test": "jest"
   },
-  "repository": "https://github.com/apollographql/rover",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/apollographql/rover.git"
+  },
   "keywords": [
     "rover",
     "graphql",
@@ -29,25 +32,17 @@
     "url": "https://github.com/apollographql/rover/issues"
   },
   "engines": {
-    "node": ">=14",
-    "npm": ">=6"
-  },
-  "volta": {
-    "node": "20.19.5",
-    "npm": "11.6.0"
+    "node": ">=22.14.0"
   },
   "homepage": "https://github.com/apollographql/rover#readme",
   "dependencies": {
-    "axios": "^1.6.5",
-    "axios-proxy-builder": "^0.1.1",
-    "console.table": "^0.10.0",
-    "detect-libc": "^2.0.0",
-    "tar": "^7.0.0"
+    "detect-libc": "2.1.2",
+    "tar": "^7.0.0",
+    "undici": "^7.0.0"
   },
   "devDependencies": {
-    "prettier": "3.6.2",
-    "jest": "30.1.3",
-    "axios-mock-adapter": "2.1.0",
-    "jest-junit": "16.0.0"
+    "jest": "30.3.0",
+    "jest-junit": "16.0.0",
+    "prettier": "3.8.1"
   }
 }