mielk-api 1.5.12 → 1.6.0

package/dist/db/pg/connection/pool.d.ts

@@ -1,4 +1,6 @@
 import { Pool } from 'pg';
 import { PostgreDbConfig } from '../types/DbConfig.js';
+import { QueryExecutor } from '../types/Executor.js';
 export declare const initDb: (dbConfig: PostgreDbConfig) => void;
 export declare function getPool(): Promise<Pool>;
+export declare function getQueryExecutor(): Promise<QueryExecutor>;

package/dist/db/pg/connection/pool.js

@@ -7,10 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Msg } from '../../../internal/messaging/messageTags.js';
 import { Pool } from 'pg';
-let pool = null;
+import { getClient } from './transaction.js';
+import { Msg } from '../../../internal/messaging/messageTags.js';
 let config = null;
+let pool = null;
 export const initDb = (dbConfig) => {
     config = Object.assign({ max: 10, min: 0, idleTimeoutMillis: 30000, connectionTimeoutMillis: 10000 }, dbConfig);
 };
@@ -20,11 +21,6 @@ export function getPool() {
             return pool;
         if (config === null)
             throw new Error(Msg.connection.notInitialized);
-        // if (!isProd()) {
-        // 	if (!config.ssh) throw new Error(Msg.connection.sshOptionsNotSpecified)
-        // 	const port: number = await openSshTunnel(config.ssh, config.port);
-        // 	config.port = port;
-        // }
         pool = new Pool(config);
         pool.on('error', (err) => {
             console.error(Msg.connection.postgreConnectionError, err);
@@ -32,3 +28,14 @@ export function getPool() {
         return pool;
     });
 }
+export function getQueryExecutor() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const client = getClient();
+        if (client) {
+            return client;
+        }
+        else {
+            return yield getPool();
+        }
+    });
+}

package/dist/db/pg/connection/transaction.d.ts

@@ -1,2 +1,6 @@
 import { PoolClient } from "pg";
-export declare function withTransaction<T>(fn: (client: PoolClient) => Promise<T>): Promise<T>;
+export declare function withTransaction<T>(fn: () => Promise<T>): Promise<T>;
+export declare const getClient: () => PoolClient | null;
+export declare function beginTransaction(): Promise<void>;
+export declare function commitTransaction(): Promise<void>;
+export declare function rollbackTransaction(): Promise<void>;

package/dist/db/pg/connection/transaction.js

@@ -8,22 +8,49 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { getPool } from "./pool.js";
+import { Msg } from "../../../internal/messaging/messageTags.js";
+let client = null;
 export function withTransaction(fn) {
     return __awaiter(this, void 0, void 0, function* () {
-        const pool = yield getPool();
-        const client = yield pool.connect();
         try {
-            yield client.query('BEGIN');
-            const result = yield fn(client);
-            yield client.query('COMMIT');
+            yield beginTransaction();
+            const result = yield fn();
+            yield commitTransaction();
             return result;
         }
         catch (err) {
-            yield client.query('ROLLBACK');
+            yield rollbackTransaction();
             throw err;
         }
         finally {
-            client.release();
+            if (client) {
+                client.release();
+                client = null;
+            }
         }
     });
 }
+export const getClient = () => client;
+export function beginTransaction() {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (client)
+            throw new Error(Msg.transactions.alreadyActive);
+        const pool = yield getPool();
+        client = yield pool.connect();
+        yield client.query('BEGIN');
+    });
+}
+export function commitTransaction() {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!client)
+            throw new Error(Msg.transactions.noActiveTransactionToCommit);
+        yield client.query('COMMIT');
+    });
+}
+export function rollbackTransaction() {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!client)
+            throw new Error(Msg.transactions.noActiveTransactionToRollback);
+        yield client.query('ROLLBACK');
+    });
+}

package/dist/db/pg/index.d.ts

@@ -1,11 +1,11 @@
 import { PostgreDbConfig } from './types/DbConfig.js';
 import { QueryExecutor } from './types/Executor.js';
-import { initDb, getPool } from './connection/pool.js';
+import { initDb, getQueryExecutor } from './connection/pool.js';
 import { withTransaction } from './connection/transaction.js';
 import { isUniqueViolation } from './errors/errorChecks.js';
 import { UniqueKeyViolationError } from './errors/customErrors.js';
 export { PostgreDbConfig, QueryExecutor };
-export { initDb, getPool };
+export { initDb, getQueryExecutor };
 export { withTransaction };
 export { isUniqueViolation };
 export { UniqueKeyViolationError };

package/dist/db/pg/index.js

@@ -1,8 +1,8 @@
-import { initDb, getPool } from './connection/pool.js';
+import { initDb, getQueryExecutor } from './connection/pool.js';
 import { withTransaction } from './connection/transaction.js';
 import { isUniqueViolation } from './errors/errorChecks.js';
 import { UniqueKeyViolationError } from './errors/customErrors.js';
-export { initDb, getPool };
+export { initDb, getQueryExecutor };
 export { withTransaction };
 export { isUniqueViolation };
 export { UniqueKeyViolationError };

package/dist/db/pg/types/Executor.d.ts

@@ -1,3 +1,4 @@
+import { QueryResult, QueryResultRow } from "pg";
 export interface QueryExecutor {
-    query: (text: string, params?: any[]) => Promise<any>;
+    query<T extends QueryResultRow = any>(text: string, params?: any[]): Promise<QueryResult<T>>;
 }

package/dist/internal/messaging/messageTags.d.ts

@@ -21,4 +21,9 @@ export declare const Msg: {
         postgreConnectionError: string;
         unauthorizedRequest: string;
     };
+    transactions: {
+        alreadyActive: string;
+        noActiveTransactionToCommit: string;
+        noActiveTransactionToRollback: string;
+    };
 };

package/dist/internal/messaging/messageTags.js

@@ -1,6 +1,7 @@
 const PARENT_FOLDER = 'api/';
 const ___HTTP_STATUS___ = `${PARENT_FOLDER}/httpStatus`;
 const ___CONNECTION___ = `${PARENT_FOLDER}/connection`;
+const ___TRANSACTIONS___ = `${PARENT_FOLDER}/transactions`;
 export const Msg = {
     apiStatus: {
         ok: `${___HTTP_STATUS___}:ok`,
@@ -23,5 +24,10 @@ export const Msg = {
         sshTunnelFailed: `${___CONNECTION___}:sshTunnelFailed`, // ❌ SSH tunnel failed
         postgreConnectionError: `${___CONNECTION___}:postgreConnectionError`, // Unexpected PostgreSQL error
         unauthorizedRequest: `${___CONNECTION___}:unauthorizedRequest`
+    },
+    transactions: {
+        alreadyActive: `${___TRANSACTIONS___}:alreadyActive`,
+        noActiveTransactionToCommit: `${___TRANSACTIONS___}:noActiveTransactionToCommit`,
+        noActiveTransactionToRollback: `${___TRANSACTIONS___}:noActiveTransactionToRollback`
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mielk-api",
-	"version": "1.5.12",
+	"version": "1.6.0",
 	"keywords": [],
 	"author": "mielk",
 	"description": "Wrapper for API operations",