@sap/cds-dk 4.5.4 → 4.6.0

package/lib/watch/node-watch.js

@@ -5,28 +5,26 @@ module.exports = ({ cwd, script, ext, ignore=RegExp(), env={}, delay=200, option
   // Phoning home...
   const EventEmitter = require('events')
   const emitter = new EventEmitter
-  process.on('exit', () => {
-    if (child)  child.kill()  // propagate exit to child
-    emitter.emit('quit') // listener might exit(), so expect this to be the last statement here
-  })
+  process.on('exit', () => { gracefullyKill (child);  emitter.emit('quit') })
 
   // Re-starting child process...
   const { fork } = require('child_process')
   const restart = (evt, name)=>{
-    const execArgv = [...process.execArgv]
-    if (child) child.kill()
-    if (evt && evt.startsWith('--')) execArgv.push(evt)
-    if (name && name.startsWith('--')) execArgv.push(name)
-    if (options.debug) execArgv.push('--inspect')
-    if (options['debug-brk']) execArgv.push('--inspect-brk')
-    const files = evt === "update" ? [ name ] : undefined
-    emitter.emit ('restart', files)
-    child = fork (script, { cwd, env, stdio:'inherit', execArgv }, (err)=>{
-      if (err) console.error (err)
-    })
-    child.on('message', msg => {
-      if (msg === 'restart') return restart()
-      emitter.emit('message', msg)
+    gracefullyKill (child, () => {
+      const execArgv = [...process.execArgv]
+      if (evt && evt.startsWith('--')) execArgv.push(evt)
+      if (name && name.startsWith('--')) execArgv.push(name)
+      if (options.debug) execArgv.push('--inspect')
+      if (options['debug-brk']) execArgv.push('--inspect-brk')
+      const files = evt === "update" ? [ name ] : undefined
+      emitter.emit ('restart', files)
+      child = fork (script, { cwd, env, stdio:'inherit', execArgv }, (err)=>{
+        if (err) console.error (err)
+      })
+      child.on('message', msg => {
+        if (msg === 'restart') return restart()
+        emitter.emit('message', msg)
+      })
     })
   }
   restart()
@@ -46,10 +44,19 @@ module.exports = ({ cwd, script, ext, ignore=RegExp(), env={}, delay=200, option
     else if (input === 'break' || input === 'brk')  restart('--inspect-brk')
     else if (input === 'debug-brk')  restart('--inspect-brk')
     else if (input === 'ps') ps(child,env)
-    else if (input === 'bye' || input.match(/^n$/i)) { child.kill(); process.exit() }
+    else if (input === 'bye' || input.match(/^n$/i)) { gracefullyKill (child, () => process.exit())  }
     else console.log ('?\n')
   })
 
+  emitter.restart = restart
+  emitter.stop    = () => { gracefullyKill(child, () => false); child = undefined; }
+  emitter.setEnv = (name, value) => {
+    if (typeof value === "undefined") {
+      delete env[name]
+    } else {
+      env[name]
+    }
+  }
   return emitter
 }
 
@@ -59,3 +66,15 @@ const ps = (child,env) => console.log (`\x1b[32m
   ${  child.pid}   child     cds ${JSON.parse(env._args).join(' ')}
   \x1b[0m`
 )
+
+// On Windows, kill() abruptly kills the child process (https://nodejs.org/api/child_process.html#subprocesskillsignal)
+// Send a custom message an wait a bit to give cleanup code a chance to execute.
+const isWindows = (process.platform === 'win32')
+const waitTime = parseInt(process.env.CDS_WATCH_KILL_DELAY) || (isWindows ? 500 : 0)
+function gracefullyKill (proc, fn=()=>{}) {
+  if (proc)  {
+    proc.send({ exit: true })
+    setTimeout(()=> { proc.kill(); fn()}, waitTime)
+  }
+  else fn()
+}