jsql-neo 6.3.6 → 6.4.0-beta.1

package/bin/jsql

@@ -247,6 +247,96 @@ const cli = yaggs({ pkg: require('../package.json') })
     console.log(`jsql-neo Redis server on ${argv.host || '127.0.0.1'}:${argv.port != null ? argv.port : 6379}${argv['data-dir'] ? ' (data: ' + argv['data-dir'] + ')' : ''}`);
     setInterval(() => {}, 1 << 30);
   })
+  .command('plugin', 'Plugin registry management (list, search, install, uninstall, info)', (sub) => {
+    sub.option('json', { type: 'boolean', description: 'Output as JSON' });
+    sub.option('category', { type: 'string', description: 'Filter by category' });
+    sub.option('limit', { type: 'number', description: 'Max results per page' });
+  }, async (argv) => {
+    const pluginMgr = require('../src/cli/plugin');
+    const action = argv._[0];
+    const arg = argv._[1];
+    const useJson = !!argv.json;
+
+    const fail = (e) => { console.error(`Error: ${e.message}`); process.exitCode = 1; };
+    const out = (obj) => {
+      if (obj === undefined) return;
+      if (useJson) console.log(JSON.stringify(obj, null, 2));
+      else console.log(obj);
+    };
+
+    try {
+      switch (action) {
+        case 'list':
+        case 'ls': {
+          const opts = {};
+          if (argv.category) opts.category = argv.category;
+          if (argv.limit) opts.limit = argv.limit;
+          const plugins = await pluginMgr.listPlugins(opts);
+          out(useJson ? plugins : pluginMgr.formatPluginList(plugins));
+          break;
+        }
+        case 'search': {
+          if (!arg) throw new Error('Usage: jsql plugin search <query>');
+          const opts = {};
+          if (argv.category) opts.category = argv.category;
+          const data = await pluginMgr.searchPlugins(arg, opts);
+          // search 返回 { results: [...], query, total } 或 [...]
+          const plugins = Array.isArray(data) ? data : (data.results || []);
+          if (useJson) {
+            out(data);
+          } else {
+            if (!plugins.length) {
+              console.log(`No plugins found for '${arg}'.`);
+            } else {
+              console.log(`Found ${plugins.length} plugin(s) for '${arg}':`);
+              console.log(pluginMgr.formatPluginList(plugins.map(p => p.plugin || p)));
+            }
+          }
+          break;
+        }
+        case 'install': {
+          if (!arg) throw new Error('Usage: jsql plugin install <name>');
+          const manifest = await pluginMgr.installPlugin(arg);
+          out(useJson ? manifest : `Installed plugin '${manifest.name}' (${manifest.version})`);
+          break;
+        }
+        case 'uninstall':
+        case 'remove': {
+          if (!arg) throw new Error('Usage: jsql plugin uninstall <name>');
+          const r = pluginMgr.uninstallPlugin(arg);
+          out(useJson ? r : `Uninstalled plugin '${r.name}'.`);
+          break;
+        }
+        case 'info': {
+          if (!arg) throw new Error('Usage: jsql plugin info <name>');
+          const p = await pluginMgr.getPluginInfo(arg);
+          out(useJson ? p : pluginMgr.formatPluginInfo(p));
+          break;
+        }
+        case undefined:
+          // 无子命令 → 显示已安装插件
+          const installed = pluginMgr.listInstalled();
+          if (useJson) {
+            out(installed);
+          } else {
+            if (!installed.length) {
+              console.log('No plugins installed.');
+              console.log(`Plugin directory: ${pluginMgr.PLUGIN_DIR}`);
+            } else {
+              console.log(`Installed plugins (${installed.length}):`);
+              installed.forEach(p => {
+                console.log(`  ${p.name.padEnd(24)} ${p.version || '?'}`);
+              });
+            }
+          }
+          break;
+        default:
+          throw new Error(`Unknown plugin action: ${action}`);
+      }
+    } catch (e) {
+      fail(e);
+    }
+  })
   .command('version', 'Show version', null, () => {
     console.log(require('../package.json').version);
   })

package/index.js

@@ -1,5 +1,5 @@
 /**
- * JSQL-NEO v6.3.6 — Rust-Powered Embedded Database (WASM + HTTP)
+ * JSQL-NEO v6.4.0-beta.1 — 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 (val !== null && typeof val === 'object' && val._type === 'hash') return 'hash';
     return 'string';
   }
   expire(key, seconds) {
@@ -83,7 +85,10 @@ class Cache {
   hset(key, field, value) {
     const k = String(key);
     let hash = this._getData().get(k);
-    if (!hash || hash._type !== 'hash') { hash = { _type: 'hash' }; this._getData().set(k, hash); }
+    if (hash !== undefined && (typeof hash !== 'object' || hash._type !== 'hash')) {
+      throw new Error('WRONGTYPE Operation against a key holding the wrong kind of value');
+    }
+    if (!hash) { hash = { _type: 'hash' }; this._getData().set(k, hash); }
     const existed = hash[field] !== undefined;
     hash[field] = String(value);
     this._dirty = true;
@@ -132,7 +137,10 @@ class Cache {
   lpush(key, ...values) {
     const k = String(key);
     let list = this._getData().get(k);
-    if (!list || !Array.isArray(list) || list._type === 'hash') { list = []; this._getData().set(k, list); }
+    if (list !== undefined && (!Array.isArray(list) || list._type === 'hash')) {
+      throw new Error('WRONGTYPE Operation against a key holding the wrong kind of value');
+    }
+    if (!list) { list = []; this._getData().set(k, list); }
     list.unshift(...values.map(String).reverse());
     this._dirty = true;
     return list.length;
@@ -140,7 +148,10 @@ class Cache {
   rpush(key, ...values) {
     const k = String(key);
     let list = this._getData().get(k);
-    if (!list || !Array.isArray(list) || list._type === 'hash') { list = []; this._getData().set(k, list); }
+    if (list !== undefined && (!Array.isArray(list) || list._type === 'hash')) {
+      throw new Error('WRONGTYPE Operation against a key holding the wrong kind of value');
+    }
+    if (!list) { list = []; this._getData().set(k, list); }
     list.push(...values.map(String));
     this._dirty = true;
     return list.length;
@@ -175,13 +186,18 @@ 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);
   }
 
   sadd(key, ...members) {
     const k = String(key);
     let set = this._getData().get(k);
-    if (!set || !(set instanceof Set)) { set = new Set(); this._getData().set(k, set); }
+    if (set !== undefined && !(set instanceof Set)) {
+      throw new Error('WRONGTYPE Operation against a key holding the wrong kind of value');
+    }
+    if (!set) { set = new Set(); this._getData().set(k, set); }
     let count = 0;
     for (const m of members) { if (!set.has(String(m))) { set.add(String(m)); count++; } }
     if (count > 0) this._dirty = true;
@@ -219,10 +235,11 @@ class Cache {
   }
 
   flushall() {
+    const currentDb = this._db;
     for (let i = 0; i < this._dbs.length; i++) { if (this._dbs[i]) this._dbs[i].clear(); if (this._dbsExpires[i]) this._dbsExpires[i].clear(); }
-    this._data = this._dbs[0] = new Map();
-    this._expires = this._dbsExpires[0] = new Map();
-    this._db = 0;
+    this._data = this._dbs[currentDb] = new Map();
+    this._expires = this._dbsExpires[currentDb] = new Map();
+    this._db = currentDb;
     this._dirty = true;
     return 'OK';
   }
@@ -244,32 +261,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', () => {