@faasjs/knex 1.3.2 → 1.4.1

package/dist/index.d.mts

@@ -24,6 +24,11 @@ declare class Knex implements Plugin {
     onMount(data: MountData, next: Next): Promise<void>;
     onInvoke(data: InvokeData<any, any, any>, next: Next): Promise<void>;
     raw<TResult = any>(sql: string, bindings?: Knex$1.RawBinding[] | Knex$1.ValueDict): Promise<Knex$1.Raw<TResult>>;
+    /**
+     * Wraps a transaction, returning a promise that resolves to the return value of the callback.
+     *
+     * - Support 'commit' and 'rollback' event.
+     */
     transaction<TResult = any>(scope: (trx: Knex$1.Transaction<any, any>) => Promise<TResult> | void, config?: Knex$1.TransactionConfig, options?: {
         trx?: Knex$1.Transaction;
     }): Promise<TResult | void>;

package/dist/index.d.ts

@@ -24,6 +24,11 @@ declare class Knex implements Plugin {
     onMount(data: MountData, next: Next): Promise<void>;
     onInvoke(data: InvokeData<any, any, any>, next: Next): Promise<void>;
     raw<TResult = any>(sql: string, bindings?: Knex$1.RawBinding[] | Knex$1.ValueDict): Promise<Knex$1.Raw<TResult>>;
+    /**
+     * Wraps a transaction, returning a promise that resolves to the return value of the callback.
+     *
+     * - Support 'commit' and 'rollback' event.
+     */
     transaction<TResult = any>(scope: (trx: Knex$1.Transaction<any, any>) => Promise<TResult> | void, config?: Knex$1.TransactionConfig, options?: {
         trx?: Knex$1.Transaction;
     }): Promise<TResult | void>;

package/dist/index.js

@@ -4,6 +4,7 @@ var func = require('@faasjs/func');
 var logger = require('@faasjs/logger');
 var deep_merge = require('@faasjs/deep_merge');
 var knex = require('knex');
+var crypto = require('crypto');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -46,12 +47,13 @@ var Knex = class {
     await next();
   }
   async onMount(data, next) {
-    var _a, _b, _c;
+    var _a, _b;
     this.logger = data.logger;
     if (global.FaasJS_Knex[this.name]) {
       this.config = global.FaasJS_Knex[this.name].config;
       this.adapter = global.FaasJS_Knex[this.name].adapter;
       this.query = this.adapter;
+      this.logger.debug("[%s] use exists adapter", this.name);
       await next();
       return;
     }
@@ -74,9 +76,11 @@ var Knex = class {
         data.config.plugins[this.name].config,
         this.config
       );
-    if (this.config.client === "sqlite3")
+    if (this.config.client === "sqlite3") {
       this.config.client = "better-sqlite3";
-    if (this.config.client === "pg" && typeof ((_c = this.config.pool) == null ? void 0 : _c.propagateCreateError) === "undefined") {
+      this.config.useNullAsDefault = true;
+    }
+    if (this.config.client === "pg") {
       if (!this.config.pool)
         this.config.pool = /* @__PURE__ */ Object.create(null);
       this.config.pool = Object.assign(
@@ -105,6 +109,8 @@ var Knex = class {
     }
     this.query = this.adapter;
     this.query.on("query", ({ sql, __knexQueryUid, bindings }) => {
+      if (!__knexQueryUid)
+        return;
       this.logger.time(`Knex${this.name}${__knexQueryUid}`);
       this.logger.debug(
         "[%s] [%s] query begin: %s %j",
@@ -114,6 +120,8 @@ var Knex = class {
         bindings
       );
     }).on("query-response", (response, { sql, __knexQueryUid, bindings }) => {
+      if (!__knexQueryUid)
+        return;
       this.logger.timeEnd(
         `Knex${this.name}${__knexQueryUid}`,
         "[%s] [%s] query done: %s %j %j",
@@ -124,6 +132,8 @@ var Knex = class {
         response
       );
     }).on("query-error", (_, { __knexQueryUid, sql, bindings }) => {
+      if (!__knexQueryUid)
+        return;
       this.logger.timeEnd(
         `Knex${this.name}${__knexQueryUid}`,
         "[%s] [%s] query failed: %s %j",
@@ -146,12 +156,47 @@ var Knex = class {
       throw Error("[Knex] Client not initialized.");
     return this.adapter.raw(sql, bindings);
   }
+  /**
+   * Wraps a transaction, returning a promise that resolves to the return value of the callback.
+   *
+   * - Support 'commit' and 'rollback' event.
+   */
   async transaction(scope, config, options) {
     if (!this.adapter)
       throw Error(`[${this.name}] Client not initialized.`);
     if (options == null ? void 0 : options.trx)
       return scope(options.trx);
-    return this.adapter.transaction(scope, config);
+    return this.adapter.transaction(async (trx) => {
+      const trxId = crypto.randomUUID();
+      try {
+        const result = await scope(trx);
+        this.logger.debug(
+          "[%s] [%s] query begin: %s",
+          this.name,
+          trxId,
+          "COMMIT;"
+        );
+        await trx.commit();
+        this.logger.debug(
+          "[%s] [%s] query done: %s",
+          this.name,
+          trxId,
+          "COMMIT;"
+        );
+        trx.emit("commit");
+        return result;
+      } catch (error) {
+        await trx.rollback(error);
+        this.logger.debug(
+          "[%s] [%s] query failed: %s",
+          this.name,
+          trxId,
+          "ROLLBACK;"
+        );
+        trx.emit("rollback", error);
+        throw error;
+      }
+    }, config);
   }
   schema() {
     if (!this.adapter)

package/dist/index.mjs

@@ -2,6 +2,7 @@ import { usePlugin } from '@faasjs/func';
 import { Logger } from '@faasjs/logger';
 import { deepMerge } from '@faasjs/deep_merge';
 import knex from 'knex';
+import { randomUUID } from 'node:crypto';
 
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
@@ -40,12 +41,13 @@ var Knex = class {
     await next();
   }
   async onMount(data, next) {
-    var _a, _b, _c;
+    var _a, _b;
     this.logger = data.logger;
     if (global.FaasJS_Knex[this.name]) {
       this.config = global.FaasJS_Knex[this.name].config;
       this.adapter = global.FaasJS_Knex[this.name].adapter;
       this.query = this.adapter;
+      this.logger.debug("[%s] use exists adapter", this.name);
       await next();
       return;
     }
@@ -68,9 +70,11 @@ var Knex = class {
         data.config.plugins[this.name].config,
         this.config
       );
-    if (this.config.client === "sqlite3")
+    if (this.config.client === "sqlite3") {
       this.config.client = "better-sqlite3";
-    if (this.config.client === "pg" && typeof ((_c = this.config.pool) == null ? void 0 : _c.propagateCreateError) === "undefined") {
+      this.config.useNullAsDefault = true;
+    }
+    if (this.config.client === "pg") {
       if (!this.config.pool)
         this.config.pool = /* @__PURE__ */ Object.create(null);
       this.config.pool = Object.assign(
@@ -99,6 +103,8 @@ var Knex = class {
     }
     this.query = this.adapter;
     this.query.on("query", ({ sql, __knexQueryUid, bindings }) => {
+      if (!__knexQueryUid)
+        return;
       this.logger.time(`Knex${this.name}${__knexQueryUid}`);
       this.logger.debug(
         "[%s] [%s] query begin: %s %j",
@@ -108,6 +114,8 @@ var Knex = class {
         bindings
       );
     }).on("query-response", (response, { sql, __knexQueryUid, bindings }) => {
+      if (!__knexQueryUid)
+        return;
       this.logger.timeEnd(
         `Knex${this.name}${__knexQueryUid}`,
         "[%s] [%s] query done: %s %j %j",
@@ -118,6 +126,8 @@ var Knex = class {
         response
       );
     }).on("query-error", (_, { __knexQueryUid, sql, bindings }) => {
+      if (!__knexQueryUid)
+        return;
       this.logger.timeEnd(
         `Knex${this.name}${__knexQueryUid}`,
         "[%s] [%s] query failed: %s %j",
@@ -140,12 +150,47 @@ var Knex = class {
       throw Error("[Knex] Client not initialized.");
     return this.adapter.raw(sql, bindings);
   }
+  /**
+   * Wraps a transaction, returning a promise that resolves to the return value of the callback.
+   *
+   * - Support 'commit' and 'rollback' event.
+   */
   async transaction(scope, config, options) {
     if (!this.adapter)
       throw Error(`[${this.name}] Client not initialized.`);
     if (options == null ? void 0 : options.trx)
       return scope(options.trx);
-    return this.adapter.transaction(scope, config);
+    return this.adapter.transaction(async (trx) => {
+      const trxId = randomUUID();
+      try {
+        const result = await scope(trx);
+        this.logger.debug(
+          "[%s] [%s] query begin: %s",
+          this.name,
+          trxId,
+          "COMMIT;"
+        );
+        await trx.commit();
+        this.logger.debug(
+          "[%s] [%s] query done: %s",
+          this.name,
+          trxId,
+          "COMMIT;"
+        );
+        trx.emit("commit");
+        return result;
+      } catch (error) {
+        await trx.rollback(error);
+        this.logger.debug(
+          "[%s] [%s] query failed: %s",
+          this.name,
+          trxId,
+          "ROLLBACK;"
+        );
+        trx.emit("rollback", error);
+        throw error;
+      }
+    }, config);
   }
   schema() {
     if (!this.adapter)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/knex",
-  "version": "1.3.2",
+  "version": "1.4.1",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,9 +21,9 @@
     "dist"
   ],
   "dependencies": {
-    "@faasjs/deep_merge": "1.3.2",
-    "@faasjs/func": "1.3.2",
-    "@faasjs/logger": "1.3.2"
+    "@faasjs/deep_merge": "1.4.1",
+    "@faasjs/func": "1.4.1",
+    "@faasjs/logger": "1.4.1"
   },
   "peerDependencies": {
     "knex": "*"