jsql-neo 6.1.0 → 6.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsql-neo",
-  "version": "6.1.0",
+  "version": "6.3.0",
   "description": "JSQL-NEO — Rust-powered embedded database with WASM, REST API, B-Tree indexes, WAL, crash recovery",
   "main": "index.js",
   "types": "index.d.ts",

package/postinstall.js

@@ -14,10 +14,51 @@ const BP = path.join(ROOT, 'bin', BIN_NAME);
 // Native N-API module (native/jsql-neo-native.node)
 const NATIVE_PATH = path.join(ROOT, 'native', 'jsql-neo-native.node');
 
-// GitHub 加速代理前缀；把原始 github 链接直接拼在后面即可
-const GHPROXY = 'https://gh-proxy.com/';
+// GitHub 加速代理前缀；加速站的用法是把原始 URL 直接拼在后面：
+//   https://<host>/https://github.com/owner/repo/releases/download/vX.Y.Z/asset
+// 鉴权走 `Authorization: Bearer <token>` 请求头（Worker 从该头读取，不读 ?token=）。
+// 前缀可用 JSQL_GHPROXY 覆盖（逗号分隔多个，按序回退；'' 表示直连兜底）；
+// token 可用 JSQL_GHPROXY_TOKEN 覆盖。
+// 加速站候选（按优先级）：自建站优先，公共站回退，最后直连兜底。
+const DEFAULT_PROXIES = [
+  'https://gh-proxyjsql-neoworkerapi.vexify.de5.net/',
+  'https://gh-proxy.com/',
+];
+// 内置 token：让所有安装者都自动走自建加速站，无需配置环境变量。
+// 加速站自身已限制只能代理 /releases/download/ 等文件下载路径，故该值公开无风险。
+const DEFAULT_GHPROXY_TOKEN =
+  'NkUbD165V_1iPvEeGRcAfNEv4cqv5WRLn1NfjgBzIMpo9gq5CBH10Rl5ZPmt7RGCh3kyaZU4Nc6pLhHHbvzc9w';
+const GHPROXY = process.env.JSQL_GHPROXY !== undefined
+  ? process.env.JSQL_GHPROXY
+  : DEFAULT_PROXIES[0];
+const GHPROXY_TOKEN = process.env.JSQL_GHPROXY_TOKEN || DEFAULT_GHPROXY_TOKEN;
 const TAG = `v${pkg.version}`;
 
+/** 加速站鉴权头 */
+function proxyHeaders() {
+  return GHPROXY_TOKEN ? { Authorization: 'Bearer ' + GHPROXY_TOKEN } : undefined;
+}
+
+/**
+ * 生成候选下载地址列表（按优先级）：
+ *   JSQL_GHPROXY 指定的代理 → 内置加速站 → 直连
+ */
+function proxyCandidates(raw) {
+  const bases = String(GHPROXY || '')
+    .split(',')
+    .map((s) => s.trim())
+    .filter(Boolean)
+    .concat(DEFAULT_PROXIES)
+    .concat('');
+  const list = [];
+  for (const base of bases) {
+    const url = base ? (base.endsWith('/') ? base : base + '/') + raw : raw;
+    if (list.some((x) => x.url === url)) continue;
+    list.push({ url, viaProxy: !!base });
+  }
+  return list;
+}
+
 // 从 repository 字段提取 owner/repo，例如 vexify-org/JSQL-neo
 const REPO = (pkg.repository && pkg.repository.url)
   ? pkg.repository.url.replace(/\.git$/, '').replace(/^.*github\.com\//i, '')
@@ -32,13 +73,13 @@ function nativeTargetSuffix(platform = process.platform, arch = process.arch) {
   return `${p}-${a}-msvc`;
 }
 
-function download(url, dest) {
+function download(url, dest, headers) {
   return new Promise((resolve, reject) => {
     const mod = url.startsWith('https:') ? https : http;
-    const req = mod.get(url, (res) => {
+    const req = mod.get(url, { headers: headers || {} }, (res) => {
       if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
         res.resume();
-        download(res.headers.location, dest).then(resolve, reject);
+        download(res.headers.location, dest, headers).then(resolve, reject);
         return;
       }
       if (res.statusCode !== 200) {
@@ -95,20 +136,23 @@ function tryLoadNative() {
 
 async function downloadAndVerify() {
   const asset = `jsql-neo-native.${nativeTargetSuffix()}.node`;
-  const url = `${GHPROXY}https://github.com/${REPO}/releases/download/${TAG}/${asset}`;
-  console.log(`[jsql-neo] downloading native module: ${url}`);
-  try {
-    await download(url, NATIVE_PATH);
-    if (!tryLoadNative()) {
-      console.warn('[jsql-neo] downloaded module also invalid, removed.');
-      return false;
+  const raw = `https://github.com/${REPO}/releases/download/${TAG}/${asset}`;
+  // 依次尝试：环境变量指定的代理 → 内置加速站 → 直连
+  for (const cand of proxyCandidates(raw)) {
+    console.log(`[jsql-neo] downloading native module: ${cand.url}`);
+    try {
+      // 加速站鉴权走 Authorization 头，直连时不带
+      await download(cand.url, NATIVE_PATH, cand.viaProxy ? proxyHeaders() : undefined);
+      if (tryLoadNative()) {
+        console.log('[jsql-neo] native module downloaded: native/jsql-neo-native.node');
+        return true;
+      }
+      console.warn('[jsql-neo] downloaded module cannot be loaded; trying next source.');
+    } catch (e) {
+      console.warn('[jsql-neo] download failed:', e.message);
     }
-    console.log('[jsql-neo] native module downloaded: native/jsql-neo-native.node');
-    return true;
-  } catch (e) {
-    console.warn('[jsql-neo] download failed, falling back to source build:', e.message);
-    return false;
   }
+  return false;
 }
 
 async function ensureNativeNode() {

package/test/readme-audit.test.js

@@ -142,16 +142,16 @@ async function main() {
   console.log('\n--- 方言特性：DIV / XOR / && / || / <=> / :: / -> ->> / LIKE ESCAPE ---');
   {
     const data = [
-      { id: 1, n: 10, flag: 1, s: '100%', meta: '{"name":"Alice","addr":{"city":"SH"},"tags":["x","y"]}' },
-      { id: 2, n: 20, flag: 0, s: '1000', meta: '{"name":"Bob","addr":{"city":"BJ"},"tags":[]}' },
-      { id: 3, n: 30, flag: 1, s: '100', meta: null },
+      { id: 1, n: 10, flag: 1, s: '100%', nm: 'Alice', meta: '{"name":"Alice","addr":{"city":"SH"},"tags":["x","y"]}' },
+      { id: 2, n: 20, flag: 0, s: '1000', nm: 'Bob', meta: '{"name":"Bob","addr":{"city":"BJ"},"tags":[]}' },
+      { id: 3, n: 30, flag: 1, s: '100', nm: 'Cara', meta: null },
     ];
     const engine = {
       hasTable: () => true, truncate: async () => {}, flush: async () => {},
       find: async () => data.map(r => ({ ...r })),
       getTableSchema: async () => ({
         id: { type: 'integer', primaryKey: true }, n: { type: 'integer' }, flag: { type: 'integer' },
-        s: { type: 'string' }, meta: { type: 'json' },
+        s: { type: 'string' }, nm: { type: 'string' }, meta: { type: 'json' },
       }),
     };
     const rowsOf = async (sql) => {
@@ -176,12 +176,98 @@ async function main() {
       JSON.stringify(await rowsOf("SELECT meta->'addr'->>'city' AS x FROM tbl WHERE id = 1")) === '[["SH"]]');
     ok("->'tags'->>0 数组下标",
       JSON.stringify(await rowsOf("SELECT meta->'tags'->>0 AS x FROM tbl WHERE id = 1")) === '[["x"]]');
+    // PG JSON 包含 / 路径操作符
+    ok("meta @> '{...}' 包含",
+      JSON.stringify(await rowsOf(`SELECT id FROM tbl WHERE meta @> '{"addr":{"city":"SH"}}'`)) === '[[1]]');
+    ok("'{...}' <@ meta 被包含",
+      JSON.stringify(await rowsOf(`SELECT id FROM tbl WHERE '{"name":"Bob"}' <@ meta`)) === '[[2]]');
+    ok("meta#>'{addr,city}' 路径",
+      JSON.stringify(await rowsOf("SELECT meta#>'{addr,city}' AS x FROM tbl WHERE id = 1")) === '[["SH"]]');
+    ok("meta#>>'{addr,city}' 路径文本",
+      JSON.stringify(await rowsOf("SELECT meta#>>'{addr,city}' AS x FROM tbl WHERE id = 1")) === '[["SH"]]');
+    ok("meta#>'{tags,0}' 路径含下标",
+      JSON.stringify(await rowsOf("SELECT meta#>'{tags,0}' AS x FROM tbl WHERE id = 1")) === '[["x"]]');
+    // JSON 键存在 ? / ?| / ?&
+    ok("meta ? 'name'", JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE meta ? 'name'")) === '[[1],[2]]');
+    ok("meta ? 'nope'（不存在）",
+      JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE meta ? 'nope'")) === '[]');
+    ok("meta ?| '{name,nope}'（任一）",
+      JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE meta ?| '{name,nope}'")) === '[[1],[2]]');
+    ok("meta ?& '{name,addr}'（全部）",
+      JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE meta ?& '{name,addr}'")) === '[[1],[2]]');
+    ok("meta ?& '{name,nope}'（缺一个）",
+      JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE meta ?& '{name,nope}'")) === '[]');
+    // PG 正则：~ 敏感 / ~* 不敏感 / !~ 取反
+    ok("nm ~ '^A' 大小写敏感", JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE nm ~ '^A'")) === '[[1]]');
+    ok("nm ~* '^a' 不敏感", JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE nm ~* '^a'")) === '[[1]]');
+    ok("nm !~ '^A' 取反", JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE nm !~ '^A'")) === '[[2],[3]]');
+    ok('REGEXP 仍可用', JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE nm REGEXP '^A'")) === '[[1]]');
+    // —— 日期/时间函数（README 承诺但此前大量缺失、静默返回 null）——
+    ok('YEAR()', JSON.stringify(await rowsOf("SELECT YEAR('2024-03-15')")) === '[[2024]]');
+    ok('MONTH()', JSON.stringify(await rowsOf("SELECT MONTH('2024-03-15')")) === '[[3]]');
+    ok('DAY()', JSON.stringify(await rowsOf("SELECT DAY('2024-03-15')")) === '[[15]]');
+    ok('HOUR()', JSON.stringify(await rowsOf("SELECT HOUR('2024-03-15 10:20:30')")) === '[[10]]');
+    ok('MINUTE()', JSON.stringify(await rowsOf("SELECT MINUTE('2024-03-15 10:20:30')")) === '[[20]]');
+    ok('SECOND()', JSON.stringify(await rowsOf("SELECT SECOND('2024-03-15 10:20:30')")) === '[[30]]');
+    ok('QUARTER()', JSON.stringify(await rowsOf("SELECT QUARTER('2024-08-15')")) === '[[3]]');
+    ok('DAYOFWEEK()', JSON.stringify(await rowsOf("SELECT DAYOFWEEK('2024-03-15')")) === '[[6]]');
+    ok('DATE()', JSON.stringify(await rowsOf("SELECT DATE('2024-03-15 10:20:30')")) === '[["2024-03-15"]]');
+    ok('TIME()', JSON.stringify(await rowsOf("SELECT TIME('2024-03-15 10:20:30')")) === '[["10:20:30"]]');
+    ok('DATEDIFF', JSON.stringify(await rowsOf("SELECT DATEDIFF('2026-08-12','2026-08-01')")) === '[[11]]');
+    ok('TIMESTAMPDIFF 裸 unit',
+      JSON.stringify(await rowsOf("SELECT TIMESTAMPDIFF(MONTH,'2024-01-01','2024-03-01')")) === '[[2]]');
+    ok('DATE_FORMAT',
+      JSON.stringify(await rowsOf("SELECT DATE_FORMAT('2026-08-12 10:30:00','%Y-%m-%d %H:%i')")) === '[["2026-08-12 10:30"]]');
+    ok('STR_TO_DATE',
+      JSON.stringify(await rowsOf("SELECT STR_TO_DATE('2024-03-15','%Y-%m-%d')")) === '[["2024-03-15"]]');
+    ok('TO_DATE(PG 格式)',
+      JSON.stringify(await rowsOf("SELECT TO_DATE('2024-03-15','YYYY-MM-DD')")) === '[["2024-03-15"]]');
+    ok('TO_CHAR(PG 格式)',
+      JSON.stringify(await rowsOf("SELECT TO_CHAR('2024-03-15','YYYY-MM-DD')")) === '[["2024-03-15"]]');
+    ok('DATE_PART', JSON.stringify(await rowsOf("SELECT DATE_PART('year','2024-03-15')")) === '[[2024]]');
+    ok('AGE', JSON.stringify(await rowsOf("SELECT AGE('2026-08-12','2020-01-01')")) === '[["6 years 7 mons 11 days"]]');
+    ok('LAST_DAY 闰年', JSON.stringify(await rowsOf("SELECT LAST_DAY('2024-02-05')")) === '[["2024-02-29"]]');
+    ok('DAYNAME', JSON.stringify(await rowsOf("SELECT DAYNAME('2024-03-15')")) === '[["Friday"]]');
+    ok('MONTHNAME', JSON.stringify(await rowsOf("SELECT MONTHNAME('2024-03-15')")) === '[["March"]]');
+    ok('PERIOD_DIFF', JSON.stringify(await rowsOf('SELECT PERIOD_DIFF(202403,202401)')) === '[[2]]');
+    ok('DATE_TRUNC',
+      JSON.stringify(await rowsOf("SELECT DATE_TRUNC('month','2024-03-15 10:20:30')")) === '[["2024-03-01 00:00:00"]]');
+    ok('WEEK()', JSON.stringify(await rowsOf("SELECT WEEK('2024-01-14')")) === '[[2]]');
+
+    // —— 数值比较 / 聚合 / LIKE：曾"不报错但结果错"——
+    ok('数值列 vs 数值字符串 <', JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE n < '9'")) === '[]');
+    ok('数值列 vs 数值字符串 =', JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE n = '10'")) === '[[1]]');
+    ok('HAVING 无 GROUP BY', JSON.stringify(await rowsOf('SELECT COUNT(*) AS c FROM tbl HAVING COUNT(*) > 2')) === '[[3]]');
+    ok('HAVING 不成立应为空', JSON.stringify(await rowsOf('SELECT COUNT(*) AS c FROM tbl HAVING COUNT(*) > 100')) === '[]');
+    ok('MIN 字符串列', JSON.stringify(await rowsOf('SELECT MIN(nm) FROM tbl')) === '[["Alice"]]');
+    ok('MAX 字符串列', JSON.stringify(await rowsOf('SELECT MAX(nm) FROM tbl')) === '[["Cara"]]');
+    ok('LIKE 默认不区分大小写', JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE nm LIKE 'alice'")) === '[[1]]');
+    ok('LIKE BINARY 区分大小写', JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE nm LIKE BINARY 'alice'")) === '[]');
+
+    // —— 6.2.0 回归项（这些曾不报错但结果错）——
+    ok('NOT IN 取反', JSON.stringify(await rowsOf('SELECT id FROM tbl WHERE id NOT IN (1,2)')) === '[[3]]');
+    const dStar = await rowsOf('SELECT DISTINCT * FROM tbl');
+    ok('DISTINCT * 按整行去重（此前只剩 1 行）', dStar.length === 3, dStar);
+    ok('ORDER BY 1 按第 1 列排序', JSON.stringify(await rowsOf('SELECT n FROM tbl ORDER BY 1')) === '[[10],[20],[30]]');
+    ok("'' 内双写引号转义",
+      JSON.stringify(await rowsOf("SELECT 'O''Brien' AS x FROM tbl WHERE id = 1")) === '[["O\'Brien"]]');
     ok("LIKE ... ESCAPE '!' 匹配字面量 %",
       JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE s LIKE '100!%' ESCAPE '!'")) === '[[1]]');
     ok('LIKE 反斜杠转义匹配字面量 %',
       JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE s LIKE '100\\%'")) === '[[1]]');
     ok('LIKE 普通 % 仍为通配',
       JSON.stringify(await rowsOf("SELECT id FROM tbl WHERE s LIKE '100%'")) === '[[1],[2],[3]]');
+
+    // 参数绑定：位置 ? / 命名 :name / 编号 $1（README「Params」一节）
+    const rowsOfP = async (sql, params) => {
+      const r = await executeSQL(engine, sql, params, OPTS);
+      return (Array.isArray(r) ? r[0] : r).rows;
+    };
+    ok('位置参数 ?', JSON.stringify(await rowsOfP('SELECT id FROM tbl WHERE id = ?', [1])) === '[[1]]');
+    ok('命名参数 :id', JSON.stringify(await rowsOfP('SELECT id FROM tbl WHERE id = :id', { id: 2 })) === '[[2]]');
+    ok('命名参数多占位', JSON.stringify(await rowsOfP('SELECT id FROM tbl WHERE id = :a OR id = :b', { a: 1, b: 3 })) === '[[1],[3]]');
+    ok('编号参数 $1', JSON.stringify(await rowsOfP('SELECT id FROM tbl WHERE id = $1', [3])) === '[[3]]');
+    ok('编号参数 $2/$1', JSON.stringify(await rowsOfP('SELECT id FROM tbl WHERE id = $2 OR id = $1', [1, 2])) === '[[1],[2]]');
   }
 
   console.log('\n--- DDL / 解析器节点覆盖 ---');
@@ -325,6 +411,102 @@ async function main() {
     }
   }
 
+  console.log('\n--- 唯一约束：非主键 UNIQUE 必须报 ER_DUP_ENTRY ---');
+  {
+    let JSQL, db;
+    try {
+      ({ JSQL } = require('../lib/native_client.js'));
+      db = new JSQL();
+      await db.start();
+    } catch (e) {
+      console.log('[SKIP] native 不可用：' + e.message.slice(0, 60));
+    }
+    if (db) {
+      const run = (sql) => executeSQL(db, sql, OPTS);
+      const dupErrMsg = async (sql) => {
+        try { await run(sql); return null; } catch (e) { return e.message; }
+      };
+      await run('CREATE TABLE u (id SERIAL PRIMARY KEY, email TEXT UNIQUE, nick TEXT UNIQUE)');
+      await run("INSERT INTO u (email, nick) VALUES ('a@x.com', 'a')");
+      ok('唯一列重复 → ER_DUP_ENTRY',
+        /ER_DUP_ENTRY/.test(await dupErrMsg("INSERT INTO u (email, nick) VALUES ('a@x.com', 'z')") || ''));
+      ok('批内唯一重复 → ER_DUP_ENTRY',
+        /ER_DUP_ENTRY/.test(await dupErrMsg("INSERT INTO u (email, nick) VALUES ('b@x.com', 'n1'), ('c@x.com', 'n1')") || ''));
+      const r1 = await run('SELECT id FROM u');
+      ok('冲突后仍只有 1 行', r1.rows.length === 1, r1.rows);
+      await run("INSERT INTO u (email, nick) VALUES (NULL, 'x'), (NULL, 'y')");
+      const r2 = await run('SELECT id FROM u');
+      ok('UNIQUE 允许多个 NULL', r2.rows.length === 3, r2.rows);
+      await db.stop();
+    }
+  }
+
+  console.log('\n--- 6.2.0 回归：JOIN 一对多 / NOW() 用本地时区 ---');
+  {
+    let JSQL, db;
+    try {
+      ({ JSQL } = require('../lib/native_client.js'));
+      db = new JSQL();
+      await db.start();
+    } catch (e) {
+      console.log('[SKIP] native 不可用：' + e.message.slice(0, 60));
+    }
+    if (db) {
+      const run = (sql) => executeSQL(db, sql, OPTS);
+      await run('CREATE TABLE ru (id INT PRIMARY KEY, name TEXT)');
+      await run('CREATE TABLE ro (id INT PRIMARY KEY, uid INT, amt INT)');
+      await run("INSERT INTO ru (id,name) VALUES (1,'x')");
+      await run('INSERT INTO ro (id,uid,amt) VALUES (1,1,10),(2,1,20),(3,1,30)');
+      const j = await run('SELECT ru.name, ro.amt FROM ru JOIN ro ON ru.id = ro.uid');
+      ok('JOIN 一对多返回 3 行', j.rows.length === 3, j.rows);
+
+      const n = await run('SELECT NOW() AS d');
+      const nowLocal = new Date();
+      const p = (x) => String(x).padStart(2, '0');
+      const expectYmd = nowLocal.getFullYear() + '-' + p(nowLocal.getMonth() + 1) + '-' + p(nowLocal.getDate());
+      ok('NOW() 返回本地时区日期', String(n.rows[0][0]).slice(0, 10) === expectYmd, n.rows);
+      await db.stop();
+    }
+  }
+
+  console.log('\n--- NULL 三值逻辑 / 相关子查询 / DATE 列时区 ---');
+  {
+    let JSQL, db;
+    try {
+      ({ JSQL } = require('../lib/native_client.js'));
+      db = new JSQL();
+      await db.start();
+    } catch (e) {
+      console.log('[SKIP] native 不可用：' + e.message.slice(0, 60));
+    }
+    if (db) {
+      const run = (sql) => executeSQL(db, sql, OPTS);
+      // NOT 作用于含 NULL 的比较：UNKNOWN 取反仍是 UNKNOWN，该行不应入选
+      await run('CREATE TABLE nl (id INT PRIMARY KEY, a INT)');
+      await run('INSERT INTO nl (id,a) VALUES (1,1),(2,2),(3,NULL)');
+      ok('NOT (a > 1) 排除 NULL 行', JSON.stringify((await run('SELECT id FROM nl WHERE NOT (a > 1)')).rows) === '[[1]]');
+
+      // 相关子查询引用外层别名
+      await run('CREATE TABLE ta (id INT PRIMARY KEY, v INT)');
+      await run('CREATE TABLE tb (id INT PRIMARY KEY, av INT)');
+      await run('INSERT INTO ta (id,v) VALUES (1,10),(2,20)');
+      await run('INSERT INTO tb (id,av) VALUES (1,10)');
+      ok('EXISTS 相关子查询',
+        JSON.stringify((await run('SELECT id FROM ta WHERE EXISTS (SELECT 1 FROM tb WHERE tb.av = ta.v)')).rows) === '[[1]]');
+      ok('NOT EXISTS 相关子查询',
+        JSON.stringify((await run('SELECT id FROM ta WHERE NOT EXISTS (SELECT 1 FROM tb WHERE tb.av = ta.v)')).rows) === '[[2]]');
+
+      // DATE 列序列化：不能用 toISOString（UTC），否则东八区差一天
+      const { validateDateType } = require('../lib/date-types.js');
+      ok('DATE 字符串不回退一天', validateDateType('2023-01-01', 'date', 'f') === '2023-01-01');
+      ok('DATE 闰年边界（2024-02-29）', validateDateType('2024-02-29', 'date', 'f') === '2024-02-29');
+      ok('DATE 对象按本地时区', validateDateType(new Date(2023, 0, 1), 'date', 'f') === '2023-01-01');
+      ok('DATETIME 对象按本地时区',
+        validateDateType(new Date(2023, 0, 1, 8, 30), 'datetime', 'f') === '2023-01-01 08:30:00');
+      await db.stop();
+    }
+  }
+
   console.log('\n--- Redis：RESP2 帧解析（曾 inline 命令恒为 unknown command）---');
   {
     const { RedisServer } = require('../lib/redis_server.js');