@app-public/weaverbird-debug 1.0.1 → 1.0.3

package/README.md

@@ -65,11 +65,18 @@ weaverbird cli --help         # 显示子命令帮助
   "env": "debug",
   "ci_base_url": "http://10.25.72.141:16644",
   "token_path": "C:\\Users\\xxx\\.weaverbird\\token.debug.json",
+  "user_id": "abc123",
+  "user_name": "张三",
   "token": {
     "access_token": "eyJxxx",
     "token_type": "Bearer",
     "expires_in": 7200,
-    "refresh_token": "xxx"
+    "refresh_token": "xxx",
+    "user": {
+      "id": "abc123",
+      "name": "zhangsan",
+      "realname": "张三"
+    }
   }
 }
 ```
@@ -82,6 +89,8 @@ weaverbird cli --help         # 显示子命令帮助
   "env": "debug",
   "ci_base_url": "http://10.25.72.141:16644",
   "token_path": "C:\\Users\\xxx\\.weaverbird\\token.debug.json",
+  "user_id": null,
+  "user_name": null,
   "token": null
 }
 ```

package/api.js

@@ -20,7 +20,7 @@ async function refreshAccessToken(refreshToken) {
   if (result.code !== 200 || !result.data?.access_token) {
     throw new Error(result.msg || '刷新 token 失败');
   }
-  saveToken(result.data);
+  saveToken({ ...getToken(), ...result.data });
   return result.data;
 }
 
@@ -38,9 +38,9 @@ async function request(path, options = {}) {
   const response = await fetch(url, {
     ...options,
     headers: {
-      cli_token: accessToken,
       'Content-Type': 'application/json',
       ...(options.headers || {}),
+      cli_token: accessToken,
     },
   });
   const data = await response.json().catch(() => ({}));

package/index.js

@@ -4,6 +4,7 @@ const yargs = require('yargs/yargs');
 const { hideBin } = require('yargs/helpers');
 const { startLogin } = require('./login');
 const { getToken, clearToken, getTokenPath } = require('./tokenStore');
+const { getDisplayName } = require('./user');
 const { CI_BASE_URL, ENV } = require('./config');
 const { resolveScriptName } = require('./cli-env');
 const { runUpdate } = require('./update');
@@ -11,14 +12,18 @@ const { setServiceToken } = require('./token');
 const pkg = require('./package.json');
 
 const scriptName = resolveScriptName();
+const UPDATE_ALIASES = ['update', 'udpate'];
 
 function printStatus() {
   const token = getToken();
+  const user = token?.user;
   const result = {
     logged_in: !!(token && token.access_token),
     env: ENV,
     ci_base_url: CI_BASE_URL,
     token_path: getTokenPath(),
+    user_id: user?.id || null,
+    user_name: getDisplayName(user),
     token: token || null,
   };
   console.log(JSON.stringify(result, null, 2));
@@ -47,6 +52,8 @@ function registerTokenCommands(yargs) {
 
 function registerCliSubcommands(yargs) {
   return yargs
+    .strictCommands()
+    .recommendCommands()
     .command(
       'login',
       `浏览器 OAuth 登录，token 保存至 ~/.weaverbird/token.${ENV}.json`,
@@ -73,7 +80,7 @@ function registerCliSubcommands(yargs) {
       }
     )
     .command(
-      'update',
+      UPDATE_ALIASES,
       '从 npm 更新当前环境 CLI 到最新版本',
       () => {},
       () => {
@@ -88,8 +95,10 @@ async function main() {
     .scriptName(scriptName)
     .usage('$0 <command> [options]')
     .version(pkg.version)
+    .strictCommands()
+    .recommendCommands()
     .command(
-      'update',
+      UPDATE_ALIASES,
       '从 npm 更新当前环境 CLI 到最新版本',
       () => {},
       () => {

package/login.js

@@ -1,7 +1,8 @@
 const express = require('express');
 const open = require('open');
 const fetch = require('cross-fetch');
-const {saveToken} = require('./tokenStore');
+const { saveToken } = require('./tokenStore');
+const { fetchAndSaveCurrentUser, getDisplayName } = require('./user');
 const {
     CLIENT_ID,
     CLIENT_SECRET,
@@ -219,13 +220,20 @@ async function startLogin() {
             try {
                 const token = await exchangeCodeForToken(code);
                 saveToken(token);
+                let userName = null;
+                try {
+                    const user = await fetchAndSaveCurrentUser();
+                    userName = getDisplayName(user);
+                } catch (userErr) {
+                    console.warn(`⚠️  获取用户信息失败：${userErr.message}`);
+                }
                 res.send(renderCallbackPage({
                     type: 'success',
                     title: '登录成功',
                     message: 'CLI 已完成授权，token 已保存到本地。',
                     hint: '可以关闭此页面',
                 }));
-                console.log('✅ 登录成功');
+                console.log(userName ? `✅ 登录成功：${userName}` : '✅ 登录成功');
                 resolve(token);
             } catch (err) {
                 res.status(500).send(renderCallbackPage({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@app-public/weaverbird-debug",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "WeaverBird CI 开放 CLI — 本地调试环境",
   "bin": {
     "weaverbird-debug": "bin/weaverbird-debug.js"

package/token.js

@@ -1,5 +1,5 @@
 const { getToken, saveToken } = require('./tokenStore');
-const { request } = require('./api');
+const { request, getValidAccessToken } = require('./api');
 
 const SET_TOKEN_PATH = '/v1/api/ci/open/setToken';
 
@@ -25,6 +25,7 @@ async function setServiceToken(type, tokenValue) {
   }
 
   const value = String(tokenValue).trim();
+  const cliToken = await getValidAccessToken();
   saveToken({
     ...stored,
     [config.localKey]: value,
@@ -32,6 +33,10 @@ async function setServiceToken(type, tokenValue) {
 
   const result = await request(SET_TOKEN_PATH, {
     method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'cli_token': cliToken,
+    },
     body: JSON.stringify({
       type,
       token: value,

package/update.js

@@ -3,10 +3,13 @@ const { ENV } = require('./config');
 const { getNpmPackageName } = require('./npm-packages');
 const pkg = require('./package.json');
 
+function getNpmCommand() {
+  return process.platform === 'win32' ? 'npm.cmd' : 'npm';
+}
+
 function queryLatestVersion(packageName) {
-  const result = spawnSync('npm', ['view', packageName, 'version'], {
+  const result = spawnSync(getNpmCommand(), ['view', packageName, 'version'], {
     encoding: 'utf8',
-    shell: true,
   });
   if (result.status !== 0) {
     return null;
@@ -29,9 +32,8 @@ function runUpdate() {
   }
 
   console.log(`⬇️  正在更新 ${packageName}@latest ...`);
-  const result = spawnSync('npm', ['install', '-g', `${packageName}@latest`], {
+  const result = spawnSync(getNpmCommand(), ['install', '-g', `${packageName}@latest`], {
     stdio: 'inherit',
-    shell: true,
   });
   if (result.status !== 0) {
     throw new Error('更新失败，请检查网络或 npm 登录状态');

package/user.js

@@ -0,0 +1,47 @@
+const { getToken, saveToken } = require('./tokenStore');
+const { request, getValidAccessToken } = require('./api');
+const GET_USER_PATH = '/v1/api/ci/open/getUser';
+
+function normalizeUser(user) {
+  if (!user) {
+    return null;
+  }
+  return {
+    id: user.id,
+    name: user.name,
+    realname: user.realname || null,
+  };
+}
+
+function getDisplayName(user) {
+  if (!user) {
+    return null;
+  }
+  return user.realname || user.name || null;
+}
+
+async function fetchAndSaveCurrentUser() {
+  const cliToken = await getValidAccessToken();
+  const result = await request(GET_USER_PATH, {
+    method: 'GET',
+    headers: {
+      cli_token: cliToken,
+    },
+  });  if (result.code !== 200 || !result.data?.user) {
+    throw new Error(result.msg || '获取用户信息失败');
+  }
+  const user = normalizeUser(result.data.user);
+  const stored = getToken() || {};
+  saveToken({
+    ...stored,
+    user,
+  });
+  return user;
+}
+
+module.exports = {
+  GET_USER_PATH,
+  normalizeUser,
+  getDisplayName,
+  fetchAndSaveCurrentUser,
+};