jsql-neo 6.3.5 → 6.3.10

package/index.js

@@ -1,5 +1,5 @@
 /**
- * JSQL-NEO v6.3.5 — Rust-Powered Embedded Database (WASM + HTTP)
+ * JSQL-NEO v6.3.10 — Rust-Powered Embedded Database (WASM + HTTP)
  *
  * @example
  * const jsql = require('jsql-neo');

package/lib/cache.js

@@ -36,7 +36,8 @@ class Cache {
     return count;
   }
   keys(pattern = '*') {
-    const regex = new RegExp('^' + pattern.replace(/\*/g, '.*').replace(/\?/g, '.') + '$');
+    const escaped = pattern.replace(/[.+^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*').replace(/\?/g, '.');
+    const regex = new RegExp('^' + escaped + '$');
     const result = [];
     for (const key of this._getData().keys()) { if (!this._isExpired(key) && regex.test(key)) result.push(key); }
     return result;
@@ -47,8 +48,9 @@ class Cache {
     const val = this._getData().get(k);
     if (val === undefined) return 'none';
     if (typeof val === 'string') return 'string';
-    if (Array.isArray(val)) return val._type === 'hash' ? 'hash' : 'list';
     if (val instanceof Set) return 'set';
+    if (Array.isArray(val)) return val._type === 'hash' ? 'hash' : 'list';
+    if (typeof val === 'object' && val._type === 'hash') return 'hash';
     return 'string';
   }
   expire(key, seconds) {
@@ -175,6 +177,8 @@ class Cache {
     if (!list || !Array.isArray(list) || list._type === 'hash') return [];
     if (start < 0) start = Math.max(list.length + start, 0);
     if (stop < 0) stop = list.length + stop;
+    stop = Math.min(stop, list.length - 1);
+    if (start > stop) return [];
     return list.slice(start, stop + 1);
   }
 
@@ -244,32 +248,34 @@ class Cache {
 
   save() {
     if (!this._persistPath) return;
-    const dump = { version: 1, databases: [] };
-    for (let i = 0; i < this._dbs.length; i++) {
-      const db = this._dbs[i];
-      if (!db || db.size === 0) continue;
-      const data = {};
-      for (const [key, val] of db) {
-        const exp = this._dbsExpires[i];
-        if (exp && exp.has(key) && exp.get(key) <= Date.now()) continue;
-        if (val instanceof Set) data[key] = { _t: 'set', _v: [...val] };
-        else if (Array.isArray(val)) data[key] = { _t: 'list', _v: val };
-        else if (typeof val === 'object' && val._type === 'hash') {
-          const clean = {}; for (const [f, v] of Object.entries(val)) { if (f !== '_type') clean[f] = v; }
-          data[key] = { _t: 'hash', _v: clean };
-        } else data[key] = { _t: 'string', _v: val };
+    try {
+      const dump = { version: 1, databases: [] };
+      for (let i = 0; i < this._dbs.length; i++) {
+        const db = this._dbs[i];
+        if (!db || db.size === 0) continue;
+        const data = {};
+        for (const [key, val] of db) {
+          const exp = this._dbsExpires[i];
+          if (exp && exp.has(key) && exp.get(key) <= Date.now()) continue;
+          if (val instanceof Set) data[key] = { _t: 'set', _v: [...val] };
+          else if (Array.isArray(val)) data[key] = { _t: 'list', _v: val };
+          else if (typeof val === 'object' && val._type === 'hash') {
+            const clean = {}; for (const [f, v] of Object.entries(val)) { if (f !== '_type') clean[f] = v; }
+            data[key] = { _t: 'hash', _v: clean };
+          } else data[key] = { _t: 'string', _v: val };
+        }
+        const expires = {};
+        const expMap = this._dbsExpires[i];
+        if (expMap) { for (const [key, ttl] of expMap) { if (ttl > Date.now()) expires[key] = ttl; } }
+        if (Object.keys(data).length > 0 || Object.keys(expires).length > 0) dump.databases.push({ index: i, data, expires });
       }
-      const expires = {};
-      const expMap = this._dbsExpires[i];
-      if (expMap) { for (const [key, ttl] of expMap) { if (ttl > Date.now()) expires[key] = ttl; } }
-      if (Object.keys(data).length > 0 || Object.keys(expires).length > 0) dump.databases.push({ index: i, data, expires });
-    }
-    const dir = path.dirname(this._persistPath);
-    if (dir) fs.mkdirSync(dir, { recursive: true });
-    fs.writeFileSync(this._persistPath + '.tmp', JSON.stringify(dump), 'utf8');
-    fs.renameSync(this._persistPath + '.tmp', this._persistPath);
-    this._dirty = false;
-    return 'OK';
+      const dir = path.dirname(this._persistPath);
+      if (dir) fs.mkdirSync(dir, { recursive: true });
+      fs.writeFileSync(this._persistPath + '.tmp', JSON.stringify(dump), 'utf8');
+      fs.renameSync(this._persistPath + '.tmp', this._persistPath);
+      this._dirty = false;
+      return 'OK';
+    } catch (e) { return null; }
   }
 
   _load() {

package/lib/client.js

@@ -12,7 +12,8 @@ function binPath() {
 class JSQL {
     constructor(opts = {}) {
         this.host = opts.host || '127.0.0.1';
-        this.port = opts.port || 6379;
+        // P3-5: 默认端口 6379 会与 Redis 冲突，改为 3000
+        this.port = opts.port || 3000;
         this.dataDir = opts.dataDir || null;
         this._process = null;
     }
@@ -45,7 +46,8 @@ class JSQL {
     async stop() {
         if (!this._process) return;
         this._process.kill();
-        await new Promise(r => setTimeout(r, 500));
+        // P3-6: 不再硬等 500ms，给进程一点时间退出即可
+        await new Promise(r => setTimeout(r, 100));
         this._process = null;
     }
 
@@ -74,6 +76,13 @@ class JSQL {
                 headers: body ? { 'Content-Type': 'application/json' } : {},
             };
             const req = http.request(opts, (res) => {
+                // P3-7: 未处理 res 错误——非 2xx 状态码应 reject
+                if (res.statusCode < 200 || res.statusCode >= 300) {
+                    let errData = '';
+                    res.on('data', c => errData += c);
+                    res.on('end', () => reject(new Error(`HTTP ${res.statusCode}: ${errData}`)));
+                    return;
+                }
                 let data = '';
                 res.on('data', c => data += c);
                 res.on('end', () => {