improve connect-to-mysql, add creation of magento database if it does…

… not exist

build-packages/magento-scripts/lib/tasks/mysql/connect-to-mysql.js

@@ -2,31 +2,57 @@ const mysql = require('mysql2/promise');
 const UnknownError = require('../../errors/unknown-error');
 const { execAsyncSpawn } = require('../../util/exec-async-command');
 const sleep = require('../../util/sleep');
+const { createMagentoDatabase } = require('./create-magento-database');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
-const connectToMySQL = () => ({
-    title: 'Connecting to MySQL server...',
-    skip: (ctx) => ctx.skipSetup,
+const waitForMySQLInitialization = () => ({
+    title: 'Waiting for MySQL to initialize',
+    task: async (ctx, task) => {
+        const { mysql: { name } } = ctx.config.docker.getContainers();
+        let mysqlReadyForConnections = false;
+        while (!mysqlReadyForConnections) {
+            const mysqlOutput = await execAsyncSpawn(`docker logs ${name}`);
+            if (mysqlOutput.includes('ready for connections')) {
+                mysqlReadyForConnections = true;
+                break;
+            } else if (mysqlOutput.includes('Initializing database files')) {
+                task.output = `MySQL is initializing database files!
+Please wait, this will take some time and do not restart the MySQL container until initialization is finished!`;
+
+                let mysqlFinishedInitialization = false;
+                while (!mysqlFinishedInitialization) {
+                    const mysqlOutput = await execAsyncSpawn(`docker logs ${name}`);
+                    if (mysqlOutput.includes('MySQL init process done.') && !mysqlFinishedInitialization) {
+                        mysqlFinishedInitialization = true;
+                        break;
+                    }
+                    await sleep(2000);
+                }
+            }
+
+            await sleep(2000);
+        }
+    },
+    options: {
+        bottomBar: 10
+    }
+});
+
+/**
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const gettingMySQLConnection = () => ({
+    title: 'Getting MySQL connection',
     task: async (ctx, task) => {
         const { config: { docker }, ports } = ctx;
-        const { mysql: { env, name } } = docker.getContainers();
+        const { mysql: { env } } = docker.getContainers();
         let tries = 0;
-        let maxTries = 20;
+        const maxTries = 20;
         const errors = [];
         while (tries < maxTries) {
             tries++;
-
-            if (maxTries !== 120) {
-                const mysqlOutput = await execAsyncSpawn(`docker logs ${name}`);
-                if (mysqlOutput.includes('Initializing database files')) {
-                    maxTries = 120;
-                    task.output = `MySQL is initializing database files!
-Please wait, this will take some time and do not restart the MySQL container until initialization is finished!`;
-                }
-                await sleep(2000);
-            }
             try {
                 const connection = await mysql.createConnection({
                     host: '127.0.0.1',
@@ -49,7 +75,25 @@ Please wait, this will take some time and do not restart the MySQL container unt
         }
 
         task.title = 'MySQL server connected!';
-    },
+    }
+});
+
+/**
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const connectToMySQL = () => ({
+    title: 'Connecting to MySQL server',
+    skip: (ctx) => ctx.skipSetup,
+    task: (ctx, task) => task.newListr([
+        waitForMySQLInitialization(),
+        createMagentoDatabase(),
+        gettingMySQLConnection()
+    ], {
+        concurrent: false,
+        rendererOptions: {
+            collapse: true
+        }
+    }),
     options: {
         bottomBar: 10
     }

build-packages/magento-scripts/lib/tasks/mysql/create-magento-database.js

@@ -0,0 +1,18 @@
+const { execAsyncSpawn } = require('../../util/exec-async-command');
+
+/**
+ * Will create database 'magento' in MySQL if it does not exist for some reason
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const createMagentoDatabase = () => ({
+    title: 'Creating Magento database in MySQL',
+    task: async (ctx) => {
+        const { mysql } = ctx.config.docker.getContainers();
+
+        await execAsyncSpawn(`docker exec ${mysql.name} mysql -umagento -pmagento -h 127.0.0.1 -e "CREATE DATABASE IF NOT EXISTS magento;"`);
+    }
+});
+
+module.exports = {
+    createMagentoDatabase
+};