jsql-neo 6.5.1 → 6.5.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.5.1** — stable release · [github.com/vexify-org/JSQL-neo](https://github.com/vexify-org/JSQL-neo) · [jsql.vexify.top](https://jsql.vexify.top)
+> **v6.5.3** — stable release · [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)

package/bin/jsql

@@ -212,17 +212,29 @@ const cli = yaggs({ pkg: require('../package.json') })
     console.log('Waiting for authorization (up to 3 minutes)…');
     // startOauthCheck 的定时器是 unref 的，命令必须自己前台等，否则接不到结果
     const res = sn.waitForResult(nonceUrl, 180000);
-    if (res && res.starred) {
+    const status = res && res.status;
+    if (status === 'starred') {
       sn.setStarred(true);
       console.log(`Confirmed: ${res.login} has starred ${res.repo}. Thanks!`);
       return;
     }
-    if (res) {
+    if (status === 'not-starred') {
       console.log(`Authorization finished, but ${res.login} has not starred ${res.repo} yet.`);
-      console.log(`Star it at https://github.com/${res.repo} then run \`jsql star\` again.`);
+      console.log(`Star it at ${sn.URL} then run \`jsql star\` again.`);
       return;
     }
-    console.log('Timed out or the link expired. Run `jsql star` again to retry.');
+    if (status === 'denied' || status === 'error') {
+      // 这不是「没 star」，是授权本身没走通（code 过期、链接被重复打开、被拒绝）。
+      // 老实现这里会把 login/repo 打印成 undefined，并让用户去 star —— 误导。
+      console.log(`Authorization ${status === 'denied' ? 'was declined' : 'failed'}: ${res.error || 'unknown reason'}`);
+      console.log('The link is single-use. Run `jsql star` again to get a fresh one.');
+      return;
+    }
+    if (status === 'expired') {
+      console.log('The link expired. Run `jsql star` again to retry.');
+      return;
+    }
+    console.log('Timed out. Run `jsql star` again to retry.');
   })
   .command('bench', 'Insert + query benchmark against a data directory', (sub) => {
     sub.option('n', { type: 'number', description: 'Number of rows (default 10000)' });

package/index.js

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

package/lib/star-nag.js

@@ -35,6 +35,24 @@ const AUTH_RESULT = AUTH_BASE + '/result.php';
  * 拿到结果写进 ~/.jsqlmr（starred: true/false）。
  * 进程提前退出就放弃这一次，下次启动会再提示（30 天节流管频率）。
  */
+// result.php 的合法终态：done / denied / error。
+// 只有终态才写配置——"started" 这一类中间态写进去只会污染 ~/.jsqlmr。
+const TERMINAL_STATES = new Set(['done', 'denied', 'error']);
+
+// 把 result.php 的响应收敛成规范状态。老服务端会把 started 也报成 done，
+// 缺少 starred 字段 —— 一律当未完成处理，让调用方继续等。
+function parseAuthResult(j) {
+  if (!j || typeof j !== 'object') return null;
+  const st = j.state;
+  if (!TERMINAL_STATES.has(st)) return null;
+  const r = j.result || {};
+  if (st === 'done') {
+    if (typeof r.starred !== 'boolean') return null;
+    return { status: r.starred ? 'starred' : 'not-starred', login: r.login, repo: r.repo };
+  }
+  return { status: st, error: r.error || (st === 'denied' ? 'authorization denied' : 'authorization failed') };
+}
+
 function startOauthCheck() {
   const crypto = require('crypto');
   const nonce = crypto.randomBytes(24).toString('base64url');
@@ -61,12 +79,13 @@ function startOauthCheck() {
         if (err) return;
         let j = null;
         try { j = JSON.parse(stdout); } catch (e) { return; }
-        if (!j || j.state !== 'done' || !j.result) return;
+        const res = parseAuthResult(j);
+        if (!res) return;   // pending / started / 格式不符 —— 继续等
         clearInterval(t);
         const cfg = readConfig();
         cfg.oauthCheckedAt = Date.now();
-        cfg.login = j.result.login || undefined;
-        cfg.starred = !!j.result.starred;
+        cfg.login = res.login || undefined;
+        cfg.starred = res.status === 'starred';
         if (cfg.starred) cfg.starredAt = Date.now();
         writeConfig(cfg);
       });
@@ -214,6 +233,21 @@ function setStarred(v) {
  * @param {number} [timeoutMs] 最长等待时间，默认 180 秒
  * @returns {object|null} result 对象（含 login/starred/repo），超时或失败返回 null
  */
+/**
+ * 前台等待授权结果（`jsql star` 用）。
+ *
+ * 返回规范化后的结果对象：
+ *   { status: 'starred', login, repo }        已 star
+ *   { status: 'not-starred', login, repo }    授权完成但没 star
+ *   { status: 'denied', error }               用户在 GitHub 拒绝授权
+ *   { status: 'error', error }                回调失败（code 过期/复用等）
+ *   { status: 'expired' }                     链接超龄被清理
+ *   null                                     超时（timeoutMs 内没有终态）
+ *
+ * 老服务端会把 "started" 这类中间态也报成 done 且不带 starred 字段 ——
+ * parseAuthResult 一律判为未完成，继续轮询直到超时，而不是打印一段
+ * login/repo 全为 undefined 的假失败信息。
+ */
 function waitForResult(startUrl, timeoutMs = 180000) {
   const { execFileSync } = require('child_process');
   // 注意：本模块顶部有 const URL = 'https://github.com/...' 会遮蔽全局 URL 类，
@@ -232,9 +266,11 @@ function waitForResult(startUrl, timeoutMs = 180000) {
     try {
       const out = execFileSync('curl', ['-sS', '-m', '5', AUTH_RESULT + '?nonce=' + nonce],
         { stdio: ['ignore', 'pipe', 'ignore'], timeout: 8000, encoding: 'utf8' });
-      const j = JSON.parse(out);
-      if (j && j.state === 'done' && j.result) return j.result;
-      if (j && j.state === 'expired') return null;
+      let j = null;
+      try { j = JSON.parse(out); } catch (e) { j = null; }
+      const res = parseAuthResult(j);
+      if (res) return res;
+      if (j && j.state === 'expired') return { status: 'expired' };
     } catch (e) {
       // 网络抖动 / 超时 —— 继续等
     }
@@ -243,4 +279,4 @@ function waitForResult(startUrl, timeoutMs = 180000) {
   return null;
 }
 
-module.exports = { nag, checkStarred, startOauthCheck, waitForResult, readConfig, setStarred, configPath, REPO, URL };
+module.exports = { nag, checkStarred, startOauthCheck, waitForResult, parseAuthResult, readConfig, setStarred, configPath, REPO, URL };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsql-neo",
-  "version": "6.5.1",
+  "version": "6.5.3",
   "description": "JSQL-NEO — Rust-powered embedded database with WASM, REST API, B-Tree indexes, WAL, crash recovery",
   "main": "index.js",
   "types": "index.d.ts",
@@ -46,7 +46,7 @@
   ],
   "scripts": {
     "postinstall": "node postinstall.js",
-    "test": "node test/smoke.js && node test/native.test.js && node test/json-functions.test.js && node test/sql-parser.test.js && node test/readme-audit.test.js && node test/query-opt.test.js && node test/wal-recovery.test.js && node test/mysql-compat-hijack.test.js && node test/dml-constraints.test.js",
+    "test": "node test/smoke.js && node test/native.test.js && node test/json-functions.test.js && node test/sql-parser.test.js && node test/readme-audit.test.js && node test/query-opt.test.js && node test/wal-recovery.test.js && node test/mysql-compat-hijack.test.js && node test/dml-constraints.test.js && node test/star-nag.test.js",
     "test:parser": "node test/sql-parser.test.js",
     "test:btree": "node test/btree.test.js",
     "test:native": "node test/native.test.js",
@@ -59,6 +59,7 @@
     "test:index": "node test/index-ddl.test.js",
     "test:mongo": "node test/mongo-group.test.js",
     "test:multi": "node test/multiprotocol.test.js",
+    "test:star": "node test/star-nag.test.js",
     "test:savepoint": "node test/savepoint.test.js",
     "test:alter": "node test/alter-table.test.js",
     "test:ident": "node test/identifier-keywords.test.js",

package/test/star-nag.test.js

@@ -0,0 +1,160 @@
+/**
+ * jsql star 授权流回归测试
+ *
+ * 背景：线上 result.php 曾把「state 文件存在」一律当成授权完成，
+ * 而 start.php 一开始就会写入 {"state":"started"}。于是 CLI 第二轮轮询
+ * 就拿到 started 当 done，打印出：
+ *     Authorization finished, but undefined has not starred undefined yet.
+ *     Star it at https://github.com/undefined then run `jsql star` again.
+ * 真相是授权根本没走完。
+ *
+ * 覆盖：
+ *   1. parseAuthResult 对各形态响应的归一化（中间态不得当成完成）
+ *   2. CLI 对 starred / not-starred / denied / error 的输出
+ *   3. 慢用户场景：先 pending 再完成，CLI 必须继续等而不是误判
+ *   4. waitForResult 的超时与 expired 收敛
+ *
+ * 注意：AUTH_RESULT 是 lib/star-nag 在 require 时从 JSQL_AUTH_BASE 读的，
+ * 所以必须先把 env 设好再 require（waitForResult 又用同步 curl，
+ * 本进程内的 server 会被饿死，所以 CLI 相关用例一律起子进程）。
+ */
+const http = require('http');
+const path = require('path');
+const fs = require('fs');
+const os = require('os');
+const { spawn } = require('child_process');
+
+const PORT = Number(process.env.JSQL_STAR_TEST_PORT) || 34711;
+process.env.JSQL_AUTH_BASE = `http://127.0.0.1:${PORT}`;
+
+const sn = require('../lib/star-nag');
+
+let pass = 0, fail = 0;
+function ok(name, cond, extra) {
+  if (cond) { pass++; console.log('[OK]   ' + name); }
+  else { fail++; console.log('[FAIL] ' + name + (extra !== undefined ? ' → ' + JSON.stringify(extra) : '')); }
+}
+
+/** 当前 result.php 要返回的内容；pollsLeft <= 0 时切到 after */
+let scenario = { state: 'pending' };
+let pollsLeft = 0;
+let after = null;
+
+const server = http.createServer((req, res) => {
+  res.writeHead(200, { 'Content-Type': 'application/json' });
+  if (new URL(req.url, 'http://127.0.0.1').pathname === '/result.php') {
+    if (pollsLeft > 0 && --pollsLeft === 0 && after) scenario = after;
+    res.end(JSON.stringify(scenario));
+    return;
+  }
+  res.end('{}');
+});
+
+function runCli(mrPath) {
+  return new Promise((resolve) => {
+    const bin = path.join(__dirname, '..', 'bin', 'jsql');
+    const child = spawn(process.execPath, [bin, 'star'], {
+      env: { ...process.env, JSQL_AUTH_BASE: `http://127.0.0.1:${PORT}`, JSQL_MR_PATH: mrPath, JSQL_NO_STAR_NAG: '1' },
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    let out = '';
+    child.stdout.on('data', (c) => { out += c; });
+    child.stderr.on('data', (c) => { out += c; });
+    const t = setTimeout(() => { try { child.kill(); } catch (e) {} resolve(out + '\n[TIMEOUT]'); }, 40000);
+    child.on('exit', () => { clearTimeout(t); resolve(out); });
+  });
+}
+
+async function main() {
+  /* ---------- 1. parseAuthResult ---------- */
+  console.log('--- parseAuthResult：中间态不得当成完成 ---');
+  {
+    const P = sn.parseAuthResult;
+    ok('done + starred=true → starred', P({ state: 'done', result: { starred: true, login: 'u', repo: 'o/r' } }).status === 'starred');
+    ok('done + starred=false → not-starred', P({ state: 'done', result: { starred: false, login: 'u', repo: 'o/r' } }).status === 'not-starred');
+    ok('started 被误报成 done → 未完成', P({ state: 'done', result: { state: 'started', at: 1 } }) === null);
+    ok('pending → 未完成', P({ state: 'pending' }) === null);
+    ok('缺 result 的 done → 未完成', P({ state: 'done' }) === null);
+    ok('denied → 带原因', P({ state: 'denied', result: { error: 'access_denied' } }).status === 'denied');
+    ok('error → 带原因', P({ state: 'error', result: { error: 'The code passed is incorrect or expired.' } }).error === 'The code passed is incorrect or expired.');
+    ok('空响应 → 未完成', P(null) === null && P({}) === null);
+    ok('未知状态 → 未完成', P({ state: 'weird' }) === null);
+    ok('expired 不在终态集（由 waitForResult 单独处理）', P({ state: 'expired' }) === null);
+  }
+
+  await new Promise((r) => server.listen(PORT, '127.0.0.1', r));
+  const mrDir = fs.mkdtempSync(path.join(os.tmpdir(), 'jsqlmr-'));
+
+  /* ---------- 2. CLI 各终态输出 ---------- */
+  console.log('\n--- 假 result.php 驱动真实 CLI ---');
+  const cases = [
+    ['done + starred', { state: 'done', result: { starred: true, login: 'octocat', repo: 'vexify-org/JSQL-neo' } },
+      'Confirmed: octocat has starred vexify-org/JSQL-neo. Thanks!'],
+    ['done + 未 star', { state: 'done', result: { starred: false, login: 'octocat', repo: 'vexify-org/JSQL-neo' } },
+      'Authorization finished, but octocat has not starred vexify-org/JSQL-neo yet.'],
+    ['denied', { state: 'denied', result: { error: 'access_denied' } },
+      'Authorization was declined: access_denied'],
+    ['error（code 过期/复用）', { state: 'error', result: { error: 'The code passed is incorrect or expired.' } },
+      'Authorization failed: The code passed is incorrect or expired.'],
+  ];
+  for (const [name, resp, expect] of cases) {
+    scenario = resp; pollsLeft = 0; after = null;
+    const out = await runCli(path.join(mrDir, name.replace(/[^a-z0-9]+/gi, '-')));
+    ok(`CLI 输出正确：${name}`, out.includes(expect), out.trim().slice(0, 200));
+    ok(`CLI 不再出现 undefined：${name}`, !/undefined/.test(out), out.trim().slice(0, 200));
+  }
+
+  /* ---------- 3. 慢用户 ---------- */
+  console.log('\n--- 慢用户：先 pending 再完成，CLI 必须继续等而不是误判 ---');
+  {
+    scenario = { state: 'pending' };
+    pollsLeft = 2;
+    after = { state: 'done', result: { starred: true, login: 'octocat', repo: 'vexify-org/JSQL-neo' } };
+    const out = await runCli(path.join(mrDir, 'slow'));
+    ok('等完 pending 后正确确认', out.includes('Confirmed: octocat has starred vexify-org/JSQL-neo. Thanks!'), out.trim().slice(0, 200));
+    ok('全程没有误判成完成', !/Authorization finished/.test(out), out.trim().slice(0, 200));
+    ok('全程没有 undefined', !/undefined/.test(out), out.trim().slice(0, 200));
+  }
+
+  /* ---------- 4. waitForResult ---------- */
+  console.log('\n--- waitForResult：中间态与超时 ---');
+  {
+    // waitForResult 用同步 curl，会阻塞本进程事件循环 —— server 必须留在父进程，
+    // 轮询放到子进程里跑，否则 parent 的 server 被饿死，curl 全部 -m 超时。
+    const url = `http://127.0.0.1:${PORT}/start.php?nonce=abcdefghijklmnopqrst`;
+    const poll = (resp, timeoutMs) => new Promise((resolve) => {
+      scenario = resp; pollsLeft = 0; after = null;
+      const code = [
+        `const sn = require(${JSON.stringify(path.join(__dirname, '..', 'lib', 'star-nag'))});`,
+        `const t = Date.now();`,
+        `const r = sn.waitForResult(process.env.TEST_URL, ${timeoutMs});`,
+        `process.stdout.write(JSON.stringify({ r, ms: Date.now() - t }));`,
+      ].join('\n');
+      const c = spawn(process.execPath, ['-e', code],
+        { env: { ...process.env, TEST_URL: url }, stdio: ['ignore', 'pipe', 'ignore'] });
+      let out = '';
+      c.stdout.on('data', (d) => { out += d; });
+      c.on('exit', () => { try { resolve(JSON.parse(out)); } catch (e) { resolve({ r: null, ms: -1 }); } });
+    });
+
+    for (const [name, resp] of [
+      ['pending', { state: 'pending' }],
+      ['老服务端误报 started 为 done', { state: 'done', result: { state: 'started', at: 1 } }],
+    ]) {
+      const { r, ms } = await poll(resp, 3000);
+      ok(`waitForResult(${name}) 超时返回 null`, r === null, r);
+      ok(`确实等满了 3 秒`, ms >= 2800, ms);
+    }
+    {
+      const { r, ms } = await poll({ state: 'expired' }, 5000);
+      ok('waitForResult(expired) 立即收敛', !!r && r.status === 'expired', r);
+      ok('expired 没有拖到超时', ms >= 0 && ms < 2500, ms);
+    }
+  }
+
+  server.close();
+  console.log(`\nRESULT: ${pass} passed, ${fail} failed`);
+  if (fail > 0) process.exit(1);
+}
+
+main().catch((e) => { console.error(e); process.exit(1); });