jsql-neo 6.0.0 → 6.1.0

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';