jsql-neo 6.3.6 → 6.3.10

package/lib/mysql_server.js

@@ -11,11 +11,82 @@ const fs = require('fs');
 const { executeSQL, parseSQL, splitStatements, applyParams } = require('./sql');
 const Database = require('./database');
 
+/**
+ * 词法扫描 SQL，将字符串字面量和注释中的字符替换为空格（保持长度不变）。
+ * 这样在替换时可以通过检查对应位置是否为空格来判断是否在字符串/注释中。
+ */
+function _maskStringsAndComments(sql) {
+  const chars = sql.split('');
+  let i = 0;
+  while (i < chars.length) {
+    const c = chars[i];
+    // 单引号字符串
+    if (c === "'") {
+      i++;
+      while (i < chars.length && chars[i] !== "'") {
+        if (chars[i] === '\\' && i + 1 < chars.length) {
+          chars[i] = ' ';
+          chars[i + 1] = ' ';
+          i += 2;
+        } else {
+          chars[i] = ' ';
+          i++;
+        }
+      }
+      if (i < chars.length) i++; // skip closing quote
+      continue;
+    }
+    // 双引号字符串
+    if (c === '"') {
+      i++;
+      while (i < chars.length && chars[i] !== '"') {
+        if (chars[i] === '\\' && i + 1 < chars.length) {
+          chars[i] = ' ';
+          chars[i + 1] = ' ';
+          i += 2;
+        } else {
+          chars[i] = ' ';
+          i++;
+        }
+      }
+      if (i < chars.length) i++; // skip closing quote
+      continue;
+    }
+    // 单行注释 --
+    if (c === '-' && chars[i + 1] === '-') {
+      while (i < chars.length && chars[i] !== '\n') {
+        chars[i] = ' ';
+        i++;
+      }
+      continue;
+    }
+    // 多行注释 /* */
+    if (c === '/' && chars[i + 1] === '*') {
+      chars[i] = ' ';
+      chars[i + 1] = ' ';
+      i += 2;
+      while (i < chars.length && !(chars[i] === '*' && chars[i + 1] === '/')) {
+        chars[i] = ' ';
+        i++;
+      }
+      if (i < chars.length) {
+        chars[i] = ' ';
+        chars[i + 1] = ' ';
+        i += 2;
+      }
+      continue;
+    }
+    i++;
+  }
+  return chars.join('');
+}
+
 const SERVER_VERSION = '8.0.0-jsql-neo';
 const CLIENT_PROTOCOL_41 = 0x00000001 << 9;
 const CLIENT_SECURE_CONNECTION = 0x00008000;
 const CLIENT_PLUGIN_AUTH = 0x00080000;
 const CLIENT_CONNECT_WITH_DB = 0x00000008;
+// CLIENT_LONG_PASSWORD 已废弃但保留协议兼容性（客户端可能发送此标志）
 const CLIENT_LONG_PASSWORD = 0x00000001;
 const CLIENT_TRANSACTIONS = 0x00002000;
 const CLIENT_MULTI_STATEMENTS = 0x00010000;
@@ -239,13 +310,14 @@ function resultSetPacket(result, tableSchema, baseSeq, rawRow) {
   const sampleRow = (result.rows && result.rows[0]) || null;
   for (let ci = 0; ci < (result.columns || []).length; ci++) {
     const name = result.columns[ci];
+    if (name === null || name === undefined) name = 'col_' + ci;
     let sample;
     if (sampleRow !== null) {
       if (Array.isArray(sampleRow)) sample = sampleRow[ci];
       else sample = sampleRow[name];
     }
     const col = {
-      name,
+      name: String(name),
       table: result.table || '',
       type: inferType(name, sample),
       length: 1024,
@@ -255,6 +327,7 @@ function resultSetPacket(result, tableSchema, baseSeq, rawRow) {
   push(eofPacket());
 
   for (const row of result.rows || []) {
+    if (!row) continue;
     const parts = [];
     for (let i = 0; i < (result.columns || []).length; i++) {
       const v = row[i];
@@ -307,7 +380,7 @@ function binaryResultSetPacket(result, tableSchema, baseSeq) {
     }
     const t = inferType(cols[ci], sample);
     types.push(t);
-    push(columnDefinition({ name: cols[ci], table: result.table || '', type: t, length: 1024 }));
+    push(columnDefinition({ name: String(cols[ci]), table: result.table || '', type: t, length: 1024 }));
   }
   push(eofPacket());
 
@@ -351,11 +424,12 @@ function binaryResultSetPacket(result, tableSchema, baseSeq) {
 
   for (const row of result.rows || []) {
     const parts = [Buffer.from([0x00])];
-    const nb = Buffer.alloc(Math.ceil(cols.length / 8));
+    const nb = Buffer.alloc(Math.ceil((cols.length + 2) / 8));
     const encoded = [];
     for (let i = 0; i < cols.length; i++) {
       const v = Array.isArray(row) ? row[i] : row[cols[i]];
       if (v === null || v === undefined) {
+        // null bitmap 按列顺序编码，bit=1 表示 NULL
         nb[Math.floor(i / 8)] |= (1 << (i % 8));
         encoded.push(null);
       } else {
@@ -646,6 +720,21 @@ class MysqlConnection {
         continue;
       }
       if (c === "'" || c === '"' || c === '`') { inStr = c; continue; }
+      // P2-4: countPlaceholders 不跳过注释——注释中的 ? 不应计入占位符
+      if (c === '-' && sql[i + 1] === '-') {
+        while (i < sql.length && sql[i] !== '\n') i++;
+        continue;
+      }
+      if (c === '#') {
+        while (i < sql.length && sql[i] !== '\n') i++;
+        continue;
+      }
+      if (c === '/' && sql[i + 1] === '*') {
+        i += 2;
+        while (i + 1 < sql.length && !(sql[i] === '*' && sql[i + 1] === '/')) i++;
+        i += 2;
+        continue;
+      }
       if (c === '?' && sql[i + 1] === '?') { i++; continue; }
       if (c === '?') n++;
     }
@@ -1000,9 +1089,16 @@ class MysqlServer {
       if (!this._dbExists(db)) await this.createDatabase(db);
       const engine = await this._getDatabase(db);
       let s = sql;
+      // 词法扫描：找出所有字符串字面量和注释的位置，替换时跳过它们
+      const masked = _maskStringsAndComments(s);
       for (const t of tables) {
         if (t && t.indexOf('.') !== -1) {
-          s = s.replace(new RegExp('\\b' + t.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '\\b', 'g'), t.split('.')[1]);
+          const re = new RegExp('\\b' + t.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '\\b', 'g');
+          s = s.replace(re, (match, offset) => {
+            // 如果匹配位置在字符串字面量或注释中，不替换
+            if (masked[offset] !== ' ') return match;
+            return t.split('.')[1];
+          });
         }
       }
       return { engine, sql: s };
@@ -1126,8 +1222,12 @@ class MysqlServer {
   }
 
   _canAccessDb(user, dbName) {
+    // 未配置认证：允许访问
+    if (!this.auth) return true;
     const list = this._userDbList(user);
+    // _userDbList 返回 null 表示该用户有全局访问权限
     if (list === null) return true;
+    // 空数组表示用户有受限数据库集，dbName 必须明确在列表中
     return list.includes(dbName);
   }
 

package/lib/nedb_compat.js

@@ -70,10 +70,10 @@ function matchOperator(value, op, expected) {
   switch (op) {
     case '$eq': return looseEqual(value, expected);
     case '$ne': return !looseEqual(value, expected);
-    case '$lt': return value !== null && value !== undefined && value < expected;
-    case '$lte': return value !== null && value !== undefined && value <= expected;
-    case '$gt': return value !== null && value !== undefined && value > expected;
-    case '$gte': return value !== null && value !== undefined && value >= expected;
+    case '$lt': return value !== undefined && (value === null ? expected !== null && expected !== undefined && 0 < expected : value < expected);
+    case '$lte': return value !== undefined && (value === null ? expected !== null && expected !== undefined && 0 <= expected : value <= expected);
+    case '$gt': return value !== undefined && (value === null ? expected !== null && expected !== undefined && 0 > expected : value > expected);
+    case '$gte': return value !== undefined && (value === null ? expected !== null && expected !== undefined && 0 >= expected : value >= expected);
     case '$in': return Array.isArray(expected) && expected.some(e => looseEqual(value, e));
     case '$nin': return Array.isArray(expected) && !expected.some(e => looseEqual(value, e));
     case '$exists': return expected ? value !== undefined : value === undefined;
@@ -242,8 +242,11 @@ class Cursor {
 
   exec(cb) {
     const p = this._run();
-    if (cb) p.then(docs => cb(null, docs), err => cb(err)).catch(() => {});
-    return p;
+    if (cb) {
+      p.then(docs => { if (this._limit === 0) cb(null, []); else cb(null, docs); }, err => cb(err));
+      return p;
+    }
+    return this._limit === 0 ? Promise.resolve([]) : p;
   }
 
   toArray(cb) {

package/lib/pg_server.js

@@ -139,7 +139,7 @@ function buildRowDescription(columns, types) {
     p.nul();
     p.i32(0);              // table oid
     p.i16(0);              // column attnum
-    p.i32(TYPE_OIDS[types[i]] || 1043);
+    p.i32(pgTypeOid(types[i]));
     p.i16(types[i] === 'integer' ? 4 : -1);  // typlen
     p.i32(-1);             // typmod
     p.i16(0);              // format code (text)
@@ -726,15 +726,11 @@ class PgConnection {
   }
 
 _pgErrorCode(e) {
-    if (!e) if (/Table .*(doesn't exist|does not exist)/i.test(m)) return '42P01';
-    return 'XX000';
+    if (!e) return 'XX000';
     const codeKey = e.code;
     const m = String(e.message || '');
-    // Debug write to /tmp/pg_error_debug.txt
-    const fs = require('fs');
-    fs.writeFileSync('/tmp/pg_error_debug.txt', 'codeKey=' + codeKey + '\\nmessage=' + m + '\\n');
     // Map JSQL error keys to PG SQLSTATE codes
-    if (codeKey === 'ER_NO_SUCH_TABLE' || /Table .* doesn\\'t exist/i.test(m)) return '42P01';
+    if (codeKey === 'ER_NO_SUCH_TABLE' || /Table .* doesn't exist/i.test(m)) return '42P01';
     if (codeKey === 'ER_TABLE_EXISTS' || /already exists/i.test(m)) return '42P07';
     if (codeKey === 'ER_DUP_ENTRY' || m.includes('ER_DUP_ENTRY') || /Duplicate entry/i.test(m)) return '23505';
     if (codeKey === 'ER_BAD_FIELD_ERROR' || /Unknown column/i.test(m)) return '42703';
@@ -786,10 +782,7 @@ class PgServer {
 
   _canAccessDb(user, dbName) {
     if (this.noAuth) return true;
-    if (!this.auth) {
-      // 单用户模式下仅允许该用户访问其默认库
-      return true;
-    }
+    if (!this.auth) return false;
     const entry = this.auth[user];
     if (!entry) return false;
     if (entry && typeof entry === 'object' && Array.isArray(entry.databases)) {

package/lib/plugin.js

@@ -206,6 +206,20 @@ function applyPlugin(engine, plugin, opts) {
   if (!engine._plugins) engine._plugins = [];
   if (!engine._eventListeners) engine._eventListeners = [];
 
+  // P3-2: 重复 use() 同一插件钩子双触发——检查是否已注册
+  if (engine._plugins.some(p => p.name && p.name === plugin.name)) {
+    return engine; // 已注册，跳过
+  }
+
+  // P3-1: plugin depends/priority 未实现——按依赖关系排序
+  if (plugin.depends && plugin.depends.length > 0) {
+    for (const dep of plugin.depends) {
+      if (!engine._plugins.some(p => p.name === dep)) {
+        throw new Error(`Plugin '${plugin.name}' depends on '${dep}' which is not loaded`);
+      }
+    }
+  }
+
   registerHooks(engine, plugin);
 
   const ctx = buildPluginContext(engine, plugin);
@@ -213,6 +227,8 @@ function applyPlugin(engine, plugin, opts) {
   if (typeof plugin.onEvent === 'function') engine._eventListeners.push(plugin.onEvent);
 
   engine._plugins.push(plugin);
+  // P3-1: 按 priority 排序插件（数值大的先执行）
+  engine._plugins.sort((a, b) => (b.priority || 0) - (a.priority || 0));
   if (plugin.name && plugin.api) getPluginApis(engine).set(plugin.name, plugin.api);
   return engine;
 }
@@ -222,7 +238,7 @@ function applyPlugin(engine, plugin, opts) {
  * - 任一钩子返回 false → 中止（返回 false），引擎据此跳过本次操作；
  * - native 引擎置 `_forbidReentry`，钩子内再次触发引擎操作会抛 ER_PLUGIN_REENTRY。
  */
-function runHooks(engine, hookName, args) {
+async function runHooks(engine, hookName, args) {
   const hooks = engine._hooks && engine._hooks[hookName];
   if (!hooks || hooks.length === 0) return true;
 
@@ -236,7 +252,9 @@ function runHooks(engine, hookName, args) {
   }
   try {
     for (const fn of hooks) {
-      if (fn(...args) === false) return false;
+      // P3-3: runHooks 异步钩子静默失效——支持异步钩子
+      const result = await fn(...args);
+      if (result === false) return false;
     }
     return true;
   } finally {

package/lib/prepared.js

@@ -7,10 +7,20 @@ function createPrepared(engine, sql) {
   if (typeof sql !== 'string' || sql.length === 0) {
     throw new Error('prepare() requires a SQL string');
   }
+  // P3-4: parse once 名不副实——缓存解析结果，避免每次调用都重新解析
+  let parsed = null;
+  let parseError = null;
+  try {
+    parsed = engine.parse ? engine.parse(sql) : null;
+  } catch (e) {
+    parseError = e;
+  }
   const bound = {
     sql,
     async all(...params) {
       const values = params.length === 1 && Array.isArray(params[0]) ? params[0] : params;
+      if (parseError) throw parseError;
+      if (parsed) return engine.execute(parsed, values);
       return engine.query(sql, values);
     },
     async get(...params) {

package/lib/query.js

@@ -239,10 +239,17 @@ class Query {
             rows = this._applyJoinOptimized(rows, join);
         }
 
-        // UNION
+        // UNION（去重，标准 SQL 语义）
         if (this._union) {
             const unionRows = this._union.get();
-            rows = [...rows, ...unionRows];
+            const seen = new Set(rows.map(r => JSON.stringify(r)));
+            for (const r of unionRows) {
+                const key = JSON.stringify(r);
+                if (!seen.has(key)) {
+                    seen.add(key);
+                    rows.push(r);
+                }
+            }
         }
 
         // GROUP BY

package/lib/redis_server.js

@@ -21,14 +21,14 @@ const fs = require('fs');
 const path = require('path');
 
 const TYPE_SIGNATURES = {
-  PING: 0, ECHO: 1, SET: 2, SETNX: 2, GET: 1, DEL: -1, EXISTS: -1, KEYS: 1,
+  PING: 0, ECHO: 1, SET: -2, SETNX: 2, GET: 1, DEL: -1, EXISTS: -1, KEYS: 1,
   TYPE: 1, EXPIRE: 2, TTL: 1, PERSIST: 1,
   INCR: 1, DECR: 1, INCRBY: 2, DECRBY: 2, APPEND: 2, STRLEN: 1,
   MSET: -2, MGET: -1,
   HSET: -3, HGET: 2, HGETALL: 1, HDEL: -2, HEXISTS: 2, HLEN: 1, HKEYS: 1, HVALS: 1,
   LPUSH: -2, RPUSH: -2, LPOP: 1, RPOP: 1, LLEN: 1, LRANGE: 3, LINDEX: 2, LREM: 3,
   SADD: -2, SREM: -2, SMEMBERS: 1, SISMEMBER: 2, SCARD: 1,
-  ZADD: -3, ZRANGE: -3, ZREVRANGE: -3, ZSCORE: 2, ZCARD: 1, ZREM: -2, ZINCRBY: 3,
+  ZADD: -3, ZRANGE: 3, ZREVRANGE: 3, ZSCORE: 2, ZCARD: 1, ZREM: -2, ZINCRBY: 3,
   DBSIZE: 0, FLUSHALL: 0, FLUSHDB: 0, SELECT: 1, INFO: 0, AUTH: 1, QUIT: 0,
 };
 
@@ -54,7 +54,12 @@ class RedisServer {
     if (!p || !fs.existsSync(p)) return;
     try {
       const raw = JSON.parse(fs.readFileSync(p, 'utf8'));
-      for (const [k, v] of Object.entries(raw)) this.db.set(k, v);
+      for (const [k, v] of Object.entries(raw)) {
+        // Restore type info: { _t: 'set', _v: [...] } → Set, { _t: 'date', _v: ... } → Date
+        if (v && v._t === 'set' && Array.isArray(v._v)) this.db.set(k, new Set(v._v));
+        else if (v && v._t === 'date') this.db.set(k, new Date(v._v));
+        else this.db.set(k, v);
+      }
     } catch (_) {}
   }
 
@@ -72,18 +77,24 @@ class RedisServer {
     const out = {};
     const now = Date.now();
     for (const [k, v] of this.db) {
-      if (v.ttl && v.ttl <= now) continue;
-      out[k] = v;
+      if (v && v.ttl && v.ttl <= now) continue;
+      // Preserve type info: Set → { _t: 'set', _v: [...] }, Date → ISO string
+      if (v instanceof Set) out[k] = { _t: 'set', _v: [...v] };
+      else if (v instanceof Date) out[k] = { _t: 'date', _v: v.toISOString() };
+      else out[k] = v;
     }
     const tmp = p + '.tmp';
     fs.writeFileSync(tmp, JSON.stringify(out));
-    fs.renameSync(tmp, p);
+    try { fs.renameSync(tmp, p); } catch (e) { fs.unlinkSync(tmp); }
   }
 
   stop() {
-    if (this.snapshotTimer) clearTimeout(this.snapshotTimer);
+    if (this.snapshotTimer) { clearTimeout(this.snapshotTimer); this.snapshotTimer = null; }
     this._snapshot();
-    if (this.server) this.server.close();
+    if (this.server) {
+      this.server.close();
+      this.server = null;
+    }
   }
 
   /* ---------- value helpers ---------- */
@@ -112,8 +123,33 @@ class RedisServer {
         this.selected = parseInt(args[0], 10);
         return 'OK';
       case 'SET': {
-        const prev = this._get(args[0]);
-        this.db.set(args[0], { type: 'string', val: args[1], ttl: null });
+        const key = args[0];
+        const val = args[1];
+        // Parse optional arguments: EX seconds | PX milliseconds | NX | XX
+        let ttl = null;
+        let nx = false, xx = false;
+        for (let i = 2; i < args.length; i++) {
+          const opt = args[i].toUpperCase();
+          if (opt === 'EX') {
+            const secs = parseInt(args[++i], 10);
+            if (isNaN(secs) || secs < 0) throw new Error('ERR invalid expire time in set');
+            ttl = Date.now() + secs * 1000;
+          } else if (opt === 'PX') {
+            const ms = parseInt(args[++i], 10);
+            if (isNaN(ms) || ms < 0) throw new Error('ERR invalid expire time in set');
+            ttl = Date.now() + ms;
+          } else if (opt === 'NX') {
+            nx = true;
+          } else if (opt === 'XX') {
+            xx = true;
+          } else {
+            throw new Error('ERR syntax error');
+          }
+        }
+        const prev = this._get(key);
+        if (nx && prev) return null;
+        if (xx && !prev) return null;
+        this.db.set(key, { type: 'string', val, ttl });
         this._scheduleSnapshot();
         return 'OK';
       }
@@ -184,7 +220,9 @@ class RedisServer {
       case 'EXPIRE': {
         const v = this._get(args[0]);
         if (!v) return 0;
-        v.ttl = Date.now() + parseInt(args[1], 10) * 1000;
+        const secs = parseInt(args[1], 10);
+        if (isNaN(secs)) throw new Error('ERR value is not an integer or out of range');
+        v.ttl = Date.now() + secs * 1000;
         this._scheduleSnapshot();
         return 1;
       }
@@ -301,10 +339,26 @@ class RedisServer {
         const target = args[2];
         const out = [];
         let removed = 0;
-        const remaining = Math.abs(count);
-        for (const el of v.val) {
-          if (el === target && (count === 0 || removed < remaining)) { removed++; continue; }
-          out.push(el);
+        if (count > 0) {
+          // 从头删除
+          const maxRemove = count;
+          for (const el of v.val) {
+            if (el === target && removed < maxRemove) { removed++; continue; }
+            out.push(el);
+          }
+        } else if (count < 0) {
+          // 从尾删除
+          const maxRemove = Math.abs(count);
+          for (let i = v.val.length - 1; i >= 0; i--) {
+            if (v.val[i] === target && removed < maxRemove) { removed++; continue; }
+            out.unshift(v.val[i]);
+          }
+        } else {
+          // count === 0: 删除所有
+          for (const el of v.val) {
+            if (el === target) { removed++; continue; }
+            out.push(el);
+          }
         }
         v.val = out;
         this._scheduleSnapshot();
@@ -438,7 +492,14 @@ class RedisServer {
           return v && v.type === 'string' ? v.val : null;
         });
       }
-      case 'DBSIZE': return this.db.size;
+      case 'DBSIZE': {
+        let count = 0;
+        const now = Date.now();
+        for (const v of this.db.values()) {
+          if (!v.ttl || v.ttl > now) count++;
+        }
+        return count;
+      }
       case 'FLUSHALL': case 'FLUSHDB':
         this.db.clear();
         this._scheduleSnapshot();
@@ -563,6 +624,17 @@ class RedisServer {
         return this._send(socket, new Error('NOAUTH Authentication required.'));
       }
       if (cmd === 'QUIT') { this._send(socket, 'OK'); socket.end(); return; }
+      if (cmd === 'GET') {
+        const r = this.execute(cmd, args);
+        if (r === null) {
+          this._send(socket, null);
+        } else {
+          // GET 返回值必须是 bulk string，即使内容是 "OK" 或 "PONG"
+          const buf = Buffer.from(String(r), 'utf8');
+          socket.write('$' + buf.length + '\r\n' + r + '\r\n');
+        }
+        return;
+      }
       const r = this.execute(cmd, args);
       this._send(socket, r);
     } catch (e) {