build - 1.4.1

Author: Sebastian-Webster

dist/src/index.js

@@ -31,16 +31,12 @@ const Logger_1 = __importDefault(require("./libraries/Logger"));
 const os = __importStar(require("node:os"));
 const Executor_1 = __importDefault(require("./libraries/Executor"));
 const semver_1 = require("semver");
-const AbortSignal_1 = __importDefault(require("./libraries/AbortSignal"));
 const Version_1 = __importDefault(require("./libraries/Version"));
 const versions_json_1 = __importDefault(require("./versions.json"));
 const Downloader_1 = require("./libraries/Downloader");
 const crypto_1 = require("crypto");
 const path_1 = require("path");
 const constants_1 = __importDefault(require("./constants"));
-process.on('exit', () => {
-    AbortSignal_1.default.abort('Process is exiting');
-});
 async function createDB(opts) {
     const defaultOptions = {
         dbName: 'dbdata',

dist/src/libraries/AbortSignal.js

@@ -1,4 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const DBDestroySignal = new AbortController();
+function abortSignal() {
+    if (!DBDestroySignal.signal.aborted) {
+        DBDestroySignal.abort('Process is exiting');
+    }
+}
+process.on('beforeExit', abortSignal);
+process.on('exit', abortSignal);
 exports.default = DBDestroySignal;

dist/src/libraries/Downloader.js

@@ -107,7 +107,7 @@ function downloadFromCDN(url, downloadLocation, logger) {
         });
     });
 }
-function extractBinary(url, archiveLocation, extractedLocation) {
+function extractBinary(url, archiveLocation, extractedLocation, logger) {
     return new Promise(async (resolve, reject) => {
         const lastDashIndex = url.lastIndexOf('-');
         const fileExtension = url.slice(lastDashIndex).split('.').splice(1).join('.');
@@ -140,17 +140,23 @@ function extractBinary(url, archiveLocation, extractedLocation) {
             try {
                 await fsPromises.rm(archiveLocation);
             }
+            catch (e) {
+                logger.error('A non-fatal error occurred while removing no longer needed archive file:', e);
+            }
             finally {
-                fsPromises.rename(`${extractedLocation}/${folderName}`, `${extractedLocation}/mysql`);
+                await fsPromises.rename(`${extractedLocation}/${folderName}`, `${extractedLocation}/mysql`);
                 return resolve((0, path_1.normalize)(`${extractedLocation}/mysql/bin/mysqld.exe`));
             }
         }
         handleTarExtraction(archiveLocation, extractedLocation).then(async () => {
             try {
                 await fsPromises.rm(archiveLocation);
             }
+            catch (e) {
+                logger.error('A non-fatal error occurred while removing no longer needed archive file:', e);
+            }
             finally {
-                fsPromises.rename(`${extractedLocation}/${folderName}`, `${extractedLocation}/mysql`);
+                await fsPromises.rename(`${extractedLocation}/${folderName}`, `${extractedLocation}/mysql`);
                 resolve(`${extractedLocation}/mysql/bin/mysqld`);
             }
         }).catch(error => {
@@ -180,7 +186,7 @@ function downloadBinary(binaryInfo, options, logger) {
                 (0, proper_lockfile_1.lockSync)(extractedPath);
                 lockedByUs = true;
                 await downloadFromCDN(url, archivePath, logger);
-                await extractBinary(url, archivePath, extractedPath);
+                await extractBinary(url, archivePath, extractedPath, logger);
                 try {
                     (0, proper_lockfile_1.unlockSync)(extractedPath);
                 }
@@ -226,7 +232,7 @@ function downloadBinary(binaryInfo, options, logger) {
             reject(e);
         }
         try {
-            const binaryPath = await extractBinary(url, zipFilepath, extractedPath);
+            const binaryPath = await extractBinary(url, zipFilepath, extractedPath, logger);
             resolve(binaryPath);
         }
         catch (e) {

dist/src/libraries/Executor.js

@@ -226,6 +226,9 @@ _Executor_instances = new WeakSet(), _Executor_execute = function _Executor_exec
                     await this.deleteDatabaseDirectory(dbPath);
                 }
             }
+            catch (e) {
+                this.logger.error('An erorr occurred while deleting database directory at path:', dbPath, '| The error was:', e);
+            }
             finally {
                 try {
                     if (binaryFilepath.includes(os.tmpdir()) && !options.downloadBinaryOnce) {
@@ -237,6 +240,9 @@ _Executor_instances = new WeakSet(), _Executor_execute = function _Executor_exec
                         await fsPromises.rm(splitPath.join('/'), { force: true, recursive: true });
                     }
                 }
+                catch (e) {
+                    this.logger.error('An error occurred while deleting no longer needed MySQL binary:', e);
+                }
                 finally {
                     if (resolveFunction) {
                         resolveFunction();

package-lock.json

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