midway-fatcms 0.0.1-beta.75 → 0.0.1-beta.76

package/dist/libs/crud-pro/models/TransactionPostgres.js

@@ -1,85 +1,91 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TransactionPostgres = void 0;
-async function beginTransaction(connection) {
-    return await connection.query('BEGIN');
-}
-async function commit(connection) {
-    return await connection.query('COMMIT');
-}
-async function rollback(connection) {
-    return await connection.query('ROLLBACK');
-}
-class TransactionPostgres {
-    constructor() {
-        this.isBeginTransaction = false;
-        this.connectionMap = {};
-    }
-    /**
-     * 获取链接对象
-     * @param pool
-     */
-    async getTxConnection(pool) {
-        let connection = this.connectionMap[pool.poolName];
-        if (!connection) {
-            const poolInstance = pool.poolInstance;
-            connection = await poolInstance.connect();
-            this.connectionMap[pool.poolName] = connection;
-            // 开启了事务
-            if (this.isBeginTransaction) {
-                await beginTransaction(connection);
-            }
-        }
-        return connection;
-    }
-    /**
-     * 开始事务
-     */
-    beginTx() {
-        this.isBeginTransaction = true;
-    }
-    /**
-     * 提交事务
-     */
-    async commitTx() {
-        if (!this.isBeginTransaction) {
-            return;
-        }
-        const connections = Object.values(this.connectionMap);
-        for (let i = 0; i < connections.length; i++) {
-            const connection = connections[i];
-            await commit(connection);
-        }
-    }
-    /**
-     * 事务回滚
-     */
-    async rollbackTx() {
-        if (!this.isBeginTransaction) {
-            return;
-        }
-        const connections = Object.values(this.connectionMap);
-        for (let i = 0; i < connections.length; i++) {
-            const connection = connections[i];
-            await rollback(connection);
-        }
-    }
-    /**
-     * 释放连接
-     */
-    async releaseTx() {
-        // 不管有没有开启事务，都要释放连接。
-        const connections = Object.values(this.connectionMap);
-        for (let i = 0; i < connections.length; i++) {
-            const connection = connections[i];
-            try {
-                await connection.release();
-            }
-            catch (e) {
-                console.error(e);
-            }
-        }
-        this.connectionMap = {};
-    }
-}
-exports.TransactionPostgres = TransactionPostgres;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionPostgres = void 0;
+const CrudMonitor_1 = require("../../../libs/crud-pro/utils/CrudMonitor");
+async function beginTransaction(connection) {
+    return await connection.query('BEGIN');
+}
+async function commit(connection) {
+    return await connection.query('COMMIT');
+}
+async function rollback(connection) {
+    return await connection.query('ROLLBACK');
+}
+class TransactionPostgres {
+    constructor() {
+        this.isBeginTransaction = false;
+        this.connectionMap = {};
+        this.connectionList = [];
+    }
+    /**
+     * 获取链接对象
+     * @param pool
+     */
+    async getTxConnection(pool) {
+        let connection = this.connectionMap[pool.poolName];
+        if (!connection) {
+            const poolInstance = pool.poolInstance;
+            connection = await poolInstance.connect();
+            this.connectionMap[pool.poolName] = connection;
+            this.connectionList.push(connection);
+            CrudMonitor_1.CrudMonitor.postgresGetConnectionCount++;
+            // 开启了事务
+            if (this.isBeginTransaction) {
+                await beginTransaction(connection);
+            }
+        }
+        return connection;
+    }
+    /**
+     * 开始事务
+     */
+    beginTx() {
+        this.isBeginTransaction = true;
+    }
+    /**
+     * 提交事务
+     */
+    async commitTx() {
+        if (!this.isBeginTransaction) {
+            return;
+        }
+        const connections = this.connectionList;
+        for (let i = 0; i < connections.length; i++) {
+            const connection = connections[i];
+            await commit(connection);
+        }
+    }
+    /**
+     * 事务回滚
+     */
+    async rollbackTx() {
+        if (!this.isBeginTransaction) {
+            return;
+        }
+        const connections = this.connectionList;
+        for (let i = 0; i < connections.length; i++) {
+            const connection = connections[i];
+            await rollback(connection);
+        }
+    }
+    /**
+     * 释放连接
+     */
+    async releaseTx() {
+        // 不管有没有开启事务，都要释放连接。
+        const connections = this.connectionList;
+        for (let i = 0; i < connections.length; i++) {
+            const connection = connections[i];
+            try {
+                CrudMonitor_1.CrudMonitor.postgresReleaseConnectionCount++;
+                await connection.release();
+            }
+            catch (e) {
+                console.error(e);
+            }
+        }
+        this.connectionList = [];
+        this.connectionMap = {};
+    }
+}
+exports.TransactionPostgres = TransactionPostgres;

package/dist/libs/crud-pro/models/TransactionSqlServer.d.ts

@@ -1,34 +1,35 @@
-import { ConnectionPool } from 'mssql';
-import { IConnectionPool, IPoolConnectionClient } from '../interfaces';
-interface ISqlServerConnection extends IPoolConnectionClient {
-    originConnection: ConnectionPool;
-}
-declare class TransactionSqlServer {
-    private isBeginTransaction;
-    private connectionMap;
-    private transactionMap;
-    /**
-     * 获取链接对象
-     * @param pool
-     */
-    getTxConnection(pool: IConnectionPool): Promise<ISqlServerConnection>;
-    private connectAndCreateConnection;
-    /**
-     * 开始事务
-     */
-    beginTx(): void;
-    /**
-     * 提交事务
-     */
-    commitTx(): Promise<void>;
-    /**
-     * 事务回滚
-     */
-    rollbackTx(): Promise<void>;
-    /**
-     * 释放连接
-     */
-    releaseTx(): Promise<void>;
-    private beginTransaction;
-}
-export { TransactionSqlServer };
+import { ConnectionPool } from 'mssql';
+import { IConnectionPool, IPoolConnectionClient } from '../interfaces';
+interface ISqlServerConnection extends IPoolConnectionClient {
+    originConnection: ConnectionPool;
+}
+declare class TransactionSqlServer {
+    private isBeginTransaction;
+    private connectionMap;
+    private connectionList;
+    private transactionList;
+    /**
+     * 获取链接对象
+     * @param pool
+     */
+    getTxConnection(pool: IConnectionPool): Promise<ISqlServerConnection>;
+    private connectAndCreateConnection;
+    /**
+     * 开始事务
+     */
+    beginTx(): void;
+    /**
+     * 提交事务
+     */
+    commitTx(): Promise<void>;
+    /**
+     * 事务回滚
+     */
+    rollbackTx(): Promise<void>;
+    /**
+     * 释放连接
+     */
+    releaseTx(): Promise<void>;
+    private beginTransaction;
+}
+export { TransactionSqlServer };

package/dist/libs/crud-pro/models/TransactionSqlServer.js

@@ -1,92 +1,100 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TransactionSqlServer = void 0;
-const mssql_1 = require("mssql");
-class TransactionSqlServer {
-    constructor() {
-        this.isBeginTransaction = false;
-        this.connectionMap = {};
-        this.transactionMap = {};
-    }
-    /**
-     * 获取链接对象
-     * @param pool
-     */
-    async getTxConnection(pool) {
-        let connection = this.connectionMap[pool.poolName];
-        if (!connection) {
-            connection = await this.connectAndCreateConnection(pool);
-            this.connectionMap[pool.poolName] = connection;
-            // 开启了事务
-            if (this.isBeginTransaction) {
-                await this.beginTransaction(pool.poolName);
-            }
-        }
-        return connection;
-    }
-    async connectAndCreateConnection(pool) {
-        const poolInstance = pool.poolInstance;
-        const originConnection = await poolInstance.connect();
-        return {
-            originConnection,
-            query: (sql, values) => {
-                const request = new mssql_1.Request(originConnection);
-                if (Array.isArray(values)) {
-                    for (let i = 0; i < values.length; i++) {
-                        const index = i + 1;
-                        const value = values[i];
-                        request.input(`fatcms_ms${index}`, value);
-                    }
-                }
-                return request.query(sql);
-            },
-        };
-    }
-    /**
-     * 开始事务
-     */
-    beginTx() {
-        this.isBeginTransaction = true;
-    }
-    /**
-     * 提交事务
-     */
-    async commitTx() {
-        if (!this.isBeginTransaction) {
-            return;
-        }
-        const transactions = Object.values(this.transactionMap);
-        for (let i = 0; i < transactions.length; i++) {
-            const tmpTx = transactions[i];
-            await tmpTx.commit();
-        }
-    }
-    /**
-     * 事务回滚
-     */
-    async rollbackTx() {
-        if (!this.isBeginTransaction) {
-            return;
-        }
-        const transactions = Object.values(this.transactionMap);
-        for (let i = 0; i < transactions.length; i++) {
-            const tmpTx = transactions[i];
-            await tmpTx.rollback();
-        }
-    }
-    /**
-     * 释放连接
-     */
-    async releaseTx() {
-        this.connectionMap = {};
-        this.transactionMap = {};
-    }
-    async beginTransaction(poolName) {
-        const connection = this.connectionMap[poolName];
-        const originConnection = connection.originConnection;
-        const tmpTx = new mssql_1.Transaction(originConnection);
-        this.transactionMap[poolName] = tmpTx;
-        return await tmpTx.begin();
-    }
-}
-exports.TransactionSqlServer = TransactionSqlServer;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransactionSqlServer = void 0;
+const mssql_1 = require("mssql");
+const CrudMonitor_1 = require("../../../libs/crud-pro/utils/CrudMonitor");
+class TransactionSqlServer {
+    constructor() {
+        this.isBeginTransaction = false;
+        this.connectionMap = {};
+        this.connectionList = [];
+        this.transactionList = [];
+    }
+    /**
+     * 获取链接对象
+     * @param pool
+     */
+    async getTxConnection(pool) {
+        let connection = this.connectionMap[pool.poolName];
+        if (!connection) {
+            connection = await this.connectAndCreateConnection(pool);
+            this.connectionMap[pool.poolName] = connection;
+            this.connectionList.push(connection);
+            CrudMonitor_1.CrudMonitor.mssqlGetConnectionCount++;
+            // 开启了事务
+            if (this.isBeginTransaction) {
+                await this.beginTransaction(connection);
+            }
+        }
+        return connection;
+    }
+    async connectAndCreateConnection(pool) {
+        const poolInstance = pool.poolInstance;
+        const originConnection = await poolInstance.connect();
+        return {
+            originConnection,
+            query: (sql, values) => {
+                const request = new mssql_1.Request(originConnection);
+                if (Array.isArray(values)) {
+                    for (let i = 0; i < values.length; i++) {
+                        const index = i + 1;
+                        const value = values[i];
+                        request.input(`fatcms_ms${index}`, value);
+                    }
+                }
+                return request.query(sql);
+            },
+        };
+    }
+    /**
+     * 开始事务
+     */
+    beginTx() {
+        this.isBeginTransaction = true;
+    }
+    /**
+     * 提交事务
+     */
+    async commitTx() {
+        if (!this.isBeginTransaction) {
+            return;
+        }
+        const transactions = this.transactionList;
+        for (let i = 0; i < transactions.length; i++) {
+            const tmpTx = transactions[i];
+            await tmpTx.commit();
+        }
+    }
+    /**
+     * 事务回滚
+     */
+    async rollbackTx() {
+        if (!this.isBeginTransaction) {
+            return;
+        }
+        const transactions = this.transactionList;
+        for (let i = 0; i < transactions.length; i++) {
+            const tmpTx = transactions[i];
+            await tmpTx.rollback();
+        }
+    }
+    /**
+     * 释放连接
+     */
+    async releaseTx() {
+        const connections = this.connectionList || [];
+        for (let i = 0; i < connections.length; i++) {
+            CrudMonitor_1.CrudMonitor.mssqlReleaseConnectionCount--;
+        }
+        this.connectionMap = {};
+        this.connectionList = [];
+        this.transactionList = [];
+    }
+    async beginTransaction(connection) {
+        const originConnection = connection.originConnection;
+        const tmpTx = new mssql_1.Transaction(originConnection);
+        this.transactionList.push(tmpTx);
+        return await tmpTx.begin();
+    }
+}
+exports.TransactionSqlServer = TransactionSqlServer;

package/dist/libs/crud-pro/models/keys.d.ts

@@ -1,110 +1,110 @@
-export declare enum SqlDbType {
-    mysql = "mysql",
-    postgres = "postgres",
-    sqlserver = "sqlserver"
-}
-export declare enum KeysOfFunCtx {
-    FUNC_CTX = "$",
-    CURRENT_VALUE = "$current",
-    VISITOR = "visitor",
-    VISITOR_ATTR = "visitor.",
-    REQUEST = "req.",
-    RESULT = "res."
-}
-export declare enum KeysOfAuthType {
-    free = "free",
-    login = "login",
-    byRoleCode = "byRoleCode",
-    byFuncCode = "byFuncCode"
-}
-export declare enum KeysOfValidators {
-    REQUIRED = "required",
-    BOOLEAN = "boolean",
-    OBJECT = "object",
-    ARRAY = "array",
-    ARRAY_STRING = "array:string",
-    ARRAY_NUMBER = "array:number",
-    STRING = "string",
-    EMAIL = "email",
-    NAME = "name",
-    PHONE_CN = "phone:cn",
-    INTEGER = "integer",
-    NUMBER = "number",
-    NUMERIC = "numeric",
-    MOMENT = "moment:",
-    SCALE = "scale:",
-    LENGTH = "length:",
-    REG_EXP = "regexp:",
-    ENUM = "enum:"
-}
-export declare enum KeyOfCrudTypes {
-    SELECT = "SELECT",
-    UPDATE = "UPDATE",
-    INSERT = "INSERT",
-    DELETE = "DELETE",
-    NOT_CRUD = "NOT_CRUD",
-    EMPTY_SQL = "EMPTY_SQL",
-    SYS_QUERY = "SYS_QUERY"
-}
-export declare enum KeysOfSimpleSQL {
-    SIMPLE_QUERY = "SIMPLE_QUERY",
-    SIMPLE_QUERY_ONE = "SIMPLE_QUERY_ONE",
-    SIMPLE_QUERY_PAGE = "SIMPLE_QUERY_PAGE",
-    SIMPLE_QUERY_COUNT = "SIMPLE_QUERY_COUNT",
-    SIMPLE_UPDATE = "SIMPLE_UPDATE",
-    SIMPLE_INSERT = "SIMPLE_INSERT",
-    SIMPLE_DELETE = "SIMPLE_DELETE",
-    SIMPLE_INSERT_ON_DUPLICATE_UPDATE = "SIMPLE_INSERT_ON_DUPLICATE_UPDATE",
-    SIMPLE_INSERT_OR_UPDATE = "SIMPLE_INSERT_OR_UPDATE",
-    CUSTOM = "CUSTOM"
-}
-export declare enum KeysOfSqlResPicker {
-    UPDATE_RESULT = "UPDATE_RESULT",
-    RESULT_FIRST_ROW = "RESULT_FIRST_ROW",
-    RESULT_TOTAL_COUNT = "RESULT_TOTAL_COUNT",
-    RESULT_ONE_VALUE = "RESULT_ONE_VALUE"
-}
-export declare const KeysOfCustomSQL: {
-    SQL_COLUMNS: string;
-    SQL_TABLE: string;
-    SQL_OFFSET_LIMIT: string;
-    SQL_ORDER_BYS: string;
-    SQL_AS_WHERE: string;
-    SQL_AS_UPDATE: string;
-    SQL_AS_INSERT_KEYS: string;
-    SQL_AS_INSERT_VALUES: string;
-    SQL_GET_DATA_ATTR_START: string;
-    SQL_GET_CONDITION_ATTR_START: string;
-    SQL_PICK_RES_AS_NUMBER: string;
-    SQL_PICK_RES_AS_STRING: string;
-    SQL_FUNCTION: string;
-};
-/**
- * 查询条件中允许出现的关键词
- * 与MongoDB的语法完全一致
- */
-export declare const KeysOfConditions: {
-    $OR: string;
-    $NE: string;
-    $LT: string;
-    $LTE: string;
-    $GT: string;
-    $GTE: string;
-    $IN: string;
-    $NIN: string;
-    $NOT_NULL: string;
-    $NULL: string;
-    $RANGE: string;
-    $LIKE: string;
-    $NOT_LIKE: string;
-    $LIKE_INCLUDE: string;
-    $NOT_LIKE_INCLUDE: string;
-    $MATCH: string;
-    $MATCH_BOOL: string;
-    /**
-     * SELECT * FROM table WHERE JSON_CONTAINS(`related_user1`, JSON_ARRAY('aaaaa'), '$');
-     */
-    $JSON_ARRAY_CONTAINS: string;
-    COMPARE_KEYS: Set<string>;
-    ALL_KEYS: Set<string>;
-};
+export declare enum SqlDbType {
+    mysql = "mysql",
+    postgres = "postgres",
+    sqlserver = "sqlserver"
+}
+export declare enum KeysOfFunCtx {
+    FUNC_CTX = "$",
+    CURRENT_VALUE = "$current",
+    VISITOR = "visitor",
+    VISITOR_ATTR = "visitor.",
+    REQUEST = "req.",
+    RESULT = "res."
+}
+export declare enum KeysOfAuthType {
+    free = "free",
+    login = "login",
+    byRoleCode = "byRoleCode",
+    byFuncCode = "byFuncCode"
+}
+export declare enum KeysOfValidators {
+    REQUIRED = "required",
+    BOOLEAN = "boolean",
+    OBJECT = "object",
+    ARRAY = "array",
+    ARRAY_STRING = "array:string",
+    ARRAY_NUMBER = "array:number",
+    STRING = "string",
+    EMAIL = "email",
+    NAME = "name",
+    PHONE_CN = "phone:cn",
+    INTEGER = "integer",
+    NUMBER = "number",
+    NUMERIC = "numeric",
+    MOMENT = "moment:",
+    SCALE = "scale:",
+    LENGTH = "length:",
+    REG_EXP = "regexp:",
+    ENUM = "enum:"
+}
+export declare enum KeyOfCrudTypes {
+    SELECT = "SELECT",
+    UPDATE = "UPDATE",
+    INSERT = "INSERT",
+    DELETE = "DELETE",
+    NOT_CRUD = "NOT_CRUD",
+    EMPTY_SQL = "EMPTY_SQL",
+    SYS_QUERY = "SYS_QUERY"
+}
+export declare enum KeysOfSimpleSQL {
+    SIMPLE_QUERY = "SIMPLE_QUERY",
+    SIMPLE_QUERY_ONE = "SIMPLE_QUERY_ONE",
+    SIMPLE_QUERY_PAGE = "SIMPLE_QUERY_PAGE",
+    SIMPLE_QUERY_COUNT = "SIMPLE_QUERY_COUNT",
+    SIMPLE_UPDATE = "SIMPLE_UPDATE",
+    SIMPLE_INSERT = "SIMPLE_INSERT",
+    SIMPLE_DELETE = "SIMPLE_DELETE",
+    SIMPLE_INSERT_ON_DUPLICATE_UPDATE = "SIMPLE_INSERT_ON_DUPLICATE_UPDATE",
+    SIMPLE_INSERT_OR_UPDATE = "SIMPLE_INSERT_OR_UPDATE",
+    CUSTOM = "CUSTOM"
+}
+export declare enum KeysOfSqlResPicker {
+    UPDATE_RESULT = "UPDATE_RESULT",
+    RESULT_FIRST_ROW = "RESULT_FIRST_ROW",
+    RESULT_TOTAL_COUNT = "RESULT_TOTAL_COUNT",
+    RESULT_ONE_VALUE = "RESULT_ONE_VALUE"
+}
+export declare const KeysOfCustomSQL: {
+    SQL_COLUMNS: string;
+    SQL_TABLE: string;
+    SQL_OFFSET_LIMIT: string;
+    SQL_ORDER_BYS: string;
+    SQL_AS_WHERE: string;
+    SQL_AS_UPDATE: string;
+    SQL_AS_INSERT_KEYS: string;
+    SQL_AS_INSERT_VALUES: string;
+    SQL_GET_DATA_ATTR_START: string;
+    SQL_GET_CONDITION_ATTR_START: string;
+    SQL_PICK_RES_AS_NUMBER: string;
+    SQL_PICK_RES_AS_STRING: string;
+    SQL_FUNCTION: string;
+};
+/**
+ * 查询条件中允许出现的关键词
+ * 与MongoDB的语法完全一致
+ */
+export declare const KeysOfConditions: {
+    $OR: string;
+    $NE: string;
+    $LT: string;
+    $LTE: string;
+    $GT: string;
+    $GTE: string;
+    $IN: string;
+    $NIN: string;
+    $NOT_NULL: string;
+    $NULL: string;
+    $RANGE: string;
+    $LIKE: string;
+    $NOT_LIKE: string;
+    $LIKE_INCLUDE: string;
+    $NOT_LIKE_INCLUDE: string;
+    $MATCH: string;
+    $MATCH_BOOL: string;
+    /**
+     * SELECT * FROM table WHERE JSON_CONTAINS(`related_user1`, JSON_ARRAY('aaaaa'), '$');
+     */
+    $JSON_ARRAY_CONTAINS: string;
+    COMPARE_KEYS: Set<string>;
+    ALL_KEYS: Set<string>;
+};