mm_sqlite 1.1.2 → 1.1.3

package/index.js

@@ -12,8 +12,7 @@ class Sqlite extends BaseService {
    * 默认配置
    */
   static default_config = {
-    host: "/db/".fullname(),
-    port: 3306,
+    dir: "/db/".fullname(),
     user: "root",
     password: "",
     database: "mm",
@@ -39,7 +38,7 @@ class Sqlite extends BaseService {
   constructor(config) {
     const merged_config = Object.assign({}, Sqlite.default_config, config || {});
     super(merged_config);
-    
+
     this.config = merged_config;
     this._connection = null;
     this._pool = null;
@@ -58,7 +57,7 @@ class Sqlite extends BaseService {
  * 初始化服务
  * @returns {Promise<void>}
  */
-Sqlite.prototype._initService = async function() {
+Sqlite.prototype._initService = async function () {
   if (this._is_inited) {
     $.log.warn('SQLite服务已初始化');
     return;
@@ -79,7 +78,7 @@ Sqlite.prototype._initService = async function() {
  * @param {Number} timeout - 超时时间(毫秒)
  * @returns {Promise<boolean>}
  */
-Sqlite.prototype.open = async function(timeout) {
+Sqlite.prototype.open = async function (timeout) {
   if (this._status === 'connected' || this._status === 'connecting') {
     $.log.warn('数据库连接已存在或正在连接中');
     return true;
@@ -89,14 +88,6 @@ Sqlite.prototype.open = async function(timeout) {
   this._status = 'connecting';
 
   try {
-    // $.log.debug(`[${this.constructor.name}] [open]`, '开始创建数据库连接', {
-    //   host: this.config.host,
-    //   port: this.config.port,
-    //   database: this.config.database,
-    //   user: this.config.user,
-    //   timeout: timeout
-    // });
-
     // 创建连接
     const connection_promise = this._openInternal();
     const timeout_promise = new Promise((_, reject) => {
@@ -111,8 +102,7 @@ Sqlite.prototype.open = async function(timeout) {
       this._last_connect_time = Date.now();
       this._status = 'connected';
       $.log.info(`[${this.constructor.name}] [open]`, '数据库连接成功', {
-        host: this.config.host,
-        port: this.config.port,
+        dir: this.config.dir,
         database: this.config.database
       });
       return true;
@@ -122,7 +112,7 @@ Sqlite.prototype.open = async function(timeout) {
         code: connection_err.code,
         syscall: connection_err.syscall,
         address: connection_err.address,
-        port: connection_err.port,
+        dir: connection_err.dir,
         stack: connection_err.stack
       });
       throw connection_err;
@@ -131,8 +121,7 @@ Sqlite.prototype.open = async function(timeout) {
     this._status = 'closed';
     $.log.error(`[${this.constructor.name}] [open]`, '数据库连接失败', {
       error: err.message,
-      host: this.config.host,
-      port: this.config.port,
+      dir: this.config.dir,
       database: this.config.database
     });
     throw err;
@@ -144,31 +133,31 @@ Sqlite.prototype.open = async function(timeout) {
  * @private
  * @returns {Promise<void>}
  */
-Sqlite.prototype._openInternal = function() {
+Sqlite.prototype._openInternal = function () {
   return new Promise((resolve, reject) => {
     try {
       const fs = require('fs');
       const path = require('path');
-      
+
       // 确保数据库目录存在
       const db_path = this._getDatabasePath();
       const dir = path.dirname(db_path);
-      
+
       if (!fs.existsSync(dir)) {
         fs.mkdirSync(dir, { recursive: true });
       }
-      
+
       // 创建数据库连接
       this._db = new sqlite3.Database(db_path);
       this._open = true;
       this._conn_retry_count = 0;
-      
+
       // 设置连接错误处理
       this._db.on('error', (err) => {
         $.log.error('SQLite数据库连接错误:', err);
         this._handleConnectionError(err);
       });
-      
+
       $.log.debug(`SQLite数据库已打开: ${db_path}`);
       resolve();
     } catch (error) {
@@ -182,9 +171,9 @@ Sqlite.prototype._openInternal = function() {
  * @private
  * @returns {String}
  */
-Sqlite.prototype._getDatabasePath = function() {
+Sqlite.prototype._getDatabasePath = function () {
   const db_name = this.config.database || 'mm';
-  const db_dir = this.config.host || '/db/';
+  const db_dir = this.config.dir || '/db/';
   return `${db_dir}${db_name}.db`;
 };
 
@@ -192,7 +181,7 @@ Sqlite.prototype._getDatabasePath = function() {
  * 关闭数据库连接
  * @returns {Promise<boolean>}
  */
-Sqlite.prototype.close = function() {
+Sqlite.prototype.close = function () {
   if (this._status !== 'connected') {
     $.log.warn('数据库连接未建立');
     return Promise.resolve(false);
@@ -230,7 +219,7 @@ Sqlite.prototype.close = function() {
  * @param {Number} timeout - 超时时间(毫秒)
  * @returns {Promise<Object>}
  */
-Sqlite.prototype.getConn = async function(timeout) {
+Sqlite.prototype.getConn = async function (timeout) {
   timeout = timeout || this.config.acquire_timeout || this.config.connect_timeout || 20000;
 
   // $.log.debug(`[${this.constructor.name}] [getConn] 使用超时时间: ${timeout}ms`);
@@ -279,7 +268,7 @@ Sqlite.prototype.getConn = async function(timeout) {
  * @private
  * @param {Error} err - 错误对象
  */
-Sqlite.prototype._handleConnectionError = function(err) {
+Sqlite.prototype._handleConnectionError = function (err) {
   if (this._reconnecting) {
     $.log.debug('重连已在进行中');
     return;
@@ -304,7 +293,7 @@ Sqlite.prototype._handleConnectionError = function(err) {
  * @param {Number} max_retries - 最大重试次数
  * @returns {Promise<boolean>}
  */
-Sqlite.prototype._reconnect = async function(max_retries) {
+Sqlite.prototype._reconnect = async function (max_retries) {
   if (this._reconnecting) {
     $.log.warn('重连已在进行中');
     return false;
@@ -353,7 +342,7 @@ Sqlite.prototype._reconnect = async function(max_retries) {
  * @param {Number} ms - 休眠时间(毫秒)
  * @returns {Promise<void>}
  */
-Sqlite.prototype._sleep = function(ms) {
+Sqlite.prototype._sleep = function (ms) {
   return new Promise(resolve => setTimeout(resolve, ms));
 };
 
@@ -364,7 +353,7 @@ Sqlite.prototype._sleep = function(ms) {
  * @param {Number} timeout - 超时时间(毫秒)
  * @returns {Promise<Object>}
  */
-Sqlite.prototype.run = async function(sql, params, timeout) {
+Sqlite.prototype.run = async function (sql, params, timeout) {
   let conn = null;
   timeout = timeout || this.config.query_timeout || 30000;
 
@@ -383,7 +372,7 @@ Sqlite.prototype.run = async function(sql, params, timeout) {
         }
       });
     });
-    
+
     const timeout_promise = new Promise((_, reject) => {
       setTimeout(() => {
         reject(new Error(`SQL查询超时: ${timeout}ms`));
@@ -416,7 +405,7 @@ Sqlite.prototype.run = async function(sql, params, timeout) {
  * @param {Number} timeout - 超时时间(毫秒)
  * @returns {Promise<Object>}
  */
-Sqlite.prototype.exec = async function(sql, params, timeout) {
+Sqlite.prototype.exec = async function (sql, params, timeout) {
   let conn = null;
   timeout = timeout || this.config.query_timeout || 30000;
 
@@ -426,7 +415,7 @@ Sqlite.prototype.exec = async function(sql, params, timeout) {
 
     // 直接在方法内部实现超时控制
     const query_promise = new Promise((resolve, reject) => {
-      conn.run(sql, params || [], function(error) {
+      conn.run(sql, params || [], function (error) {
         if (error) {
           reject(error);
         } else {
@@ -439,7 +428,7 @@ Sqlite.prototype.exec = async function(sql, params, timeout) {
         }
       });
     });
-    
+
     const timeout_promise = new Promise((_, reject) => {
       setTimeout(() => {
         reject(new Error(`SQL执行超时: ${timeout}ms`));
@@ -472,7 +461,7 @@ Sqlite.prototype.exec = async function(sql, params, timeout) {
  * @param {Object} options - 选项（order_by, limit, offset等）
  * @returns {Promise<Array>}
  */
-Sqlite.prototype.read = async function(table, condition, options) {
+Sqlite.prototype.read = async function (table, condition, options) {
   try {
     // 检查连接状态
     if (this._status !== 'connected') {
@@ -539,24 +528,24 @@ Sqlite.prototype.read = async function(table, condition, options) {
  * @param {String} database - 数据库名称
  * @returns {Object} 数据库操作实例
  */
-Sqlite.prototype.db = function(database) {
+Sqlite.prototype.db = function (database) {
   if (this._status !== 'connected') {
     throw new Error('数据库连接未建立');
   }
-  
+
   // 优化：缓存DB实例，避免重复创建
   if (!this._db_instance) {
     this._db_instance = new DB(this);
-    
+
     // 为DB实例添加必要的方法，确保与MySQL接口兼容
     this._db_instance.run = this.run.bind(this);
     this._db_instance.exec = this.exec.bind(this);
   }
-  
+
   if (database) {
     this._db_instance.database = database;
   }
-  
+
   return this._db_instance;
 };
 
@@ -564,7 +553,7 @@ Sqlite.prototype.db = function(database) {
  * 获取数据库管理器模型
  * @returns {Object} 数据库管理器模型
  */
-Sqlite.prototype.dbs = function() {
+Sqlite.prototype.dbs = function () {
   return this.db();
 };
 
@@ -572,7 +561,7 @@ Sqlite.prototype.dbs = function() {
  * 开始事务
  * @returns {Promise<Object>} 事务连接对象
  */
-Sqlite.prototype.beginTransaction = async function() {
+Sqlite.prototype.beginTransaction = async function () {
   try {
     // 检查连接状态
     if (this._status !== 'connected') {
@@ -631,7 +620,7 @@ Sqlite.prototype.beginTransaction = async function() {
       exec: async (sql, params) => {
         // 在事务中执行SQL
         return new Promise((resolve, reject) => {
-          connection.run(sql, params || [], function(error) {
+          connection.run(sql, params || [], function (error) {
             if (error) {
               reject(error);
             } else {
@@ -658,7 +647,7 @@ Sqlite.prototype.beginTransaction = async function() {
  * @param {Function} callback - 包含事务操作的回调函数
  * @returns {Promise<*>} 回调函数的返回值
  */
-Sqlite.prototype.transaction = async function(callback) {
+Sqlite.prototype.transaction = async function (callback) {
   let transaction = null;
 
   try {
@@ -689,10 +678,10 @@ Sqlite.prototype.transaction = async function(callback) {
  * 确保连接池对象存在
  */
 if (!$.pool) {
-	$.pool = {};
+  $.pool = {};
 }
 if (!$.pool.sqlite) {
-	$.pool.sqlite = {};
+  $.pool.sqlite = {};
 }
 
 /**
@@ -702,15 +691,15 @@ if (!$.pool.sqlite) {
  * @return {Object} 返回一个Sqlite类实例
  */
 function sqliteAdmin(scope, config) {
-	if (!scope) {
-		scope = 'sys';
-	}
-	var obj = $.pool.sqlite[scope];
-	if (!obj) {
-		$.pool.sqlite[scope] = new Sqlite(config);
-		obj = $.pool.sqlite[scope];
-	}
-	return obj;
+  if (!scope) {
+    scope = 'sys';
+  }
+  var obj = $.pool.sqlite[scope];
+  if (!obj) {
+    $.pool.sqlite[scope] = new Sqlite(config);
+    obj = $.pool.sqlite[scope];
+  }
+  return obj;
 }
 
 // 模块导出

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_sqlite",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "description": "高性能SQLite数据库操作模块，提供与mm_mysql完全兼容的API接口，支持异步操作、事务处理和批量操作",
     "main": "index.js",
     "scripts": {