mm_mysql 2.5.0 → 2.5.2

package/index.js

@@ -41,7 +41,7 @@ class Mysql extends Base {
     this._pool = null;
     // 移除单连接支持，统一使用连接池
 
-    // 错误信息
+    // 错误信息（注意：同 scope 下为单例共享，并发时以最后一次写入为准）
     this.error = null;
     // 最近执行的SQL语句
     this.sql = '';
@@ -136,13 +136,12 @@ Mysql.prototype.open = async function () {
  * @returns {Promise<boolean>}
  */
 Mysql.prototype.close = async function () {
+  if (!this._pool) {
+    return true;
+  }
   try {
-    // 先关闭连接池（避免连接状态问题）
-    if (this._pool) {
-      await this._pool.end();
-      this._pool = null;
-    }
-
+    await this._pool.end();
+    this._pool = null;
     this.log('info', '数据库连接池已关闭');
     return true;
   } catch (error) {
@@ -157,12 +156,15 @@ Mysql.prototype.close = async function () {
    * @throws {TypeError} 当连接池不存在时
    */
 Mysql.prototype.getConn = async function () {
-  // 参数校验
+  // 连接池不存在则创建
   if (!this._pool) {
     await this.open();
   }
+  // 连接池可能已被外部关闭，检测并重建
+  if (this._pool._closed) {
+    await this.open();
+  }
 
-  // 统一从连接池获取连接
   return await this._pool.getConnection();
 };
 
@@ -187,14 +189,13 @@ Mysql.prototype.run = async function (sql, params = []) {
   let conn = null;
   let ret = [];
   try {
-    // 获取连接
     conn = await this.getConn();
     this.sql = sql;
     let [rows] = await conn.query(sql, params);
     ret = rows;
   } catch (err) {
     console.error('SQL执行失败', err);
-    this.sql = err.sql;
+    this.sql = err.sql || sql;
     this.error = {
       code: err.errno,
       message: err.sqlMessage
@@ -226,14 +227,13 @@ Mysql.prototype.exec = async function (sql, params = []) {
   let conn = null;
   let ret = 0;
   try {
-    // 获取连接
     conn = await this.getConn();
     this.sql = sql;
     let [result] = await conn.execute(sql, params);
     ret = result.insertId || result.affectedRows || result.changedRows || 1;
   } catch (error) {
     console.error('SQL执行失败', error);
-    this.sql = error.sql;
+    this.sql = error.sql || sql;
     this.error = {
       code: error.errno,
       message: error.sqlMessage
@@ -394,7 +394,7 @@ Mysql.prototype.getPoolStats = function () {
  */
 Mysql.prototype.healthCheck = async function () {
   try {
-    if (!this._pool && !this._conneced) {
+    if (!this._pool) {
       return {
         status: 'error',
         message: '数据库连接未初始化'

package/package.json

@@ -1,10 +1,10 @@
 {
 	"name": "mm_mysql",
-	"version": "2.5.0",
+	"version": "2.5.2",
 	"description": "这是超级美眉mysql帮助函数模块，用于便捷操作mysql，使用await方式，可以避免嵌套函数",
 	"main": "index.js",
 	"dependencies": {
-		"mm_expand": "^2.4.7",
+		"mm_expand": "^2.5.1",
 		"mysql2": "^3.23.2",
 		"sqlstring": "^2.3.3"
 	},
@@ -36,8 +36,8 @@
 		"node": ">=12.0.0"
 	},
 	"devDependencies": {
-		"eslint": "^10.8.0",
-		"eslint-plugin-jsdoc": "^63.3.3",
+		"eslint": "^10.8.1",
+		"eslint-plugin-jsdoc": "^64.0.1",
 		"mm_eslint": "^1.7.5"
 	}
 }

package/sql.js

@@ -441,6 +441,10 @@ Sql.prototype._buildLikeWhere = function (obj) {
   var where = '';
   for (var k in obj) {
     var val = obj[k];
+    // 防御：如果 String.prototype 被污染导致 .slice 丢失，强制重建原始字符串
+    if (typeof val === 'string') {
+      val = String(val);
+    }
     // 先转义再处理字符串，避免转义字符被错误处理
     val = escape(val);
     if (k.endsWith('_min')) {
@@ -469,6 +473,10 @@ Sql.prototype._buildExactWhere = function (obj) {
   var where = '';
   for (var k in obj) {
     var val = obj[k];
+    // 防御：如果 String.prototype 被污染导致 .slice 丢失，强制重建原始字符串
+    if (typeof val === 'string') {
+      val = String(val);
+    }
     // 先转义再处理字符串，避免转义字符被错误处理
     val = escape(val);
     if (k.endsWith('_min')) {