mm_mysql 1.9.6 → 1.9.7

package/index.js

@@ -5,17 +5,14 @@
  */
 const {
 	createPool
-} = require('mysql');
+} = require('mysql2/promise');
 const {
 	DB
 } = require('./db');
 
 const Link_model = require('./link_model');
-const {
-	table
-} = require('console');
 
-var pool = {};
+var pools = {};
 
 /**
  * @description 数据库封装
@@ -46,8 +43,8 @@ class Mysql {
 		 * sql语句
 		 */
 		this.sql = "";
-		// 连接器
-		this.conn;
+		// 连接池
+		this.pool;
 		// 连接态 0未连接，1已连接
 		this.state = 0;
 
@@ -65,10 +62,15 @@ class Mysql {
 			database: "mm",
 			// 是否支持多个sql语句同时操作
 			multipleStatements: false,
-			// 打印SQL
-			log: false,
-			// 排除打印
-			log_ignore: [1062]
+			// // 打印SQL
+			// log: true,
+			// // 排除打印
+			// log_ignore: [1062],
+			// debug: true,
+			// 启用keep-alive，保持连接活跃
+			enableKeepAlive: true,
+			waitForConnections: true,
+			compress: false // 启用压缩
 		};
 
 		// 唯一标识符
@@ -83,49 +85,29 @@ class Mysql {
 		 * @param {Array} val 替换值
 		 * @return {Promise|Array} 异步构造器, 当await时返回执行结果
 		 */
-		this.run = function(sql, val) {
-			var _this = this;
+		this.run = async function(sql, val) {
 			this.sql = sql;
 			if ($this.config.log) {
 				$.log.debug("SQL：", sql);
 			}
-
-			// 返回一个 Promise
-			return new Promise((resolve, reject) => {
-				$this.conn.getConnection(function(err, db) {
-					if (err) {
-						_this.error = {
-							code: 2003,
-							message: $.info(err).between('Error: ', '\n')
-						};
-						$.log.error("SQL error：", err);
-						if (err.message.indexOf("connect ECONNREFUSED") !== -1) {
-							$this.state = 0;
-						}
-						resolve([]);
-						reject(err);
-					} else {
-						db.query(sql, val, (err, rows) => {
-							// 结束会话
-							db.release();
-							if (err) {
-								_this.error = {
-									code: err.errno,
-									message: err.sqlMessage
-								};
-								if ($this.config.log_ignore.indexOf(err.errno) === -1) {
-									$.log.error("SQL error：", err);
-								}
-								resolve([]);
-								reject(err);
-							} else {
-								_this.error = undefined;
-								resolve(rows);
-							}
-						});
-					}
-				});
-			});
+			var conn;
+			var list = [];
+			try {
+				// 关于连接池初始化，请参阅上文
+				conn = await $this.pool.getConnection();
+				const [rows] = await conn.query(sql, val);
+				// 查询解析时，连接会自动释放
+				list = rows;
+			} catch (err) {
+				console.error("mysql查询错误", err);
+				this.error = {
+					code: err.errno,
+					message: err.sqlMessage
+				};
+			} finally {
+				if (conn) conn.release();
+			}
+			return list;
 		};
 
 		/**
@@ -134,8 +116,7 @@ class Mysql {
 		 * @param {Array} val 替换值
 		 * @return {Promise|Array} 异步构造器, 当await时返回执行结果
 		 */
-		this.exec = function(sql, val) {
-			var _this = this;
+		this.exec = async function(sql, val) {
 			if (this.task) {
 				this.task_sql += sql + "\r\n";
 				if (this.task === 1) {
@@ -154,64 +135,46 @@ class Mysql {
 			if ($this.config.log) {
 				$.log.debug("SQL：", sql);
 			}
-
-			// 返回一个 Promise
-			return new Promise((resolve, reject) => {
-				$this.conn.getConnection(function(err, db) {
-					if (err) {
-						_this.error = {
-							code: 41000,
-							message: $.info(err).between('Error: ', '\n')
-						};
-						$.log.error("SQL error：", err);
-						if (err.message.indexOf("connect ECONNREFUSED") !== -1) {
-							$this.state = 0;
+			var conn;
+			var bl = -1;
+			try {
+				conn = await $this.pool.getConnection();
+				var [rows] = await conn.execute(sql, val);
+				console.log("执行结果", rows);
+				if (rows.constructor == Array) {
+					if (rows.length > 0) {
+						var num = 0;
+						rows.map(function(item) {
+							num += item['affectedRows'];
+						});
+						if (num === 0) {
+							bl = rows.length;
+						} else {
+							bl = num;
 						}
-						resolve(-1);
-						reject(err);
 					} else {
-						db.query(sql, val, (err, o) => {
-							if (err) {
-								_this.error = {
-									code: err.errno,
-									message: err.sqlMessage
-								};
-								if ($this.config.log_ignore.indexOf(err.errno) === -1) {
-									$.log.error("SQL error：", err);
-								}
-								resolve(-1);
-								reject(err);
-							} else {
-								_this.error = undefined;
-								if (o.constructor == Array) {
-									if (o.length > 0) {
-										var num = 0;
-										o.map(function(item) {
-											num += item['affectedRows'];
-										});
-										if (num === 0) {
-											resolve(o.length);
-										} else {
-											resolve(num);
-										}
-									} else {
-										resolve(1);
-									}
-								} else {
-									var num = o['affectedRows'];
-									if (num === 0) {
-										resolve(1);
-									} else {
-										resolve(num);
-									}
-								}
-							}
-							// 结束会话
-							db.release();
-						});
+						bl = 1;
 					}
-				});
-			});
+				} else {
+					var num = rows['affectedRows'];
+					if (num === 0) {
+						bl = 1;
+					} else {
+						bl = num;
+					}
+				}
+				// 查询解析时，连接会自动释放
+			} catch (err) {
+				console.error("mysql执行错误", err);
+				this.error = {
+					code: err.errno,
+					message: err.sqlMessage
+				};
+			} finally {
+				if (conn) conn.release();
+			}
+
+			return bl;
 		};
 
 		/**
@@ -223,6 +186,19 @@ class Mysql {
 	}
 }
 
+Mysql.prototype.getConn = async function() {
+	let conn;
+	try {
+		conn = await this.pool.getConnection();
+	} catch (err) {
+		console.error('Connection failed - retrying: ' + err.message);
+		// 重试逻辑，例如等待一段时间后再次尝试获取连接
+		await new Promise(resolve => setTimeout(resolve, 5000)); // 等待5秒后重试
+		conn = await this.getConn(); // 递归调用直到成功获取连接
+	}
+	return conn;
+}
+
 /**
  * 导入数据库
  * @param {Object} file sql文件
@@ -301,7 +277,6 @@ Mysql.prototype.save = async function(file, func, tables = []) {
 		}
 
 		tableCount = tables.length;
-		console.log("tables", tables);
 		for (var i = 0; i < tables.length; i++) {
 			var tableName = tables[i];
 			try {
@@ -412,21 +387,21 @@ Mysql.prototype.setConfig = function(cg) {
  * @param {boolean} 是否重置
  */
 Mysql.prototype.open = function(reset) {
-	if (reset || !this.state || !pool[this.identifier]) {
+	if (reset || !this.state || !pools[this.identifier]) {
 		this.state = 1;
-		pool[this.identifier] = createPool(this.config);
+		pools[this.identifier] = createPool(this.config);
 	}
-	this.conn = pool[this.identifier];
+	this.pool = pools[this.identifier];
 };
 
 /**
  * @description 关闭连接
  */
 Mysql.prototype.close = function() {
-	if (pool[this.identifier]) {
-		pool[this.identifier].end();
-		pool[this.identifier] = null;
-		delete pool[this.identifier];
+	if (pools[this.identifier]) {
+		pools[this.identifier].end();
+		pools[this.identifier] = null;
+		delete pools[this.identifier];
 	}
 };
 

package/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "mm_mysql",
-	"version": "1.9.6",
+	"version": "1.9.7",
 	"description": "这是超级美眉mysql帮助函数模块，用于便捷操作mysql，使用await方式，可以避免嵌套函数",
 	"main": "index.js",
 	"dependencies": {
 		"mm_expand": "^1.8.0",
 		"mm_logs": "^1.1.7",
-		"mysql": "^2.18.1"
+		"mysql2": "^3.14.0"
 	},
 	"scripts": {
 		"test": "node test.js",

package/sql.js

@@ -7,7 +7,7 @@ require('mm_logs');
 const {
 	escape,
 	escapeId
-} = require('mysql');
+} = require('mysql2');
 
 /**
  * @class 数据库语法通用类

package/test.js

@@ -17,9 +17,31 @@ async function test() {
 
 	db = sql.db();
 	db.table = 'user_account';
-
-	var obj = await db.getObj();
-	console.log(obj);
+	db.key = "user_id";
+	var obj = await db.getObj({
+		"user_id": "1"
+	});
+	console.log("查询对象", obj);
+
+	var i = 0;
+	var timer = setInterval(async () => {
+		var now = new Date();
+		var start = now.getTime();
+		console.log(start);
+		var bl = await db.set({
+			"user_id": "1"
+		}, {
+			"nickname": "hao" + (i++)
+		});
+		now = new Date();
+		var end = now.getTime();
+		console.log(end);
+		console.log(end - start);
+		console.log("测试", bl);
+	}, 3000);
+
+	// obj.nickname = "hao";
+	// console.log("查询对象", obj, db.error, db.sql);
 
 	// // 导入
 	// var ret = await sql.load("./data.sql".fullname(__dirname), function(progress, index, error, sql_str) {
@@ -45,7 +67,7 @@ async function test() {
 	// });
 	// console.log("导入结果", ret);
 
-	sql.close();
+	// sql.close();
 
 }
 test();