mysql-memory-server 1.12.1 → 1.12.2

package/README.md

@@ -17,7 +17,7 @@ Download with your package manager of choice. The package name is `mysql-memory-
 - ```mysql-memory-server``` can run MySQL versions 5.7.19 and newer (if the version is already installed on your system)
 - ```mysql-memory-server``` can download and run MySQL versions (inclusive) 5.7.19 - 5.7.44, 8.0.0 - 8.0.43, 8.1.0 - 8.4.6, and 9.0.1 - 9.4.0 (if the version is not already installed on your system)
 
-Extra system requirements apply when ```mysql-memory-server``` is downloading MySQL instead of running a version of MySQL that is already installed on the system. To see the requirements and learn more about the supported versions for download, [read the doc](https://github.com/Sebastian-Webster/mysql-memory-server-nodejs/blob/v1.12.1/docs/SUPPORTED_MYSQL_DOWNLOADS.md)
+Extra system requirements apply when ```mysql-memory-server``` is downloading MySQL instead of running a version of MySQL that is already installed on the system. To see the requirements and learn more about the supported versions for download, [read the doc](https://github.com/Sebastian-Webster/mysql-memory-server-nodejs/blob/v1.12.2/docs/SUPPORTED_MYSQL_DOWNLOADS.md)
 
 ## Example Usage - Application Code
 
@@ -102,11 +102,11 @@ Description: Version of MySQL to use for the database. Uses semver for getting t
 
 If left undefined:
 - If the system has MySQL installed, the system-installed version will be used. If the installed version is not supported by this package (currently <5.7.19), an error will be thrown unless `ignoreUnsupportedSystemVersion` is set to `true`.
-- If the system does not have MySQL installed, the latest version of MySQL that [this package supports downloading](https://github.com/Sebastian-Webster/mysql-memory-server-nodejs/blob/v1.12.1/docs/SUPPORTED_MYSQL_DOWNLOADS.md) will be downloaded.
+- If the system does not have MySQL installed, the latest version of MySQL that [this package supports downloading](https://github.com/Sebastian-Webster/mysql-memory-server-nodejs/blob/v1.12.2/docs/SUPPORTED_MYSQL_DOWNLOADS.md) will be downloaded.
 
 If defined:
 - If the version is older than 5.7.19, an error will be thrown as this package does not currently support those versions of MySQL.
-- If the desired version of MySQL is already installed on the system, the installed version will be used. Otherwise the selected version will be downloaded as long as this package [supports downloading it](https://github.com/Sebastian-Webster/mysql-memory-server-nodejs/blob/v1.12.1/docs/SUPPORTED_MYSQL_DOWNLOADS.md). If this package does not support downloading the selected version, or your system does not [meet the requirements](https://github.com/Sebastian-Webster/mysql-memory-server-nodejs/blob/v1.12.1/docs/SUPPORTED_MYSQL_DOWNLOADS.md) for that version to be ran, an error will be thrown.
+- If the desired version of MySQL is already installed on the system, the installed version will be used. Otherwise the selected version will be downloaded as long as this package [supports downloading it](https://github.com/Sebastian-Webster/mysql-memory-server-nodejs/blob/v1.12.2/docs/SUPPORTED_MYSQL_DOWNLOADS.md). If this package does not support downloading the selected version, or your system does not [meet the requirements](https://github.com/Sebastian-Webster/mysql-memory-server-nodejs/blob/v1.12.2/docs/SUPPORTED_MYSQL_DOWNLOADS.md) for that version to be ran, an error will be thrown.
 
 - `dbName: string`
 

package/dist/src/libraries/Executor.js

@@ -198,14 +198,18 @@ _Executor_instances = new WeakSet(), _Executor_executeFile = function _Executor_
             resolve({ error, stdout, stderr });
         });
     });
-}, _Executor_killProcess = async function _Executor_killProcess(process) {
+}, _Executor_killProcess = async function _Executor_killProcess(childProcess) {
     // If the process has already been killed, return true
-    if (process.kill(0) === false) {
-        this.logger.warn('Called #killProcess to kill mysqld but it has already been killed.');
+    const pid = childProcess.pid;
+    try {
+        process.kill(pid, 0);
+    }
+    catch (e) {
+        this.logger.warn('#killProcess got called to kill mysqld but it is not running:', e);
         return true;
     }
     if (os.platform() === 'win32') {
-        const { error, stderr } = await __classPrivateFieldGet(this, _Executor_instances, "m", _Executor_executeFile).call(this, 'taskkill', ['/pid', String(process.pid), '/t', '/f']);
+        const { error, stderr } = await __classPrivateFieldGet(this, _Executor_instances, "m", _Executor_executeFile).call(this, 'taskkill', ['/pid', String(pid), '/t', '/f']);
         const message = error || stderr;
         if (!message) {
             return true;
@@ -217,7 +221,7 @@ _Executor_instances = new WeakSet(), _Executor_executeFile = function _Executor_
         this.logger.error(message, '| Error toString:', message.toString());
         return false;
     }
-    return process.kill('SIGKILL');
+    return process.kill(pid, 'SIGKILL');
 }, _Executor_returnBinaryPathToDelete = function _Executor_returnBinaryPathToDelete(binaryFilepath, options) {
     if (binaryFilepath.includes(os.tmpdir()) && !options.downloadBinaryOnce) {
         const splitPath = binaryFilepath.split(os.platform() === 'win32' ? '\\' : '/');
@@ -351,7 +355,7 @@ _Executor_instances = new WeakSet(), _Executor_executeFile = function _Executor_
                     if (code) {
                         let errorMessage = '';
                         if (os.platform() === 'win32' && code === 3221225781) {
-                            errorMessage = `The MySQL database exited early with code 3221225781. A possible cause is that the Microsoft Visual C++ Redistributable Package is not installed. Please refer to the following link for this package's requirements on your system - this may help solve this error: https://github.com/Sebastian-Webster/mysql-memory-server-nodejs/blob/v1.12.1/docs/SUPPORTED_MYSQL_DOWNLOADS.md#required-dependencies. If you are sure you have this installed, check the following for more details: The error log was:\n${errorLog}\nThe error string was: "${errorString}".`;
+                            errorMessage = `The MySQL database exited early with code 3221225781. A possible cause is that the Microsoft Visual C++ Redistributable Package is not installed. Please refer to the following link for this package's requirements on your system - this may help solve this error: https://github.com/Sebastian-Webster/mysql-memory-server-nodejs/blob/v1.12.2/docs/SUPPORTED_MYSQL_DOWNLOADS.md#required-dependencies. If you are sure you have this installed, check the following for more details: The error log was:\n${errorLog}\nThe error string was: "${errorString}".`;
                         }
                         else {
                             errorMessage = `The database exited early with code ${code}. The error log was:\n${errorLog}\nThe error string was: "${errorString}".`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql-memory-server",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "description": "Spin up an ephemeral MySQL database from your JavaScript code",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",