jsql-neo 6.3.10 → 6.4.0-beta.3

package/README.md

@@ -3,7 +3,7 @@
 > **One engine to rule them all** — a Rust-powered embedded database that speaks your language:
 > MySQL, PostgreSQL, MongoDB, Redis, SQL, TypeScript, **and the browser**.
 
-> **v6.3.10** — official release build · [github.com/vexify-org/JSQL-neo](https://github.com/vexify-org/JSQL-neo) · [jsql.vexify.top](https://jsql.vexify.top)
+> **v6.4.0-beta.3** — official release build · [github.com/vexify-org/JSQL-neo](https://github.com/vexify-org/JSQL-neo) · [jsql.vexify.top](https://jsql.vexify.top)
 
 ![Engines](https://img.shields.io/badge/engines-Native%20%7C%20WASM%20%7C%20Pure%20JS-7ee787)
 ![MySQL](https://img.shields.io/badge/protocol-MySQL%20compatible-1f6feb)
@@ -112,6 +112,27 @@ const db = new Database(':memory:');
 // same API as Node.js
 ```
 
+### 🦀 NativeJSQL
+
+Pure Rust native bindings — the highest-performance way to run JSQL-NEO:
+
+- **Zero abstraction overhead** — direct calls into the Rust core
+- **Batch operations** — up to **1.54M rows/sec** peak throughput
+- **Automatic memory management** with smart caching
+
+**Install:**
+
+```bash
+npm install jsql-neo
+```
+
+**Usage:**
+
+```javascript
+import { Database } from 'jsql-neo';
+const db = new Database('mydb.jsql');
+```
+
 ### Storage modes
 
 | Mode | Usage | Use Case |

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.10 — Rust-Powered Embedded Database (WASM + HTTP)
+ * JSQL-NEO v6.4.0-beta.3 — Rust-Powered Embedded Database (WASM + HTTP)
  *
  * @example
  * const jsql = require('jsql-neo');

package/lib/cache.js

@@ -50,7 +50,7 @@ class Cache {
     if (typeof val === 'string') return 'string';
     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';
+    if (val !== null && typeof val === 'object' && val._type === 'hash') return 'hash';
     return 'string';
   }
   expire(key, seconds) {
@@ -85,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;
@@ -134,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;
@@ -142,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;
@@ -185,7 +194,10 @@ class Cache {
   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;
@@ -223,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';
   }

package/lib/database.js

@@ -56,6 +56,35 @@ function parseFieldShorthand(str) {
     return def;
 }
 
+/**
+ * 深度相等比较两个行对象（用于无主键表的行匹配）。
+ * 剥离内部字段（_rid, _deleted）后逐字段比较。
+ */
+function _rowDeepEqual(a, b) {
+    if (a === b) return true;
+    if (!a || !b || typeof a !== 'object' || typeof b !== 'object') return false;
+    const strip = (obj) => {
+        const out = {};
+        for (const [k, v] of Object.entries(obj)) {
+            if (k === '_rid' || k === '_deleted') continue;
+            out[k] = v;
+        }
+        return out;
+    };
+    const sa = strip(a), sb = strip(b);
+    const ka = Object.keys(sa), kb = Object.keys(sb);
+    if (ka.length !== kb.length) return false;
+    for (const k of ka) {
+        if (!Object.prototype.hasOwnProperty.call(sb, k)) return false;
+        const va = sa[k], vb = sb[k];
+        if (va === vb) continue;
+        if (va === null || va === undefined || vb === null || vb === undefined) return false;
+        if (typeof va === 'number' && typeof vb === 'number' && va === vb) continue;
+        if (String(va) !== String(vb)) return false;
+    }
+    return true;
+}
+
 class Database {
     /**
      * @param {string} filePath - 数据库文件/目录路径，传 null 或 ':memory:' 使用内存模式
@@ -113,6 +142,12 @@ class Database {
         this._plugins = [];
         this._hooks = createHookRegistry();
         this._eventListeners = [];
+
+        // P1: {modules:true} 自动加载插件（mod.config + ~/.jsql/plugins/）
+        this._autoPlugins = options.modules !== false;
+        if (this._autoPlugins) {
+            this._loadAutoPlugins();
+        }
         this._tableNames = new Set(Object.keys(this._tables));
         this._migrations = [];
         this._observers = [];      // 响应式观察者
@@ -1570,6 +1605,80 @@ class Database {
         return buildPluginContext(this, plugin);
     }
 
+    /**
+     * P1 修复：{modules:true} 自动加载插件。
+     * 1. 通过 ModuleManager 读取 ~/.config/jsql/mod.config，应用已启用的模块
+     * 2. 扫描 ~/.jsql/plugins/ 加载 registry 安装的插件
+     */
+    _loadAutoPlugins() {
+        // 1. mod.config 中的模块
+        try {
+            const { ModuleManager } = require('./mod');
+            new ModuleManager().applyTo(this);
+        } catch (e) {
+            if (process.env.JSQL_DEBUG) console.warn('[database] Failed to load mod.config:', e.message);
+        }
+        // 2. ~/.jsql/plugins/ 中的 registry 插件
+        try {
+            this._loadInstalledPlugins();
+        } catch (e) {
+            if (process.env.JSQL_DEBUG) console.warn('[database] Failed to load installed plugins:', e.message);
+        }
+    }
+
+    /**
+     * 扫描 ~/.jsql/plugins/ 目录，加载已安装的 registry 插件。
+     * 兼容两种布局：根级入口文件 + plugins/ 子目录入口文件。
+     */
+    _loadInstalledPlugins() {
+        const os = require('os');
+        const fs = require('fs');
+        const PLUGIN_DIR = path.join(os.homedir(), '.jsql', 'plugins');
+        if (!fs.existsSync(PLUGIN_DIR)) return;
+        const entries = fs.readdirSync(PLUGIN_DIR, { withFileTypes: true });
+        for (const entry of entries) {
+            if (!entry.isDirectory()) continue;
+            const dir = path.join(PLUGIN_DIR, entry.name);
+            const manifestPath = path.join(dir, 'manifest.json');
+            if (!fs.existsSync(manifestPath)) continue;
+            let manifest;
+            try {
+                manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
+            } catch { continue; }
+            if (manifest.disabled) continue;
+            const pluginName = manifest.name || entry.name;
+            // 查找入口文件：manifest.main || manifest.entry || 'index.js'
+            const entryFile = manifest.main || manifest.entry || 'index.js';
+            // 兼容两种路径：根级 + plugins/ 子目录
+            const candidates = [
+                path.join(dir, entryFile),
+                path.join(dir, entryFile + '.js'),
+                path.join(dir, 'plugins', entryFile),
+                path.join(dir, 'plugins', entryFile + '.js'),
+            ];
+            let entryPath = null;
+            for (const c of candidates) {
+                if (fs.existsSync(c) && fs.statSync(c).isFile()) {
+                    entryPath = c;
+                    break;
+                }
+            }
+            if (!entryPath) continue;
+            try {
+                const resolved = require.resolve(entryPath);
+                delete require.cache[resolved];
+                const plugin = require(resolved);
+                if (typeof plugin === 'function') {
+                    this.use({ name: pluginName, install: plugin });
+                } else if (plugin && typeof plugin === 'object') {
+                    if (!plugin.name) plugin.name = pluginName;
+                    this.use(plugin);
+                }
+            } catch (e) {
+                if (process.env.JSQL_DEBUG) console.warn('[database] Failed to load plugin', entry.name, e.message);
+            }
+        }
+    }n
     on(event, fn) {
         return registerHook(this, event, fn);
     }
@@ -1702,7 +1811,15 @@ class Database {
     _resolveId(table, id) {
         const pk = this._pkOf(table);
         if (pk) return table._rows.find(r => r[pk] === id) || null;
-        return table._rows[id - 1] || null;
+        // 无主键表：id 是行对象（可能是 find() 返回的浅拷贝）时，用内容匹配代替引用比较。
+        // 做法：逐行比对所有字段值是否相等；是数字时当 1-based 行号。
+        if (id && typeof id === 'object') {
+            const keys = Object.keys(id);
+            return table._rows.find(r => keys.every(k => r[k] === id[k])) || null;
+        }
+        const idx = Number(id);
+        if (!isNaN(idx)) return table._rows[idx - 1] || null;
+        return null;
     }
 
     find(tableName, filter, opts = {}) {
@@ -1710,7 +1827,8 @@ class Database {
         if (!table) throw createError('ER_NO_SUCH_TABLE', tableName);
         if (!this._runHooks('beforeFind', [tableName, { filter, opts }])) return [];
         const { limit, offset = 0 } = opts;
-        let rows = table._applyFilterOptimized(table._rows, filter || {});
+        // P1-4: 软删除模式下不得泄露已删除行——只看可见行
+        let rows = table._applyFilterOptimized(table._getVisibleRows(), filter || {});
         if (limit > 0) rows = rows.slice(offset, offset + limit);
         else if (offset > 0) rows = rows.slice(offset);
         // P1-11: 返回浅拷贝，防止调用方修改影响内部数据
@@ -1744,6 +1862,8 @@ class Database {
         if (!table) throw createError('ER_NO_SUCH_TABLE', tableName);
         if (!this._runHooks('beforeFind', [tableName, { id }])) return null;
         const row = this._resolveId(table, id);
+        // P1-4: 软删除行对普通读取不可见
+        if (row && row._deleted) return null;
         // P1-11: 返回浅拷贝，防止调用方修改影响内部数据
         const result = row ? { ...row } : null;
         this._touchTable(tableName);
@@ -1755,8 +1875,8 @@ class Database {
         const table = this._ensureTable(tableName);
         if (!table) throw createError('ER_NO_SUCH_TABLE', tableName);
         if (!this._runHooks('beforeFind', [tableName, { ids }])) return null;
-        // P1-11: 返回浅拷贝
-        const rows = ids.map(id => this._resolveId(table, id)).filter(r => r !== null).map(r => ({ ...r }));
+        // P1-4: 过滤掉软删除行；P1-11: 返回浅拷贝
+        const rows = ids.map(id => this._resolveId(table, id)).filter(r => r !== null && !r._deleted).map(r => ({ ...r }));
         this._touchTable(tableName);
         this._runHooks('afterFind', [tableName, { ids }, rows]);
         return rows;
@@ -1770,7 +1890,8 @@ class Database {
         const table = this._ensureTable(tableName);
         if (!table) throw createError('ER_NO_SUCH_TABLE', tableName);
         this._runHooks('beforeCount', [tableName]);
-        const n = table._rows.length;
+        // P1-4: 软删除模式下只统计可见行
+        const n = table._softDelete ? table._getVisibleRows().length : table._rows.length;
         this._touchTable(tableName);
         this._runHooks('afterCount', [tableName, n]);
         return n;
@@ -1783,7 +1904,8 @@ class Database {
         // P1-9: updateById 绕过类型校验——先校验再更新
         const validated = table._validateDataTypes({ ...data }, true);
         const row = this._resolveId(table, id);
-        if (!row) return { ok: false, error: 'not found' };
+        // P1-4: 软删除行不可更新
+        if (!row || row._deleted) return { ok: false, error: 'not found' };
         // 改主键/唯一列时要先确认新值不与其它行冲突。
         // 此前直接 Object.assign，导致
         //   UPDATE t SET id = 1 WHERE id = 2   （t 已有 id=1）
@@ -1862,20 +1984,29 @@ class Database {
         if (table._primaryKey) {
             for (const id of ids) removed += table.removeById(id);
         } else {
-            // 无主键表没有稳定的行标识，_resolveId 只能把 id 当 1-based 行号，
-            // 而 _rowPkId 在无主键时回退到 row.id（业务列名）——
-            // 两者语义不一致，导致 DELETE ... WHERE id IN (3,5) 删错行。
-            // 这里先按「行对象 === id」尝试（SQL 层可以直接传行引用），
-            // 退化到行号解析；并一次性收集目标后统一移除，避免边删边移位。
-            const targets = [];
+            // 无主键表没有稳定的行标识，P1-11 后 find() 返回浅拷贝（{...r}），
+            // 对象引用与 table._rows 里的原对象不同，不能用 Set.has(row) 做引用匹配。
+            // _resolveId 对无主键表做 table._rows[id-1]，传入对象时 id-1=NaN → undefined。
+            // 所以这里对对象 id 做深度相等匹配，对值 id 走 _resolveId（1-based 行号）。
             const seen = new Set();
-            const push = (row) => { if (row && !seen.has(row)) { seen.add(row); targets.push(row); } };
+            const targets = [];
             for (const id of ids) {
-                if (id && typeof id === 'object') { push(id); continue; }
-                push(this._resolveId(table, id));
+                let rowIndex;
+                if (id && typeof id === 'object') {
+                    // id 是行对象（find() 返回的浅拷贝），用深度相等匹配
+                    rowIndex = table._rows.findIndex(r => _rowDeepEqual(r, id));
+                } else {
+                    // id 是值（1-based 行号），_resolveId 能处理
+                    const original = this._resolveId(table, id);
+                    if (original) rowIndex = table._rows.indexOf(original);
+                }
+                if (rowIndex >= 0 && !seen.has(rowIndex)) {
+                    seen.add(rowIndex);
+                    targets.push(rowIndex);
+                }
             }
             if (targets.length) {
-                table._rows = table._rows.filter(r => !seen.has(r));
+                table._rows = table._rows.filter((_, idx) => !seen.has(idx));
                 removed = targets.length;
             }
             table._rebuildPKIndex();
@@ -1893,7 +2024,8 @@ class Database {
         if (!table) throw createError('ER_NO_SUCH_TABLE', tableName);
         if (!this._runHooks('beforeDelete', [tableName, [filter]])) return { ok: true, count: 0 };
         const before = table._rows.length;
-        const matched = table._applyFilter(table._rows, filter || {});
+        // P1-4: 只匹配可见行（软删除行已“不存在”，不应被硬删操作波及）
+        const matched = table._applyFilter(table._getVisibleRows(), filter || {});
         const matchSet = new Set(matched);
         table._rows = table._rows.filter(r => !matchSet.has(r));
         const removed = before - table._rows.length;

package/lib/date-types.js

@@ -199,9 +199,12 @@ function validateTime(value, fieldName) {
                 return value;
             }
         }
-        // 负时间: -HH:MM:SS
+        // 负时间: -HH:MM:SS（同样校验范围）
         const neg = value.match(/^-(\d{2}):(\d{2}):(\d{2})$/);
-        if (neg) return value;
+        if (neg) {
+            const h = parseInt(neg[1]), min = parseInt(neg[2]), sec = parseInt(neg[3]);
+            if (h >= 0 && h < 24 && min >= 0 && min < 60 && sec >= 0 && sec < 60) return value;
+        }
     }
     throw createError('ER_INVALID_DATE', fieldName, String(value));
 }

package/lib/jsql_format.js

@@ -12,12 +12,19 @@ const SZ = {
 
 const BT = { FREE: 0, DATA: 1, IDX: 2 };
 
-const TYPE = { NUL:0, BOL:1, I32:2, F64:3, STR:4, BUF:5, ARR:6, OBJ:7 };
+const TYPE = { NUL:0, BOL:1, I32:2, F64:3, STR:4, BUF:5, ARR:6, OBJ:7, I64:8 };
 
 function tag(v) {
   if (v===null||v===undefined) return TYPE.NUL;
   if (typeof v==='boolean') return TYPE.BOL;
-  if (typeof v==='number') return Number.isInteger(v)?TYPE.I32:TYPE.F64;
+  if (typeof v==='number') {
+    if (Number.isInteger(v)) {
+      // P2-29-fix: 超出 int32 范围的整数用 I64 存储
+      if (v >= -0x80000000 && v <= 0x7FFFFFFF) return TYPE.I32;
+      return TYPE.I64;
+    }
+    return TYPE.F64;
+  }
   if (typeof v==='string') return TYPE.STR;
   if (v instanceof Buffer) return TYPE.BUF;
   return Array.isArray(v)?TYPE.ARR:TYPE.OBJ;
@@ -29,6 +36,7 @@ function enc(v) {
     case TYPE.NUL: return Buffer.from([t]);
     case TYPE.BOL: return Buffer.from([t, v?1:0]);
     case TYPE.I32: { const b=Buffer.alloc(5); b[0]=t; b.writeInt32LE(v,1); return b; }
+    case TYPE.I64: { const b=Buffer.alloc(9); b[0]=t; b.writeBigInt64LE(BigInt(v),1); return b; }
     case TYPE.F64: { const b=Buffer.alloc(9); b[0]=t; b.writeDoubleLE(v,1); return b; }
     case TYPE.STR: { const s=Buffer.from(v,'utf8'); const b=Buffer.alloc(5+s.length); b[0]=t; b.writeUInt32LE(s.length,1); s.copy(b,5); return b; }
     case TYPE.BUF: { const b=Buffer.alloc(5+v.length); b[0]=t; b.writeUInt32LE(v.length,1); v.copy(b,5); return b; }
@@ -43,6 +51,7 @@ function dec(buf, off) {
     case TYPE.NUL: return {v:null,off};
     case TYPE.BOL: return {v:buf[off]!==0,off:off+1};
     case TYPE.I32: return {v:buf.readInt32LE(off),off:off+4};
+    case TYPE.I64: return {v:Number(buf.readBigInt64LE(off)),off:off+8};
     case TYPE.F64: return {v:buf.readDoubleLE(off),off:off+8};
     case TYPE.STR: { const l=buf.readUInt32LE(off);off+=4; return {v:buf.toString('utf8',off,off+l),off:off+l}; }
     case TYPE.BUF: { const l=buf.readUInt32LE(off);off+=4; return {v:Buffer.from(buf.subarray(off,off+l)),off:off+l}; }
@@ -62,7 +71,11 @@ function writeEnc(buf, off, v) {
   if (v === null || v === undefined) { buf[off] = 0; return off + 1; }
   if (typeof v === 'boolean') { buf[off] = 1; buf[off+1] = v ? 1 : 0; return off + 2; }
   if (typeof v === 'number') {
-    if (Number.isInteger(v)) { buf[off] = 2; buf.writeInt32LE(v, off+1); return off + 5; }
+    if (Number.isInteger(v)) {
+      // P2-29-fix: 超出 int32 范围的整数用 I64 存储
+      if (v >= -0x80000000 && v <= 0x7FFFFFFF) { buf[off] = 2; buf.writeInt32LE(v, off+1); return off + 5; }
+      buf[off] = 8; buf.writeBigInt64LE(BigInt(v), off+1); return off + 9;
+    }
     buf[off] = 3; buf.writeDoubleLE(v, off+1); return off + 9;
   }
   if (typeof v === 'string') {
@@ -414,8 +427,7 @@ class JSQLFormat {
       }
       if (buf[36] !== BT.DATA || buf[37] !== t.tableId) continue;
       if (!verifyHash(buf)) {
-        console.warn(`[JSQLFormat] Table '${name}': data block ${bid} failed integrity check, skipping`);
-        continue;
+        throw new Error(`[JSQLFormat] Table '${name}': data block ${bid} failed integrity check`);
       }
 
       const compFlag = buf[48];

package/lib/mongo_server.js

@@ -154,6 +154,7 @@ class MongoServer {
     this._engine = null;
     this._server = null;
     this._sockets = new Set();
+    this._dbCollections = new Map(); // db name → Set of collection names
   }
 
   async _getEngine() {
@@ -166,11 +167,15 @@ class MongoServer {
     return this._engine;
   }
 
-  async _ensureCollection(name) {
+  async _ensureCollection(name, db = null) {
     const engine = await this._getEngine();
     if (!engine.getTableSchema(name)) {
       engine.createTable(name, {});
     }
+    if (db) {
+      if (!this._dbCollections.has(db)) this._dbCollections.set(db, new Set());
+      this._dbCollections.get(db).add(name);
+    }
     return engine;
   }
 
@@ -339,7 +344,7 @@ class MongoServer {
         return { ok: 1, cursor: { id: { $long: 0 }, ns: `${this._dbOf(doc)}.$cmd.listCollections`, firstBatch } };
       }
       case 'create': {
-        const engine = await this._ensureCollection(String(doc.create));
+        const engine = await this._ensureCollection(String(doc.create), this._dbOf(doc));
         return { ok: 1, ns: engine ? `${this._dbOf(doc)}.${doc.create}` : '' };
       }
       case 'drop': {
@@ -353,7 +358,7 @@ class MongoServer {
       }
       case 'insert': {
         const coll = String(doc.insert);
-        const engine = await this._ensureCollection(coll);
+        const engine = await this._ensureCollection(coll, this._dbOf(doc));
         const docs = doc.documents || [];
         const ids = [];
         for (const d of docs) {
@@ -369,7 +374,7 @@ class MongoServer {
       }
       case 'findAndModify': {
         const coll = String(doc.findAndModify);
-        const engine = await this._ensureCollection(coll);
+        const engine = await this._ensureCollection(coll, this._dbOf(doc));
         const q = doc.query || {};
         const rows = this._matching(engine, coll, q);
         const found = rows[0] || null;
@@ -393,7 +398,7 @@ class MongoServer {
       }
       case 'distinct': {
         const coll = String(doc.distinct);
-        const engine = await this._ensureCollection(coll);
+        const engine = await this._ensureCollection(coll, this._dbOf(doc));
         const key = String(doc.key || '');
         const rows = this._matching(engine, coll, doc.query);
         const seen = new Set();
@@ -404,11 +409,21 @@ class MongoServer {
         }
         return { ok: 1, values };
       }
-      case 'dropDatabase':
-        return { ok: 1, dropped: String(doc.dropDatabase || this._dbOf(doc)) };
+      case 'dropDatabase': {
+        const dbName = String(doc.$db || 'test');
+        const engine = await this._getEngine();
+        const colls = this._dbCollections.get(dbName);
+        if (colls) {
+          for (const c of colls) {
+            try { engine.dropTable(c); } catch (_) {}
+          }
+          this._dbCollections.delete(dbName);
+        }
+        return { ok: 1, dropped: dbName };
+      }
       case 'find': {
         const coll = String(doc.find);
-        const engine = await this._ensureCollection(coll);
+        const engine = await this._ensureCollection(coll, this._dbOf(doc));
         let rows = this._matching(engine, coll, doc.filter);
         const skip = typeof doc.skip === 'number' ? doc.skip : 0;
         if (skip > 0) rows = rows.slice(skip);
@@ -420,7 +435,7 @@ class MongoServer {
         return { ok: 1, cursor: { id: { $long: 0 }, ns: String(doc.collection || ''), nextBatch: [] } };
       case 'update': {
         const coll = String(doc.update);
-        const engine = await this._ensureCollection(coll);
+        const engine = await this._ensureCollection(coll, this._dbOf(doc));
         let n = 0;
         const updates = doc.updates || [];
         for (const u of updates) {
@@ -453,24 +468,26 @@ class MongoServer {
       }
       case 'delete': {
         const coll = String(doc.delete);
-        const engine = await this._ensureCollection(coll);
+        const engine = await this._ensureCollection(coll, this._dbOf(doc));
         let n = 0;
         for (const d of (doc.deletes || [])) {
           const rows = this._matching(engine, coll, d.q || {});
-          if (rows.length > 0) this._removeRows(engine, coll, rows);
-          n += rows.length;
+          // MongoDB delete: limit=1 means delete only one, limit=0 means delete all
+          const toDelete = d.limit === 1 ? rows.slice(0, 1) : rows;
+          if (toDelete.length > 0) this._removeRows(engine, coll, toDelete);
+          n += toDelete.length;
         }
         return { ok: 1, n };
       }
       case 'count': {
         const coll = String(doc.count);
-        const engine = await this._ensureCollection(coll);
+        const engine = await this._ensureCollection(coll, this._dbOf(doc));
         const rows = this._matching(engine, coll, doc.query);
         return { ok: 1, n: Number(doc.limit) > 0 ? Math.min(rows.length, doc.limit) : rows.length };
       }
       case 'aggregate': {
         const coll = String(doc.aggregate);
-        const engine = await this._ensureCollection(coll);
+        const engine = await this._ensureCollection(coll, this._dbOf(doc));
         const pipeline = doc.pipeline || [];
         let rows = engine.find(coll, {});
         for (const stage of pipeline) {