eip-cloud-services 1.1.13 → 1.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eip-cloud-services",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "Houses a collection of helpers for connecting with Cloud services.",
   "main": "index.js",
   "scripts": {

package/src/mysql.js

@@ -6,21 +6,33 @@ if ( fs.existsSync ( configDirPath ) && fs.statSync ( configDirPath ).isDirector
     config = require ( 'config' ); // require the config directory if it exists
 }
 
-let pool = null;
+// Replace single pool with pools object to store multiple connection pools
+const pools = {};
 
-function getPool () {
-    if ( !pool ) {
-        pool = mysql.createPool ( {
-            connectionLimit: config.mysql.connectionLimit,
-            host: config.mysql.host,
-            user: config.mysql.user,
-            password: config.mysql.password,
-            database: config.mysql.database || undefined,
-            multipleStatements: config.mysql.multipleStatements || true
-        } );
+/**
+ * Creates or retrieves a MySQL connection pool based on a given pool identifier.
+ * If the pool does not exist, it creates a new one with the configuration settings.
+ *
+ * @param {string} [poolId='main'] - The identifier for the MySQL connection pool. Defaults to 'main'.
+ * @returns {Object} The MySQL connection pool.
+ */
+function getPool (poolId = 'main') {
+    console.log(`Getting MySQL connection pool for poolId: ${poolId}`);
+    if (!pools[poolId]) {
+        // Support custom config per poolId if available
+        const poolConfig = config.mysql[poolId] || config.mysql;
+        
+        pools[poolId] = mysql.createPool({
+            connectionLimit: poolConfig.connectionLimit,
+            host: poolConfig.host,
+            user: poolConfig.user,
+            password: poolConfig.password,
+            database: poolConfig.database || undefined,
+            multipleStatements: poolConfig.multipleStatements || true
+        });
     }
     
-    return pool;
+    return pools[poolId];
 }
 
 const newQuery = ( connection, query ) => new Promise ( ( resolve, reject ) => {
@@ -44,29 +56,71 @@ const newQuery = ( connection, query ) => new Promise ( ( resolve, reject ) => {
     } );
 } );
 
+/**
+ * Deletes a MySQL connection pool.
+ * @param {string} poolId - The identifier of the pool to delete.
+ * @returns {Promise<void>} - A promise that resolves once the pool is closed and deleted.
+ */
+exports.deletePool = (poolId) => new Promise((resolve) => {
+    if (pools[poolId]) {
+        pools[poolId].end(() => {
+            delete pools[poolId];
+            resolve();
+        });
+    } else {
+        resolve();
+    }
+});
+
 exports.getPool = getPool;
-exports.getConnection = () => new Promise ( ( resolve, reject ) => {
-    getPool ().getConnection ( ( error, connection ) => {
-        if ( error ) {
-            console.log ( error );
-            console.error ( 'There was a problem getting a new database connection.' );
-            reject ( 'There was a problem getting a new database connection.' );
-        }
-        else {
-            resolve ( connection );
+
+/**
+ * Gets a MySQL connection from a specified pool.
+ * @param {string} [poolId='main'] - The identifier for the MySQL connection pool.
+ * @returns {Promise<Object>} - A promise that resolves with a MySQL connection.
+ */
+exports.getConnection = (poolId = 'main') => new Promise((resolve, reject) => {
+    getPool(poolId).getConnection((error, connection) => {
+        if (error) {
+            console.log(error);
+            console.error('There was a problem getting a new database connection.');
+            reject('There was a problem getting a new database connection.');
+        } else {
+            resolve(connection);
         }
-    } );
-} );
+    });
+});
 
-exports.query = queryString => new Promise ( ( resolve, reject ) => {
-    if ( !queryString.endsWith ( ';' ) ){
+/**
+ * Executes a query using a connection from a specified pool.
+ * @param {string} queryString - The SQL query to execute.
+ * @param {string} [poolId='main'] - The identifier for the MySQL connection pool.
+ * @returns {Promise<Object>} - A promise that resolves with the query results.
+ */
+exports.query = (queryString, poolId = 'main') => new Promise((resolve, reject) => {
+    if (!queryString.endsWith(';')) {
         queryString += ';';
     }
-    this.getConnection ().then ( connection => newQuery ( connection, queryString ) ).then ( resolve ).catch ( reject );
-} );
+    
+    this.getConnection(poolId)
+        .then(connection => newQuery(connection, queryString))
+        .then(resolve)
+        .catch(reject);
+});
 
-exports.kill = () => new Promise ( resolve => {
-    pool.end ( () => {
-        resolve ();
-    } );
-} );
+/**
+ * Gracefully closes all MySQL connection pools.
+ * @returns {Promise<void>} - A promise that resolves once all pools are closed.
+ */
+exports.kill = () => new Promise(resolve => {
+    const closePromises = Object.keys(pools).map(poolId => 
+        new Promise(poolResolve => {
+            pools[poolId].end(() => {
+                delete pools[poolId];
+                poolResolve();
+            });
+        })
+    );
+    
+    Promise.all(closePromises).then(() => resolve());
+});

package/src/s3.js

@@ -134,6 +134,10 @@ exports.get = async ( key, bucket = config?.s3?.Bucket, options = {} ) => {
                 data = zlib.unzipSync ( data );
             }
 
+            if ( response.ContentType.includes('image') ) {
+                return data;
+            }
+
             if ( response.ContentType !== 'application/json' && !response.Metadata[ 'tmg-json' ] ) {
                 if ( config?.s3?.logs === 'output' )
                     log ( `S3 [GET]: Returned ${response.ContentType} from ${bucket}/${key}.` );