velocious 1.0.82 → 1.0.84

package/README.md

@@ -190,7 +190,7 @@ First create a test file under something like the following path 'src/routes/acc
 import {describe, expect, it} from "velocious/src/testing/test.js"
 import Account from "../../models/account.js"
 
-await describe("accounts - create", {type: "request"}, async () => {
+describe("accounts - create", {type: "request"}, async () => {
   it("creates an account", async ({client}) => {
     const response = await client.post("/accounts", {account: {name: "My event company"}})
 

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.82",
+  "version": "1.0.84",
   "main": "index.js",
   "scripts": {
     "test": "VELOCIOUS_TEST_DIR=../ cd spec/dummy && npx velocious test",
@@ -25,7 +25,7 @@
     "awaitery": "^1.0.1",
     "bcryptjs": "^3.0.2",
     "better-localstorage": "^1.0.7",
-    "debounce": "^2.2.0",
+    "debounce": "^3.0.0",
     "diggerize": "^1.0.5",
     "ejs": "^3.1.6",
     "env-sense": "^1.0.0",

package/src/database/drivers/base.js

@@ -7,6 +7,7 @@ import UUID from "pure-uuid"
 import TableData from "../table-data/index.js"
 import TableColumn from "../table-data/table-column.js"
 import TableForeignKey from "../table-data/table-foreign-key.js"
+import wait from "awaitery/src/wait.js"
 
 export default class VelociousDatabaseDriversBase {
   constructor(config, configuration) {
@@ -230,6 +231,30 @@ export default class VelociousDatabaseDriversBase {
     await this.query("COMMIT")
   }
 
+  async query(sql) {
+    let tries = 0
+
+    while(tries < 5) {
+      tries++
+
+      try {
+        return await this._queryActual(sql)
+      } catch (error) {
+        if (tries < 5 && this.retryableDatabaseError(error)) {
+          await wait(100)
+          this.logger.warn(`Retrying query because failed with: ${error.stack}`)
+          // Retry
+        } else {
+          throw error
+        }
+      }
+    }
+  }
+
+  retryableDatabaseError(_error) {
+    return false
+  }
+
   async rollbackTransaction() {
     await this._transactionsActionsMutex.sync(async () => {
       await this._rollbackTransactionAction()

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

@@ -85,7 +85,7 @@ export default class VelociousDatabaseDriversMssql extends Base{
   getType() { return "mssql" }
   primaryKeyType() { return "bigint" }
 
-  async query(sql) {
+  async _queryActual(sql) {
     let result, request, tries = 0
 
     if (this._currentTransaction) {

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

@@ -94,7 +94,7 @@ export default class VelociousDatabaseDriversMysql extends Base{
   getType() { return "mysql" }
   primaryKeyType() { return "bigint" }
 
-  async query(sql) {
+  async _queryActual(sql) {
     try {
       return await query(this.connection, sql)
     } catch (error) {

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

@@ -102,7 +102,7 @@ export default class VelociousDatabaseDriversPgsql extends Base{
   getType() { return "pgsql" }
   primaryKeyType() { return "bigint" }
 
-  async query(sql) {
+  async _queryActual(sql) {
     let response
 
     try {

package/src/database/drivers/sqlite/base.js

@@ -12,7 +12,6 @@ import Options from "./options.js"
 import QueryParser from "./query-parser.js"
 import Table from "./table.js"
 import Update from "./sql/update.js"
-import wait from "awaitery/src/wait.js"
 
 export default class VelociousDatabaseDriversSqliteBase extends Base {
   async alterTableSql(tableData) {
@@ -190,29 +189,10 @@ export default class VelociousDatabaseDriversSqliteBase extends Base {
     return result
   }
 
-  async query(sql) {
-    let tries = 0
-
-    while(tries < 5) {
-      tries++
-
-      try {
-        return await this._queryActual(sql)
-      } catch (error) {
-        if (tries < 5 && this._retryableDatabaseError(error)) {
-          await wait(100)
-          this.logger.warn(`Retrying query because failed with: ${error.stack}`)
-          // Retry
-        } else {
-          throw error
-        }
-      }
-    }
-  }
-
-  _retryableDatabaseError(error) {
-    if (this.getType() == "sqlite" && error.message?.startsWith("attempt to write a readonly database")) return true
-    if (this.getType() == "sqlite" && error.message?.startsWith("database is locked")) return true
+  retryableDatabaseError(error) {
+    if (error.message?.startsWith("attempt to write a readonly database")) return true
+    if (error.message?.startsWith("database is locked")) return true
+    if (error.message?.includes("→ Caused by: Error code : database is locked")) return true
 
     return false
   }

package/src/http-server/client/request-parser.js

@@ -39,6 +39,7 @@ export default class VelociousHttpServerClientRequestParser {
 
   feed = (data) => this.requestBuffer.feed(data)
   getHeader(name) { return this.requestBuffer.getHeader(name)?.value }
+  getHeaders() { return this.requestBuffer.getHeadersHash() }
   getHttpMethod() { return digg(this, "requestBuffer", "httpMethod") }
   getHttpVersion() { return digg(this, "requestBuffer", "httpVersion") }
 

package/src/http-server/client/request-runner.js

@@ -27,8 +27,10 @@ export default class VelociousHttpServerClientRequestRunner {
     if (!request) throw new Error("No request?")
 
     try {
-      if (request.header("sec-fetch-mode") == "cors") {
-        await this.logger.debug(() => ["Run CORS", {httpMethod: request.httpMethod(), secFetchMode: request.header("sec-fetch-mode")}])
+      // Before we checked if the sec-fetch-mode was "cors", but it seems the sec-fetch-mode isn't always present
+      await this.logger.debug(() => ["Run CORS", {httpMethod: request.httpMethod(), secFetchMode: request.header("sec-fetch-mode")}])
+
+      if (configuration.cors) {
         await configuration.cors({request, response})
       }
 

package/src/http-server/client/request.js

@@ -14,6 +14,7 @@ export default class VelociousHttpServerClientRequest {
   baseURL() { return `${this.protocol()}://${this.hostWithPort()}` }
   feed(data) { return this.requestParser.feed(data) }
   header(headerName) { return this.getRequestBuffer().getHeader(headerName)?.getValue() }
+  headers() { return this.getRequestBuffer().getHeadersHash() }
   httpMethod() { return this.requestParser.getHttpMethod() }
   httpVersion() { return this.requestParser.getHttpVersion() }
   host() { return this.requestParser.getHost() }

package/src/http-server/index.js

@@ -52,11 +52,15 @@ export default class VelociousHttpServer {
   }
 
   async stopClients() {
+    const promises = []
+
     for (const clientCount in this.clients) {
       const client = this.clients[clientCount]
 
-      await client.close()
+      promises.push(client.end())
     }
+
+    await Promise.all(promises)
   }
 
   stopServer() {

package/src/http-server/server-client.js

@@ -17,9 +17,11 @@ export default class ServerClient {
 
   listen = () => this.socket.on("data", this.onSocketData)
 
-  close() {
-    this.socket.destroy()
-    this.events.emit("close", this)
+  end() {
+    return new Promise((resolve) => {
+      this.socket.once("close", () => resolve())
+      this.socket.end()
+    })
   }
 
   onSocketData = (chunk) => {
@@ -37,8 +39,12 @@ export default class ServerClient {
     this.events.emit("close", this)
   }
 
-  send(data) {
-    this.logger.debug("Send", data)
-    this.socket.write(data)
+  async send(data) {
+    return new Promise((resolve) => {
+      this.logger.debug("Send", data)
+      this.socket.write(data, () => {
+        resolve()
+      })
+    })
   }
 }

package/src/http-server/worker-handler/index.js

@@ -78,7 +78,7 @@ export default class VelociousHttpServerWorker {
     } else if (command == "clientClose") {
       const {clientCount} = digs(data, "clientCount")
 
-      this.clients[clientCount]?.close()
+      this.clients[clientCount]?.end()
     } else {
       throw new Error(`Unknown command: ${command}`)
     }