byteplan-cli 1.2.0 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "byteplan-cli",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "BytePlan CLI - Command line tool for BytePlan API",
   "keywords": [
     "byteplan",

package/src/api.js

@@ -6,7 +6,7 @@ import Conf from 'conf';
 import dotenv from 'dotenv';
 import { homedir } from 'os';
 import { join } from 'path';
-import { existsSync, mkdirSync, writeFileSync } from 'fs';
+import { existsSync, mkdirSync, writeFileSync, readFileSync } from 'fs';
 
 const configDir = join(homedir(), '.byteplan');
 const envFile = join(configDir, '.env');
@@ -38,6 +38,30 @@ const DEFAULT_MENU_HEADERS = {
 let currentEnv = process.env.BP_ENV || 'uat';
 let currentToken = process.env.ACCESS_TOKEN || null;
 
+// 统一的响应处理函数
+async function handleResponse(response) {
+  const data = await response.json();
+
+  // 检查 HTTP 状态码
+  if (!response.ok) {
+    // 401 表示 token 无效或过期
+    if (response.status === 401) {
+      throw new Error('Token invalid or expired. Please run "byteplan login" to re-authenticate.');
+    }
+    // 其他 HTTP 错误
+    const errMsg = data.message || data.error_description || data.msg || `HTTP ${response.status}`;
+    throw new Error('API error: ' + errMsg);
+  }
+
+  // 检查响应中的错误字段（有些 API 返回 200 但包含错误信息）
+  if (data.error || data.code === 'ERROR' || data.success === false) {
+    const errMsg = data.message || data.msg || data.error_description || JSON.stringify(data);
+    throw new Error('API error: ' + errMsg);
+  }
+
+  return data;
+}
+
 export function setEnvironment(env) {
   if (ENVIRONMENTS[env]) {
     currentEnv = env;
@@ -87,7 +111,7 @@ export async function getPublicKey() {
 // 保存凭证到 .env
 function saveCredentials(data) {
   const envPath = join(homedir(), '.byteplan', '.env');
-  
+
   const lines = [];
   lines.push('BP_ENV=' + currentEnv);
   lines.push('BP_USER=' + data.username);
@@ -101,10 +125,42 @@ function saveCredentials(data) {
   if (data.expiresIn) {
     lines.push('TOKEN_EXPIRES_IN=' + (Date.now() + data.expiresIn * 1000));
   }
-  
+
   writeFileSync(envPath, lines.join('\n') + '\n');
 }
 
+// 保存 token 到 .env（切换租户时使用）
+export function saveToken(accessToken, refreshToken, expiresIn) {
+  const envPath = join(homedir(), '.byteplan', '.env');
+
+  // 读取现有的 .env 内容
+  let existingLines = [];
+  if (existsSync(envPath)) {
+    existingLines = readFileSync(envPath, 'utf-8').split('\n').filter(line =>
+      !line.startsWith('ACCESS_TOKEN=') &&
+      !line.startsWith('REFRESH_TOKEN=') &&
+      !line.startsWith('TOKEN_EXPIRES_IN=')
+    );
+  }
+
+  // 添加新的 token 信息
+  const newLines = [...existingLines];
+  if (accessToken) {
+    newLines.push('ACCESS_TOKEN=' + accessToken);
+  }
+  if (refreshToken) {
+    newLines.push('REFRESH_TOKEN=' + refreshToken);
+  }
+  if (expiresIn) {
+    newLines.push('TOKEN_EXPIRES_IN=' + (Date.now() + expiresIn * 1000));
+  }
+
+  writeFileSync(envPath, newLines.join('\n') + '\n');
+
+  // 更新内存中的 token
+  setToken(accessToken);
+}
+
 // 登录
 export async function login(username, password, env = 'uat') {
   if (env) setEnvironment(env);
@@ -212,8 +268,8 @@ export async function getUserInfo(token) {
       'authorization': 'Bearer ' + (token || currentToken),
     },
   });
-  
-  return response.json();
+
+  return handleResponse(response);
 }
 
 // 切换租户
@@ -227,27 +283,27 @@ export async function switchTenant(token, tenantId) {
       'authorization': 'Bearer ' + (token || currentToken),
     },
   });
-  
-  return response.json();
+
+  return handleResponse(response);
 }
 
 // 查询模型列表
 export async function queryModels(token, options = {}) {
   const { page = 0, size = 100 } = options;
   const baseUrl = getBaseUrl();
-  
+
   const headers = {
     'accept': 'application/json, text/plain, */*',
     'authorization': 'Bearer ' + (token || currentToken),
     ...DEFAULT_MENU_HEADERS,
   };
-  
+
   const response = await fetch(baseUrl + '/data/api/model/query?page=' + page + '&size=' + size, {
     method: 'GET',
     headers,
   });
-  
-  return response.json();
+
+  return handleResponse(response);
 }
 
 // 获取模型字段
@@ -263,8 +319,8 @@ export async function getModelColumns(token, modelCodes) {
     },
     body: JSON.stringify(modelCodes),
   });
-  
-  return response.json();
+
+  return handleResponse(response);
 }
 
 // 查询模型数据
@@ -280,18 +336,22 @@ export async function getModelData(token, modelCode, params = {}) {
     },
     body: JSON.stringify({
       modelCode,
-      ...params,
+      params: {
+        pageNum: params.pageNum || 0,
+        pageSize: params.pageSize || 100,
+        ...params,
+      },
     }),
   });
-  
-  return response.json();
+
+  return handleResponse(response);
 }
 
 // 获取维度值
 export async function getDimValues(token, dimCode, options = {}) {
   const { page = 0, size = 100 } = options;
   const baseUrl = getBaseUrl();
-  
+
   const response = await fetch(baseUrl + '/data/api/online/lov/DATA_DIM_VALUE_LOV?dimCode=' + dimCode + '&page=' + page + '&size=' + size, {
     method: 'POST',
     headers: {
@@ -302,18 +362,18 @@ export async function getDimValues(token, dimCode, options = {}) {
     },
     body: JSON.stringify({ dimCode, page, size }),
   });
-  
-  return response.json();
+
+  return handleResponse(response);
 }
 
 // 获取 LOV 值
 export async function getLovValues(token, lovCode, options = {}) {
   const { keywords = null } = options;
   const baseUrl = getBaseUrl();
-  
+
   const body = {};
   if (keywords) body.keywords = keywords;
-  
+
   const response = await fetch(baseUrl + '/data/api/online/lov/' + lovCode, {
     method: 'POST',
     headers: {
@@ -324,6 +384,6 @@ export async function getLovValues(token, lovCode, options = {}) {
     },
     body: JSON.stringify(body),
   });
-  
-  return response.json();
+
+  return handleResponse(response);
 }

package/src/cli.js

@@ -16,6 +16,7 @@ import {
   getModelData,
   getDimValues,
   getLovValues,
+  saveToken,
 } from './api.js';
 import { skillsCmd } from './commands/skills.js';
 
@@ -141,12 +142,18 @@ tenantCmd
       await loginWithEnv();
       const result = await switchTenant(null, tenantId);
 
+      // 保存切换后的新 token
+      if (result.access_token) {
+        saveToken(result.access_token, result.refresh_token, result.expires_in);
+      }
+
       printJSON({
         success: true,
         tenant: {
           tenantId: tenantId,
           tenantName: result.data?.tenantName || '',
         },
+        tokenUpdated: !!result.access_token,
       });
     } catch (error) {
       printError(error);
@@ -229,7 +236,7 @@ const dataCmd = program
 dataCmd
   .command('query <modelCode>')
   .description('Query data from a model')
-  .option('-p, --page <number>', 'Page number', '0')
+  .option('-p, --page <number>', 'Page number (starting from 0)', '0')
   .option('-s, --size <number>', 'Page size', '100')
   .action(async (modelCode, options) => {
     try {