mm_sqlite 1.4.8 → 1.4.9

package/index.js

@@ -1,4 +1,3 @@
-const sqlite3 = require('sqlite3').verbose();
 const {
   DB
 } = require('./db');
@@ -184,40 +183,19 @@ SQLite.prototype.run = async function (sql, params = [], timeout = 30000) {
   try {
     // 获取连接
     conn = await this.getConn(query_timeout);
-    let timeout_id = null;
-
-    ret = await new Promise((resolve, reject) => {
-      // 设置超时定时器
-      timeout_id = setTimeout(() => {
-        reject(new Error(`SQL查询超时: ${timeout}ms`));
-      }, timeout);
-
-      // 执行SQL查询
-      conn.all(sql, params || [], (error, rows) => {
-        // 清除超时定时器
-        if (timeout_id) {
-          clearTimeout(timeout_id);
-          timeout_id = null;
-        }
-        if (error) {
-          reject(error);
-          resolve([]);
-        } else {
-          // 保持与MySQL兼容的返回值格式，始终返回数组
-          resolve(rows);
-        }
-      });
-    });
+
+    // better-sqlite3 同步查询，无需 Promise 包装
+    const stmt = conn.prepare(sql);
+    ret = params.length > 0 ? stmt.all(params) : stmt.all();
   } catch (error) {
     console.error('SQL执行失败', error);
     this.sql = sql;
     this.error = {
-      code: error.errno,
+      code: error.code || error.errno,
       message: error.message
     };
     ret = [];
-  }
-  finally {
+  } finally {
     await releaseConn(conn);
   }
   return ret;
@@ -252,40 +230,28 @@ SQLite.prototype.exec = async function (sql, params, timeout) {
     // 获取连接
     conn = await this.getConn(timeout);
     this.sql = sql;
-    // 替换Promise.race为更可靠的超时控制
-    let timeout_id = null;
-    ret = await new Promise((resolve, reject) => {
-      // 设置超时定时器
-      timeout_id = setTimeout(() => {
-        reject(new Error(`SQL执行超时: ${timeout}ms`));
-      }, timeout);
-
-      // 执行SQL语句
-      conn.run(sql, params || [], function (error) {
-        // 清除超时定时器
-        if (timeout_id) {
-          clearTimeout(timeout_id);
-          timeout_id = null;
-        }
-        if (error) {
-          reject(error);
-        } else {
-          resolve(this.lastID || this.changes || 1);
-        }
-      });
-    });
+
+    const trimmed = sql.trim().toUpperCase().replace(/;+$/, '');
+    let info;
+    // 事务命令不能作为预编译语句，需用 exec() 直接执行
+    if (trimmed === 'BEGIN' || trimmed === 'BEGIN TRANSACTION' ||
+        trimmed === 'COMMIT' || trimmed === 'ROLLBACK') {
+      conn.exec(sql);
+      info = { changes: 0, lastInsertRowid: 0 };
+    } else {
+      const stmt = conn.prepare(sql);
+      info = params && params.length > 0 ? stmt.run(params) : stmt.run();
+    }
+    ret = info.lastInsertRowid || info.changes || 1;
   } catch (error) {
     console.error('SQL执行失败', error);
     this.sql = sql;
     this.error = {
-      code: error.errno,
+      code: error.code || error.errno,
       message: error.message
     };
-    // 简化错误处理：SQLite不需要复杂的连接错误处理
-    // 返回0，保持与MySQL一致的错误处理行为
     ret = 0;
-  }
-  finally {
+  } finally {
     await releaseConn(conn);
   }
   return ret;
@@ -417,18 +383,8 @@ SQLite.prototype.beginTransaction = async function () {
     // 标记连接为事务中
     conn._in_transaction = true;
 
-    // 开始事务
-    await new Promise((resolve, reject) => {
-      conn.run('BEGIN TRANSACTION', (error) => {
-        if (error) {
-          // 事务开始失败，清除事务标记
-          conn._in_transaction = false;
-          reject(error);
-        } else {
-          resolve();
-        }
-      });
-    });
+    // 开始事务（better-sqlite3 同步执行）
+    conn.exec('BEGIN TRANSACTION');
 
     if (this.config.debug) {
       this.log('debug', '事务开始');
@@ -438,15 +394,7 @@ SQLite.prototype.beginTransaction = async function () {
     return {
       conn,
       commit: async () => {
-        await new Promise((resolve, reject) => {
-          conn.run('COMMIT', (error) => {
-            if (error) {
-              reject(error);
-            } else {
-              resolve();
-            }
-          });
-        });
+        conn.exec('COMMIT');
         if (this.config.debug) {
           this.log('debug', '事务提交');
         }
@@ -456,15 +404,7 @@ SQLite.prototype.beginTransaction = async function () {
         await releaseConn(conn);
       },
       rollback: async () => {
-        await new Promise((resolve, reject) => {
-          conn.run('ROLLBACK', (error) => {
-            if (error) {
-              reject(error);
-            } else {
-              resolve();
-            }
-          });
-        });
+        conn.exec('ROLLBACK');
         if (this.config.debug) {
           this.log('debug', '事务回滚');
         }
@@ -474,21 +414,9 @@ SQLite.prototype.beginTransaction = async function () {
       },
       exec: async (sql, params) => {
         // 在事务中执行SQL
-        return new Promise((resolve, reject) => {
-          conn.run(sql, params || [], function (error) {
-            if (error) {
-              this.sql = error.sql;
-              this.error = {
-                code: error.errno,
-                message: error.message
-              };
-              reject(error);
-              resolve(0);
-            } else {
-              resolve(this.lastID || this.changes || 1);
-            }
-          });
-        });
+        const stmt = conn.prepare(sql);
+        const info = params && params.length > 0 ? stmt.run(params) : stmt.run();
+        return info.lastInsertRowid || info.changes || 1;
       }
     };
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_sqlite",
-    "version": "1.4.8",
+    "version": "1.4.9",
     "description": "高性能SQLite数据库操作模块，提供与mm_mysql完全兼容的API接口，支持异步操作、事务处理和批量操作",
     "main": "index.js",
     "scripts": {
@@ -38,13 +38,13 @@
         "node": ">=14.0.0"
     },
     "dependencies": {
-        "mm_expand": "^2.4.3",
-        "sqlite3": "^6.0.1",
+        "better-sqlite3": "^13.0.2",
+        "mm_expand": "^2.4.5",
         "sqlstring": "^2.3.3"
     },
     "devDependencies": {
-        "eslint": "^10.6.0",
-        "eslint-plugin-jsdoc": "^63.0.10",
+        "eslint": "^10.8.0",
+        "eslint-plugin-jsdoc": "^63.3.2",
         "mm_eslint": "^1.7.5"
     }
-}
+}

package/pool.js

@@ -1,4 +1,4 @@
-const sqlite3 = require('sqlite3').verbose();
+const Database = require('better-sqlite3');
 
 /**
  * SQLite连接池类
@@ -33,9 +33,9 @@ class SQLitePool {
       return;
     }
 
-    // 创建最小连接数
+    // 创建最小连接数（better-sqlite3是同步的，无需await）
     for (let i = 0; i < this.config.pool_min; i++) {
-      const conn = await this._createConnection();
+      const conn = this._createConnection();
       this._pool_connections.push(conn);
       this._pool_available.push(conn);
     }
@@ -86,18 +86,16 @@ class SQLitePool {
 
         // 检查是否可以创建新连接
         if (this._pool_connections.length < this.config.pool_max) {
-          this._createConnection()
-            .then(conn => {
-              this._pool_connections.push(conn);
-              conn._last_used = Date.now();
-              conn.release = () => this.releaseConn(conn);
-              cleanup();
-              resolve(conn);
-            })
-            .catch(err => {
-              cleanup();
-              reject(err);
-            });
+          try {
+            const conn = this._createConnection();
+            this._pool_connections.push(conn);
+            conn._last_used = Date.now();
+            cleanup();
+            resolve(conn);
+          } catch (err) {
+            cleanup();
+            reject(err);
+          }
           return;
         }
 
@@ -159,14 +157,10 @@ class SQLitePool {
       this._pool_reaper = null;
     }
 
-    // 关闭所有连接
+    // 关闭所有连接（better-sqlite3的close是同步的）
     this._pool_connections.forEach(conn => {
       try {
-        conn.close((err) => {
-          if (err) {
-            this.log('error', '关闭连接池连接失败', err);
-          }
-        });
+        conn.close();
       } catch (error) {
         this.log('error', '关闭连接池连接异常', error);
       }
@@ -192,21 +186,20 @@ class SQLitePool {
   }
 
   /**
-   * 创建SQLite连接
+   * 创建SQLite连接（better-sqlite3，同步创建）
    * @private
-   * @returns {Promise<object>} 数据库连接对象
+   * @returns {object} 数据库连接对象
    */
   _createConnection() {
-    return new Promise((resolve, reject) => {
-      const db = new sqlite3.Database(this._getDbFilename(), (err) => {
-        if (err) {
-          reject(err);
-        } else {
-          db.release = () => this.releaseConn(db);
-          resolve(db);
-        }
-      });
+    const db = new Database(this._getDbFilename(), {
+      timeout: this.config.connect_timeout || 5000
     });
+    // 启用WAL模式，提升并发读取性能
+    db.pragma('journal_mode = WAL');
+    // 添加release方法，兼容原有API
+    db.release = () => this.releaseConn(db);
+    db._last_used = Date.now();
+    return db;
   }
 
   /**
@@ -221,11 +214,11 @@ class SQLitePool {
       const conn = this._pool_available[i];
       if (conn._last_used && now - conn._last_used > idle_timeout) {
         // 关闭并移除空闲连接
-        conn.close((err) => {
-          if (err) {
-            this.log('error', '关闭空闲连接失败', err);
-          }
-        });
+        try {
+          conn.close();
+        } catch (error) {
+          this.log('error', '关闭空闲连接失败', error);
+        }
 
         // 从连接池中移除
         const conn_idx = this._pool_connections.indexOf(conn);
@@ -238,4 +231,4 @@ class SQLitePool {
   }
 }
 
-module.exports = SQLitePool;
+module.exports = SQLitePool;

package/sql.js

@@ -7,6 +7,10 @@ const SqlString = require('sqlstring');
 const { Base } = require('mm_expand');
 
 function escape(value, stringifyObjects, timeZone) {
+  if (typeof value === 'string') {
+    // SQLite使用双单引号('')转义，不使用反斜杠转义
+    return "'" + value.replace(/'/g, "''") + "'";
+  }
   return SqlString.escape(value, stringifyObjects, timeZone);
 }
 
@@ -705,6 +709,11 @@ Sql.prototype.toWhere = function (obj, like) {
   if (like) {
     for (var k in obj) {
       var val = obj[k];
+      if (Array.isArray(val)) {
+        var vals = val.map(function(o) { return escape(o); });
+        where += ' and ' + escapeId(k) + ' in (' + vals.join(', ') + ')';
+        continue;
+      }
       val = escape(val);
       if (k.endsWith('_min')) {
         where += ' and ' + escapeId(k.replace('_min', '')) + ' >= ' + val;
@@ -713,7 +722,7 @@ Sql.prototype.toWhere = function (obj, like) {
       } else if (k.endsWith('_not')) {
         where += ' and ' + escapeId(k.replace('_not', '')) + ' != ' + val;
       } else if (k.endsWith('_has')) {
-        var vals = val.trim("'").split(',').map((o) => {
+        var vals = val.trim("'").split(',').map(function(o) {
           return escape(o);
         });
         where += ' and ' + escapeId(k.replace('_has', '')) + ' in (' + vals.join(',') + ')';
@@ -728,6 +737,11 @@ Sql.prototype.toWhere = function (obj, like) {
   } else {
     for (var k in obj) {
       var val = obj[k];
+      if (Array.isArray(val)) {
+        var vals = val.map(function(o) { return escape(o); });
+        where += ' and ' + escapeId(k) + ' in (' + vals.join(', ') + ')';
+        continue;
+      }
       val = escape(val);
       if (k.endsWith('_min')) {
         where += ' and ' + escapeId(k.replace('_min', '')) + ' >= ' + val;
@@ -736,7 +750,7 @@ Sql.prototype.toWhere = function (obj, like) {
       } else if (k.endsWith('_not')) {
         where += ' and ' + escapeId(k.replace('_not', '')) + ' != ' + val;
       } else if (k.endsWith('_has')) {
-        var vals = val.trim("'").split(',').map((o) => {
+        var vals = val.trim("'").split(',').map(function(o) {
           return escape(o);
         });
         where += ' and ' + escapeId(k.replace('_has', '')) + ' in (' + vals.join(',') + ')';