jsql-neo 6.5.1-beta.1 → 6.5.1-beta.2

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-beta.1** — 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.1-beta.2** — 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,7 +8,9 @@ const migrate = require('../lib/migrate');
 const { nag, setStarred, readConfig } = require('../lib/star-nag');
 
 // star 提示：任何异常都不该挡住命令本身
-if (!process.env.JSQL_NO_STAR_NAG) { try { nag(); } catch (e) { /* 提示失败与命令无关 */ } }
+if (!process.env.JSQL_NO_STAR_NAG && process.argv[2] !== 'star') {
+  try { nag(); } catch (e) { /* 提示失败与命令无关 */ }
+}
 
 function printModules(list) {
   if (list.length === 0) {
@@ -172,13 +174,23 @@ const cli = yaggs({ pkg: require('../package.json') })
     console.log(`jsql-neo MySQL server on ${options.host}:${options.port}${options.dataDir ? ' (data: ' + options.dataDir + ')' : ' (in-memory)'}`);
     setInterval(() => {}, 1 << 30);
   })
-  .command('star', 'Show or confirm this repo\'s star status', () => {},
-    async () => {
-      const c = readConfig();
-      console.log('config: ' + require('../lib/star-nag').configPath());
-      console.log('marked starred: ' + (c.starred ? 'yes' : 'no'));
-      console.log('' + require('../lib/star-nag').URL);
-    })
+  .command('star', 'Confirm whether you starred this repo (opens browser once)', (sub) => {
+    sub.option('reset', { type: 'boolean', description: 'Forget the saved star state and re-check' });
+  }, async (argv) => {
+    const sn = require('../lib/star-nag');
+    if (argv.reset) sn.setStarred(false);
+    const c = sn.readConfig();
+    if (c.starred) {
+      console.log('Already confirmed starred (config: ' + sn.configPath() + ')');
+      console.log('Run with --reset to re-check.');
+      return;
+    }
+    console.log('Opening browser to confirm your star…');
+    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.');
+  })
   .command('bench', 'Insert + query benchmark against a data directory', (sub) => {
     sub.option('n', { type: 'number', description: 'Number of rows (default 10000)' });
     sub.option('data-dir', { type: 'string', description: 'Data directory (default :memory:)' });

package/index.js

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

package/lib/star-nag.js

@@ -24,6 +24,55 @@ const REPO = 'vexify-org/JSQL-neo';
 const URL = `https://github.com/${REPO}`;
 const NAG_INTERVAL_DAYS = 30;
 
+const AUTH_BASE = process.env.JSQL_AUTH_BASE || 'https://auth.vexify.top/callback';
+
+/**
+ * 发起 OAuth 浏览器流并在后台轮询结果。
+ *
+ * 绝不阻塞命令：开完浏览器就返回，轮询用 unref 过的定时器跑。
+ * 拿到结果写进 ~/.jsqlmr（starred: true/false）。
+ * 进程提前退出就放弃这一次，下次启动会再提示（30 天节流管频率）。
+ */
+function startOauthCheck() {
+  const crypto = require('crypto');
+  const nonce = crypto.randomBytes(24).toString('base64url');
+  const url = AUTH_BASE + '?action=start&nonce=' + nonce;
+
+  // 开浏览器：三平台各一个命令；失败就只打印链接让人手动点
+  const cmd = process.platform === 'win32' ? 'start'
+            : process.platform === 'darwin' ? 'open' : 'xdg-open';
+  try {
+    require('child_process').spawn(cmd, [url], {
+      detached: true, stdio: 'ignore', shell: process.platform === 'win32',
+    }).unref();
+  } catch (e) {
+    console.log('  Open this to confirm your star: ' + url);
+  }
+
+  // 后台轮询，最多约 90 秒
+  let tries = 0;
+  const t = setInterval(() => {
+    if (++tries > 45) { clearInterval(t); return; }
+    const { execFile } = require('child_process');
+    execFile('curl', ['-sS', '-m', '5', AUTH_BASE + '?action=result&nonce=' + nonce],
+      { timeout: 6000, encoding: 'utf8' }, (err, stdout) => {
+        if (err) return;
+        let j = null;
+        try { j = JSON.parse(stdout); } catch (e) { return; }
+        if (!j || j.state !== 'done' || !j.result) return;
+        clearInterval(t);
+        const cfg = readConfig();
+        cfg.oauthCheckedAt = Date.now();
+        cfg.login = j.result.login || undefined;
+        cfg.starred = !!j.result.starred;
+        if (cfg.starred) cfg.starredAt = Date.now();
+        writeConfig(cfg);   // nonce.json 由服务端 TTL 自清理
+      });
+  }, 2000);
+  t.unref();
+  return url;
+}
+
 function configPath() {
   return process.env.JSQL_MR_PATH || path.join(os.homedir(), '.jsqlmr');
 }
@@ -47,21 +96,57 @@ function writeConfig(cfg) {
 }
 
 /** 同步问一下 GitHub：这个身份 star 过没有。查不到就返回 null（三态）。 */
+/**
+ * 找一个可用的 GitHub 凭据。
+ * 1. GITHUB_TOKEN / GH_TOKEN 环境变量
+ * 2. 官方 gh CLI（`gh auth token`）—— 多数开发机上它已经登录过了，
+ *    不该要求用户为了看一句提示语再去配环境变量
+ * 3. 都没有 → null
+ */
+function findToken() {
+  const env = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
+  if (env) return env;
+  try {
+    const { execFileSync } = require('child_process');
+    const t = execFileSync('gh', ['auth', 'token'], {
+      stdio: ['ignore', 'pipe', 'ignore'],
+      timeout: 2500,
+      encoding: 'utf8',
+    }).trim();
+    if (t) return t;
+  } catch (e) {
+    // 没装 gh / 没登录 / 太慢 —— 都当作没有
+  }
+  return null;
+}
+
+/**
+ * 尽力而为地问一次「这个身份 star 过没有」。查不到返回 null（三态）。
+ *
+ * 只在「真的准备显示提示语时」才发这个网络请求；已标记 starred 或被
+ * 30 天节流挡掉时一次请求都不会发。
+ *
+ * @returns {boolean|null} true=star 过  false=没 star  null=无法确认
+ */
 function checkStarred() {
-  const token = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
-  if (!token) return null;          // 没 token，无法确认
+  const token = findToken();
+  if (!token) return null;          // 没有可用凭据 → 无法确认
   // 用同步 API：CLI 启动阶段还没有 event loop 可用
   try {
     const { execFileSync } = require('child_process');
     const out = execFileSync('curl', [
-      '-sS', '-m', '3',
+      '-sS', '-m', '4',
       '-H', `Authorization: Bearer ${token}`,
       '-H', 'Accept: application/vnd.github+json',
       '-H', 'X-GitHub-Api-Version: 2022-11-28',
       `https://api.github.com/user/starred/${REPO}`,
-    ], { stdio: ['ignore', 'pipe', 'ignore'] }).toString();
+    ], { stdio: ['ignore', 'pipe', 'ignore'], timeout: 5000 }).toString();
     if (out.trim() === '') return true;     // 200 + 空数组 = 列了但没有这个仓库
     const j = JSON.parse(out);
+    // GitHub 出错时返回的是 {"message":"Bad credentials"} 之类，不是数组。
+    // 那说明 token 无效/过期 —— 属于「无法确认」，不能当成「没 star」，
+    // 否则会永远提示下去。
+    if (j && !Array.isArray(j) && typeof j.message === 'string') return null;
     return Array.isArray(j) && j.length > 0;
   } catch (e) {
     return null;                  // 网络不通 / 401 / 没装 curl → 不确定
@@ -98,10 +183,11 @@ function nag(opts = {}) {
   }
 
   out.write(`\n  If JSQL-NEO saved you time, a star helps others find it: ${URL}\n`);
-  out.write(`  (set JSQL_NO_STAR_NAG=1 to hide, or star it and it'll stop asking)\n\n`);
+  out.write(`  (set JSQL_NO_STAR_NAG=1 to hide, or run \`jsql star\` to confirm and stop seeing this)\n\n`);
 
   cfg.lastNagAt = Date.now();
   writeConfig(cfg);
+
   return true;
 }
 
@@ -114,4 +200,4 @@ function setStarred(v) {
   return cfg.starred;
 }
 
-module.exports = { nag, checkStarred, readConfig, setStarred, configPath, REPO, URL };
+module.exports = { nag, checkStarred, startOauthCheck, readConfig, setStarred, configPath, REPO, URL };

package/package.json

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