fix: run input.start around help and openining urls

This also refactors open url and open url prompt to
the same file.

lib/commands/fund.js

@@ -5,8 +5,7 @@ const { output } = require('proc-log')
 const npa = require('npm-package-arg')
 const { depth } = require('treeverse')
 const { readTree: getFundingInfo, normalizeFunding, isValidFunding } = require('libnpmfund')
-
-const openUrl = require('../utils/open-url.js')
+const { openUrl } = require('../utils/open-url.js')
 const ArboristWorkspaceCmd = require('../arborist-cmd.js')
 
 const getPrintableName = ({ name, version }) => {

lib/commands/help.js

@@ -1,8 +1,8 @@
 const spawn = require('@npmcli/promise-spawn')
 const path = require('path')
-const openUrl = require('../utils/open-url.js')
+const { openUrl } = require('../utils/open-url.js')
 const { glob } = require('glob')
-const { output } = require('proc-log')
+const { output, input } = require('proc-log')
 const localeCompare = require('@isaacs/string-locale-compare')('en')
 const { deref } = require('../utils/cmd-list.js')
 const BaseCommand = require('../base-cmd.js')
@@ -95,13 +95,15 @@ class Help extends BaseCommand {
       args = ['emacsclient', ['-e', `(woman-find-file '${man}')`]]
     }
 
-    return spawn(...args, { stdio: 'inherit' }).catch(err => {
+    try {
+      await input.start(() => spawn(...args, { stdio: 'inherit' }))
+    } catch (err) {
       if (err.code) {
         throw new Error(`help process exited with code: ${err.code}`)
       } else {
         throw err
       }
-    })
+    }
   }
 
   // Returns the path to the html version of the man page

lib/package-url-cmd.js

@@ -1,5 +1,5 @@
 const pacote = require('pacote')
-const openUrl = require('./utils/open-url.js')
+const { openUrl } = require('./utils/open-url.js')
 const { log } = require('proc-log')
 const BaseCommand = require('./base-cmd.js')
 

lib/utils/auth.js

@@ -1,6 +1,6 @@
 const profile = require('npm-profile')
 const { log } = require('proc-log')
-const openUrlPrompt = require('../utils/open-url-prompt.js')
+const { openUrlPrompt } = require('../utils/open-url.js')
 const read = require('../utils/read-user-info.js')
 const otplease = require('../utils/otplease.js')
 

lib/utils/open-url.js

@@ -1,51 +1,100 @@
 const promiseSpawn = require('@npmcli/promise-spawn')
-const { output } = require('proc-log')
-
+const { output, input } = require('proc-log')
 const { URL } = require('url')
+const readline = require('readline')
+
+const assertValidUrl = (url) => {
+  try {
+    if (!/^https?:$/.test(new URL(url).protocol)) {
+      throw new Error()
+    }
+  } catch {
+    throw new Error('Invalid URL: ' + url)
+  }
+}
+
+const outputMsg = (json, title, url) => {
+  const msg = json ? JSON.stringify({ title, url }) : `${title}:\n${url}\n`
+  output.standard(msg)
+}
 
 // attempt to open URL in web-browser, print address otherwise:
-const open = async (npm, url, errMsg, isFile) => {
+const openUrl = async (npm, url, title, isFile) => {
   url = encodeURI(url)
   const browser = npm.config.get('browser')
-
-  function printAlternateMsg () {
-    const json = npm.config.get('json')
-    const alternateMsg = json
-      ? JSON.stringify({
-        title: errMsg,
-        url,
-      }, null, 2)
-      : `${errMsg}:\n  ${url}\n`
-
-    output.standard(alternateMsg)
-  }
+  const json = npm.config.get('json')
 
   if (browser === false) {
-    printAlternateMsg()
+    outputMsg(json, title, url)
     return
   }
 
   // We pass this in as true from the help command so we know we don't have to
   // check the protocol
   if (!isFile) {
-    try {
-      if (!/^https?:$/.test(new URL(url).protocol)) {
-        throw new Error()
-      }
-    } catch {
-      throw new Error('Invalid URL: ' + url)
+    assertValidUrl(url)
+  }
+
+  try {
+    await input.start(() => promiseSpawn.open(url, {
+      command: browser === true ? null : browser,
+    }))
+  } catch (err) {
+    if (err.code !== 127) {
+      throw err
     }
+    outputMsg(json, title, url)
+  }
+}
+
+// Prompt to open URL in browser if possible
+const openUrlPrompt = async (npm, url, title, prompt, emitter) => {
+  const browser = npm.config.get('browser')
+  const json = npm.config.get('json')
+  const isInteractive = process.stdin.isTTY === true && process.stdout.isTTY === true
+
+  assertValidUrl(url)
+  outputMsg(json, title, url)
+
+  if (browser === false || !isInteractive) {
+    return
   }
 
-  const command = browser === true ? null : browser
-  await promiseSpawn.open(url, { command })
-    .catch((err) => {
-      if (err.code !== 127) {
-        throw err
-      }
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  })
 
-      printAlternateMsg()
+  const tryOpen = await input.read(() => new Promise(resolve => {
+    rl.on('SIGINT', () => {
+      rl.close()
+      resolve('SIGINT')
     })
+
+    rl.question(prompt, () => {
+      resolve(true)
+    })
+
+    if (emitter && emitter.addListener) {
+      emitter.addListener('abort', () => {
+        rl.close()
+        resolve(false)
+      })
+    }
+  }))
+
+  if (tryOpen === 'SIGINT') {
+    throw new Error('canceled')
+  }
+
+  if (!tryOpen) {
+    return
+  }
+
+  await openUrl(npm, url, 'Browser unavailable.  Please open the URL manually')
 }
 
-module.exports = open
+module.exports = {
+  openUrl,
+  openUrlPrompt,
+}

lib/utils/otplease.js

@@ -8,7 +8,7 @@ async function otplease (npm, opts, fn) {
 
     if (isWebOTP(err)) {
       const webAuth = require('./web-auth')
-      const openUrlPrompt = require('./open-url-prompt')
+      const { openUrlPrompt } = require('./open-url')
 
       const openerPromise = (url, emitter) =>
         openUrlPrompt(

test/lib/commands/bugs.js

@@ -63,7 +63,7 @@ t.test('open bugs urls & emails', async t => {
   const { npm } = await loadMockNpm(t, {
     mocks: {
       pacote,
-      '{LIB}/utils/open-url.js': openUrl,
+      '{LIB}/utils/open-url.js': { openUrl },
     },
   })
 

test/lib/commands/docs.js

@@ -84,7 +84,7 @@ const setup = async (t, { prefixDir = fixtures.pkg, config } = {}) => {
   const res = await mockNpm(t, {
     prefixDir,
     mocks: {
-      '{LIB}/utils/open-url.js': openUrl,
+      '{LIB}/utils/open-url.js': { openUrl },
     },
     config,
   })

test/lib/commands/repo.js

@@ -187,10 +187,10 @@ const loadMockNpm = async (t, prefixDir, config = {}) => {
   const mock = await mockNpm(t, {
     command: 'repo',
     mocks: {
-      '{LIB}/utils/open-url.js': async (_, url) => {
+      '{LIB}/utils/open-url.js': { openUrl: async (_, url) => {
         opened[url] = opened[url] || 0
         opened[url]++
-      },
+      } },
     },
     config,
     prefixDir,