jsql-neo 6.0.0-beta2 → 6.0.2

package/lib/pg_server.js

@@ -762,7 +762,7 @@ class PgServer {
     this.auth = options.auth || null;           // { user: { password, databases: [...] } }
     this.noAuth = options.noAuth === true;
     this.dataDir = options.dataDir || null;
-    this.version = '5.1.3';
+    this.version = require('../package.json').version;
     this._server = null;
     this._sockets = new Set();
     this._connSeq = 0;
@@ -861,4 +861,10 @@ class PgServer {
   }
 }
 
-module.exports = { PgServer, PgConnection, buildRowDescription, buildDataRow, buildCommandComplete, buildErrorResponse, buildReadyForQuery, buildParameterStatus, buildBackendKeyData, buildParseComplete, buildBindComplete, buildCloseComplete, buildNoData, buildParameterDesc, TYPE_OIDS, pgTypeOid, pgFormatValue };
+// README 的 createXxxServer 工厂系列里，PG 这个之前漏了实现：
+// index.js 一直从本模块解构 createPgServer，实际拿到 undefined。
+function createPgServer(options) {
+  return new PgServer(options || {});
+}
+
+module.exports = { PgServer, createPgServer, PgConnection, buildRowDescription, buildDataRow, buildCommandComplete, buildErrorResponse, buildReadyForQuery, buildParameterStatus, buildBackendKeyData, buildParseComplete, buildBindComplete, buildCloseComplete, buildNoData, buildParameterDesc, TYPE_OIDS, pgTypeOid, pgFormatValue };

package/lib/plugin.js

@@ -159,7 +159,7 @@ function buildPluginContext(engine, plugin) {
     /** 主动触发一个钩子（含自定义钩子） */
     hook(hookName, ...args) { return engine.runHook(hookName, ...args); },
     /** 组合：加载另一个插件 */
-    use(other) { return engine.use(other); },
+    use(other, opts) { return engine.use(other, opts); },
     /** 表清单（同步） */
     tables() {
       if (engine._tableNames) return Array.from(engine._tableNames);
@@ -191,7 +191,7 @@ function buildPluginContext(engine, plugin) {
 
 /**
  * 把一个插件应用到引擎：登记钩子、调用 install、挂载事件与 API。
- * 引擎的 `use()` 只需 `return applyPlugin(this, plugin)`。
+ * 引擎的 `use()` 只需 `return applyPlugin(this, plugin, opts)`。
  * @returns {object} engine（便于链式调用）
  */
 function applyPlugin(engine, plugin, opts) {

package/lib/plugins/timestamps.js

@@ -2,7 +2,8 @@
  * timestamps —— 自动维护创建/更新时间戳。
  *
  * 在插入时补全 createdAt / updatedAt（已存在则不覆盖 createdAt），
- * 更新时刷新 updatedAt。所有引擎通用，钩子内只原地修改数据、不回调引擎。
+ * 更新时刷新 updatedAt。建表时若 schema 未声明这两个字段，会原地补上，
+ * 以便 native / WASM 引擎按 schema 列持久化。钩子内只原地修改数据、不回调引擎。
  *
  * @example
  * db.use(require('jsql-neo/lib/plugins').timestamps());
@@ -22,9 +23,22 @@ function createTimestamps(opts = {}) {
     if (row[updatedField] === undefined || opts.overwriteUpdated) row[updatedField] = t;
   };
 
+  const stampDef = { type: 'string' };
+
+  const ensureStampFields = (schema) => {
+    if (!schema) return;
+    if (typeof schema === 'string') return;
+    if (typeof schema !== 'object') return;
+    if (schema[createdField] === undefined) schema[createdField] = { ...stampDef };
+    if (schema[updatedField] === undefined) schema[updatedField] = { ...stampDef };
+  };
+
   return definePlugin('timestamps', {
     config: { createdField, updatedField },
     hooks: {
+      beforeCreateTable(_name, schema) {
+        ensureStampFields(schema);
+      },
       beforeInsert(_table, rows) {
         if (Array.isArray(rows)) rows.forEach(r => stampRow(r, true));
         else stampRow(rows, true);

package/lib/prepared.js

@@ -0,0 +1,37 @@
+/**
+ * Shared prepared-statement helper for JS / native / WASM engines.
+ * parse once, bind on each run. Compatible with executeSQL placeholder rules.
+ */
+
+function createPrepared(engine, sql) {
+  if (typeof sql !== 'string' || sql.length === 0) {
+    throw new Error('prepare() requires a SQL string');
+  }
+  const bound = {
+    sql,
+    async all(...params) {
+      const values = params.length === 1 && Array.isArray(params[0]) ? params[0] : params;
+      return engine.query(sql, values);
+    },
+    async get(...params) {
+      const r = await bound.all(...params);
+      if (!r) return null;
+      if (Array.isArray(r.raw) && r.raw.length > 0) return r.raw[0];
+      if (Array.isArray(r.rows) && r.rows.length > 0) {
+        if (r.columns && Array.isArray(r.rows[0])) {
+          const obj = {};
+          for (let i = 0; i < r.columns.length; i++) obj[r.columns[i]] = r.rows[0][i];
+          return obj;
+        }
+        return r.rows[0];
+      }
+      return null;
+    },
+    async run(...params) {
+      return bound.all(...params);
+    }
+  };
+  return bound;
+}
+
+module.exports = { createPrepared };

package/lib/query.js

@@ -25,6 +25,7 @@ class Query {
         this._cache = null;        // { ttl, result, timestamp }
         this._caseExpr = null;     // [{ when, then }, ...] + else
         this._optimizerHints = {}; // { useHashJoin: true }
+        this._forUpdate = false;
     }
 
     // ============================================================
@@ -302,8 +303,6 @@ class Query {
             });
         }
 
-        // 字段选择
-        rows = rows.map(r => ({ ...r }));
         if (this._selectFields) {
             rows = rows.map(r => {
                 const obj = {};
@@ -312,6 +311,12 @@ class Query {
                 }
                 return obj;
             });
+        } else if (this._caseExpr) {
+            // CASE already cloned
+        } else {
+            const copy = new Array(rows.length);
+            for (let i = 0; i < rows.length; i++) copy[i] = { ...rows[i] };
+            rows = copy;
         }
 
         // 缓存存储
@@ -329,6 +334,14 @@ class Query {
         return rows.length > 0 ? rows[0] : null;
     }
 
+    exists() {
+        const prev = this._limitCount;
+        this._limitCount = 1;
+        const rows = this.get();
+        this._limitCount = prev;
+        return rows.length > 0;
+    }
+
     count() {
         return this._countRaw();
     }
@@ -533,10 +546,16 @@ class Query {
                 }
             }
         } else if (join.type === 'right') {
+            const localMap = new Map();
+            for (const lr of localRows) {
+                const key = lr[join.localField];
+                if (key === undefined || key === null) continue;
+                if (!localMap.has(key)) localMap.set(key, []);
+                localMap.get(key).push(lr);
+            }
             for (const fr of foreignTable._rows) {
-                const key = fr[join.foreignField];
-                const matches = localRows.filter(lr => lr[join.localField] === key);
-                if (matches.length === 0) {
+                const matches = localMap.get(fr[join.foreignField]);
+                if (!matches || matches.length === 0) {
                     result.push(this._rightNullRow(localRows, fr, join));
                 } else {
                     for (const lr of matches) {

package/lib/redis_server.js

@@ -470,52 +470,81 @@ class RedisServer {
 
   /** 供多协议嗅探复用：把 socket 交给 Redis 处理，可携带已缓冲的首包 */
   _handleSocket(socket, existing = '') {
-    let buf = String(existing || '');
+    // 刻意不 setEncoding('utf8')：RESP 的 $N 是**字节**长度，
+    // 转成字符串再按字符切片会把多字节 UTF-8（中文等）截断。
+    let buf = Buffer.isBuffer(existing) ? existing : Buffer.from(String(existing || ''), 'utf8');
     this._authedSockets.set(socket, false);
-    socket.setEncoding('utf8');
-    socket.on('data', (chunk) => {
-      buf += chunk;
+
+    const drain = () => {
       for (;;) {
-        const msg = this._parse(buf);
+        let msg;
+        try {
+          msg = this._parse(buf);
+        } catch (e) {
+          // 协议错误：回复错误并丢弃缓冲，避免一直卡在同一段坏数据上
+          this._send(socket, (e instanceof Error) ? e : new Error('ERR Protocol error'));
+          buf = Buffer.alloc(0);
+          return;
+        }
         if (!msg) break;
         buf = buf.slice(msg.consumed);
+        if (msg.ignore) continue;
         this._handle(socket, msg.cmd, msg.args);
       }
+    };
+
+    socket.on('data', (chunk) => {
+      buf = Buffer.concat([buf, Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk), 'utf8')]);
+      drain();
     });
     socket.on('error', () => {});
-    for (;;) {
-      const msg = this._parse(buf);
-      if (!msg) break;
-      buf = buf.slice(msg.consumed);
-      this._handle(socket, msg.cmd, msg.args);
-    }
+    drain();
   }
 
+  /**
+   * 解析一条 RESP2 请求，返回 { consumed, cmd, args } 或 null（数据不完整）。
+   * buf 是 Buffer —— 所有长度计算都按**字节**进行。
+   */
   _parse(buf) {
-    if (buf[0] !== '*') {
-      const i = buf.indexOf('\r\n');
+    if (!buf || buf.length === 0) return null;
+    const crlf = (from) => buf.indexOf('\r\n', from, 'utf8');
+
+    // 非 '*' 开头：inline 命令（telnet / nc 手工输入）
+    if (buf[0] !== 0x2a) {
+      const i = crlf(0);
       if (i < 0) return null;
-      const cmd = buf.slice(0, i).trim().split(/\s+/);
-      if (!cmd.length) return null;
-      return { consumed: i + 2, cmd: cmd.map(c => c.toUpperCase()), args: cmd.slice(1) };
+      const line = buf.slice(0, i).toString('utf8').trim();
+      if (!line) return { consumed: i + 2, ignore: true };
+      const parts = line.split(/\s+/);
+      // 之前这里返回的是数组（cmd.map(...)），导致 switch(cmd) 永远匹配不上，
+      // inline 输入一律被当成 unknown command。必须是字符串。
+      const cmd = parts[0].toUpperCase();
+      return { consumed: i + 2, cmd, args: parts.slice(1) };
     }
-    const i = buf.indexOf('\r\n');
+
+    const i = crlf(0);
     if (i < 0) return null;
-    const n = parseInt(buf.slice(1, i), 10);
-    if (isNaN(n)) throw new Error('ERR Protocol error');
+    const n = parseInt(buf.slice(1, i).toString('utf8'), 10);
+    if (isNaN(n)) throw new Error('ERR Protocol error: invalid multibulk length');
+    // *0（空命令）与 *-1（null 数组）此前会走到 parts[0].toUpperCase() 崩溃
+    if (n <= 0) return { consumed: i + 2, ignore: true };
+
     let off = i + 2;
     const parts = [];
     for (let k = 0; k < n; k++) {
-      if (buf[off] !== '$') throw new Error('ERR Protocol error: expected bulk string');
-      const j = buf.indexOf('\r\n', off);
+      if (buf.length <= off) return null;
+      if (buf[off] !== 0x24) throw new Error('ERR Protocol error: expected bulk string');   // '$'
+      const j = crlf(off);
       if (j < 0) return null;
-      const len = parseInt(buf.slice(off + 1, j), 10);
-      if (isNaN(len)) throw new Error('ERR Protocol error');
-      if (buf.length < j + 2 + len + 2) return null;
-      parts.push(buf.slice(j + 2, j + 2 + len));
-      off = j + 2 + len + 2;
+      const len = parseInt(buf.slice(off + 1, j).toString('utf8'), 10);
+      if (isNaN(len)) throw new Error('ERR Protocol error: invalid bulk length');
+      const start = j + 2;
+      if (len === -1) { parts.push(null); off = start; continue; }   // $-1 null bulk
+      if (buf.length < start + len + 2) return null;                 // 按字节判断
+      parts.push(buf.slice(start, start + len).toString('utf8'));
+      off = start + len + 2;
     }
-    const cmd = parts[0].toUpperCase();
+    const cmd = String(parts[0] || '').toUpperCase();
     return { consumed: off, cmd, args: parts.slice(1) };
   }
 
@@ -550,7 +579,8 @@ class RedisServer {
     } else if (typeof val === 'number') {
       out = ':' + val + '\r\n';
     } else if (Array.isArray(val)) {
-      out = '*' + val.length + '\r\n' + val.map(v => '$' + String(v).length + '\r\n' + v + '\r\n').join('');
+      // 长度用字节数，不能用 String.length —— 否则中文等多字节值会让客户端解帧错位
+      out = '*' + val.length + '\r\n' + val.map(v => '$' + Buffer.byteLength(String(v), 'utf8') + '\r\n' + v + '\r\n').join('');
     } else if (typeof val === 'string') {
       if (val === 'OK' || val === 'PONG') {
         out = '+' + val + '\r\n';