fix: properly catch missing url opener error on interactive prompt (n…

…pm#7005) Closes: npm#7002
ljharb · Nov 21, 2023 · 6267f54 · 6267f54
1 parent 7788ef2
commit 6267f54
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/lib/utils/open-url-prompt.js b/lib/utils/open-url-prompt.js
@@ -1,5 +1,5 @@
 const readline = require('readline')
-const promiseSpawn = require('@npmcli/promise-spawn')
+const open = require('./open-url.js')
 
 function print (npm, title, url) {
   const json = npm.config.get('json')
@@ -63,8 +63,7 @@ const promptOpen = async (npm, url, title, prompt, emitter) => {
     return
   }
 
-  const command = browser === true ? null : browser
-  await promiseSpawn.open(url, { command })
+  await open(npm, url, 'Browser unavailable.  Please open the URL manually')
 }
 
 module.exports = promptOpen
diff --git a/tap-snapshots/test/lib/utils/open-url-prompt.js.test.cjs b/tap-snapshots/test/lib/utils/open-url-prompt.js.test.cjs
@@ -5,6 +5,14 @@
  * Make sure to inspect the output below.  Do not ignore changes!
  */
 'use strict'
+exports[`test/lib/utils/open-url-prompt.js TAP does not error when opener can not find command > Outputs extra Browser unavailable message and url 1`] = `
+npm home:
+https://www.npmjs.com
+Browser unavailable.  Please open the URL manually:
+  https://www.npmjs.com
+
+`
+
 exports[`test/lib/utils/open-url-prompt.js TAP opens a url > must match snapshot 1`] = `
 npm home:
 https://www.npmjs.com

diff --git a/test/lib/utils/open-url-prompt.js b/test/lib/utils/open-url-prompt.js
@@ -126,13 +126,24 @@ t.test('does not open url if canceled', async t => {
 
 t.test('returns error when opener errors', async t => {
   const { error, openerUrl } = await mockOpenUrlPrompt(t, {
-    openerResult: new Error('Opener failed'),
+    openerResult: Object.assign(new Error('Opener failed'), { code: 1 }),
   })
 
   t.match(error, /Opener failed/, 'got the correct error')
   t.equal(openerUrl, 'https://www.npmjs.com', 'did not open')
 })
 
+t.test('does not error when opener can not find command', async t => {
+  const { OUTPUT, error, openerUrl } = await mockOpenUrlPrompt(t, {
+    // openerResult: new Error('Opener failed'),
+    openerResult: Object.assign(new Error('Opener failed'), { code: 127 }),
+  })
+
+  t.notOk(error, 'Did not error')
+  t.equal(openerUrl, 'https://www.npmjs.com', 'did not open')
+  t.matchSnapshot(OUTPUT, 'Outputs extra Browser unavailable message and url')
+})
+
 t.test('throws "canceled" error on SIGINT', async t => {
   const emitter = new EventEmitter()
   const { open } = await mockOpenUrlPrompt(t, {