jsql-neo 4.5.0 → 4.5.1

package/lib/database.js

@@ -1142,9 +1142,46 @@ class Database {
     async start() {
         this._runHooks('onStart', []);
         this._emit('start', {});
+        if (this._dirMode && !this._sigInstalled) {
+            this._sigInstalled = true;
+            Database._installSignalHandler(this);
+        }
         return this;
     }
 
+    /**
+     * 进程退出时兜底刷盘：拦截 SIGINT/SIGTERM，同步落盘脏表后再退出。
+     * 使用静态共享 handler，避免多个数据库实例重复注册/互相覆盖。
+     * @private
+     */
+    static _installSignalHandler(db) {
+        if (!Database._signalHandlerInstalled) {
+            Database._signalHandlerInstalled = true;
+            Database._signalDBs = new Set();
+            const handler = (sig) => {
+                for (const d of Database._signalDBs) {
+                    try {
+                        if (d._dirMode) {
+                            if (d._flushTimer) { clearTimeout(d._flushTimer); d._flushTimer = null; }
+                            d._flushDirty();
+                            d._saveMeta();
+                        }
+                    } catch (e) { /* 兜底失败不阻塞退出 */ }
+                }
+                process.exit(128 + (sig === 'SIGINT' ? 2 : 15));
+            };
+            process.on('SIGINT', handler);
+            process.on('SIGTERM', handler);
+            Database._signalHandler = handler;
+        }
+        Database._signalDBs.add(db);
+    }
+
+    /** 从进程退出兜底集合移除（stop 时调用） */
+    static _uninstallSignalHandler(db) {
+        if (Database._signalDBs) Database._signalDBs.delete(db);
+    }
+
     insert(tableName, data) {
         const table = this._ensureTable(tableName);
         if (!table) throw createError('ER_NO_SUCH_TABLE', tableName);
@@ -1333,11 +1370,16 @@ class Database {
         this._runHooks('onStop', []);
         this._emit('stop', {});
         if (this._dirMode) {
+            if (this._flushTimer) { clearTimeout(this._flushTimer); this._flushTimer = null; }
             try {
                 this._flushDirty();
                 this._saveMeta();
             } catch (e) {}
         }
+        if (this._sigInstalled) {
+            this._sigInstalled = false;
+            Database._uninstallSignalHandler(this);
+        }
         return this;
     }
 

package/lib/mysql_server.js

@@ -104,8 +104,19 @@ function handshakePacket(connectionId, seed) {
   return b.build();
 }
 
-function okPacket(affectedRows = 0, insertId = 0, status = SERVER_STATUS_AUTOCOMMIT) {
-  const b = new PacketBuilder();
+/**
+ * 生成握手 seed：使用可打印 ASCII（33-126），避开 0x00。
+ * 老客户端按 C 字符串读取 seed，若含 \0 会提前截断导致握手失败/断连。
+ */
+function genSeed(len = 20) {
+  const out = Buffer.alloc(len);
+  for (let i = 0; i < len; i++) {
+    out[i] = 33 + Math.floor(Math.random() * 94);
+  }
+  return out;
+}
+
+function okPacket(affectedRows = 0, insertId = 0, status = SERVER_STATUS_AUTOCOMMIT) {  const b = new PacketBuilder();
   b.byte(0x00);
   b.raw(encodeLenenc(affectedRows));
   b.raw(encodeLenenc(insertId));
@@ -364,7 +375,7 @@ class MysqlConnection {
     this.socket = socket;
     this.server = server;
     this.connectionId = ++server._connectionCounter;
-    this.seed = crypto.randomBytes(20);
+    this.seed = genSeed(20);
     this.buffer = Buffer.alloc(0);
     this.sequence = 0;
     this.authenticated = false;

package/lib/native_client.js

@@ -257,14 +257,23 @@ class JSQL {
   _runHooks(hookName, args) {
     const hooks = this._hooks[hookName];
     if (!hooks || hooks.length === 0) return true;
-    for (const fn of hooks) {
-      const r = fn(...args);
-      if (r === false) return false;
-      if (r !== undefined && args.length > 0) {
-        args[0] = r;
+    if (this._inHook) {
+      // 防止插件 hook 内重入 native 调用导致 N-API 崩溃（段错误）
+      throw new Error('ER_PLUGIN_REENTRY: plugin hook "' + hookName + '" re-entered native call; plugin must not call engine methods inside its own hook');
+    }
+    this._inHook = true;
+    try {
+      for (const fn of hooks) {
+        const r = fn(...args);
+        if (r === false) return false;
+        if (r !== undefined && args.length > 0) {
+          args[0] = r;
+        }
       }
+      return true;
+    } finally {
+      this._inHook = false;
     }
-    return true;
   }
 
   async start() {

package/lib/sql.js

@@ -284,16 +284,28 @@ class Parser {
         if (t.value === 'PRIMARY') {
           this.expectKeyword('PRIMARY'); this.expectKeyword('KEY');
           this.expect('op', '(');
-          const pkCol = this.parseTableName();
+          const pkCols = [this.parseTableName()];
+          while (this.peek().type === 'op' && this.peek().value === ',') {
+            this.next();
+            pkCols.push(this.parseTableName());
+          }
           this.expect('op', ')');
-          if (schema[pkCol]) schema[pkCol].primaryKey = true;
+          for (const pkCol of pkCols) {
+            if (schema[pkCol]) schema[pkCol].primaryKey = true;
+          }
           hasPk = true;
         } else {
           this.expectKeyword('UNIQUE');
           this.expect('op', '(');
-          const uCol = this.parseTableName();
+          const uCols = [this.parseTableName()];
+          while (this.peek().type === 'op' && this.peek().value === ',') {
+            this.next();
+            uCols.push(this.parseTableName());
+          }
           this.expect('op', ')');
-          if (schema[uCol]) schema[uCol].unique = true;
+          for (const uCol of uCols) {
+            if (schema[uCol]) schema[uCol].unique = true;
+          }
         }
       } else if (t.type === 'keyword' && t.value === 'CONSTRAINT') {
         this.expectKeyword('CONSTRAINT');
@@ -1012,7 +1024,7 @@ class Parser {
     if (t.type === 'sysvar') return { type: 'sysvar', name: t.value };
     if (t.type === 'keyword' && t.value === 'NULL') return { type: 'value', value: null };
     if (t.type === 'keyword' && t.value === 'CASE') return this.parseCase();
-    if (t.type === 'keyword' && this.peek().type === 'op' && this.peek().value === '(') {
+    if (t.type === 'keyword' && !['SUM', 'AVG', 'MIN', 'MAX', 'COUNT'].includes(t.value) && this.peek().type === 'op' && this.peek().value === '(') {
       const name = t.value;
       this.next();
       const args = [];
@@ -1608,7 +1620,10 @@ class SQLExecutor {
           if (explicit.length > 0) {
             const all = (await this.engine.find(statement.name, {}, { limit: 1e9, offset: 0 })).map(r => normalizeRow(r, schema));
             const pkMap = new Map();
-            for (const row of all) pkMap.set(keyOf(row), row.id);
+            for (const row of all) {
+              const keys = pkCols.map(c => row[c]).filter(v => v !== undefined && v !== null);
+              if (keys.length === pkCols.length) pkMap.set(keyOf(row), keys);
+            }
             const conflicts = [];
             const fresh = [];
             for (const d of dataRows) {
@@ -1626,7 +1641,13 @@ class SQLExecutor {
               for (const { d, existingId } of conflicts) {
                 const data = {};
                 for (const [col, val] of statement.onDuplicate) data[col] = val;
-                this.engine.updateById(statement.name, existingId, data);
+                if (this.engine.updateById && existingId.length === 1) {
+                  this.engine.updateById(statement.name, existingId[0], data);
+                } else if (this.engine.update) {
+                  const filter = {};
+                  pkCols.forEach((c, i) => { filter[c] = existingId[i]; });
+                  this.engine.update(statement.name, filter, data);
+                }
                 updated++;
               }
               await this.engine.flush();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsql-neo",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "description": "JSQL-NEO — Rust-powered embedded database with WASM, REST API, B-Tree indexes, WAL, crash recovery",
   "main": "index.js",
   "types": "index.d.ts",