velocious 1.0.108 → 1.0.109

package/spec/http-server/get-spec.js

@@ -1,86 +0,0 @@
-import fetch from "node-fetch"
-import Dummy from "../dummy/index.js"
-import Header from "../../src/http-client/header.js"
-import HttpClient from "../../src/http-client/index.js"
-import {wait, waitFor} from "awaitery"
-
-describe("HttpServer - get", {databaseCleaning: {transaction: false, truncate: true}}, async () => {
-  it("handles get requests", async () => {
-    await Dummy.run(async () => {
-      for (let i = 0; i <= 5; i++) {
-        const response = await fetch("http://localhost:3006/tasks")
-        const text = await response.text()
-
-        expect(response.status).toEqual(200)
-        expect(response.statusText).toEqual("OK")
-        expect(text).toEqual("1, 2, 3, 4, 5\n")
-      }
-    })
-  })
-
-  it("returns a 404 error when a collection action isnt found", async () => {
-    await Dummy.run(async () => {
-      for (let i = 0; i <= 5; i++) {
-        const response = await fetch("http://localhost:3006/tasks/doesnt-exist")
-        const text = await response.text()
-
-        expect(response.status).toEqual(404)
-        expect(response.statusText).toEqual("Not Found")
-        expect(text).toEqual("Path not found: /tasks/doesnt-exist\n")
-      }
-    })
-  })
-
-  it("supports HTTP 1.0 close connection", async () => {
-    await Dummy.run(async () => {
-      await wait(200)
-
-      const httpClient = new HttpClient({
-        debug: false,
-        headers: [
-          new Header("Connection", "Close")
-        ],
-        version: "1.0"
-      })
-
-      await httpClient.connect()
-
-      const {response} = await httpClient.get("/ping")
-
-      expect(response.json()).toEqual({message: "Pong"})
-      expect(response.getHeader("Connection")?.value).toEqual("Close")
-
-      await waitFor(() => {
-        if (httpClient.isConnected()) throw new Error("HTTP client is still connected")
-      })
-    })
-  })
-
-  it("supports HTTP 1.0 keep-alive", async () => {
-    await Dummy.run(async () => {
-      await wait(200)
-
-      const httpClient = new HttpClient({
-        debug: false,
-        headers: [
-          new Header("Connection", "Keep-Alive")
-        ],
-        version: "1.0"
-      })
-
-      await httpClient.connect()
-
-      for (let i = 0; i < 5; i++) {
-        const {response} = await httpClient.get("/ping")
-
-        expect(response.json()).toEqual({message: "Pong"})
-        expect(response.getHeader("Connection")?.value).toEqual("Keep-Alive")
-        await wait(100)
-        expect(httpClient.isConnected()).toBeTrue()
-      }
-
-      await wait(500)
-      expect(httpClient.isConnected()).toBeTrue()
-    })
-  })
-})

package/spec/http-server/namespace-spec.js

@@ -1,17 +0,0 @@
-import fetch from "node-fetch"
-
-import Dummy from "../dummy/index.js"
-
-describe("HttpServer - namespace", {databaseCleaning: {transaction: false, truncate: true}}, async () => {
-  it("handles post requests", async () => {
-    await Dummy.run(async () => {
-      const response = await fetch(
-        "http://localhost:3006/api/version",
-        {method: "POST"}
-      )
-      const data = /** @type {Record<string, any>} */ (await response.json())
-
-      expect(data.version).toEqual("2.1")
-    })
-  })
-})

package/spec/http-server/post-spec.js

@@ -1,93 +0,0 @@
-import {digg} from "diggerize"
-import fetch from "node-fetch"
-import querystring from "querystring"
-import wait from "awaitery/src/wait.js"
-
-import Dummy from "../dummy/index.js"
-import Project from "../dummy/src/models/project.js"
-
-describe("HttpServer - post", {databaseCleaning: {transaction: false, truncate: true}}, async () => {
-  it("handles post requests", async () => {
-    await Dummy.run(async () => {
-      for (let i = 0; i <= 5; i++) {
-        const postData = querystring.stringify({"project[name]": "Test create project"})
-        const response = await fetch(
-          "http://localhost:3006/projects",
-          {
-            body: postData,
-            headers: {
-              "Content-Type": "application/x-www-form-urlencoded",
-              "Content-Length": Buffer.byteLength(postData).toString()
-            },
-            method: "POST"
-          }
-        )
-        const data = await response.json()
-        const projectID = digg(data, "project", "id")
-
-        await wait(100) // Wait a bit to ensure the database connections are in sync
-
-        const createdProject = /** @type {Project} */ (await Project.preload({translations: true}).find(projectID))
-
-        expect(createdProject.name()).toEqual("Test create project")
-      }
-    })
-  })
-
-  it("handles post json requests", async () => {
-    await Dummy.run(async () => {
-      for (let i = 0; i <= 5; i++) {
-        const postData = JSON.stringify({project: {name: "Test create project"}})
-        const response = await fetch(
-          "http://localhost:3006/projects",
-          {
-            body: postData,
-            headers: {
-              "Content-Type": "application/json",
-              "Content-Length": Buffer.byteLength(postData).toString()
-            },
-            method: "POST"
-          }
-        )
-        const data = /** @type {Record<string, any>} */ (await response.json())
-
-        expect(data.status).toEqual("success")
-
-        await wait(100) // Wait a bit to ensure the database connections are in sync
-
-        const createdProject = /** @type {Project} */ (await Project.preload({translations: true}).last())
-
-        expect(createdProject.name()).toEqual("Test create project")
-      }
-    })
-  })
-
-  it("handles post form-data requests", async () => {
-    await Dummy.run(async () => {
-      for (let i = 0; i <= 5; i++) {
-        const body = new FormData()
-
-        body.append("project[creating_user_reference]", "150123")
-        body.append("project[name]", "Test create project")
-
-        const response = await fetch(
-          "http://localhost:3006/projects",
-          {
-            body,
-            method: "POST"
-          }
-        )
-        const data = /** @type {Record<string, any>} */ (await response.json())
-
-        expect(data.status).toEqual("success")
-
-        await wait(100) // Wait a bit to ensure the database connections are in sync
-
-        const createdProject = /** @type {Project} */ (await Project.preload({translations: true}).last())
-
-        expect(createdProject.creatingUserReference()).toEqual("150123")
-        expect(createdProject.name()).toEqual("Test create project")
-      }
-    })
-  })
-})

package/spec/http-server/root-get-spec.js

@@ -1,31 +0,0 @@
-import {describe, it} from "../../src/testing/test.js"
-import fetch from "node-fetch"
-import Dummy from "../dummy/index.js"
-
-describe("HttpServer - root get", {databaseCleaning: {transaction: false, truncate: true}}, async () => {
-  it("handles root get requests", async () => {
-    await Dummy.run(async () => {
-      for (let i = 0; i <= 5; i++) {
-        const response = await fetch("http://localhost:3006/ping")
-        const text = await response.text()
-
-        expect(response.status).toEqual(200)
-        expect(response.statusText).toEqual("OK")
-        expect(text).toEqual("{\"message\":\"Pong\"}")
-      }
-    })
-  })
-
-  it("returns a 404 error when a root get isn't found", async () => {
-    await Dummy.run(async () => {
-      for (let i = 0; i <= 5; i++) {
-        const response = await fetch("http://localhost:3006/doesnt-exist")
-        const text = await response.text()
-
-        expect(response.status).toEqual(404)
-        expect(response.statusText).toEqual("Not Found")
-        expect(text).toEqual("Path not found: /doesnt-exist\n")
-      }
-    })
-  })
-})

package/src/application.js

@@ -1,123 +0,0 @@
-// @ts-check
-
-import AppRoutes from "./routes/app-routes.js"
-import {Logger} from "./logger.js"
-import HttpServer from "./http-server/index.js"
-import restArgsError from "./utils/rest-args-error.js"
-
-/**
- * @typedef {object} HttpServerConfiguration
- * @property {number} [maxWorkers]
- * @property {string} [host]
- * @property {number} [port]
- */
-
-export default class VelociousApplication {
-  /**
-   * @param {object} args
-   * @param {import("./configuration.js").default} args.configuration
-   * @param {HttpServerConfiguration} [args.httpServer]
-   * @param {string} args.type
-   */
-  constructor({configuration, httpServer, type, ...restArgs}) {
-    restArgsError(restArgs)
-
-    if (!configuration) throw new Error("configuration is required")
-
-    this.configuration = configuration
-
-    /** @type {HttpServerConfiguration} */
-    this.httpServerConfiguration = httpServer ?? {port: undefined}
-
-    this.logger = new Logger(this)
-    this._type = type
-  }
-
-  /**
-   * @returns {string}
-   */
-  getType() { return this._type }
-
-  /**
-   * @returns {Promise<void>}
-   */
-  async initialize() {
-    const routes = await AppRoutes.getRoutes(this.configuration)
-
-    await this.configuration.initialize({type: this.getType()})
-
-    this.configuration.setRoutes(routes)
-
-    if (!this.configuration.isDatabasePoolInitialized()) {
-      await this.configuration.initializeDatabasePool()
-    }
-  }
-
-  /**
-   * @returns {boolean}
-   */
-  isActive() {
-    if (this.httpServer) {
-      return this.httpServer?.isActive()
-    }
-
-    return false
-  }
-
-  /**
-   * @param {function() : void} callback
-   * @returns {Promise<void>}
-   */
-  async run(callback) {
-    await this.startHttpServer()
-
-    try {
-      await callback()
-    } finally {
-      this.stop()
-    }
-  }
-
-  /**
-   * @returns {Promise<void>}
-   */
-  async startHttpServer() {
-    const {configuration, httpServerConfiguration} = this
-    const port = httpServerConfiguration.port || 3006
-
-    await this.logger.debug(`Starting server on port ${port}`)
-
-    this.httpServer = new HttpServer({configuration, port})
-    this.httpServer.events.on("close", this.onHttpServerClose)
-
-    await this.httpServer.start()
-  }
-
-  /**
-   * @returns {Promise<void>}
-   */
-  async stop() {
-    await this.logger.debug("Stopping server")
-    await this.httpServer?.stop()
-  }
-
-  /**
-   * @returns {void}
-   */
-  onHttpServerClose = () => {
-    this.logger.debug("HTTP server closed")
-
-    if (this.waitResolve) {
-      this.waitResolve()
-    }
-  }
-
-  /**
-   * @returns {Promise<void>}
-   */
-  wait() {
-    return new Promise((resolve) => {
-      this.waitResolve = resolve
-    })
-  }
-}

package/src/cli/base-command.js

@@ -1,40 +0,0 @@
-import restArgsError from "../utils/rest-args-error.js"
-
-export default class VelociousCliBaseCommand {
-  /**
-   * @param {object} args
-   * @param {object} args.args
-   */
-  constructor({args = {}, ...restArgs}) {
-    restArgsError(restArgs)
-
-    this.args = args
-    this._configuration = args.configuration
-    this._environmentHandler = args.configuration.getEnvironmentHandler()
-    this.processArgs = args.processArgs
-  }
-
-  /**
-   * @returns {string}
-   */
-  directory() { return this.getConfiguration().getDirectory() }
-
-  /**
-   * @abstract
-   * @returns {Promise<any>}
-   */
-  execute() {
-    throw new Error("execute not implemented")
-  }
-
-  /**
-   * @returns {import("../configuration.js").default}
-   */
-  getConfiguration() { return this._configuration }
-
-  /**
-   * @template T extends import("../environment-handlers/base.js").default
-   * @returns {T}
-   */
-  getEnvironmentHandler() { return this._environmentHandler }
-}

package/src/cli/browser-cli.js

@@ -1,37 +0,0 @@
-import Cli from "./index.js"
-import restArgsError from "../utils/rest-args-error.js"
-
-export default class VelociousBrowserCli {
-  /**
-   * @param {object} args
-   * @param {import("../configuration.js").default} args.configuration
-   */
-  constructor({configuration, ...restArgs}) {
-    restArgsError(restArgs)
-
-    this.configuration = configuration
-  }
-
-  /**
-   * @description Enable the CLI in the global scope. This is useful for debugging and testing.
-   * @returns {void}
-   */
-  enable() {
-    globalThis.velociousCLI = this
-  }
-
-  /**
-   * @description Run a command. This is useful for debugging and testing. This is a wrapper around the Cli class.
-   * @param {string} command
-   * @returns {Promise<void>}
-   */
-  async run(command) {
-    const processArgs = command.split(/\s+/)
-    const cli = new Cli({
-      configuration: this.configuration,
-      processArgs
-    })
-
-    await cli.execute()
-  }
-}

package/src/cli/commands/db/create.js

@@ -1,72 +0,0 @@
-import BaseCommand from "../../base-command.js"
-import {digg} from "diggerize"
-import {incorporate} from "incorporator"
-import TableData from "../../../database/table-data/index.js"
-
-export default class DbCreate extends BaseCommand{
-  async execute() {
-    for (const databaseIdentifier of this.getConfiguration().getDatabaseIdentifiers()) {
-      const databaseType = this.getConfiguration().getDatabaseType(databaseIdentifier)
-      const databasePool = this.getConfiguration().getDatabasePool(databaseIdentifier)
-      const newConfiguration = incorporate({}, databasePool.getConfiguration())
-      const DriverClass = digg(newConfiguration, "driver")
-
-      if (this.args.testing) this.result = []
-
-      // Use a database known to exist. Since we are creating the database, it shouldn't actually exist which would make connecting fail.
-      newConfiguration.database = newConfiguration.useDatabase || "mysql"
-
-      // Login can fail because given db name doesn't exist, which it might not because we are trying to create it right now.
-      if (databaseType == "mssql" && newConfiguration.sqlConfig?.database) {
-        delete newConfiguration.sqlConfig.database
-      }
-
-      this.databaseConnection = new DriverClass(newConfiguration, this.getConfiguration())
-
-      await this.databaseConnection.connect()
-
-      try {
-        if (databaseType != "sqlite") {
-          await this.createDatabase(databaseIdentifier)
-        }
-
-        await this.createSchemaMigrationsTable()
-      } finally {
-        if (databaseType != "mssql") {
-          await this.databaseConnection.close()
-        }
-      }
-
-      if (this.args.testing) return this.result
-    }
-  }
-
-  async createDatabase(databaseIdentifier) {
-    const databaseName = digg(this.getConfiguration().getDatabaseConfiguration(), databaseIdentifier, "database")
-    const sqls = this.databaseConnection.createDatabaseSql(databaseName, {ifNotExists: true})
-
-    for (const sql of sqls) {
-      if (this.args.testing) {
-        this.result.push({databaseName, sql})
-      } else {
-        await this.databaseConnection.query(sql)
-      }
-    }
-  }
-
-  async createSchemaMigrationsTable() {
-    const schemaMigrationsTable = new TableData("schema_migrations", {ifNotExists: true})
-
-    schemaMigrationsTable.string("version", {null: false, primaryKey: true})
-
-    const createSchemaMigrationsTableSqls = await this.databaseConnection.createTableSql(schemaMigrationsTable)
-
-    for (const createSchemaMigrationsTableSql of createSchemaMigrationsTableSqls) {
-      if (this.args.testing) {
-        this.result.push({createSchemaMigrationsTableSql})
-      } else {
-        await this.databaseConnection.query(createSchemaMigrationsTableSql)
-      }
-    }
-  }
-}

package/src/cli/commands/db/drop.js

@@ -1,18 +0,0 @@
-import BaseCommand from "../../base-command.js"
-import Migrator from "../../../database/migrator.js"
-
-export default class DbDrop extends BaseCommand {
-  async execute() {
-    const environment = this.getConfiguration().getEnvironment()
-
-    if (environment != "development" && environment != "test") {
-      throw new Error(`This command should only be executed on development and test environments and not: ${environment}`)
-    }
-
-    const migrator = new Migrator({configuration: this.getConfiguration()})
-
-    await this.getConfiguration().ensureConnections(async () => {
-      await migrator.dropDatabase()
-    })
-  }
-}

package/src/cli/commands/db/migrate.js

@@ -1,17 +0,0 @@
-import BaseCommand from "../../base-command.js"
-import {digg} from "diggerize"
-import Migrator from "../../../database/migrator.js"
-
-export default class DbMigrate extends BaseCommand {
-  async execute() {
-    const migrations = await this.getEnvironmentHandler().findMigrations()
-    const migrator = new Migrator({configuration: this.getConfiguration()})
-
-    console.log(`Running ${migrations.length} migrations`)
-
-    await this.getConfiguration().ensureConnections(async () => {
-      await migrator.prepare()
-      await migrator.migrateFiles(migrations, digg(this.getEnvironmentHandler(), "requireMigration"))
-    })
-  }
-}

package/src/cli/commands/db/reset.js

@@ -1,22 +0,0 @@
-import BaseCommand from "../../base-command.js"
-import {digg} from "diggerize"
-import Migrator from "../../../database/migrator.js"
-
-export default class DbReset extends BaseCommand {
-  async execute() {
-    const environment = this.getConfiguration().getEnvironment()
-
-    if (environment != "development" && environment != "test") {
-      throw new Error(`This command should only be executed on development and test environments and not: ${environment}`)
-    }
-
-    const migrations = await this.getEnvironmentHandler().findMigrations()
-    const migrator = new Migrator({configuration: this.getConfiguration()})
-
-    await this.getConfiguration().ensureConnections(async () => {
-      await migrator.reset()
-      await migrator.prepare()
-      await migrator.migrateFiles(migrations, digg(this.getEnvironmentHandler(), "requireMigration"))
-    })
-  }
-}

package/src/cli/commands/db/rollback.js

@@ -1,15 +0,0 @@
-import BaseCommand from "../../base-command.js"
-import {digg} from "diggerize"
-import Migrator from "../../../database/migrator.js"
-
-export default class DbRollback extends BaseCommand {
-  async execute() {
-    const migrations = await this.getEnvironmentHandler().findMigrations()
-    const migrator = new Migrator({configuration: this.getConfiguration()})
-
-    await this.getConfiguration().ensureConnections(async () => {
-      await migrator.prepare()
-      await migrator.rollback(migrations, digg(this.getEnvironmentHandler(), "requireMigration"))
-    })
-  }
-}

package/src/cli/commands/destroy/migration.js

@@ -1,7 +0,0 @@
-import BaseCommand from "../../base-command.js"
-
-export default class DbDestroyMigration extends BaseCommand {
-  async execute() {
-    return await this.getConfiguration().getEnvironmentHandler().cliCommandsMigrationDestroy(this)
-  }
-}

package/src/cli/commands/generate/base-models.js

@@ -1,7 +0,0 @@
-import BaseCommand from "../../base-command.js"
-
-export default class DbGenerateBaseModels extends BaseCommand {
-  async execute() {
-    return await this.getConfiguration().getEnvironmentHandler().cliCommandsGenerateBaseModels(this)
-  }
-}

package/src/cli/commands/generate/migration.js

@@ -1,7 +0,0 @@
-import BaseCommand from "../../base-command.js"
-
-export default class DbGenerateMigration extends BaseCommand {
-  async execute() {
-    return await this.getConfiguration().getEnvironmentHandler().cliCommandsMigrationGenerate(this)
-  }
-}

package/src/cli/commands/generate/model.js

@@ -1,7 +0,0 @@
-import BaseCommand from "../../base-command.js"
-
-export default class DbGenerateModel extends BaseCommand {
-  async execute() {
-    return await this.getConfiguration().getEnvironmentHandler().cliCommandsGenerateModel(this)
-  }
-}

package/src/cli/commands/init.js

@@ -1,11 +0,0 @@
-import BaseCommand from "../base-command.js"
-
-export default class VelociousCliCommandsInit extends BaseCommand {
-  async execute() {
-    return await this.getConfiguration().getEnvironmentHandler().cliCommandsInit(this)
-  }
-}
-
-const dontLoadConfiguration = true
-
-export {dontLoadConfiguration}

package/src/cli/commands/server.js

@@ -1,7 +0,0 @@
-import BaseCommand from "../base-command.js"
-
-export default class VelociousCliCommandsServer extends BaseCommand{
-  async execute() {
-    return await this.getConfiguration().getEnvironmentHandler().cliCommandsServer(this)
-  }
-}

package/src/cli/commands/test.js

@@ -1,7 +0,0 @@
-import BaseCommand from "../base-command.js"
-
-export default class VelociousCliCommandsTest extends BaseCommand {
-  async execute() {
-    return await this.getConfiguration().getEnvironmentHandler().cliCommandsTest(this)
-  }
-}