From 6c4b16b0437d64841a8d2056fdf199dc5d59b19c Mon Sep 17 00:00:00 2001 From: Finn Kumkar Date: Sun, 11 Apr 2021 19:22:50 +0200 Subject: [PATCH 1/5] fix: add download and extraction of windows-kill.exe v1.1.4 (#1720) This commit adds an install script that runs on 'npm install'. Its purpose is to download, extract and verify a specific version of the windows-kill.exe binary. I decided not add the - windows only - executable directly to this project to keep the dependencies clear. Furthermore I did not use the node-window-kill package, because it comes with node-gyp which requires python and vs2017 build tools on the target machine. --- .gitignore | 1 + bin/install.js | 98 +++++++++++++++++++++++++++++++++++++++++++++++ package-lock.json | 5 +++ package.json | 2 + 4 files changed, 106 insertions(+) create mode 100644 bin/install.js diff --git a/.gitignore b/.gitignore index 64f3f294..14aa01c0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ lib-cov *.out *.pid *.gz +*.exe .vscode/ diff --git a/bin/install.js b/bin/install.js new file mode 100644 index 00000000..382cd297 --- /dev/null +++ b/bin/install.js @@ -0,0 +1,98 @@ +#!/usr/bin/env node + +// We have to use another dependency here, because there is +// no native Node.js support for the ZIP archive format yet. +const StreamZip = require('node-stream-zip'); + +const https = require('https'); +const crypto = require('crypto'); +const { promisify } = require('util'); +const readFile = promisify(require('fs').readFile); +const writeFile = promisify(require('fs').writeFile); +const unlink = promisify(require('fs').unlink); + +const uri = 'https://github.com/alirdn/windows-kill/releases/download/1.1.4/windows-kill_x64_1.1.4_lib_release.zip'; +const archiveFilePath = './bin/windows-kill.zip'; +const executableFilePath = './bin/windows-kill.exe'; +const executableFileHashAlgorithm = 'SHA256'; +const executableFileHash = 'd35c0d3af8f66984b1ead5cb56744049c1d71ef0791383250ad1086c0e21f865'; + +async function downloadAndUnzipWindowsKill() { + + const isWindows = process.platform === 'win32' || + process.env.OSTYPE === 'cygwin' || + process.env.OSTYPE === 'msys'; + + if (!isWindows) { + console.log("Installation of 'windows-kill.exe' is unneccessary, skipping..."); + process.exit(0); + } + + console.log(`Downloading and extracting 'windows-kill.exe' from '${uri}'...`); + + async function download(uri) { + + return new Promise((resolve, reject) => { + + const request = (uri, resolve, reject) => { + + https.get( + uri, + response => { + + // We are following the 302 Found redirect of GitHub to the actual file location. + if (response.statusCode === 302) { + request(response.headers.location, resolve, reject); + return; + } + + if (response.statusCode !== 200) { + reject(new Error(`Failed to get '${uri}' (${response.statusCode})`)); + return; + } + + const data = []; + response.on('data', chunk => data.push(chunk)); + response.on('end', () => resolve(Buffer.concat(data))); + } + ).on('error', error => reject(error)); + } + + request(uri, resolve, reject); + }); + }; + + try { + + await writeFile(archiveFilePath, await download(uri)); + + const zip = new StreamZip.async({ file: archiveFilePath }); + await zip.extract('windows-kill_x64_1.1.4_lib_release/windows-kill.exe', executableFilePath); + await zip.close(); + + // We are using a checksum to make sure the extracted executable has not been modified. + const fileHash = crypto + .createHash(executableFileHashAlgorithm) + .update(await readFile(executableFilePath)) + .digest('hex'); + + if (fileHash !== executableFileHash) { + await unlink(executableFilePath); + throw new Error(`${executableFileHashAlgorithm} checksum mismatch for 'windows-kill.exe', aborting...`) + } + + await unlink(archiveFilePath); + + } catch (error) { + console.error(error); + + // We are intentionally breaking the 'npm install' run + // with a non-zero exit code, because nodemon relies on + // a working 'windows-kill.exe' in a windows context. + process.exit(1); + } + + process.exit(0); +}; + +downloadAndUnzipWindowsKill(); diff --git a/package-lock.json b/package-lock.json index bf1e3140..99e67135 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4465,6 +4465,11 @@ "integrity": "sha1-a+lPysqNd63gqWcNxGCRTJRHJEQ=", "dev": true }, + "node-stream-zip": { + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.13.3.tgz", + "integrity": "sha512-Vv95ug+8Jfug4AxcqNV7TeGEk2antNidj+YBOyP8SS8LTHJmjsE3d9h6L831eJtO8p7jesJ3CDtgkwmLO/wcSw==" + }, "nopt": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", diff --git a/package.json b/package.json index 7de2da3f..d30bc614 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "semantic-release": "semantic-release pre && npm publish && semantic-release post", "prepush": "npm run lint", "killall": "ps auxww | grep node | grep -v grep | awk '{ print $2 }' | xargs kill -9", + "install": "node bin/install", "postinstall": "node bin/postinstall || exit 0" }, "devDependencies": { @@ -59,6 +60,7 @@ "debug": "^3.2.6", "ignore-by-default": "^1.0.1", "minimatch": "^3.0.4", + "node-stream-zip": "^1.13.3", "pstree.remy": "^1.1.7", "semver": "^5.7.1", "supports-color": "^5.5.0", From ee99a83e3cb97dd74dfac01d04cb35ef8ec0571d Mon Sep 17 00:00:00 2001 From: Finn Kumkar Date: Mon, 12 Apr 2021 00:01:55 +0200 Subject: [PATCH 2/5] fix: change child process termination for windows contexts (#1720) This commit replaces the taskkill invocation with windows-kill.exe. We are now sending a SIGINT POSIX signal to the node process in a Windows context. Known issues: The windows-kill.exe has to be triggered in a detached process context, which currently flashes a terminal window on each reload. Furthermore the 'restart' event is triggered twice on the bus. --- lib/monitor/run.js | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/lib/monitor/run.js b/lib/monitor/run.js index 50603787..7f0f0e18 100644 --- a/lib/monitor/run.js +++ b/lib/monitor/run.js @@ -305,20 +305,34 @@ function waitForSubProcesses(pid, callback) { } function kill(child, signal, callback) { + if (!callback) { - callback = function () { }; + callback = noop; } if (utils.isWindows) { - // When using CoffeeScript under Windows, child's process is not node.exe - // Instead coffee.cmd is launched, which launches cmd.exe, which starts - // node.exe as a child process child.kill() would only kill cmd.exe, not - // node.exe - // Therefore we use the Windows taskkill utility to kill the process and all - // its children (/T for tree). - // Force kill (/F) the whole child tree (/T) by PID (/PID 123) - exec('taskkill /pid ' + child.pid + ' /T /F'); - callback(); + + // We are using the Windows Management Instrumentation Command-line + // (wmic) to resolve the sub-child process identifier, because the + // 'child' process in this context is actually a cmd.exe wrapper. + // We want to send the termination signal directly to the node process. + const resultBuffer = childProcess.execSync( + `wmic process where (ParentProcessId=${child.pid}) get ProcessId` + ); + const result = resultBuffer.toString().match(/^[0-9]+/m); + + // If there is no sub-child process we fall back to the child process. + const processId = Array.isArray(result) ? result[0] : child.pid; + + // We are using the standalone 'windows-kill' executable to send the + // standard POSIX signal 'SIGINT' to the process group. This fixes #1720. + // + // We have to detach this binary execution completely via 'start', + // because otherwise the nodemon process itself would be terminated: + // https://github.com/alirdn/windows-kill#how-it-works--limitations + const windowsKill = path.normalize(`${process.cwd()}/node_modules/nodemon/bin/windows-kill.exe`); + exec(`start "" ${windowsKill} -SIGINT ${processId}`, callback); + } else { // we use psTree to kill the full subtree of nodemon, because when // spawning processes like `coffee` under the `--debug` flag, it'll spawn From 1424afca2d6646ddb276123f619b3b1f6363553a Mon Sep 17 00:00:00 2001 From: Finn Kumkar Date: Mon, 12 Apr 2021 23:13:22 +0200 Subject: [PATCH 3/5] fix: optimize windows-kill execution and silence wmic errors (#1720) This commit silences all errors from the wmic.exe process. Which is save, because the error case is handled by falling back to the child.pid. It also optimizes the windows-kill invocation by minimizing (hiding) the terminal window and keeping it open until the process has finished. --- lib/monitor/run.js | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/lib/monitor/run.js b/lib/monitor/run.js index 7f0f0e18..d78dd79e 100644 --- a/lib/monitor/run.js +++ b/lib/monitor/run.js @@ -5,6 +5,7 @@ var bus = utils.bus; var childProcess = require('child_process'); var spawn = childProcess.spawn; var exec = childProcess.exec; +var execSync = childProcess.execSync; var fork = childProcess.fork; var watch = require('./watch').watch; var config = require('../config'); @@ -313,25 +314,37 @@ function kill(child, signal, callback) { if (utils.isWindows) { // We are using the Windows Management Instrumentation Command-line - // (wmic) to resolve the sub-child process identifier, because the + // (wmic.exe) to resolve the sub-child process identifier, because the // 'child' process in this context is actually a cmd.exe wrapper. // We want to send the termination signal directly to the node process. - const resultBuffer = childProcess.execSync( - `wmic process where (ParentProcessId=${child.pid}) get ProcessId` + // The '2> nul' silences the no process found error message. + const resultBuffer = execSync( + `wmic process where (ParentProcessId=${child.pid}) get ProcessId 2> nul` ); const result = resultBuffer.toString().match(/^[0-9]+/m); // If there is no sub-child process we fall back to the child process. const processId = Array.isArray(result) ? result[0] : child.pid; + debug('sending kill signal SIGINT to process: %s', processId); + // We are using the standalone 'windows-kill' executable to send the - // standard POSIX signal 'SIGINT' to the process group. This fixes #1720. + // standard POSIX signal 'SIGINT' to the node process. This fixes #1720. + const windowsKill = path.normalize( + `${process.cwd()}/node_modules/nodemon/bin/windows-kill.exe` + ); + + // We have to detach the 'windows-kill' execution completely from this + // process group to avoid terminating the nodemon process itself. + // See: https://github.com/alirdn/windows-kill#how-it-works--limitations // - // We have to detach this binary execution completely via 'start', - // because otherwise the nodemon process itself would be terminated: - // https://github.com/alirdn/windows-kill#how-it-works--limitations - const windowsKill = path.normalize(`${process.cwd()}/node_modules/nodemon/bin/windows-kill.exe`); - exec(`start "" ${windowsKill} -SIGINT ${processId}`, callback); + // Therefore we are using 'start' to create a new cmd.exe context. + // The '/min' option hides the new terminal window and the '/wait' + // option lets the process wait for the command to finish. + execSync( + `start "windows-kill" /min /wait "${windowsKill}" -SIGINT ${processId}` + ); + callback(); } else { // we use psTree to kill the full subtree of nodemon, because when From 50aee8d43005b3a355574ce91c3e145ded7a5999 Mon Sep 17 00:00:00 2001 From: Finn Kumkar Date: Thu, 29 Apr 2021 22:15:08 +0200 Subject: [PATCH 4/5] fix: replace provisioning script with the raw windows-kill.exe (#1720) This commit replaces the provisioning script, which downloaded a specific windows-kill.exe binary, with the binary itself. We are using the x64 version of the windows-kill.exe from: https://github.com/ElyDotDev/windows-kill/releases/tag/1.1.4 We are now embedding the binary with the project directly to decrease the complexity and avoid breaking the build by external changes. Actually the maintainer of windows-kill changed his GitHub username recently from "alirdn" to "ElyDotDev" which broke the provisioning script! --- .gitignore | 1 - bin/install.js | 98 ------------------------------------------- bin/windows-kill.exe | Bin 0 -> 80384 bytes package-lock.json | 5 --- package.json | 2 - 5 files changed, 106 deletions(-) delete mode 100644 bin/install.js create mode 100644 bin/windows-kill.exe diff --git a/.gitignore b/.gitignore index 14aa01c0..64f3f294 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ lib-cov *.out *.pid *.gz -*.exe .vscode/ diff --git a/bin/install.js b/bin/install.js deleted file mode 100644 index 382cd297..00000000 --- a/bin/install.js +++ /dev/null @@ -1,98 +0,0 @@ -#!/usr/bin/env node - -// We have to use another dependency here, because there is -// no native Node.js support for the ZIP archive format yet. -const StreamZip = require('node-stream-zip'); - -const https = require('https'); -const crypto = require('crypto'); -const { promisify } = require('util'); -const readFile = promisify(require('fs').readFile); -const writeFile = promisify(require('fs').writeFile); -const unlink = promisify(require('fs').unlink); - -const uri = 'https://github.com/alirdn/windows-kill/releases/download/1.1.4/windows-kill_x64_1.1.4_lib_release.zip'; -const archiveFilePath = './bin/windows-kill.zip'; -const executableFilePath = './bin/windows-kill.exe'; -const executableFileHashAlgorithm = 'SHA256'; -const executableFileHash = 'd35c0d3af8f66984b1ead5cb56744049c1d71ef0791383250ad1086c0e21f865'; - -async function downloadAndUnzipWindowsKill() { - - const isWindows = process.platform === 'win32' || - process.env.OSTYPE === 'cygwin' || - process.env.OSTYPE === 'msys'; - - if (!isWindows) { - console.log("Installation of 'windows-kill.exe' is unneccessary, skipping..."); - process.exit(0); - } - - console.log(`Downloading and extracting 'windows-kill.exe' from '${uri}'...`); - - async function download(uri) { - - return new Promise((resolve, reject) => { - - const request = (uri, resolve, reject) => { - - https.get( - uri, - response => { - - // We are following the 302 Found redirect of GitHub to the actual file location. - if (response.statusCode === 302) { - request(response.headers.location, resolve, reject); - return; - } - - if (response.statusCode !== 200) { - reject(new Error(`Failed to get '${uri}' (${response.statusCode})`)); - return; - } - - const data = []; - response.on('data', chunk => data.push(chunk)); - response.on('end', () => resolve(Buffer.concat(data))); - } - ).on('error', error => reject(error)); - } - - request(uri, resolve, reject); - }); - }; - - try { - - await writeFile(archiveFilePath, await download(uri)); - - const zip = new StreamZip.async({ file: archiveFilePath }); - await zip.extract('windows-kill_x64_1.1.4_lib_release/windows-kill.exe', executableFilePath); - await zip.close(); - - // We are using a checksum to make sure the extracted executable has not been modified. - const fileHash = crypto - .createHash(executableFileHashAlgorithm) - .update(await readFile(executableFilePath)) - .digest('hex'); - - if (fileHash !== executableFileHash) { - await unlink(executableFilePath); - throw new Error(`${executableFileHashAlgorithm} checksum mismatch for 'windows-kill.exe', aborting...`) - } - - await unlink(archiveFilePath); - - } catch (error) { - console.error(error); - - // We are intentionally breaking the 'npm install' run - // with a non-zero exit code, because nodemon relies on - // a working 'windows-kill.exe' in a windows context. - process.exit(1); - } - - process.exit(0); -}; - -downloadAndUnzipWindowsKill(); diff --git a/bin/windows-kill.exe b/bin/windows-kill.exe new file mode 100644 index 0000000000000000000000000000000000000000..98d7d7f7ed95fd8662f82dda3d16203f0d76e580 GIT binary patch literal 80384 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 literal 0 HcmV?d00001 diff --git a/package-lock.json b/package-lock.json index 99e67135..bf1e3140 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4465,11 +4465,6 @@ "integrity": "sha1-a+lPysqNd63gqWcNxGCRTJRHJEQ=", "dev": true }, - "node-stream-zip": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.13.3.tgz", - "integrity": "sha512-Vv95ug+8Jfug4AxcqNV7TeGEk2antNidj+YBOyP8SS8LTHJmjsE3d9h6L831eJtO8p7jesJ3CDtgkwmLO/wcSw==" - }, "nopt": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", diff --git a/package.json b/package.json index d30bc614..7de2da3f 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,6 @@ "semantic-release": "semantic-release pre && npm publish && semantic-release post", "prepush": "npm run lint", "killall": "ps auxww | grep node | grep -v grep | awk '{ print $2 }' | xargs kill -9", - "install": "node bin/install", "postinstall": "node bin/postinstall || exit 0" }, "devDependencies": { @@ -60,7 +59,6 @@ "debug": "^3.2.6", "ignore-by-default": "^1.0.1", "minimatch": "^3.0.4", - "node-stream-zip": "^1.13.3", "pstree.remy": "^1.1.7", "semver": "^5.7.1", "supports-color": "^5.5.0", From f7c6e0deebc614c309817dd790d117b0c9326ea2 Mon Sep 17 00:00:00 2001 From: Finn Kumkar Date: Sun, 9 May 2021 20:49:05 +0200 Subject: [PATCH 5/5] fix: add support for hard shutdown on SIGKILL (#1720) This commit adds back the hard shutdown behaviour under Windows as an opt-in: If the --signal option is "SIGKILL" nodemon will terminate the process group by force without waiting for the process to clean-up. This matches a SIGKILL on a UNIX system. --- lib/monitor/run.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/monitor/run.js b/lib/monitor/run.js index d78dd79e..c5f19b01 100644 --- a/lib/monitor/run.js +++ b/lib/monitor/run.js @@ -313,6 +313,22 @@ function kill(child, signal, callback) { if (utils.isWindows) { + // We are handling a 'SIGKILL' POSIX signal under Windows the + // same way it is handled on a UNIX system: We are performing + // a hard shutdown without waiting for the process to clean-up. + if (signal === 'SIGKILL') { + + debug('terminating process group by force: %s', child.pid); + + // We are using the taskkill utility to terminate the whole + // process group ('/t') of the child ('/pid') by force ('/f'). + // We need to end all sub processes, because the 'child' + // process in this context is actually a cmd.exe wrapper. + exec(`taskkill /f /t /pid ${child.pid}`); + callback(); + return; + } + // We are using the Windows Management Instrumentation Command-line // (wmic.exe) to resolve the sub-child process identifier, because the // 'child' process in this context is actually a cmd.exe wrapper.