@app-public/weaverbird-debug 1.0.0 → 1.0.2

package/README.md

@@ -34,13 +34,17 @@ npm install -g @app-public/weaverbird-test     # 测试环境
 ## CLI 命令
 
 ```bash
-weaverbird cli login          # 线上（或对应环境的命令名）
+weaverbird --version          # 显示 CLI 版本号（顶层）
+weaverbird --help             # 显示顶层帮助
+weaverbird cli login          # 浏览器 OAuth 登录
 weaverbird-debug cli login    # 本地调试
 weaverbird-test cli login     # 测试环境
 weaverbird cli logout         # 清除当前环境本地 token
 weaverbird cli status         # 查询登录状态及 token 信息
-weaverbird cli --version      # 显示 CLI 版本号
-weaverbird cli --help         # 显示命令帮助
+weaverbird cli token set --type figma <token>  # 设置 Figma token（本地 + 服务端）
+weaverbird update             # 更新当前环境 CLI 到最新版本
+weaverbird cli update         # 同上（子命令形式）
+weaverbird cli --help         # 显示子命令帮助
 ```
 
 ### login 流程
@@ -61,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": "张三"
+    }
   }
 }
 ```
@@ -78,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
 }
 ```
@@ -258,6 +271,7 @@ CLI 依赖服务端 OAuth 接口（均为 POST JSON，响应格式与项目统
 | `/v1/api/ci/oauth/getAuthorizeSession` | Web 查询授权会话状态（pending/expired/invalid） |
 | `/v1/api/ci/oauth/authorize` | 签发 authorization code（需 session_token + header `token`） |
 | `/v1/api/ci/oauth/token` | 换取/刷新 access_token |
+| `/v1/api/ci/open/setToken` | CLI 设置第三方 token（如 figma），需 `cli_token` header |
 
 授权页由前端 `{WEAVERBIRD_URL}/weaverbird/oauth/authorize?session=...` 实现；会话 **5 分钟过期、一次性使用**，过期或已用后 Web 会拦截并提示重新执行 `weaverbird cli login`。
 

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,64 +4,109 @@ 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');
+const { setServiceToken } = require('./token');
 const pkg = require('./package.json');
 
 const scriptName = resolveScriptName();
 
 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));
 }
 
+function registerTokenCommands(yargs) {
+  return yargs
+    .command(
+      'set <token>',
+      '设置第三方 token 并同步到服务端',
+      (yargs) =>
+        yargs.option('type', {
+          alias: 't',
+          type: 'string',
+          choices: ['figma'],
+          demandOption: true,
+          description: 'token 类型，当前支持 figma',
+        }),
+      async (argv) => {
+        await setServiceToken(argv.type, argv.token);
+      }
+    )
+    .demandCommand(1, '请使用 token set --type <type> <token>')
+    .help();
+}
+
+function registerCliSubcommands(yargs) {
+  return yargs
+    .command(
+      'login',
+      `浏览器 OAuth 登录，token 保存至 ~/.weaverbird/token.${ENV}.json`,
+      () => {},
+      async () => {
+        await startLogin();
+      }
+    )
+    .command(
+      'logout',
+      '清除本地 token',
+      () => {},
+      () => {
+        clearToken();
+        console.log('✅ 已退出登录');
+      }
+    )
+    .command(
+      'status',
+      '查询登录状态及 token 信息',
+      () => {},
+      () => {
+        printStatus();
+      }
+    )
+    .command(
+      'update',
+      '从 npm 更新当前环境 CLI 到最新版本',
+      () => {},
+      () => {
+        runUpdate();
+      }
+    )
+    .command('token', '管理第三方 token', (yargs) => registerTokenCommands(yargs));
+}
+
 async function main() {
   await yargs(hideBin(process.argv))
     .scriptName(scriptName)
     .usage('$0 <command> [options]')
-    .version(false)
+    .version(pkg.version)
+    .command(
+      'update',
+      '从 npm 更新当前环境 CLI 到最新版本',
+      () => {},
+      () => {
+        runUpdate();
+      }
+    )
     .command(
       'cli',
       'Weaverbird CLI 子命令',
       (yargs) =>
-        yargs
-          .version(pkg.version)
-          .command(
-            'login',
-            `浏览器 OAuth 登录，token 保存至 ~/.weaverbird/token.${ENV}.json`,
-            () => {},
-            async () => {
-              await startLogin();
-            }
-          )
-          .command(
-            'logout',
-            '清除本地 token',
-            () => {},
-            () => {
-              clearToken();
-              console.log('✅ 已退出登录');
-            }
-          )
-          .command(
-            'status',
-            '查询登录状态及 token 信息',
-            () => {},
-            () => {
-              printStatus();
-            }
-          )
-          .demandCommand(0)
-          .help()
+        registerCliSubcommands(yargs.version(pkg.version)).demandCommand(0).help()
     )
-    .demandCommand(1, `请使用 ${scriptName} cli <command>，执行 ${scriptName} cli --help 查看帮助`)
+    .demandCommand(1, `请使用 ${scriptName} <command>，执行 ${scriptName} --help 查看帮助`)
     .help()
     .parseAsync();
 }

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/npm-packages.js

@@ -0,0 +1,21 @@
+const NPM_SCOPE = '@app-public';
+
+const ENV_NPM_PACKAGES = {
+  release: `${NPM_SCOPE}/weaverbird`,
+  debug: `${NPM_SCOPE}/weaverbird-debug`,
+  test: `${NPM_SCOPE}/weaverbird-test`,
+};
+
+function getNpmPackageName(env) {
+  const name = ENV_NPM_PACKAGES[env];
+  if (!name) {
+    throw new Error(`未知环境 "${env}"，无法确定 npm 包名`);
+  }
+  return name;
+}
+
+module.exports = {
+  NPM_SCOPE,
+  ENV_NPM_PACKAGES,
+  getNpmPackageName,
+};

package/package.json

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

package/token.js

@@ -0,0 +1,55 @@
+const { getToken, saveToken } = require('./tokenStore');
+const { request, getValidAccessToken } = require('./api');
+
+const SET_TOKEN_PATH = '/v1/api/ci/open/setToken';
+
+const SUPPORTED_TYPES = {
+  figma: {
+    localKey: 'figma_token',
+    label: 'Figma',
+  },
+};
+
+async function setServiceToken(type, tokenValue) {
+  const config = SUPPORTED_TYPES[type];
+  if (!config) {
+    throw new Error(`不支持的 type: ${type}，当前支持: ${Object.keys(SUPPORTED_TYPES).join(', ')}`);
+  }
+  if (!tokenValue || !String(tokenValue).trim()) {
+    throw new Error('token 不能为空');
+  }
+
+  const stored = getToken();
+  if (!stored?.access_token) {
+    throw new Error('未登录，请先执行 weaverbird cli login');
+  }
+
+  const value = String(tokenValue).trim();
+  const cliToken = await getValidAccessToken();
+  saveToken({
+    ...stored,
+    [config.localKey]: value,
+  });
+
+  const result = await request(SET_TOKEN_PATH, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'cli_token': cliToken,
+    },
+    body: JSON.stringify({
+      type,
+      token: value,
+    }),
+  });
+  if (result.code !== 200) {
+    throw new Error(result.msg || '同步 token 到服务端失败');
+  }
+
+  console.log(`✅ ${config.label} token 已保存到本地并同步至服务端`);
+}
+
+module.exports = {
+  SUPPORTED_TYPES,
+  setServiceToken,
+};

package/update.js

@@ -0,0 +1,44 @@
+const { spawnSync } = require('child_process');
+const { ENV } = require('./config');
+const { getNpmPackageName } = require('./npm-packages');
+const pkg = require('./package.json');
+
+function queryLatestVersion(packageName) {
+  const result = spawnSync('npm', ['view', packageName, 'version'], {
+    encoding: 'utf8',
+    shell: true,
+  });
+  if (result.status !== 0) {
+    return null;
+  }
+  return result.stdout.trim() || null;
+}
+
+function runUpdate() {
+  const packageName = getNpmPackageName(ENV);
+  const latest = queryLatestVersion(packageName);
+
+  console.log(`📦 包名: ${packageName}`);
+  console.log(`📌 当前版本: ${pkg.version}`);
+  if (latest) {
+    console.log(`🌐 最新版本: ${latest}`);
+    if (latest === pkg.version) {
+      console.log('✅ 已是最新版本');
+      return;
+    }
+  }
+
+  console.log(`⬇️  正在更新 ${packageName}@latest ...`);
+  const result = spawnSync('npm', ['install', '-g', `${packageName}@latest`], {
+    stdio: 'inherit',
+    shell: true,
+  });
+  if (result.status !== 0) {
+    throw new Error('更新失败，请检查网络或 npm 登录状态');
+  }
+  console.log('✅ 更新完成');
+}
+
+module.exports = {
+  runUpdate,
+};

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,
+};