velocious 1.0.57 → 1.0.59

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.57",
+  "version": "1.0.59",
   "main": "index.js",
   "scripts": {
     "test": "VELOCIOUS_TEST_DIR=../ cd spec/dummy && npx velocious test",
@@ -22,7 +22,6 @@
   "homepage": "https://github.com/kaspernj/velocious#readme",
   "description": "",
   "dependencies": {
-    "async-mutex": "^0.5.0",
     "awaitery": "^1.0.1",
     "bcryptjs": "^3.0.2",
     "better-localstorage": "^1.0.7",
@@ -30,6 +29,7 @@
     "diggerize": "^1.0.5",
     "ejs": "^3.1.6",
     "env-sense": "^1.0.0",
+    "epic-locks": "^1.0.3",
     "escape-string-regexp": "^1.0.5",
     "incorporator": "^1.0.2",
     "inflection": "^3.0.0",

package/src/database/drivers/base.js

@@ -1,12 +1,12 @@
 import {Logger} from "../../logger.js"
 import Query from "../query/index.js"
 import Handler from "../handler.js"
+import Mutex from "epic-locks/src/mutex.js"
 import strftime from "strftime"
 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 {Mutex} from "async-mutex"
 
 export default class VelociousDatabaseDriversBase {
   constructor(config, configuration) {
@@ -209,7 +209,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   async startTransaction() {
-    await this._transactionsActionsMutex.runExclusive(async () => {
+    await this._transactionsActionsMutex.sync(async () => {
       await this._startTransactionAction()
       this._transactionsCount++
     })
@@ -220,7 +220,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   async commitTransaction() {
-    await this._transactionsActionsMutex.runExclusive(async () => {
+    await this._transactionsActionsMutex.sync(async () => {
       await this._commitTransactionAction()
       this._transactionsCount--
     })
@@ -231,7 +231,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   async rollbackTransaction() {
-    await this._transactionsActionsMutex.runExclusive(async () => {
+    await this._transactionsActionsMutex.sync(async () => {
       await this._rollbackTransactionAction()
       this._transactionsCount--
     })
@@ -246,7 +246,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   async startSavePoint(savePointName) {
-    await this._transactionsActionsMutex.runExclusive(async () => {
+    await this._transactionsActionsMutex.sync(async () => {
       await this._startSavePointAction(savePointName)
     })
   }
@@ -272,7 +272,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   async releaseSavePoint(savePointName) {
-    await this._transactionsActionsMutex.runExclusive(async () => {
+    await this._transactionsActionsMutex.sync(async () => {
       await this._releaseSavePointAction(savePointName)
     })
   }
@@ -282,7 +282,7 @@ export default class VelociousDatabaseDriversBase {
   }
 
   async rollbackSavePoint(savePointName) {
-    await this._transactionsActionsMutex.runExclusive(async () => {
+    await this._transactionsActionsMutex.sync(async () => {
       await this._rollbackSavePointAction(savePointName)
     })
   }

package/src/logger.js

@@ -2,19 +2,31 @@ import Configuration from "./configuration.js"
 
 function consoleLog(message) {
   return new Promise((resolve) => {
-    process.stdout.write(`${message}\n`, "utf8", resolve)
+    if (process.stdout) {
+      process.stdout.write(`${message}\n`, "utf8", resolve)
+    } else {
+      console.log(message)
+    }
   })
 }
 
 function consoleError(message) {
   return new Promise((resolve) => {
-    process.stderr.write(`${message}\n`, "utf8", resolve)
+    if (process.stderr) {
+      process.stderr.write(`${message}\n`, "utf8", resolve)
+    } else {
+      console.error(message)
+    }
   })
 }
 
 function consoleWarn(message) {
   return new Promise((resolve) => {
-    process.stderr.write(`${message}\n`, "utf8", resolve)
+    if (process.stderr) {
+      process.stderr.write(`${message}\n`, "utf8", resolve)
+    } else {
+      console.warn(message)
+    }
   })
 }