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

package/dist/service/proxyapi/ProxyApiUtils.js

@@ -1,34 +1,34 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringHashMod = exports.BALANCE_STRATEGY = void 0;
-const md5 = require("md5");
-exports.BALANCE_STRATEGY = {
-    ROUND_ROBIN: 'ROUND_ROBIN',
-    WEIGHTED_ROUND_ROBIN: 'WEIGHTED_ROUND_ROBIN',
-    RANDOM: 'RANDOM',
-    WEIGHTED_RANDOM: 'WEIGHTED_RANDOM',
-    IP_HASH: 'IP_HASH',
-    USER_ACCOUNT_HASH: 'USER_ACCOUNT_HASH',
-    USER_SESSION_HASH: 'USER_SESSION_HASH', //  根据用户sessionId hash
-};
-/**
- * 字符串Hash之后取模
- * @param str
- * @param mod
- */
-function stringHashMod(str, mod) {
-    if (!str) {
-        throw new Error('stringHashMod str is required');
-    }
-    const md5Str = md5(str);
-    let sum = 0;
-    for (let i = 0; i < md5Str.length; i++) {
-        const md5StrElement = md5Str.charCodeAt(i);
-        sum = sum + md5StrElement;
-        if (sum >= Number.MAX_SAFE_INTEGER - 10000000) {
-            sum = sum % 10000000;
-        }
-    }
-    return sum % mod;
-}
-exports.stringHashMod = stringHashMod;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stringHashMod = exports.BALANCE_STRATEGY = void 0;
+const md5 = require("md5");
+exports.BALANCE_STRATEGY = {
+    ROUND_ROBIN: 'ROUND_ROBIN',
+    WEIGHTED_ROUND_ROBIN: 'WEIGHTED_ROUND_ROBIN',
+    RANDOM: 'RANDOM',
+    WEIGHTED_RANDOM: 'WEIGHTED_RANDOM',
+    IP_HASH: 'IP_HASH',
+    USER_ACCOUNT_HASH: 'USER_ACCOUNT_HASH',
+    USER_SESSION_HASH: 'USER_SESSION_HASH', //  根据用户sessionId hash
+};
+/**
+ * 字符串Hash之后取模
+ * @param str
+ * @param mod
+ */
+function stringHashMod(str, mod) {
+    if (!str) {
+        throw new Error('stringHashMod str is required');
+    }
+    const md5Str = md5(str);
+    let sum = 0;
+    for (let i = 0; i < md5Str.length; i++) {
+        const md5StrElement = md5Str.charCodeAt(i);
+        sum = sum + md5StrElement;
+        if (sum >= Number.MAX_SAFE_INTEGER - 10000000) {
+            sum = sum % 10000000;
+        }
+    }
+    return sum % mod;
+}
+exports.stringHashMod = stringHashMod;

package/dist/service/proxyapi/RouteHandler.d.ts

@@ -1,5 +1,5 @@
-declare class RouteHandler {
-    cfgInfo: any;
-    constructor(cfgInfo: any);
-}
-export { RouteHandler };
+declare class RouteHandler {
+    cfgInfo: any;
+    constructor(cfgInfo: any);
+}
+export { RouteHandler };

package/dist/service/proxyapi/RouteHandler.js

@@ -1,9 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RouteHandler = void 0;
-class RouteHandler {
-    constructor(cfgInfo) {
-        this.cfgInfo = cfgInfo;
-    }
-}
-exports.RouteHandler = RouteHandler;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RouteHandler = void 0;
+class RouteHandler {
+    constructor(cfgInfo) {
+        this.cfgInfo = cfgInfo;
+    }
+}
+exports.RouteHandler = RouteHandler;

package/dist/service/proxyapi/RouteTrie.d.ts

@@ -1,12 +1,12 @@
-import { RouteHandler } from './RouteHandler';
-declare class RouteTrie {
-    private root;
-    private routeCount;
-    constructor();
-    addRoute(path: string, handler: RouteHandler): void;
-    clearRoute(): void;
-    getRouteCount(): 0;
-    findLongestMatch(path: string): any;
-}
-declare function getRouteTrie(domainCode: string): RouteTrie;
-export { RouteTrie, getRouteTrie };
+import { RouteHandler } from './RouteHandler';
+declare class RouteTrie {
+    private root;
+    private routeCount;
+    constructor();
+    addRoute(path: string, handler: RouteHandler): void;
+    clearRoute(): void;
+    getRouteCount(): 0;
+    findLongestMatch(path: string): any;
+}
+declare function getRouteTrie(domainCode: string): RouteTrie;
+export { RouteTrie, getRouteTrie };

package/dist/service/proxyapi/RouteTrie.js

@@ -1,63 +1,63 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRouteTrie = exports.RouteTrie = void 0;
-class RouteTrieNode {
-    constructor() {
-        this.children = {}; // 子节点字典
-        this.handler = null; // 路由处理程序
-        this.path = ''; // 完整路由路径
-    }
-}
-class RouteTrie {
-    constructor() {
-        this.root = new RouteTrieNode();
-        this.routeCount = 0;
-    }
-    addRoute(path, handler) {
-        const parts = path.split('/').slice(1); // 去除首部空字符串
-        let node = this.root;
-        parts.forEach(part => {
-            if (!node.children[part]) {
-                node.children[part] = new RouteTrieNode();
-            }
-            node = node.children[part];
-        });
-        // 保存路由处理函数到终点节点
-        node.handler = handler;
-        node.path = path;
-        this.routeCount++;
-    }
-    clearRoute() {
-        this.routeCount = 0;
-        this.root = new RouteTrieNode();
-    }
-    getRouteCount() {
-        return this.routeCount;
-    }
-    findLongestMatch(path) {
-        const parts = path.split('/').slice(1);
-        let node = this.root;
-        let bestMatch = null;
-        parts.forEach(part => {
-            if (node.children[part]) {
-                node = node.children[part];
-                if (node.handler) {
-                    bestMatch = {
-                        path: node.path,
-                        handler: node.handler,
-                    };
-                }
-            }
-        });
-        return bestMatch;
-    }
-}
-exports.RouteTrie = RouteTrie;
-const ROUTE_TRIE_MANAGER = {};
-function getRouteTrie(domainCode) {
-    if (!ROUTE_TRIE_MANAGER[domainCode]) {
-        ROUTE_TRIE_MANAGER[domainCode] = new RouteTrie();
-    }
-    return ROUTE_TRIE_MANAGER[domainCode];
-}
-exports.getRouteTrie = getRouteTrie;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRouteTrie = exports.RouteTrie = void 0;
+class RouteTrieNode {
+    constructor() {
+        this.children = {}; // 子节点字典
+        this.handler = null; // 路由处理程序
+        this.path = ''; // 完整路由路径
+    }
+}
+class RouteTrie {
+    constructor() {
+        this.root = new RouteTrieNode();
+        this.routeCount = 0;
+    }
+    addRoute(path, handler) {
+        const parts = path.split('/').slice(1); // 去除首部空字符串
+        let node = this.root;
+        parts.forEach(part => {
+            if (!node.children[part]) {
+                node.children[part] = new RouteTrieNode();
+            }
+            node = node.children[part];
+        });
+        // 保存路由处理函数到终点节点
+        node.handler = handler;
+        node.path = path;
+        this.routeCount++;
+    }
+    clearRoute() {
+        this.routeCount = 0;
+        this.root = new RouteTrieNode();
+    }
+    getRouteCount() {
+        return this.routeCount;
+    }
+    findLongestMatch(path) {
+        const parts = path.split('/').slice(1);
+        let node = this.root;
+        let bestMatch = null;
+        parts.forEach(part => {
+            if (node.children[part]) {
+                node = node.children[part];
+                if (node.handler) {
+                    bestMatch = {
+                        path: node.path,
+                        handler: node.handler,
+                    };
+                }
+            }
+        });
+        return bestMatch;
+    }
+}
+exports.RouteTrie = RouteTrie;
+const ROUTE_TRIE_MANAGER = {};
+function getRouteTrie(domainCode) {
+    if (!ROUTE_TRIE_MANAGER[domainCode]) {
+        ROUTE_TRIE_MANAGER[domainCode] = new RouteTrie();
+    }
+    return ROUTE_TRIE_MANAGER[domainCode];
+}
+exports.getRouteTrie = getRouteTrie;

package/dist/service/proxyapi/WeightedRandom.d.ts

@@ -1,9 +1,9 @@
-import { IUpstreamItem } from '../../models/SystemEntities';
-declare class WeightedRandom {
-    private readonly items;
-    private readonly totalWeight;
-    private readonly cumulativeWeights;
-    constructor(items: IUpstreamItem[]);
-    next(): IUpstreamItem;
-}
-export { WeightedRandom };
+import { IUpstreamItem } from '../../models/SystemEntities';
+declare class WeightedRandom {
+    private readonly items;
+    private readonly totalWeight;
+    private readonly cumulativeWeights;
+    constructor(items: IUpstreamItem[]);
+    next(): IUpstreamItem;
+}
+export { WeightedRandom };

package/dist/service/proxyapi/WeightedRandom.js

@@ -1,31 +1,31 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WeightedRandom = void 0;
-class WeightedRandom {
-    constructor(items) {
-        // 预处理累积权重
-        this.cumulativeWeights = [];
-        let runningTotal = 0;
-        for (const item of items) {
-            if (typeof item.weight !== 'number' || item.weight <= 0) {
-                throw new Error('All items must have positive weight');
-            }
-            runningTotal += item.weight;
-            this.cumulativeWeights.push(runningTotal);
-        }
-        this.totalWeight = runningTotal;
-        this.items = items;
-    }
-    next() {
-        // 生成[0, totalWeight)区间的随机数
-        const random = Math.random() * this.totalWeight;
-        // 线性查找命中区间
-        for (let i = 0; i < this.cumulativeWeights.length; i++) {
-            if (random < this.cumulativeWeights[i]) {
-                return this.items[i];
-            }
-        }
-        return this.items[0]; // 兜底返回第一个元素
-    }
-}
-exports.WeightedRandom = WeightedRandom;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WeightedRandom = void 0;
+class WeightedRandom {
+    constructor(items) {
+        // 预处理累积权重
+        this.cumulativeWeights = [];
+        let runningTotal = 0;
+        for (const item of items) {
+            if (typeof item.weight !== 'number' || item.weight <= 0) {
+                throw new Error('All items must have positive weight');
+            }
+            runningTotal += item.weight;
+            this.cumulativeWeights.push(runningTotal);
+        }
+        this.totalWeight = runningTotal;
+        this.items = items;
+    }
+    next() {
+        // 生成[0, totalWeight)区间的随机数
+        const random = Math.random() * this.totalWeight;
+        // 线性查找命中区间
+        for (let i = 0; i < this.cumulativeWeights.length; i++) {
+            if (random < this.cumulativeWeights[i]) {
+                return this.items[i];
+            }
+        }
+        return this.items[0]; // 兜底返回第一个元素
+    }
+}
+exports.WeightedRandom = WeightedRandom;

package/dist/service/proxyapi/WeightedRoundRobin.d.ts

@@ -1,8 +1,8 @@
-import { IUpstreamItem } from '../../models/SystemEntities';
-declare class WeightedRoundRobin {
-    private readonly totalWeight;
-    private servers;
-    constructor(servers: IUpstreamItem[]);
-    next(): IUpstreamItem;
-}
-export { WeightedRoundRobin };
+import { IUpstreamItem } from '../../models/SystemEntities';
+declare class WeightedRoundRobin {
+    private readonly totalWeight;
+    private servers;
+    constructor(servers: IUpstreamItem[]);
+    next(): IUpstreamItem;
+}
+export { WeightedRoundRobin };

package/dist/service/proxyapi/WeightedRoundRobin.js

@@ -1,32 +1,32 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WeightedRoundRobin = void 0;
-class WeightedRoundRobin {
-    constructor(servers) {
-        this.servers = servers.map(server => ({
-            ...server,
-            currentWeight: 0,
-            effectiveWeight: server.weight, // 有效权重（可动态调整）
-        }));
-        this.totalWeight = servers.reduce((sum, server) => sum + server.weight, 0);
-    }
-    next() {
-        let selected = null;
-        let maxCurrentWeight = 0;
-        // 1. 遍历所有服务器，动态增加权重并选择当前权重最大的
-        this.servers.forEach(server => {
-            server.currentWeight += server.effectiveWeight; // 增加动态权重
-            if (server.currentWeight > maxCurrentWeight) {
-                maxCurrentWeight = server.currentWeight;
-                selected = server;
-            }
-        });
-        // 2. 被选中的服务器减去总权重（实现平滑分配）
-        if (selected) {
-            selected.currentWeight -= this.totalWeight;
-            return selected;
-        }
-        return this.servers[0]; // 兜底返回第一个元素
-    }
-}
-exports.WeightedRoundRobin = WeightedRoundRobin;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WeightedRoundRobin = void 0;
+class WeightedRoundRobin {
+    constructor(servers) {
+        this.servers = servers.map(server => ({
+            ...server,
+            currentWeight: 0,
+            effectiveWeight: server.weight, // 有效权重（可动态调整）
+        }));
+        this.totalWeight = servers.reduce((sum, server) => sum + server.weight, 0);
+    }
+    next() {
+        let selected = null;
+        let maxCurrentWeight = 0;
+        // 1. 遍历所有服务器，动态增加权重并选择当前权重最大的
+        this.servers.forEach(server => {
+            server.currentWeight += server.effectiveWeight; // 增加动态权重
+            if (server.currentWeight > maxCurrentWeight) {
+                maxCurrentWeight = server.currentWeight;
+                selected = server;
+            }
+        });
+        // 2. 被选中的服务器减去总权重（实现平滑分配）
+        if (selected) {
+            selected.currentWeight -= this.totalWeight;
+            return selected;
+        }
+        return this.servers[0]; // 兜底返回第一个元素
+    }
+}
+exports.WeightedRoundRobin = WeightedRoundRobin;

package/index.d.ts

@@ -1,10 +1,10 @@
-export * from './dist/index';
-
-declare module '@midwayjs/core/dist/interface' {
-  interface MidwayConfig {
-    book?: PowerPartial<{
-      a: number;
-      b: string;
-    }>;
-  }
-}
+export * from './dist/index';
+
+declare module '@midwayjs/core/dist/interface' {
+  interface MidwayConfig {
+    book?: PowerPartial<{
+      a: number;
+      b: string;
+    }>;
+  }
+}

package/package.json

@@ -1,87 +1,87 @@
-{
-  "name": "midway-fatcms",
-  "version": "0.0.1-beta.76",
-  "description": "This is a midway component sample",
-  "main": "dist/index.js",
-  "typings": "index.d.ts",
-  "scripts": {
-    "build": "mwtsc --cleanOutDir",
-    "test": "cross-env NODE_ENV=unittest jest",
-    "cov": "jest --coverage",
-    "lint": "mwts check",
-    "lint:fix": "mwts fix"
-  },
-  "keywords": [],
-  "engines": {
-    "node": ">10"
-  },
-  "author": "",
-  "files": [
-    "dist/**/*.txt",
-    "dist/**/*.js",
-    "dist/**/*.d.ts",
-    "dist/**/*.html",
-    "dist/**/*.ico",
-    "src/**/*.txt",
-    "src/**/*.js",
-    "src/**/*.ts",
-    "src/**/*.d.ts",
-    "src/**/*.html",
-    "src/**/*.ico",
-    "index.d.ts",
-    "tsconfig.json",
-    ".prettierrc.js",
-    ".eslintrc.json"
-  ],
-  "license": "MIT",
-  "devDependencies": {
-    "@midwayjs/bootstrap": "^3.16.0",
-    "@midwayjs/cli": "^2.1.1",
-    "@midwayjs/cookies": "^1.2.0",
-    "@midwayjs/core": "^3.16.0",
-    "@midwayjs/cross-domain": "^3.16.1",
-    "@midwayjs/decorator": "^3.16.0",
-    "@midwayjs/info": "^3.16.1",
-    "@midwayjs/koa": "^3.16.1",
-    "@midwayjs/logger": "^3.4.0",
-    "@midwayjs/mock": "^3.16.0",
-    "@midwayjs/oss": "^3.16.0",
-    "@midwayjs/redis": "^3.20.4",
-    "@midwayjs/upload": "^3.16.1",
-    "@midwayjs/validate": "^3.16.1",
-    "@midwayjs/view-ejs": "^3.20.4",
-    "@types/ejs": "3.1.5",
-    "@types/humps": "2.0.6",
-    "@types/jest": "^29.2.0",
-    "@types/koa": "^2.13.4",
-    "@types/lodash": "^4.14.195",
-    "@types/md5": "^2.3.5",
-    "@types/mime-types": "^2.1.4",
-    "@types/mssql": "^9.1.7",
-    "@types/node": "^16.11.22",
-    "@types/nodemailer": "^6.4.17",
-    "@types/pg": "^8.15.4",
-    "aes-128-cbc": "^1.0.4",
-    "axios": "^1.8.2",
-    "cross-env": "^6.0.0",
-    "humps": "^2.0.1",
-    "jest": "^29.2.2",
-    "lodash": "^4.17.21",
-    "lru-cache": "^10.2.2",
-    "md5": "^2.3.0",
-    "mime-types": "^2.1.35",
-    "moment": "^2.30.1",
-    "mssql": "^11.0.1",
-    "mwts": "^1.3.0",
-    "mwtsc": "^1.4.0",
-    "mysql2": "^3.4.0",
-    "nodemailer": "^7.0.3",
-    "pg": "^8.16.3",
-    "ts-jest": "^29.0.3",
-    "typescript": "~4.8.0",
-    "urlsafe-base64": "^1.0.0",
-    "fast-csv": "^5.0.2",
-    "ejs": "^3.1.10"
-  },
-  "dependencies": {}
-}
+{
+  "name": "midway-fatcms",
+  "version": "0.0.1-beta.77",
+  "description": "This is a midway component sample",
+  "main": "dist/index.js",
+  "typings": "index.d.ts",
+  "scripts": {
+    "build": "mwtsc --cleanOutDir",
+    "test": "cross-env NODE_ENV=unittest jest",
+    "cov": "jest --coverage",
+    "lint": "mwts check",
+    "lint:fix": "mwts fix"
+  },
+  "keywords": [],
+  "engines": {
+    "node": ">10"
+  },
+  "author": "",
+  "files": [
+    "dist/**/*.txt",
+    "dist/**/*.js",
+    "dist/**/*.d.ts",
+    "dist/**/*.html",
+    "dist/**/*.ico",
+    "src/**/*.txt",
+    "src/**/*.js",
+    "src/**/*.ts",
+    "src/**/*.d.ts",
+    "src/**/*.html",
+    "src/**/*.ico",
+    "index.d.ts",
+    "tsconfig.json",
+    ".prettierrc.js",
+    ".eslintrc.json"
+  ],
+  "license": "MIT",
+  "devDependencies": {
+    "@midwayjs/bootstrap": "^3.16.0",
+    "@midwayjs/cli": "^2.1.1",
+    "@midwayjs/cookies": "^1.2.0",
+    "@midwayjs/core": "^3.16.0",
+    "@midwayjs/cross-domain": "^3.16.1",
+    "@midwayjs/decorator": "^3.16.0",
+    "@midwayjs/info": "^3.16.1",
+    "@midwayjs/koa": "^3.16.1",
+    "@midwayjs/logger": "^3.4.0",
+    "@midwayjs/mock": "^3.16.0",
+    "@midwayjs/oss": "^3.16.0",
+    "@midwayjs/redis": "^3.20.4",
+    "@midwayjs/upload": "^3.16.1",
+    "@midwayjs/validate": "^3.16.1",
+    "@midwayjs/view-ejs": "^3.20.4",
+    "@types/ejs": "3.1.5",
+    "@types/humps": "2.0.6",
+    "@types/jest": "^29.2.0",
+    "@types/koa": "^2.13.4",
+    "@types/lodash": "^4.14.195",
+    "@types/md5": "^2.3.5",
+    "@types/mime-types": "^2.1.4",
+    "@types/mssql": "^9.1.7",
+    "@types/node": "^16.11.22",
+    "@types/nodemailer": "^6.4.17",
+    "@types/pg": "^8.15.4",
+    "aes-128-cbc": "^1.0.4",
+    "axios": "^1.8.2",
+    "cross-env": "^6.0.0",
+    "humps": "^2.0.1",
+    "jest": "^29.2.2",
+    "lodash": "^4.17.21",
+    "lru-cache": "^10.2.2",
+    "md5": "^2.3.0",
+    "mime-types": "^2.1.35",
+    "moment": "^2.30.1",
+    "mssql": "^11.0.1",
+    "mwts": "^1.3.0",
+    "mwtsc": "^1.4.0",
+    "mysql2": "^3.4.0",
+    "nodemailer": "^7.0.3",
+    "pg": "^8.16.3",
+    "ts-jest": "^29.0.3",
+    "typescript": "~4.8.0",
+    "urlsafe-base64": "^1.0.0",
+    "fast-csv": "^5.0.2",
+    "ejs": "^3.1.10"
+  },
+  "dependencies": {}
+}

package/src/libs/crud-pro/CrudPro.ts

@@ -124,6 +124,11 @@ class CrudPro {
     // 执行SQL执行之后的的处理
     await this.afterExecuteSQLList();
 
+
+    // 再次尝试释放一下资源。避免因为不正确的使用方式导致，连接未释放。
+    const txObj = this.executeContext.getTransaction();
+    await txObj.releaseTxOnlyReleased();
+
     return exeCtx;
   }
 

package/src/libs/crud-pro/interfaces.ts

@@ -23,8 +23,17 @@ export interface IConnectionPool {
   poolInstance: any; //MysqlPool | PostgresPool;
 }
 
+export interface IPoolConnectionQueryResult {
+  rows: any[];
+  originRes: any;
+}
 export interface IPoolConnectionClient {
-  query: (sql: string, values: any[]) => Promise<any[]>;
+  query: (sql: string, values: any[]) => Promise<IPoolConnectionQueryResult>;
+  release: () => Promise<any>;
+  commit: () => Promise<any>;
+  rollback: () => Promise<any>;
+  beginTransaction: () => Promise<any>;
+  originConnection: any;
 }
 
 /**