@ruiapp/rapid-core 0.8.9 → 0.8.10

package/dist/core/routeContext.d.ts

@@ -4,6 +4,7 @@ import { HttpStatus } from "./http-types";
 import { IRpdServer } from "./server";
 import { IDatabaseAccessor, IDatabaseClient } from "../types";
 export type Next = () => Promise<void>;
+export type TransactionState = "uninited" | "inited" | "started";
 export declare class RouteContext {
     #private;
     readonly request: RapidRequest;
@@ -22,7 +23,8 @@ export declare class RouteContext {
     json(obj: any, status?: HttpStatus, headers?: HeadersInit): void;
     redirect(url: string, status?: HttpStatus): void;
     getDbTransactionClient(): IDatabaseClient | undefined;
-    beginDbTransaction(): Promise<IDatabaseClient>;
+    initDbTransactionClient(): Promise<IDatabaseClient>;
+    beginDbTransaction(): Promise<void>;
     commitDbTransaction(): Promise<void>;
     rollbackDbTransaction(): Promise<void>;
 }

package/dist/index.js

@@ -1052,12 +1052,14 @@ class RouteContext {
     routeConfig;
     #server;
     #dbTransactionClient;
+    #dbTransactionState;
     static newSystemOperationContext(server) {
         return new RouteContext(server);
     }
     constructor(server, request) {
         this.#server = server;
         this.databaseAccessor = server.getDatabaseAccessor();
+        this.#dbTransactionState = "uninited";
         this.request = request;
         this.state = {};
         this.response = new RapidResponse();
@@ -1091,27 +1093,45 @@ class RouteContext {
     getDbTransactionClient() {
         return this.#dbTransactionClient;
     }
-    async beginDbTransaction() {
+    async initDbTransactionClient() {
         let dbClient = this.#dbTransactionClient;
         if (dbClient) {
-            throw new Error("Database transaction has been started. You can not start a transaction more than once in a request context.");
+            return dbClient;
         }
         dbClient = await this.databaseAccessor.getClient();
-        await this.databaseAccessor.queryDatabaseObject("BEGIN", [], dbClient);
+        this.#dbTransactionState = "inited";
         this.#dbTransactionClient = dbClient;
         return dbClient;
     }
+    async beginDbTransaction() {
+        if (!this.#dbTransactionClient) {
+            throw new Error("Database transaction has not been inited. You should call initDbTransactionClient() first.");
+        }
+        if (this.#dbTransactionState === "started") {
+            throw new Error("Database transaction has been started. You can not begin a new transaction before you commit or rollback it.");
+        }
+        await this.databaseAccessor.queryDatabaseObject("BEGIN", [], this.#dbTransactionClient);
+        this.#dbTransactionState = "started";
+    }
     async commitDbTransaction() {
         if (!this.#dbTransactionClient) {
+            throw new Error("Database transaction has not been inited. You should call initDbTransactionClient() first.");
+        }
+        if (this.#dbTransactionState !== "started") {
             throw new Error("Database transaction has not been started. You should call beginDbTransaction() first.");
         }
         await this.databaseAccessor.queryDatabaseObject("COMMIT", [], this.#dbTransactionClient);
+        this.#dbTransactionState = "inited";
     }
     async rollbackDbTransaction() {
         if (!this.#dbTransactionClient) {
+            throw new Error("Database transaction has not been inited. You should call initDbTransactionClient() first.");
+        }
+        if (this.#dbTransactionState !== "started") {
             throw new Error("Database transaction has not been started. You should call beginDbTransaction() first.");
         }
         await this.databaseAccessor.queryDatabaseObject("ROLLBACK", [], this.#dbTransactionClient);
+        this.#dbTransactionState = "inited";
     }
 }
 
@@ -5593,7 +5613,8 @@ async function runCollectionEntityActionHandler(ctx, options, code, autoMergeInp
     if (runInTransaction) {
         let transactionDbClient;
         try {
-            transactionDbClient = await routeContext.beginDbTransaction();
+            transactionDbClient = await routeContext.initDbTransactionClient();
+            await routeContext.beginDbTransaction();
             const result = handleEntityAction(entityManager, autoMergeInput ? mergedInput : input);
             if (result instanceof Promise) {
                 ctx.output = await result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.8.9",
+  "version": "0.8.10",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/core/routeContext.ts

@@ -1,13 +1,13 @@
-import { isArray, isObject } from "lodash";
 import { RapidRequest } from "./request";
 import { RapidResponse } from "./response";
-import { HttpStatus, ResponseData } from "./http-types";
+import { HttpStatus } from "./http-types";
 import { IRpdServer } from "./server";
-import { Logger } from "~/facilities/log/LogFacility";
 import { IDatabaseAccessor, IDatabaseClient } from "~/types";
 
 export type Next = () => Promise<void>;
 
+export type TransactionState = "uninited" | "inited" | "started";
+
 // TODO: should divide to RequestContext and OperationContext
 
 export class RouteContext {
@@ -21,6 +21,7 @@ export class RouteContext {
   routeConfig: any;
   #server: IRpdServer;
   #dbTransactionClient: IDatabaseClient | undefined;
+  #dbTransactionState: TransactionState;
 
   static newSystemOperationContext(server: IRpdServer) {
     return new RouteContext(server);
@@ -29,6 +30,8 @@ export class RouteContext {
   constructor(server: IRpdServer, request?: RapidRequest) {
     this.#server = server;
     this.databaseAccessor = server.getDatabaseAccessor();
+    this.#dbTransactionState = "uninited";
+
     this.request = request;
     this.state = {};
     this.response = new RapidResponse();
@@ -71,29 +74,54 @@ export class RouteContext {
     return this.#dbTransactionClient;
   }
 
-  async beginDbTransaction(): Promise<IDatabaseClient> {
+  async initDbTransactionClient(): Promise<IDatabaseClient> {
     let dbClient = this.#dbTransactionClient;
     if (dbClient) {
-      throw new Error("Database transaction has been started. You can not start a transaction more than once in a request context.");
+      return dbClient;
     }
 
     dbClient = await this.databaseAccessor.getClient();
-    await this.databaseAccessor.queryDatabaseObject("BEGIN", [], dbClient);
+    this.#dbTransactionState = "inited";
     this.#dbTransactionClient = dbClient;
     return dbClient;
   }
 
+  async beginDbTransaction(): Promise<void> {
+    if (!this.#dbTransactionClient) {
+      throw new Error("Database transaction has not been inited. You should call initDbTransactionClient() first.");
+    }
+
+    if (this.#dbTransactionState === "started") {
+      throw new Error("Database transaction has been started. You can not begin a new transaction before you commit or rollback it.");
+    }
+
+    await this.databaseAccessor.queryDatabaseObject("BEGIN", [], this.#dbTransactionClient);
+    this.#dbTransactionState = "started";
+  }
+
   async commitDbTransaction(): Promise<void> {
     if (!this.#dbTransactionClient) {
+      throw new Error("Database transaction has not been inited. You should call initDbTransactionClient() first.");
+    }
+
+    if (this.#dbTransactionState !== "started") {
       throw new Error("Database transaction has not been started. You should call beginDbTransaction() first.");
     }
+
     await this.databaseAccessor.queryDatabaseObject("COMMIT", [], this.#dbTransactionClient);
+    this.#dbTransactionState = "inited";
   }
 
   async rollbackDbTransaction(): Promise<void> {
     if (!this.#dbTransactionClient) {
+      throw new Error("Database transaction has not been inited. You should call initDbTransactionClient() first.");
+    }
+
+    if (this.#dbTransactionState !== "started") {
       throw new Error("Database transaction has not been started. You should call beginDbTransaction() first.");
     }
+
     await this.databaseAccessor.queryDatabaseObject("ROLLBACK", [], this.#dbTransactionClient);
+    this.#dbTransactionState = "inited";
   }
 }

package/src/helpers/runCollectionEntityActionHandler.ts

@@ -28,7 +28,8 @@ export default async function runCollectionEntityActionHandler(
     let transactionDbClient: IDatabaseClient;
 
     try {
-      transactionDbClient = await routeContext.beginDbTransaction();
+      transactionDbClient = await routeContext.initDbTransactionClient();
+      await routeContext.beginDbTransaction();
 
       const result = handleEntityAction(entityManager, autoMergeInput ? mergedInput : input);
       if (result instanceof Promise) {