mysql-memory-server 1.12.0 → 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.0/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
 
@@ -88,7 +88,7 @@ If on Windows, this is the name of the named pipe that MySQL is listening on. If
 - `xSocket: string`
 If on Windows, this is the name of the named pipe that the MySQL X Plugin is listening on. If not on Windows, this is the path that the MySQL X Plugin is listening on. If ```options.xEnabled``` is set to "OFF", this value will be an empty string.
 - `mysql: {version: string, versionIsInstalledOnSystem: boolean}`
-An object with three properties. ```version``` is the version of MySQL used to create the database. ```versionIsInstalledOnSystem``` will be true if the MySQL version used is already installed on the system and false if the version had to be downloaded from MySQL's CDN.
+An object with two properties. ```version``` is the version of MySQL used to create the database. ```versionIsInstalledOnSystem``` will be true if the MySQL version used is already installed on the system and false if the version had to be downloaded from MySQL's CDN.
 - `stop: () => Promise<void>`
 The method to stop the database. The returned promise resolves when the database has successfully stopped.
 
@@ -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.0/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.0/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.0/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/constants.d.ts

@@ -8,8 +8,6 @@ export declare const LOG_LEVELS: {
 };
 declare const internalOptions: {
     deleteDBAfterStopped: string;
-    databaseDirectoryPath: string;
-    binaryDirectoryPath: string;
     cli: string;
 };
 export declare function getInternalEnvVariable(envVar: keyof typeof internalOptions): string;

package/dist/src/constants.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MYSQL_LINUX_MINIMAL_REBUILD_VERSIONS = exports.MYSQL_LINUX_FILE_EXTENSIONS = exports.MYSQL_LINUX_MINIMAL_INSTALL_AVAILABLE_ARM64 = exports.MYSQL_LINUX_MINIMAL_INSTALL_AVAILABLE = exports.MYSQL_LINUX_GLIBC_VERSIONS = exports.MYSQL_MACOS_VERSIONS_IN_FILENAME = exports.RC_MYSQL_VERSIONS = exports.DMR_MYSQL_VERSIONS = exports.MYSQL_MIN_OS_SUPPORT = exports.MYSQL_ARCH_SUPPORT = exports.DOWNLOADABLE_MYSQL_VERSIONS = exports.MySQLCDNArchivesBaseURL = exports.MySQLCDNDownloadsBaseURL = exports.MIN_SUPPORTED_MYSQL = exports.OPTION_TYPE_CHECKS = exports.LOG_LEVELS = exports.DEFAULT_OPTIONS_KEYS = exports.DEFAULT_OPTIONS = void 0;
 exports.getInternalEnvVariable = getInternalEnvVariable;
-const path_1 = require("path");
-const os_1 = require("os");
 const semver_1 = require("semver");
 exports.DEFAULT_OPTIONS = {
     version: undefined,
@@ -30,9 +28,6 @@ exports.LOG_LEVELS = {
 };
 const internalOptions = {
     deleteDBAfterStopped: 'true',
-    //mysqlmsn = MySQL Memory Server Node.js
-    databaseDirectoryPath: (0, path_1.normalize)(`${(0, os_1.tmpdir)()}/mysqlmsn/dbs`),
-    binaryDirectoryPath: `${(0, os_1.tmpdir)()}/mysqlmsn/binaries`,
     cli: 'false'
 };
 function getInternalEnvVariable(envVar) {

package/dist/src/libraries/Downloader.js

@@ -46,6 +46,7 @@ const crypto_1 = require("crypto");
 const child_process_1 = require("child_process");
 const FileLock_1 = require("./FileLock");
 const constants_1 = require("../constants");
+const os_1 = __importDefault(require("os"));
 function handleTarExtraction(filepath, extractedPath) {
     return new Promise((resolve, reject) => {
         (0, child_process_1.execFile)(`tar`, ['-xf', filepath, '-C', extractedPath], (error, stdout, stderr) => {
@@ -253,7 +254,7 @@ function extractBinary(url, archiveLocation, extractedLocation, binaryInfo, logg
 function downloadBinary(binaryInfo, options, logger) {
     return new Promise(async (resolve, reject) => {
         const { url, version } = binaryInfo;
-        const dirpath = (0, constants_1.getInternalEnvVariable)('binaryDirectoryPath');
+        const dirpath = `${os_1.default.tmpdir()}/mysqlmsn/binaries`;
         logger.log('Binary path:', dirpath);
         await fsPromises.mkdir(dirpath, { recursive: true });
         const lastDashIndex = url.lastIndexOf('-');

package/dist/src/libraries/Executor.js

@@ -164,7 +164,7 @@ class Executor {
             }
         });
         let retries = 0;
-        this.databasePath = (0, path_1.normalize)(`${(0, constants_1.getInternalEnvVariable)('databaseDirectoryPath')}/${(0, crypto_1.randomUUID)().replaceAll("-", '')}`);
+        this.databasePath = (0, path_1.normalize)(`${os.tmpdir()}/mysqlmsn/dbs/${(0, crypto_1.randomUUID)().replaceAll("-", '')}`);
         const datadir = (0, path_1.normalize)(`${this.databasePath}/data`);
         do {
             await __classPrivateFieldGet(this, _Executor_instances, "m", _Executor_setupDataDirectories).call(this, options, installedMySQLBinary, datadir, true);
@@ -198,21 +198,30 @@ _Executor_instances = new WeakSet(), _Executor_executeFile = function _Executor_
             resolve({ error, stdout, stderr });
         });
     });
-}, _Executor_killProcess = async function _Executor_killProcess(process) {
-    let killed = false;
+}, _Executor_killProcess = async function _Executor_killProcess(childProcess) {
+    // If the process has already been killed, return true
+    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']);
-        if (!error && !stderr) {
-            killed = true;
+        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;
         }
-        else {
-            this.logger.error(error || stderr);
+        if (message.toString().includes('There is no running instance of the task')) {
+            this.logger.warn('Called #killProcess and tried to kill mysqld process but taskkill could not because it is not running. Error received:', message);
+            return true;
         }
+        this.logger.error(message, '| Error toString:', message.toString());
+        return false;
     }
-    else {
-        killed = process.kill();
-    }
-    return killed;
+    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' ? '\\' : '/');
@@ -282,8 +291,10 @@ _Executor_instances = new WeakSet(), _Executor_executeFile = function _Executor_
             // This unwatch will prevent the watch from watching when the process has stopped.
             fs.unwatchFile(errorLogFile);
             if (signal) {
-                this.logger.log('Exiting because of aborted signal.');
-                return;
+                this.logger.log('Exiting because the process received a signal:', signal);
+            }
+            else {
+                this.logger.log('Exiting with code:', code);
             }
             let errorLog;
             try {
@@ -314,7 +325,9 @@ _Executor_instances = new WeakSet(), _Executor_executeFile = function _Executor_
             }
             try {
                 if ((0, constants_1.getInternalEnvVariable)('deleteDBAfterStopped') === 'true') {
+                    this.logger.log('Deleting database path as deleteDBAfterStopped is true...');
                     await fsPromises.rm(dbPath, { recursive: true, force: true, maxRetries: 50, retryDelay: 100 });
+                    this.logger.log('Database deletion was successful.');
                 }
             }
             catch (e) {
@@ -340,7 +353,13 @@ _Executor_instances = new WeakSet(), _Executor_executeFile = function _Executor_
                         return reject(`Database exited early.\nError log: ${errorLog}\nError string: "${errorString}`);
                     }
                     if (code) {
-                        const errorMessage = `The database exited early with code ${code}. The error log was:\n${errorLog}\nThe error string was: "${errorString}".`;
+                        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.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}".`;
+                        }
                         this.logger.error(errorMessage);
                         return reject(errorMessage);
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql-memory-server",
-  "version": "1.12.0",
+  "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",