jsql-neo 6.5.0-beta.5 → 6.5.0-beta.6

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.0-beta.5** — pre-release build · [github.com/vexify-org/JSQL-neo](https://github.com/vexify-org/JSQL-neo) · [jsql.vexify.top](https://jsql.vexify.top)
+> **v6.5.0-beta.6** — pre-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)

package/bin/jsql

@@ -8,8 +8,9 @@ const migrate = require('../lib/migrate');
 const { nag, setStarred, readConfig } = require('../lib/star-nag');
 
 // star 提示：任何异常都不该挡住命令本身
-// version 只回版本号、star 本身就是干这件事的 —— 这两个不提示，其余全部提示
-if (!process.env.JSQL_NO_STAR_NAG && !['version','star'].includes(process.argv[2])) {
+// version / --version 只回版本号、star 本身就是干这件事的 —— 这些不提示，其余全部提示
+const NO_NAG_ARGS = new Set(['version', '--version', '-v', 'star']);
+if (!process.env.JSQL_NO_STAR_NAG && !NO_NAG_ARGS.has(process.argv[2])) {
   try { nag(); } catch (e) { /* 提示失败与命令无关 */ }
 }
 
@@ -190,7 +191,20 @@ const cli = yaggs({ pkg: require('../package.json') })
     const nonceUrl = sn.startOauthCheck();     // 打开浏览器 + 后台轮询写回 ~/.jsqlmr
     if (!process.stdout.isTTY) console.log('  ' + nonceUrl);
     console.log('After you authorize, this config is updated: ' + sn.configPath());
-    console.log('Run `jsql star` again afterwards to see the result.');
+    console.log('Waiting for authorization (up to 3 minutes)…');
+    // startOauthCheck 的定时器是 unref 的，命令必须自己前台等，否则接不到结果
+    const res = sn.waitForResult(nonceUrl, 180000);
+    if (res && res.starred) {
+      sn.setStarred(true);
+      console.log(`Confirmed: ${res.login} has starred ${res.repo}. Thanks!`);
+      return;
+    }
+    if (res) {
+      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.`);
+      return;
+    }
+    console.log('Timed out or the link expired. 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.0-beta.5 — Rust-Powered Embedded Database (WASM + HTTP)
+ * JSQL-NEO v6.5.0-beta.6 — Rust-Powered Embedded Database (WASM + HTTP)
  *
  * @example
  * const jsql = require('jsql-neo');

package/lib/star-nag.js

@@ -204,4 +204,43 @@ function setStarred(v) {
   return cfg.starred;
 }
 
-module.exports = { nag, checkStarred, startOauthCheck, readConfig, setStarred, configPath, REPO, URL };
+/**
+ * 同步阻塞轮询授权结果，直到拿到 done / expired 或超时。
+ *
+ * `jsql star` 用：startOauthCheck 的定时器是 unref 的（不能拖住别的命令），
+ * 所以 star 命令必须自己前台等，否则授权完成后 CLI 早已退出，结果没人接。
+ *
+ * @param {string} startUrl startOauthCheck 返回的 URL（含 nonce）
+ * @param {number} [timeoutMs] 最长等待时间，默认 180 秒
+ * @returns {object|null} result 对象（含 login/starred/repo），超时或失败返回 null
+ */
+function waitForResult(startUrl, timeoutMs = 180000) {
+  const { execFileSync } = require('child_process');
+  // 注意：本模块顶部有 const URL = 'https://github.com/...' 会遮蔽全局 URL 类，
+  // 必须显式从 url 模块取，否则 new URL(...) 抛 TypeError
+  const { URL: NodeURL } = require('url');
+  let nonce = '';
+  try {
+    nonce = new NodeURL(startUrl).searchParams.get('nonce') || '';
+  } catch (e) {
+    return null;
+  }
+  if (!nonce) return null;
+
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    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;
+    } catch (e) {
+      // 网络抖动 / 超时 —— 继续等
+    }
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 2000);
+  }
+  return null;
+}
+
+module.exports = { nag, checkStarred, startOauthCheck, waitForResult, readConfig, setStarred, configPath, REPO, URL };

package/package.json

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