Extract running processes to a separated module.

Signed-off-by: David Calavera <[email protected]>

Author: calavera

src/commands/dev/index.js

@@ -1,5 +1,4 @@
 const { flags } = require('@oclif/command')
-const { spawn } = require('child_process')
 const http = require('http')
 const httpProxy = require('http-proxy')
 const waitPort = require('wait-port')
@@ -10,6 +9,7 @@ const openBrowser = require('../../utils/openBrowser')
 const Command = require('@netlify/cli-utils')
 const { getAddons } = require('netlify/src/addons')
 const { createTunnel, connectTunnel } = require('../../live-tunnel')
+const { runProcess }  = require('../../run-process')
 
 function isFunction(settings, req) {
   return settings.functionsPort && req.url.match(/^\/.netlify\/functions\/.+/)
@@ -95,19 +95,7 @@ function startDevServer(settings, log, error) {
     return
   }
 
-  const ps = spawn(settings.cmd, settings.args, { env: settings.env })
-
-  ps.stdout.on('data', data => {
-    log(`${data}`.replace(settings.urlRegexp, `$1$2${settings.port}$3`))
-  })
-
-  ps.stderr.on('data', data => {
-    log(`Error reading data: ${data}`)
-  })
-
-  ps.on('close', code => process.exit(code))
-  ps.on('SIGINT', () => process.exit())
-  ps.on('SIGTERM', () => process.exit())
+  runProcess(settings, log, error)
 }
 
 class DevCommand extends Command {

src/live-tunnel.js

@@ -1,9 +1,9 @@
-const {spawn} = require('child_process')
 const fetch = require('node-fetch')
 const fs = require('fs')
 const os = require('os')
 const path = require('path')
-const {fetchLatest} = require('gh-release-fetch')
+const { fetchLatest } = require('gh-release-fetch')
+const { runProcess }  = require('./run-process')
 
 async function createTunnel(siteId, netlifyApiToken) {
   await installTunnelClient()
@@ -32,19 +32,12 @@ async function createTunnel(siteId, netlifyApiToken) {
 async function connectTunnel(session, netlifyApiToken, localPort, log, error) {
   const execPath = path.join(os.homedir(), '.netlify', 'tunnel', 'bin', 'live-tunnel-client')
 
-  const ps = spawn(execPath, ['connect', '-s', session.id, '-t', netlifyApiToken, '-l', localPort]);
-
-  ps.stdout.on('data', data => {
-    log(`INFO: ${data}`)
-  })
-
-  ps.stderr.on('data', data => {
-    error(`ERROR: ${data}`)
-  })
+  const proc = {
+    cmd: execPath,
+    args: ['connect', '-s', session.id, '-t', netlifyApiToken, '-l', localPort]
+  }
 
-  ps.on('close', code => process.exit(code))
-  ps.on('SIGINT', () => process.exit())
-  ps.on('SIGTERM', () => process.exit())
+  runProcess(cmd, log, error)
 }
 
 async function installTunnelClient() {

src/run-process.js

@@ -0,0 +1,17 @@
+const {spawn} = require('child_process')
+
+module.exports.runProcess = ({ cmd, args, env = {} }, log, error)  => {
+  const ps = spawn(cmd, args, env);
+
+  ps.stdout.on('data', data => {
+    log(`INFO: ${data}`)
+  })
+
+  ps.stderr.on('data', data => {
+    error(`ERROR: ${data}`)
+  })
+
+  ps.on('close', code => process.exit(code))
+  ps.on('SIGINT', () => process.exit())
+  ps.on('SIGTERM', () => process.exit())
+}