velocious 1.0.91 → 1.0.93

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.91",
+  "version": "1.0.93",
   "main": "index.js",
   "scripts": {
     "lint": "eslint",

package/src/cli/commands/server.js

@@ -1,30 +1,7 @@
-import Application from "../../application.js"
 import BaseCommand from "../base-command.js"
 
 export default class VelociousCliCommandsServer extends BaseCommand{
   async execute() {
-    this.databasePool = this.getConfiguration().getDatabasePool()
-    this.newConfiguration = Object.assign({}, this.databasePool.getConfiguration())
-    this.databaseConnection = await this.databasePool.spawnConnectionWithConfiguration(this.newConfiguration)
-
-    await this.databaseConnection.connect()
-
-    const {parsedProcessArgs} = this.args
-    const host = parsedProcessArgs.h || parsedProcessArgs.host || "127.0.0.1"
-    const port = parsedProcessArgs.p || parsedProcessArgs.port || 3006
-    const application = new Application({
-      configuration: this.getConfiguration(),
-      httpServer: {
-        host,
-        port
-      },
-      type: "server"
-    })
-    const environment = this.getConfiguration().getEnvironment()
-
-    await application.initialize()
-    await application.startHttpServer()
-    console.log(`Started Velocious HTTP server on ${host}:${port} in ${environment} environment`)
-    await application.wait()
+    return await this.getConfiguration().getEnvironmentHandler().cliCommandsServer(this)
   }
 }

package/src/database/drivers/mysql/index.js

@@ -1,6 +1,5 @@
 import AlterTable from "./sql/alter-table.js"
 import Base from "../base.js"
-import connectConnection from "./connect-connection.js"
 import CreateDatabase from "./sql/create-database.js"
 import CreateIndex from "./sql/create-index.js"
 import CreateTable from "./sql/create-table.js"
@@ -16,18 +15,29 @@ import Table from "./table.js"
 import Update from "./sql/update.js"
 
 export default class VelociousDatabaseDriversMysql extends Base{
+  /**
+   * @returns {Promise<void>}
+   */
   async connect() {
-    const connection = mysql.createConnection(this.connectArgs())
+    this.pool = mysql.createPool(Object.assign({connectionLimit: 1}, this.connectArgs()))
+    this.pool.on("error", this.onPoolError)
+  }
 
-    await connectConnection(connection)
-    this.connection = connection
+  onPoolError = (error) => {
+    console.error("Velocious / MySQL driver / Pool error", error)
   }
 
+  /**
+   * @returns {Promise<void>}
+   */
   async close() {
-    await this.connection.end()
-    this.connection = undefined
+    await this.pool.end()
+    this.pool = undefined
   }
 
+  /**
+   * @returns {Record<string, any>}
+   */
   connectArgs() {
     const args = this.getArgs()
     const connectArgs = []
@@ -42,6 +52,9 @@ export default class VelociousDatabaseDriversMysql extends Base{
     return connectArgs
   }
 
+  /**
+   * @returns {Promise<string[]>}
+   */
   async alterTableSql(tableData) {
     const alterArgs = {tableData, driver: this}
     const alterTable = new AlterTable(alterArgs)
@@ -49,6 +62,9 @@ export default class VelociousDatabaseDriversMysql extends Base{
     return await alterTable.toSqls()
   }
 
+  /**
+   * @returns {Promise<string[]>}
+   */
   createDatabaseSql(databaseName, args) {
     const createArgs = Object.assign({databaseName, driver: this}, args)
     const createDatabase = new CreateDatabase(createArgs)
@@ -56,6 +72,9 @@ export default class VelociousDatabaseDriversMysql extends Base{
     return createDatabase.toSql()
   }
 
+  /**
+   * @returns {string}
+   */
   createIndexSql(indexData) {
     const createArgs = Object.assign({driver: this}, indexData)
     const createIndex = new CreateIndex(createArgs)
@@ -63,6 +82,9 @@ export default class VelociousDatabaseDriversMysql extends Base{
     return createIndex.toSql()
   }
 
+  /**
+   * @returns {string[]}
+   */
   createTableSql(tableData) {
     const createArgs = {tableData, driver: this}
     const createTable = new CreateTable(createArgs)
@@ -70,20 +92,32 @@ export default class VelociousDatabaseDriversMysql extends Base{
     return createTable.toSql()
   }
 
+  /**
+   * @returns {Promise<string>}
+   */
   async currentDatabase() {
     const rows = await this.query("SELECT DATABASE() AS db_name")
 
     return digg(rows, 0, "db_name")
   }
 
+  /**
+   * @returns {Promise<void>}
+   */
   async disableForeignKeys() {
     await this.query("SET FOREIGN_KEY_CHECKS = 0")
   }
 
+  /**
+   * @returns {Promise<void>}
+   */
   async enableForeignKeys() {
     await this.query("SET FOREIGN_KEY_CHECKS = 1")
   }
 
+  /**
+   * @returns {string[]}
+   */
   dropTableSql(tableName, args = {}) {
     const dropArgs = Object.assign({tableName, driver: this}, args)
     const dropTable = new DropTable(dropArgs)
@@ -91,41 +125,70 @@ export default class VelociousDatabaseDriversMysql extends Base{
     return dropTable.toSql()
   }
 
+  /**
+   * @returns {string}
+   */
   getType() { return "mysql" }
+
+  /**
+   * @returns {string}
+   */
   primaryKeyType() { return "bigint" }
 
+  /**
+   * @returns {Array<Record<string, any>>}
+   */
   async _queryActual(sql) {
     try {
-      return await query(this.connection, sql)
+      return await query(this.pool, sql)
     } catch (error) {
       // Re-throw to un-corrupt stacktrace
       throw new Error(error.message)
     }
   }
 
+  /**
+   * @returns {string}
+   */
   queryToSql(query) { return new QueryParser({query}).toSql() }
+
+  /**
+   * @returns {boolean}
+   */
   shouldSetAutoIncrementWhenPrimaryKey() { return true }
 
+  /**
+   * @returns {string}
+   */
   escape(value) {
-    if (!this.connection) throw new Error("Can't escape before connected")
+    if (!this.pool) throw new Error("Can't escape before connected")
 
-    const escapedValueWithQuotes = this.connection.escape(this._convertValue(value))
+    const escapedValueWithQuotes = this.pool.escape(this._convertValue(value))
 
     return escapedValueWithQuotes.slice(1, escapedValueWithQuotes.length - 1)
   }
 
+  /**
+   * @returns {string}
+   */
   quote(value) {
-    if (!this.connection) throw new Error("Can't escape before connected")
+    if (!this.pool) throw new Error("Can't escape before connected")
 
-    return this.connection.escape(this._convertValue(value))
+    return this.pool.escape(this._convertValue(value))
   }
 
+  /**
+   * @returns {string}
+   */
   deleteSql({tableName, conditions}) {
     const deleteInstruction = new Delete({conditions, driver: this, tableName})
 
     return deleteInstruction.toSql()
   }
 
+  /**
+   * @returns {string}
+   */
   insertSql(args) {
     const insertArgs = Object.assign({driver: this}, args)
     const insert = new Insert(insertArgs)
@@ -133,6 +196,9 @@ export default class VelociousDatabaseDriversMysql extends Base{
     return insert.toSql()
   }
 
+  /**
+   * @returns {Array<Table>}
+   */
   async getTables() {
     const result = await this.query("SHOW FULL TABLES")
     const tables = []
@@ -146,22 +212,34 @@ export default class VelociousDatabaseDriversMysql extends Base{
     return tables
   }
 
+  /**
+   * @returns {number}
+   */
   async lastInsertID() {
     const result = await this.query("SELECT LAST_INSERT_ID() AS last_insert_id")
 
     return digg(result, 0, "last_insert_id")
   }
 
+  /**
+   * @returns {Options}
+   */
   options() {
     if (!this._options) this._options = new Options({driver: this})
 
     return this._options
   }
 
+  /**
+   * @returns {void}
+   */
   async _startTransactionAction() {
     await this.query("START TRANSACTION")
   }
 
+  /**
+   * @returns {string}
+   */
   updateSql({conditions, data, tableName}) {
     const update = new Update({conditions, data, driver: this, tableName})
 

package/src/environment-handlers/browser.js

@@ -31,6 +31,10 @@ export default class VelociousEnvironmentsHandlerBrowser extends Base {
     throw new Error("Unsupported on browser")
   }
 
+  async cliCommandsServer(_command) { // eslint-disable-line no-unused-vars
+    throw new Error("Unsupported on browser")
+  }
+
   async cliCommandsTest(_command) { // eslint-disable-line no-unused-vars
     throw new Error("Unsupported on browser")
   }

package/src/environment-handlers/node/cli/commands/server.js

@@ -0,0 +1,30 @@
+import Application from "../../../../application.js"
+import BaseCommand from "../../../../cli/base-command.js"
+
+export default class VelociousCliCommandsServer extends BaseCommand{
+  async execute() {
+    this.databasePool = this.getConfiguration().getDatabasePool()
+    this.newConfiguration = Object.assign({}, this.databasePool.getConfiguration())
+    this.databaseConnection = await this.databasePool.spawnConnectionWithConfiguration(this.newConfiguration)
+
+    await this.databaseConnection.connect()
+
+    const {parsedProcessArgs} = this.args
+    const host = parsedProcessArgs.h || parsedProcessArgs.host || "127.0.0.1"
+    const port = parsedProcessArgs.p || parsedProcessArgs.port || 3006
+    const application = new Application({
+      configuration: this.getConfiguration(),
+      httpServer: {
+        host,
+        port
+      },
+      type: "server"
+    })
+    const environment = this.getConfiguration().getEnvironment()
+
+    await application.initialize()
+    await application.startHttpServer()
+    console.log(`Started Velocious HTTP server on ${host}:${port} in ${environment} environment`)
+    await application.wait()
+  }
+}

package/src/environment-handlers/node.js

@@ -3,6 +3,7 @@ import CliCommandsDestroyMigration from "./node/cli/commands/destroy/migration.j
 import CliCommandsInit from "./node/cli/commands/init.js"
 import CliCommandsGenerateMigration from "./node/cli/commands/generate/migration.js"
 import CliCommandsGenerateModel from "./node/cli/commands/generate/model.js"
+import CliCommandsServer from "./node/cli/commands/server.js"
 import CliCommandsTest from "./node/cli/commands/test.js"
 import {dirname} from "path"
 import {fileURLToPath} from "url"
@@ -63,6 +64,10 @@ export default class VelociousEnvironmentHandlerNode extends Base{
     return await this.forwardCommand(command, CliCommandsGenerateModel)
   }
 
+  async cliCommandsServer(command) {
+    return await this.forwardCommand(command, CliCommandsServer)
+  }
+
   async cliCommandsTest(command) {
     return await this.forwardCommand(command, CliCommandsTest)
   }

package/src/database/drivers/mysql/connect-connection.js

@@ -1,12 +0,0 @@
-// Async function to connect a MySQL connection
-export default function connectConnection(connection) {
-  return new Promise((resolve, reject) => {
-    connection.connect((error) => {
-      if (error) {
-        reject(error)
-      } else {
-        resolve()
-      }
-    })
-  })
-}